From eac8b7c1d7222682296647c90c7192e60daa3f32 Mon Sep 17 00:00:00 2001 From: Alex Date: Sat, 21 Nov 2015 02:18:44 +0300 Subject: [PATCH 1/4] lost after merge from "customized_outcomes"" --- admin/questionnairelist.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/admin/questionnairelist.php b/admin/questionnairelist.php index e0ac8ff1..18346f59 100644 --- a/admin/questionnairelist.php +++ b/admin/questionnairelist.php @@ -581,6 +581,7 @@ else CONCAT('') END as outcomes, CONCAT('') as calls, + CONCAT('') as setoutcomes, CASE WHEN enabled = 0 THEN CONCAT('') ELSE @@ -604,7 +605,7 @@ else FROM questionnaire"; $rs = $db->GetAll($sql); - $columns = array("qid","description","status","enabledisable","outcomes","calls","casestatus","shifts","assample","quotareport","dataout","modify","inlime","prefill","deletee"); + $columns = array("qid","description","status","enabledisable","outcomes","calls","casestatus","shifts","assample","quotareport","dataout","modify","setoutcomes","inlime","prefill","deletee"); xhtml_table($rs,$columns,false,"table-hover table-condensed "); print ""; From 3e2b806b6a68bf93e01008ee547c6cc4abd43fec Mon Sep 17 00:00:00 2001 From: Alex Date: Mon, 23 Nov 2015 14:51:15 +0200 Subject: [PATCH 2/4] fixes required, not commited earlier --- admin/clientquestionnaire.php | 37 +++++++++++++++++------------------ admin/clients.php | 3 +++ client/index.php | 20 ++++++++++--------- 3 files changed, 32 insertions(+), 28 deletions(-) diff --git a/admin/clientquestionnaire.php b/admin/clientquestionnaire.php index 3bf45b3c..5edaba09 100644 --- a/admin/clientquestionnaire.php +++ b/admin/clientquestionnaire.php @@ -140,18 +140,18 @@ if (isset($_POST['submit'])) } /* delete client from quexs and lime tables*/ //requires data-toggle-confirmation to finalize -if (isset($_POST['delete']) && isset($_POST['uid'])) +if (isset($_GET['delete']) && isset($_GET['uid']) && isset($_GET['uname'])) { - $client_id = intval($_POST['delete']); - $uid = intval($_POST['uid']); - $uname = $_POST['uname']; - + $client_id = intval($_GET['delete']); + $uid = intval($_GET['uid']); + $uname = $_GET['uname']; + global $db; - - $db->StartTrans(); - + if ($uid !=1){ //double protect superadmin from being deleted - + + $db->StartTrans(); + $sql = "DELETE FROM " . LIME_PREFIX . "templates_rights WHERE `uid` = '$uid' AND `uid` != 1"; $db->Execute($sql); @@ -164,20 +164,19 @@ if (isset($_POST['delete']) && isset($_POST['uid'])) $sql = "DELETE FROM " . LIME_PREFIX . "users WHERE `uid` = '$uid' AND `uid` != 1"; $db->Execute($sql); + $sql = "DELETE FROM `client_questionnaire` WHERE `client_id` = '$client_id' "; + $db->Execute($sql); + + $sql = "DELETE FROM `client` WHERE `client_id` = '$client_id'"; + $db->Execute($sql); + + $db->CompleteTrans(); } - - $sql = "DELETE FROM `client_questionnaire` WHERE `client_id` = '$client_id' "; - $db->Execute($sql); - - $sql = "DELETE FROM `client` WHERE `client_id` = '$client_id'"; - $db->Execute($sql); - - $db->CompleteTrans(); if ($db->CompleteTrans()) $msg = "

". T_("Client with username $uname deleted") . "

"; - else $msg = "

". T_("ERROR deleting client with username $uname") . "

"; + else $msg = "

". T_("ERROR deleting client with username $uname") . "

"; - unset($_POST['delete'], $_POST['uid'], $_POST['uname'], $client_id, $username, $uid); + unset($_GET['delete'], $_GET['uid'], $_GET['uname'], $client_id, $username, $uid); } diff --git a/admin/clients.php b/admin/clients.php index 3b481419..8c478e61 100644 --- a/admin/clients.php +++ b/admin/clients.php @@ -124,6 +124,9 @@ if (isset($_POST['client']) && !empty($_POST['client'])) } } else $a = T_("Username") . " " . $client . ". " . T_("is already in use"); + + $client =""; $firstname="";$lastname="";$email=""; $time_zone_name=""; + unset($_POST['client'],$_POST['password'],$_POST['lastname'],$_POST['firstname'],$_POST['email'],$_POST['Time_zone_name']); } $header = T_("Add a client"); diff --git a/client/index.php b/client/index.php index aa4bc30a..63046aaf 100644 --- a/client/index.php +++ b/client/index.php @@ -78,10 +78,9 @@ if ($client_id) print "

" . T_("There are no questionnaires assigned to you") . "

"; else { - print "
"; - foreach($qs as $q) { + print "
"; print "

{$q['description']}

"; $questionnaire_id = $q['questionnaire_id']; @@ -116,22 +115,25 @@ if ($client_id) if (!empty($rs)) { translate_array($rs,array("des")); - xhtml_table($rs,array("des","count"),array(T_("Outcome"),T_("Count")),"tclass",array("des" => "Complete")); + xhtml_table($rs,array("des","count"),array(T_("Outcome"),T_("Count")),"tclass",array("des" => "Complete"),array("count")); } else print "

" . T_("No outcomes recorded for this questionnaire") . "

"; - print "
" . T_("View summary results") . "
"; + print "
" . T_("View summary results") . "
"; } - if (isset($_GET['qsid'])) $qsid = intval($_GET['qsid']); - $page = LIME_URL . "admin/admin.php?action=browse&sid=$qsid"; -?> - + if (isset($_GET['qsid'])) { + $qsid = intval($_GET['qsid']); + $page = LIME_URL . "admin/admin.php?action=browse&sid=$qsid"; } + else $page =''; -
+ if ($page){ +?> +
Date: Mon, 23 Nov 2015 15:45:53 +0200 Subject: [PATCH 3/4] revert verification for session_start() to avoid " PHP Warning: session_start(): Cannot send session cache limiter - headers already sent" --- admin/auth-admin.php | 4 +++- auth-interviewer.php | 5 ++++- client/auth-client.php | 4 +++- voip/auth-interviewer.php | 4 +++- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/admin/auth-admin.php b/admin/auth-admin.php index 660bfddf..325d28ce 100644 --- a/admin/auth-admin.php +++ b/admin/auth-admin.php @@ -50,7 +50,9 @@ session_name($db->GetOne($sql)); session_set_cookie_params(0,QUEXS_PATH); -session_start(); +if ((defined('PHP_SESSION_ACTIVE') && session_status() !== PHP_SESSION_ACTIVE) || !session_id()) { + session_start(); +} //check if the session exists or loginID not set if (session_id() == "" || !isset($_SESSION['loginID'])) diff --git a/auth-interviewer.php b/auth-interviewer.php index 37464d53..4b3f0935 100644 --- a/auth-interviewer.php +++ b/auth-interviewer.php @@ -49,7 +49,10 @@ $sql = "SELECT stg_value session_name($db->GetOne($sql)); session_set_cookie_params(0,QUEXS_PATH); -session_start(); + +if ((defined('PHP_SESSION_ACTIVE') && session_status() !== PHP_SESSION_ACTIVE) || !session_id()) { + session_start(); +} //check if the session exists or loginID not set if (session_id() == "" || !isset($_SESSION['loginID'])) diff --git a/client/auth-client.php b/client/auth-client.php index 4e69078e..deda7ff3 100644 --- a/client/auth-client.php +++ b/client/auth-client.php @@ -50,7 +50,9 @@ session_name($db->GetOne($sql)); session_set_cookie_params(0,QUEXS_PATH); -session_start(); +if ((defined('PHP_SESSION_ACTIVE') && session_status() !== PHP_SESSION_ACTIVE) || !session_id()) { + session_start(); +} //check if the session exists or loginID not set if (session_id() == "" || !isset($_SESSION['loginID'])) diff --git a/voip/auth-interviewer.php b/voip/auth-interviewer.php index 4e69078e..deda7ff3 100644 --- a/voip/auth-interviewer.php +++ b/voip/auth-interviewer.php @@ -50,7 +50,9 @@ session_name($db->GetOne($sql)); session_set_cookie_params(0,QUEXS_PATH); -session_start(); +if ((defined('PHP_SESSION_ACTIVE') && session_status() !== PHP_SESSION_ACTIVE) || !session_id()) { + session_start(); +} //check if the session exists or loginID not set if (session_id() == "" || !isset($_SESSION['loginID'])) From d60a8a3f34250446944c0e764fd13ff0d90c0951 Mon Sep 17 00:00:00 2001 From: Alex Date: Mon, 23 Nov 2015 20:19:23 +0200 Subject: [PATCH 4/4] display delay to all, restrict edit to superadmin (admin) only --- admin/set_outcomes.php | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/admin/set_outcomes.php b/admin/set_outcomes.php index a136fea9..9f11402e 100644 --- a/admin/set_outcomes.php +++ b/admin/set_outcomes.php @@ -197,8 +197,14 @@ if (isset($_GET['qid'])) { /* for default outcomes */ if (isset($_GET['default'])) { - $sql = "SELECT o.*, ot.description as type, - CONCAT('') as `delay`, + /* allow delay edit only to superadmins (currenlty admin) */ + if ($_SESSION['user'] === "admin"){ + $delay = "CONCAT('') "; + } + else { + $delay = "CONCAT('', o.default_delay_minutes ,' ')"; + } + $sql = "SELECT o.*, ot.description as type, $delay as `delay`, CONCAT('

 " . T_("Yes") . "' ELSE 'default\">" . T_("No") . "' END , '

') as tryanother, CONCAT('

 " . T_("Yes") . "' ELSE 'default\">" . T_("No") . "' END , '

') as tryagain, CONCAT('

 " . T_("Yes") . "' ELSE 'default\">" . T_("No") . "' END , '

') as contacted, @@ -214,9 +220,6 @@ if (isset($_GET['default'])) { $row = array("outcome_id","description","select","type","delay","contacted","tryanother","tryagain","eligible","require_note"); $hdr = array(T_("Outcome ID"),T_("Description"),T_("Default"),T_("Outcome type"),T_("Delay, min"),T_("Contacted"),T_("Try another"),T_("Try again"),T_("Eligible"),T_("Require note")); - /* allow delay edit only to superadmins (currenlty admin) */ - if ( $_SESSION['user'] != "admin"){ unset($row[4]); unset($hdr[4]); } - $hid = "default"; $value = "";