" . T_("You do not have permission to access this area") . "
"; + print ""; + xhtml_foot(); +} diff --git a/admin/availability.php b/admin/availability.php index 892d438a..0808e9bf 100644 --- a/admin/availability.php +++ b/admin/availability.php @@ -39,6 +39,12 @@ include ("../config.inc.php"); */ include ("../db.inc.php"); +/** + * Authentication file + */ +include ("auth-admin.php"); + + /** * XHTML functions */ diff --git a/admin/availabilitygroup.php b/admin/availabilitygroup.php index 4b7db070..2029f348 100644 --- a/admin/availabilitygroup.php +++ b/admin/availabilitygroup.php @@ -40,6 +40,11 @@ include("../config.inc.php"); */ include ("../db.inc.php"); +/** + * Authentication file + */ +include ("auth-admin.php"); + /** * XHTML functions */ diff --git a/admin/bulkappointment.php b/admin/bulkappointment.php index 567bc8f6..e3afc406 100644 --- a/admin/bulkappointment.php +++ b/admin/bulkappointment.php @@ -44,6 +44,11 @@ include ("../functions/functions.xhtml.php"); */ include ("../db.inc.php"); +/** + * Authentication file + */ +include ("auth-admin.php"); + /** * Operator functions */ diff --git a/admin/callhistory.php b/admin/callhistory.php index 49fce497..b7fe2bc7 100644 --- a/admin/callhistory.php +++ b/admin/callhistory.php @@ -39,6 +39,11 @@ include ("../config.inc.php"); */ include ("../db.inc.php"); +/** + * Authentication file + */ +include ("auth-admin.php"); + /** * XHTML functions */ diff --git a/admin/callrestrict.php b/admin/callrestrict.php index a078dbba..2d6c591c 100644 --- a/admin/callrestrict.php +++ b/admin/callrestrict.php @@ -39,6 +39,11 @@ include ("../config.inc.php"); */ include ("../db.inc.php"); +/** + * Authentication file + */ +include ("auth-admin.php"); + /** * XHTML functions */ diff --git a/admin/casesbyoutcome.php b/admin/casesbyoutcome.php index 61704e6d..cb3d5b48 100644 --- a/admin/casesbyoutcome.php +++ b/admin/casesbyoutcome.php @@ -39,6 +39,11 @@ include ("../config.inc.php"); */ include ("../db.inc.php"); +/** + * Authentication file + */ +include ("auth-admin.php"); + /** * XHTML functions */ diff --git a/admin/casestatus.php b/admin/casestatus.php index 25fbfb70..f44e201a 100644 --- a/admin/casestatus.php +++ b/admin/casestatus.php @@ -12,6 +12,11 @@ include_once(dirname(__FILE__).'/../config.inc.php'); */ include ("../db.inc.php"); +/** + * Authentication file + */ +include ("auth-admin.php"); + /** * XHTML functions */ diff --git a/admin/centreinfo.php b/admin/centreinfo.php index cd14a844..9bc2929b 100644 --- a/admin/centreinfo.php +++ b/admin/centreinfo.php @@ -40,6 +40,11 @@ include("../config.inc.php"); */ include ("../db.inc.php"); +/** + * Authentication file + */ +include ("auth-admin.php"); + /** * XHTML functions */ diff --git a/admin/clientquestionnaire.php b/admin/clientquestionnaire.php index 17385e3f..67ad774d 100644 --- a/admin/clientquestionnaire.php +++ b/admin/clientquestionnaire.php @@ -39,6 +39,11 @@ include ("../config.inc.php"); */ include ("../db.inc.php"); +/** + * Authentication file + */ +include ("auth-admin.php"); + /** * XHTML functions */ diff --git a/admin/clients.php b/admin/clients.php index c59cb1ef..8b23f23f 100644 --- a/admin/clients.php +++ b/admin/clients.php @@ -42,6 +42,11 @@ include ("../config.inc.php"); */ include ("../db.inc.php"); +/** + * Authentication file + */ +include ("auth-admin.php"); + /** * XHTML functions */ diff --git a/admin/dataoutput.php b/admin/dataoutput.php index 5874df97..1ad770b3 100644 --- a/admin/dataoutput.php +++ b/admin/dataoutput.php @@ -1,4 +1,5 @@ - - + diff --git a/admin/new.php b/admin/new.php index f9ae671f..940296d0 100644 --- a/admin/new.php +++ b/admin/new.php @@ -11,6 +11,11 @@ include ("../config.inc.php"); */ include ("../db.inc.php"); +/** + * Authentication file + */ +include ("auth-admin.php"); + /** * XHTML functions */ @@ -378,4 +383,4 @@ else { ?> \ No newline at end of file +?> diff --git a/admin/operatorlist.php b/admin/operatorlist.php index f459f787..0a3d7b62 100644 --- a/admin/operatorlist.php +++ b/admin/operatorlist.php @@ -39,6 +39,11 @@ include_once(dirname(__FILE__).'/../config.inc.php'); */ include_once(dirname(__FILE__).'/../db.inc.php'); +/** + * Authentication file + */ +include ("auth-admin.php"); + /** * XHTML functions */ diff --git a/admin/operatorperformance.php b/admin/operatorperformance.php index 0b81c3a9..8b796a75 100644 --- a/admin/operatorperformance.php +++ b/admin/operatorperformance.php @@ -38,6 +38,11 @@ include_once(dirname(__FILE__).'/../config.inc.php'); */ include ("../db.inc.php"); +/** + * Authentication file + */ +include ("auth-admin.php"); + /** * XHTML functions */ diff --git a/admin/operatorquestionnaire.php b/admin/operatorquestionnaire.php index b6c5cc93..adec1d2c 100644 --- a/admin/operatorquestionnaire.php +++ b/admin/operatorquestionnaire.php @@ -39,6 +39,11 @@ include ("../config.inc.php"); */ include ("../db.inc.php"); +/** + * Authentication file + */ +include ("auth-admin.php"); + /** * XHTML functions */ diff --git a/admin/operators.php b/admin/operators.php index 8860ab08..a94c661e 100644 --- a/admin/operators.php +++ b/admin/operators.php @@ -39,6 +39,11 @@ include ("../config.inc.php"); */ include ("../db.inc.php"); +/** + * Authentication file + */ +include ("auth-admin.php"); + /** * XHTML functions */ diff --git a/admin/operatorskill.php b/admin/operatorskill.php index d115c0ce..614ebb6b 100644 --- a/admin/operatorskill.php +++ b/admin/operatorskill.php @@ -34,6 +34,11 @@ */ include ("../config.inc.php"); +/** + * Authentication file + */ +include ("auth-admin.php"); + /** * Database file */ diff --git a/admin/outcomes.php b/admin/outcomes.php index 26aa5208..a187d901 100644 --- a/admin/outcomes.php +++ b/admin/outcomes.php @@ -12,6 +12,11 @@ include_once(dirname(__FILE__).'/../config.inc.php'); */ include_once(dirname(__FILE__).'/../db.inc.php'); +/** + * Authentication file + */ +include ("auth-admin.php"); + /** * XHTML functions */ diff --git a/admin/process.php b/admin/process.php index c6da8ad4..0ca6e49c 100644 --- a/admin/process.php +++ b/admin/process.php @@ -39,6 +39,11 @@ include (dirname(__FILE__) . "/../config.inc.php"); */ include (dirname(__FILE__) . "/../db.inc.php"); +/** + * Authentication file + */ +include ("auth-admin.php"); + /** * Process */ diff --git a/admin/questionnairelist.php b/admin/questionnairelist.php index 08db3ba8..8e689346 100644 --- a/admin/questionnairelist.php +++ b/admin/questionnairelist.php @@ -39,6 +39,11 @@ include("../config.inc.php"); */ include("../db.inc.php"); +/** + * Authentication file + */ +include ("auth-admin.php"); + /** * XHTML functions */ diff --git a/admin/questionnaireprefill.php b/admin/questionnaireprefill.php index 94dbff31..8afea37c 100644 --- a/admin/questionnaireprefill.php +++ b/admin/questionnaireprefill.php @@ -40,6 +40,11 @@ include("../config.inc.php"); */ include ("../db.inc.php"); +/** + * Authentication file + */ +include ("auth-admin.php"); + /** * XHTML functions */ diff --git a/admin/quota.php b/admin/quota.php index fce93b21..f12b6c16 100755 --- a/admin/quota.php +++ b/admin/quota.php @@ -40,6 +40,11 @@ include("../config.inc.php"); */ include ("../db.inc.php"); +/** + * Authentication file + */ +include ("auth-admin.php"); + /** * XHTML functions */ diff --git a/admin/quotareport.php b/admin/quotareport.php index a915574d..40666da2 100644 --- a/admin/quotareport.php +++ b/admin/quotareport.php @@ -41,6 +41,11 @@ include_once(dirname(__FILE__).'/../config.inc.php'); */ include ("../db.inc.php"); +/** + * Authentication file + */ +include ("auth-admin.php"); + /** * XHTML functions */ diff --git a/admin/quotarow.php b/admin/quotarow.php index 129f3910..c5176f6c 100755 --- a/admin/quotarow.php +++ b/admin/quotarow.php @@ -41,6 +41,11 @@ include("../config.inc.php"); */ include ("../db.inc.php"); +/** + * Authentication file + */ +include ("auth-admin.php"); + /** * XHTML functions */ diff --git a/admin/samplecallattempts.php b/admin/samplecallattempts.php index 3de6161f..c6d42669 100644 --- a/admin/samplecallattempts.php +++ b/admin/samplecallattempts.php @@ -1,4 +1,5 @@ - + * @copyright Australian Consortium for Social and Political Research Incorporated (ACSPRI) 2013 + * @package queXS + * @subpackage user + * @link http://www.acspri.org.au/ queXS was writen for ACSPRI + * @license http://opensource.org/licenses/gpl-2.0.php The GNU General Public License (GPL) Version 2 + * + */ + +/** + * Configuration file + */ +include_once("config.inc.php"); + +/** + * Database file + */ +include_once("db.inc.php"); + + +//get session name from DB +// +$sql = "SELECT stg_value + FROM " . LIME_PREFIX . "settings_global + WHERE stg_name = 'SessionName'"; + +session_name($db->GetOne($sql)); + +//check if the session exists or loginID not set +if (session_id() == "" || !isset($_SESSION['loginID'])) +{ + //need to log in + header('Location: include/limesurvey/admin/admin.php'); + die(); +} diff --git a/availability.php b/availability.php index fd9adb02..6d873cc5 100644 --- a/availability.php +++ b/availability.php @@ -39,6 +39,11 @@ include ("config.inc.php"); */ include ("db.inc.php"); +/** + * Authentication + */ +include ("auth-interviewer.php"); + /** * XHTML functions */ diff --git a/call.php b/call.php index 3ff2b79f..977b96f6 100644 --- a/call.php +++ b/call.php @@ -39,6 +39,12 @@ include ("config.inc.php"); */ include ("db.inc.php"); +/** + * Authentication + */ +include ("auth-interviewer.php"); + + /** * XHTML functions */ diff --git a/call_interface2.php b/call_interface2.php index 65567369..6c8844f1 100644 --- a/call_interface2.php +++ b/call_interface2.php @@ -39,6 +39,11 @@ include ("config.inc.php"); */ include ("db.inc.php"); +/** + * Authentication + */ +include ("auth-interviewer.php"); + /** * XHTML functions */ diff --git a/callhistory.php b/callhistory.php index 4adf9546..3a44f7a3 100644 --- a/callhistory.php +++ b/callhistory.php @@ -39,6 +39,11 @@ include ("config.inc.php"); */ include ("db.inc.php"); +/** + * Authentication + */ +include ("auth-interviewer.php"); + /** * XHTML functions */ diff --git a/calllist.php b/calllist.php index 45c60c31..cf00994c 100644 --- a/calllist.php +++ b/calllist.php @@ -39,6 +39,11 @@ include ("config.inc.php"); */ include ("db.inc.php"); +/** + * Authentication + */ +include ("auth-interviewer.php"); + /** * XHTML functions */ diff --git a/casenote.php b/casenote.php index 1bb68fd9..777eecff 100644 --- a/casenote.php +++ b/casenote.php @@ -39,6 +39,12 @@ include ("config.inc.php"); */ include ("db.inc.php"); +/** + * Authentication + */ +include ("auth-interviewer.php"); + + /** * XHTML functions */ diff --git a/client/auth-client.php b/client/auth-client.php new file mode 100644 index 00000000..4a2570a5 --- /dev/null +++ b/client/auth-client.php @@ -0,0 +1,57 @@ + + * @copyright Australian Consortium for Social and Political Research Incorporated (ACSPRI) 2013 + * @package queXS + * @subpackage user + * @link http://www.acspri.org.au/ queXS was writen for ACSPRI + * @license http://opensource.org/licenses/gpl-2.0.php The GNU General Public License (GPL) Version 2 + * + */ + +/** + * Configuration file + */ +include_once(dirname(__FILE__)."/../config.inc.php"); + +/** + * Database file + */ +include_once(dirname(__FILE__)."/../db.inc.php"); + + +//get session name from DB +// +$sql = "SELECT stg_value + FROM " . LIME_PREFIX . "settings_global + WHERE stg_name = 'SessionName'"; + +session_name($db->GetOne($sql)); + +//check if the session exists or loginID not set +if (session_id() == "" || !isset($_SESSION['loginID'])) +{ + //need to log in + header('Location: ../include/limesurvey/admin/admin.php'); + die(); +} diff --git a/client/index.php b/client/index.php index ce8d4ccb..c3b0728c 100644 --- a/client/index.php +++ b/client/index.php @@ -38,6 +38,12 @@ include_once(dirname(__FILE__).'/../config.inc.php'); */ include_once(dirname(__FILE__).'/../db.inc.php'); +/** + * Authentication + */ +include ("auth-client.php"); + + /** * XHTML functions */ diff --git a/contactdetails.php b/contactdetails.php index f5254bd8..8c93ad60 100644 --- a/contactdetails.php +++ b/contactdetails.php @@ -39,6 +39,12 @@ include ("config.inc.php"); */ include ("db.inc.php"); +/** + * Authentication + */ +include ("auth-interviewer.php"); + + /** * XHTML functions */ diff --git a/display/index.php b/display/index.php deleted file mode 100644 index e503bc27..00000000 --- a/display/index.php +++ /dev/null @@ -1,149 +0,0 @@ - - * @copyright Deakin University 2007,2008 - * @package queXS - * @subpackage user - * @link http://www.deakin.edu.au/dcarf/ queXS was writen for DCARF - Deakin Computer Assisted Research Facility - * @license http://opensource.org/licenses/gpl-2.0.php The GNU General Public License (GPL) Version 2 - * - * - */ - -/** - * Configuration file - */ -include ("../config.inc.php"); - -/** - * Database file - */ -include('../db.inc.php'); - -/** - * XHTML functions - */ -include ("../functions/functions.xhtml.php"); - -/** - * Display functions - */ -include ("../functions/functions.performance.php"); - -/** - * Input functions - */ -include("../functions/functions.input.php"); - -$shift_id = 0; -$questionnaire_id = 0; -$display_type = 0; - -if (isset($_GET['shift_id'])) $shift_id = bigintval($_GET['shift_id']); -if (isset($_GET['questionnaire_id'])) $questionnaire_id = bigintval($_GET['questionnaire_id']); -if (isset($_GET['display_type'])) $display_type= bigintval($_GET['display_type']); - - -if ($display_type >= 6) -{ - $sql = "SELECT shift_id,questionnaire_id - FROM shift - WHERE start <= CONVERT_TZ(NOW(),'System','UTC') - AND end >= CONVERT_TZ(NOW(),'System','UTC') - AND shift_id > '$shift_id' - ORDER BY shift_id ASC - LIMIT 1"; - $s = $db->GetRow($sql); - - $display_type = 0; - $shift_id = 0; - $questionnaire_id = 0; - - if (!empty($s)) - { - $shift_id = $s['shift_id']; - $questionnaire_id = $s['questionnaire_id']; - } -} - -if ($shift_id == 0) -{ - $sql = "SELECT shift_id,questionnaire_id - FROM shift - WHERE start <= CONVERT_TZ(NOW(),'System','UTC') - AND end >= CONVERT_TZ(NOW(),'System','UTC') - ORDER BY shift_id ASC - LIMIT 1"; - - $s = $db->GetRow($sql); - - $display_type = 0; - - if (!empty($s)) - { - $shift_id = $s['shift_id']; - $questionnaire_id = $s['questionnaire_id']; - } -} - -$dt1 = $display_type + 1; -xhtml_head(T_("Display"),true,array("../css/display.css"),false,false,"6;url=?shift_id=$shift_id&questionnaire_id=$questionnaire_id&display_type=$dt1"); - -if ($shift_id == 0 || $questionnaire_id == 0) - display_none(); -else -{ - $sql = "SELECT description - FROM questionnaire - WHERE questionnaire_id = '$questionnaire_id'"; - $n = $db->GetRow($sql); - - print "" . T_("ERROR: You do not have server side authentication enabled therefore queXS cannot determine which user is accessing the system.") . "
"; - return false; + print "" . T_("ERROR: You are not logged in.") . "
"; + die(); } global $db; $sql = "SELECT operator_id FROM operator - WHERE username = " . $db->qstr($_SERVER['PHP_AUTH_USER']) . " + WHERE username = " . $db->qstr($_SESSION['loginID']) . " AND enabled = 1"; $o = $db->GetRow($sql); diff --git a/include/limesurvey/admin/admin.php b/include/limesurvey/admin/admin.php index 49e55b04..7100d16f 100644 --- a/include/limesurvey/admin/admin.php +++ b/include/limesurvey/admin/admin.php @@ -794,9 +794,10 @@ else sendcacheheaders(); if (!isset($_SESSION['metaHeader'])) {$_SESSION['metaHeader']='';} - $adminoutput = getAdminHeader($_SESSION['metaHeader']).$adminoutput.$loginsummary; // All future output is written into this and then outputted at the end of file + //$adminoutput = getAdminHeader($_SESSION['metaHeader']).$adminoutput.$loginsummary; // All future output is written into this and then outputted at the end of file + $adminoutput =$loginsummary; unset($_SESSION['metaHeader']); - $adminoutput.= "\n".getAdminFooter("http://docs.limesurvey.org", $clang->gT("LimeSurvey online manual")); + $adminoutput.= "\n";//.getAdminFooter("http://docs.limesurvey.org", $clang->gT("LimeSurvey online manual")); } if (($action=='showphpinfo') && ($_SESSION['USER_RIGHT_CONFIGURATOR'] == 1)) { diff --git a/include/limesurvey/admin/sessioncontrol.php b/include/limesurvey/admin/sessioncontrol.php index f7d6f2b6..8c78d60b 100644 --- a/include/limesurvey/admin/sessioncontrol.php +++ b/include/limesurvey/admin/sessioncontrol.php @@ -31,7 +31,7 @@ else {session_name("LimeSurveyAdmin");} if (session_id() == "") { - session_set_cookie_params(0,$relativeurl.'/'); + session_set_cookie_params(0,QUEXS_PATH); if ($debug==0) {@session_start();} else {session_start();} } diff --git a/include/limesurvey/admin/usercontrol.php b/include/limesurvey/admin/usercontrol.php index 9c9c7f32..d36a9615 100644 --- a/include/limesurvey/admin/usercontrol.php +++ b/include/limesurvey/admin/usercontrol.php @@ -236,6 +236,13 @@ if (!isset($_SESSION['loginID'])) } $loginsummary .= "