Mibew/mibew
1
0
Fork 0
mirror of https://github.com/Mibew/mibew.git synced 2025-04-11 18:30:10 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove global variable $session_prefix

Browse Source 
Use constant SESSION_PREFIX instead of global variable
This commit is contained in:
Dmitriy Simushev 2014-01-17 11:15:52 +00:00
parent 94815071c0
commit 1396cbc25f
7 changed files with 19 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/mibew/libs/classes/Mibew/RequestProcessor/UsersProcessor.php
View File

@ -165,7 +165,6 @@ class UsersProcessor extends ClientSideProcessor {
/** /**
* Return updated threads list. API function * Return updated threads list. API function
* *
* @global string $session_prefix Session vars prefix
* @param array $args Associative array of arguments. It must contains * @param array $args Associative array of arguments. It must contains
* following keys: * following keys:
* - 'agentId': Id of the agent related to users window * - 'agentId': Id of the agent related to users window
@ -174,17 +173,15 @@ class UsersProcessor extends ClientSideProcessor {
* - 'threads': array of threads changes * - 'threads': array of threads changes
*/ */
protected function apiUpdateThreads($args) { protected function apiUpdateThreads($args) {
global $session_prefix;
$operator = self::checkOperator($args['agentId']); $operator = self::checkOperator($args['agentId']);
$since = $args['revision']; $since = $args['revision'];
// Get operator groups // Get operator groups
if (!isset($_SESSION[$session_prefix."operatorgroups"])) { if (!isset($_SESSION[SESSION_PREFIX."operatorgroups"])) {
$_SESSION[$session_prefix."operatorgroups"] $_SESSION[SESSION_PREFIX."operatorgroups"]
= get_operator_groupslist($operator['operatorid']); = get_operator_groupslist($operator['operatorid']);
} }
$groupids = $_SESSION[$session_prefix."operatorgroups"]; $groupids = $_SESSION[SESSION_PREFIX."operatorgroups"];
$db = Database::getInstance(); $db = Database::getInstance();
$query = "select t.*, " . $query = "select t.*, " .

2
src/mibew/libs/common/constants.php
View File

@ -34,7 +34,7 @@ $featuresversion = '2.0';
* Prefix for session variables. * Prefix for session variables.
* Provide an ability to instal several mibew instances on one server. * Provide an ability to instal several mibew instances on one server.
*/ */
$session_prefix = md5($mysqlhost.'##'.$mysqldb.'##'.$mysqlprefix) . '_'; define('SESSION_PREFIX', md5($mysqlhost.'##'.$mysqldb.'##'.$mysqlprefix) . '_');
/** /**
* Default value for cron security key. * Default value for cron security key.

35
src/mibew/libs/operator.php
View File

@ -377,7 +377,6 @@ function delete_operator($operator_id) {
*/ */
function notify_operator_alive($operatorid, $istatus) function notify_operator_alive($operatorid, $istatus)
{ {
global $session_prefix;
$db = Database::getInstance(); $db = Database::getInstance();
$db->query( $db->query(
"update {chatoperator} set istatus = :istatus, dtmlastvisited = :now " . "update {chatoperator} set istatus = :istatus, dtmlastvisited = :now " .
@ -388,9 +387,9 @@ function notify_operator_alive($operatorid, $istatus)
':operatorid' => $operatorid ':operatorid' => $operatorid
) )
); );
if (isset($_SESSION[$session_prefix."operator"])) { if (isset($_SESSION[SESSION_PREFIX."operator"])) {
if ($_SESSION[$session_prefix."operator"]['operatorid'] == $operatorid) { if ($_SESSION[SESSION_PREFIX."operator"]['operatorid'] == $operatorid) {
$_SESSION[$session_prefix."operator"]['istatus'] = $istatus; $_SESSION[SESSION_PREFIX."operator"]['istatus'] = $istatus;
} }
} }
} }
@ -483,23 +482,18 @@ function append_query($link, $pv)
* an associative array with folloing keys: * an associative array with folloing keys:
* - 'requested_page': string, page where login check was failed. * - 'requested_page': string, page where login check was failed.
* *
* @global string $session_prefix Use as prefix for all session variables to
* allow many instalation of the mibew messenger at one server. It defined in
* libs/common/constants.php
*
* @param boolean $redirect Indicates if operator should be redirected to * @param boolean $redirect Indicates if operator should be redirected to
* login page. Default value is true. * login page. Default value is true.
* @return null|array Array with operator info if operator is logged in and * @return null|array Array with operator info if operator is logged in and
* null otherwise. * null otherwise.
*/ */
function check_login($redirect = true) { function check_login($redirect = true) {
global $session_prefix; if (!isset($_SESSION[SESSION_PREFIX."operator"])) {
if (!isset($_SESSION[$session_prefix."operator"])) {
if (isset($_COOKIE[REMEMBER_OPERATOR_COOKIE_NAME])) { if (isset($_COOKIE[REMEMBER_OPERATOR_COOKIE_NAME])) {
list($login, $pwd) = preg_split('/\x0/', base64_decode($_COOKIE[REMEMBER_OPERATOR_COOKIE_NAME]), 2); list($login, $pwd) = preg_split('/\x0/', base64_decode($_COOKIE[REMEMBER_OPERATOR_COOKIE_NAME]), 2);
$op = operator_by_login($login); $op = operator_by_login($login);
if ($op && isset($pwd) && isset($op['vcpassword']) && calculate_password_hash($op['vclogin'], $op['vcpassword']) == $pwd && !operator_is_disabled($op)) { if ($op && isset($pwd) && isset($op['vcpassword']) && calculate_password_hash($op['vclogin'], $op['vcpassword']) == $pwd && !operator_is_disabled($op)) {
$_SESSION[$session_prefix."operator"] = $op; $_SESSION[SESSION_PREFIX."operator"] = $op;
return $op; return $op;
} }
} }
@ -524,7 +518,7 @@ function check_login($redirect = true) {
return null; return null;
} }
} }
return $_SESSION[$session_prefix."operator"]; return $_SESSION[SESSION_PREFIX."operator"];
} }
// Force the admin to set a password after the installation // Force the admin to set a password after the installation
@ -538,8 +532,7 @@ function force_password($operator)
function get_logged_in() function get_logged_in()
{ {
global $session_prefix; return isset($_SESSION[SESSION_PREFIX."operator"]) ? $_SESSION[SESSION_PREFIX."operator"] : FALSE;
return isset($_SESSION[$session_prefix."operator"]) ? $_SESSION[$session_prefix."operator"] : FALSE;
} }
/** /**
@ -550,17 +543,12 @@ function get_logged_in()
* - 'operator': array of the logged in operator info; * - 'operator': array of the logged in operator info;
* - 'remember': boolean, indicates if system should remember operator. * - 'remember': boolean, indicates if system should remember operator.
* *
* @global string $session_prefix Use as prefix for all session variables to
* allow many instalation of the mibew messenger at one server. It defined in
* libs/common/constants.php
*
* @param array $operator Operators info * @param array $operator Operators info
* @param boolean $remember Indicates if system should remember operator * @param boolean $remember Indicates if system should remember operator
* @param boolean $https Indicates if cookie should be flagged as a secure one * @param boolean $https Indicates if cookie should be flagged as a secure one
*/ */
function login_operator($operator, $remember, $https = FALSE) { function login_operator($operator, $remember, $https = FALSE) {
global $session_prefix; $_SESSION[SESSION_PREFIX."operator"] = $operator;
$_SESSION[$session_prefix."operator"] = $operator;
if ($remember) { if ($remember) {
$value = base64_encode($operator['vclogin'] . "\x0" . calculate_password_hash($operator['vclogin'], $operator['vcpassword'])); $value = base64_encode($operator['vclogin'] . "\x0" . calculate_password_hash($operator['vclogin'], $operator['vcpassword']));
setcookie(REMEMBER_OPERATOR_COOKIE_NAME, $value, time() + 60 * 60 * 24 * 1000, MIBEW_WEB_ROOT . "/", NULL, $https, TRUE); setcookie(REMEMBER_OPERATOR_COOKIE_NAME, $value, time() + 60 * 60 * 24 * 1000, MIBEW_WEB_ROOT . "/", NULL, $https, TRUE);
@ -582,14 +570,9 @@ function login_operator($operator, $remember, $https = FALSE) {
* Log out current operator * Log out current operator
* *
* Triggers 'operatorLogout' event after operator logged out. * Triggers 'operatorLogout' event after operator logged out.
*
* @global string $session_prefix Use as prefix for all session variables to
* allow many instalation of the mibew messenger at one server. It defined in
* libs/common/constants.php
*/ */
function logout_operator() { function logout_operator() {
global $session_prefix; unset($_SESSION[SESSION_PREFIX."operator"]);
unset($_SESSION[$session_prefix."operator"]);
unset($_SESSION['backpath']); unset($_SESSION['backpath']);
if (isset($_COOKIE[REMEMBER_OPERATOR_COOKIE_NAME])) { if (isset($_COOKIE[REMEMBER_OPERATOR_COOKIE_NAME])) {
setcookie(REMEMBER_OPERATOR_COOKIE_NAME, '', time() - 3600, MIBEW_WEB_ROOT . "/"); setcookie(REMEMBER_OPERATOR_COOKIE_NAME, '', time() - 3600, MIBEW_WEB_ROOT . "/");

4
src/mibew/operator/avatar.php
View File

@ -78,8 +78,8 @@ if (!$op) {
if (count($errors) == 0) { if (count($errors) == 0) {
update_operator_avatar($op['operatorid'], $avatar); update_operator_avatar($op['operatorid'], $avatar);
if ($opId && $avatar && $_SESSION[$session_prefix."operator"] && $operator['operatorid'] == $opId) { if ($opId && $avatar && $_SESSION[SESSION_PREFIX."operator"] && $operator['operatorid'] == $opId) {
$_SESSION[$session_prefix."operator"]['vcavatar'] = $avatar; $_SESSION[SESSION_PREFIX."operator"]['vcavatar'] = $avatar;
} }
header("Location: " . MIBEW_WEB_ROOT . "/operator/avatar.php?op=" . intval($opId)); header("Location: " . MIBEW_WEB_ROOT . "/operator/avatar.php?op=" . intval($opId));
exit; exit;

2
src/mibew/operator/operator.php
View File

@ -102,7 +102,7 @@ if ((isset($_POST['login']) || !is_capable(CAN_ADMINISTRATE, $operator)) && isse
// update the session password // update the session password
if (!empty($password) && $opId == $operator['operatorid']) { if (!empty($password) && $opId == $operator['operatorid']) {
$toDashboard = check_password_hash($login, '', $operator['vcpassword']) && $password != ''; $toDashboard = check_password_hash($login, '', $operator['vcpassword']) && $password != '';
$_SESSION[$session_prefix."operator"]['vcpassword'] = calculate_password_hash($login, $password); $_SESSION[SESSION_PREFIX."operator"]['vcpassword'] = calculate_password_hash($login, $password);
if($toDashboard) { if($toDashboard) {
header("Location: " . MIBEW_WEB_ROOT . "/operator/index.php"); header("Location: " . MIBEW_WEB_ROOT . "/operator/index.php");
exit; exit;

4
src/mibew/operator/permissions.php
View File

@ -54,8 +54,8 @@ if (!$op) {
if (count($errors) == 0) { if (count($errors) == 0) {
update_operator_permissions($op['operatorid'], $new_permissions); update_operator_permissions($op['operatorid'], $new_permissions);
if ($opId && $_SESSION[$session_prefix."operator"] && $operator['operatorid'] == $opId) { if ($opId && $_SESSION[SESSION_PREFIX."operator"] && $operator['operatorid'] == $opId) {
$_SESSION[$session_prefix."operator"]['iperm'] = $new_permissions; $_SESSION[SESSION_PREFIX."operator"]['iperm'] = $new_permissions;
} }
header("Location: " . MIBEW_WEB_ROOT . "/operator/permissions.php?op=" . intval($opId) . "&stored"); header("Location: " . MIBEW_WEB_ROOT . "/operator/permissions.php?op=" . intval($opId) . "&stored");
exit; exit;

2
src/mibew/operator/users.php
View File

@ -32,7 +32,7 @@ $status = isset($_GET['away']) ? 1 : 0;
notify_operator_alive($operator['operatorid'], $status); notify_operator_alive($operator['operatorid'], $status);
$_SESSION[$session_prefix."operatorgroups"] = get_operator_groupslist($operator['operatorid']); $_SESSION[SESSION_PREFIX."operatorgroups"] = get_operator_groupslist($operator['operatorid']);
$page = array(); $page = array();
$page['havemenu'] = isset($_GET['nomenu']) ? "0" : "1"; $page['havemenu'] = isset($_GET['nomenu']) ? "0" : "1";