diff --git a/admin/auth-admin.php b/admin/auth-admin.php index f260abcb..5b707d00 100644 --- a/admin/auth-admin.php +++ b/admin/auth-admin.php @@ -39,11 +39,9 @@ include_once(dirname(__FILE__) . "/../config.inc.php"); */ include_once(dirname(__FILE__) . "/../db.inc.php"); -session_name(LS_SESSION_NAME); - -session_set_cookie_params(0,QUEXS_PATH); - if ((defined('PHP_SESSION_ACTIVE') && session_status() !== PHP_SESSION_ACTIVE) || !session_id()) { + session_name(LS_SESSION_NAME); + session_set_cookie_params(0,QUEXS_PATH); session_start(); } diff --git a/auth-interviewer.php b/auth-interviewer.php index 74089770..cc2e07bb 100644 --- a/auth-interviewer.php +++ b/auth-interviewer.php @@ -40,12 +40,10 @@ include_once("config.inc.php"); include_once("db.inc.php"); -session_name(LS_SESSION_NAME); - -session_set_cookie_params(0,QUEXS_PATH); - if ((defined('PHP_SESSION_ACTIVE') && session_status() !== PHP_SESSION_ACTIVE) || !session_id()) { - session_start(); + session_name(LS_SESSION_NAME); + session_set_cookie_params(0,QUEXS_PATH); + session_start(); } //check if the session exists or loginID not set diff --git a/functions/functions.operator.php b/functions/functions.operator.php index e743b962..4c8bd44d 100644 --- a/functions/functions.operator.php +++ b/functions/functions.operator.php @@ -2251,7 +2251,7 @@ function end_case($operator_id) AND o.eligible = 1 AND c.case_id = '$case_id'"; - if ($l['tryanother'] == 1 && $cm['call_attempt_max'] > 0 && $callattempts >= $cm['call_attempt_max']) //max call attempts reached AND last call to be tried again + if (isset($l['tryanother']) && $l['tryanother'] == 1 && $cm['call_attempt_max'] > 0 && $callattempts >= $cm['call_attempt_max']) //max call attempts reached AND last call to be tried again { //if ever eligible, code as eligible if ($db->GetOne($eligsql) > 0) @@ -2259,7 +2259,7 @@ function end_case($operator_id) else $outcome = 42; } - else if ($l['tryanother'] == 1 && $cm['call_max'] > 0 && $calls >= $cm['call_max']) //max calls reached AND last call to be tried again + else if (isset($l['tryanother']) && $l['tryanother'] == 1 && $cm['call_max'] > 0 && $calls >= $cm['call_max']) //max calls reached AND last call to be tried again { //if ever eligible, code as eligible if ($db->GetOne($eligsql) > 0) diff --git a/lang.inc.php b/lang.inc.php index 567ae324..71ef9bdf 100644 --- a/lang.inc.php +++ b/lang.inc.php @@ -29,6 +29,9 @@ * */ + +include_once(dirname(__FILE__).'/config.inc.php'); + /** * The phpgettext package */