changes for mysql 5.7 with strict mode
Dieser Commit ist enthalten in:
Ursprung
2a933cea61
Commit
dec7056fca
|
@ -1,4 +1,5 @@
|
|||
<?php
|
||||
|
||||
/**
|
||||
* Project:
|
||||
* Contenido Content Management System
|
||||
|
@ -17,7 +18,6 @@
|
|||
*
|
||||
* $Id: class.activeusers.php 362 2015-10-05 16:31:26Z oldperl $;
|
||||
*/
|
||||
|
||||
if (!defined('CON_FRAMEWORK')) {
|
||||
die('Illegal call');
|
||||
}
|
||||
|
@ -138,7 +138,6 @@ class ActiveUsers {
|
|||
|
||||
if ($this->oDb->num_rows() > 0) {
|
||||
while ($this->oDb->next_record()) { // Table Online User
|
||||
|
||||
$aUser[] = "'" . $this->oDb->f('user_id') . "'";
|
||||
}
|
||||
}
|
||||
|
@ -165,7 +164,6 @@ class ActiveUsers {
|
|||
|
||||
if (in_array("sysadmin", $aPerms)) {
|
||||
$aAllUser[$sUserId]['perms'] = 'Systemadministrator';
|
||||
|
||||
} else {
|
||||
|
||||
$bIsAdmin = false;
|
||||
|
@ -184,7 +182,6 @@ class ActiveUsers {
|
|||
|
||||
$aAllUser[$sUserId]['perms'] = "Administrator (" . $sWebsiteNames . ")";
|
||||
$iCounter++;
|
||||
|
||||
} else if (preg_match('/^client\[(\d+)\]$/', $sPerm, $aResults) && !$bIsAdmin) {
|
||||
$iClientId = $aResults[1];
|
||||
$sWebsiteName = $this->getWebsiteName($iClientId);
|
||||
|
@ -197,13 +194,9 @@ class ActiveUsers {
|
|||
$aAllUser[$sUserId]['perms'] = '(' . $sWebsiteNames . ')';
|
||||
$iCounter++;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -225,7 +218,6 @@ class ActiveUsers {
|
|||
return true;
|
||||
} else
|
||||
return false;
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -248,7 +240,6 @@ class ActiveUsers {
|
|||
} else {
|
||||
return false;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -285,7 +276,6 @@ class ActiveUsers {
|
|||
} else {
|
||||
return false;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -298,5 +288,7 @@ class ActiveUsers {
|
|||
$oClient = new cApiClient($iIdClient);
|
||||
return $oClient->get('name');
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
?>
|
|
@ -86,6 +86,8 @@ abstract class cItemBaseAbstract {
|
|||
*/
|
||||
protected $_className;
|
||||
|
||||
protected $_bDebug;
|
||||
|
||||
/**
|
||||
* Sets some common properties
|
||||
*
|
||||
|
|
|
@ -50,9 +50,9 @@ if (!isRunningFromWeb() || function_exists("runJob") || $area == "cronjobs")
|
|||
$sSql = "UPDATE " . $cfg['tab']['frontendusers'] . "
|
||||
SET active = 0
|
||||
WHERE
|
||||
(valid_to < NOW() AND valid_to != '0000-00-00' AND valid_to != '1000-01-01')
|
||||
(valid_to < NOW() AND valid_to != '1000-01-01')
|
||||
OR
|
||||
(valid_from > NOW() AND valid_from != '0000-00-00' AND valid_from != '1000-01-01')";
|
||||
(valid_from > NOW() AND valid_from != '1000-01-01')";
|
||||
//echo $sSql;
|
||||
$db->query($sSql);
|
||||
|
||||
|
|
|
@ -125,6 +125,11 @@ $cfg['AvailableCharsets'] = array(
|
|||
'SHIFT_JIS'
|
||||
);
|
||||
|
||||
// (bool) Flag to use native i18n.
|
||||
// Note: Enabling this could create unwanted side effects, because of
|
||||
// native gettext() behavior.
|
||||
$cfg['native_i18n'] = false;
|
||||
|
||||
|
||||
/* Error handling settings
|
||||
* ----------------------------------
|
||||
|
|
Laden…
In neuem Issue referenzieren