diff --git a/.bzrignore b/.bzrignore index 168db902..b0d067e1 100644 --- a/.bzrignore +++ b/.bzrignore @@ -1,5 +1,2 @@ no vars ./config.inc.local.php -./.htaccess -./admin/.htaccess -./include/limesurvey/admin/.htaccess diff --git a/call.php b/call.php index 5f54ad01..72b52897 100644 --- a/call.php +++ b/call.php @@ -116,7 +116,7 @@ function display_outcomes($contacted,$ca,$case_id) $sql = "SELECT outcome_id,description FROM outcome WHERE outcome_type_id = '5' - AND outcome_id IN ('$outcomes')"; + AND outcome_id IN ($outcomes)"; } else { @@ -125,7 +125,7 @@ function display_outcomes($contacted,$ca,$case_id) $sql = "SELECT outcome_id,description FROM outcome WHERE outcome_id != 10 - AND outcome_id IN ('$outcomes')"; //don't show completed if not + AND outcome_id IN ($outcomes)"; //don't show completed if not } else { @@ -135,7 +135,7 @@ function display_outcomes($contacted,$ca,$case_id) FROM outcome WHERE contacted = '$contacted' AND outcome_id != 10 - AND outcome_id IN ('$outcomes')"; //don't show completed if not + AND outcome_id IN ($outcomes)"; //don't show completed if not } } diff --git a/call_interface2.php b/call_interface2.php index 8776eb2b..8b0e627f 100644 --- a/call_interface2.php +++ b/call_interface2.php @@ -130,7 +130,7 @@ function display_outcomes($contacted,$ca,$case_id) $sql = "SELECT outcome_id,description,contacted FROM outcome WHERE contacted = '$contacted' - AND outcome_id IN ('$outcomes') + AND outcome_id IN ($outcomes) AND outcome_id NOT IN(5,10,19,21,40,41,42,43,44,45)"; } } @@ -141,14 +141,14 @@ function display_outcomes($contacted,$ca,$case_id) $sql = "SELECT outcome_id,description,contacted FROM outcome WHERE contacted = '$contacted' - AND outcome_id IN ('$outcomes') + AND outcome_id IN ($outcomes) AND outcome_id NOT IN(5,10,19,21,40,41,42,43,44,45)"; } } } $rs = $db->GetAll($sql); - print "
"; + print "
"; if (!empty($rs)) { $do = false; @@ -158,7 +158,7 @@ function display_outcomes($contacted,$ca,$case_id) { if ($do == $r['outcome_id']) $selected = "checked='checked'"; else $selected = ""; if (isset($r['contacted']) && $r['contacted'] == 1) $highlight = "text-primary"; else $highlight = "text-default"; - print "
  • "; + print "

    "; } $_POST['confirm'] = true; @@ -312,7 +312,7 @@ if (isset($_GET['newstate'])) if (browser_ie()) $js = "js/window_ie6_interface2.js"; else $js = "js/window_interface2.js"; -xhtml_head(T_("Set outcome"),true,array("include/bootstrap/css/bootstrap.min.css"/* ,"css/call.css" */),array($js,"include/jquery/jquery-1.4.2.min.js")); +xhtml_head(T_("Set outcome"),true,array("include/bootstrap/css/bootstrap.min.css"/* ,"css/call.css" */),array($js,"include/jquery/jquery.min.js")); $state = is_on_call($operator_id); switch($state) @@ -488,7 +488,7 @@ switch($state) print "
    "; display_outcomes(false,$call_attempt_id,$case_id); if (isset($_POST['confirm'])){ - print "
    "; + print "
    "; } break; case 5: //done -- shouldn't come here as should be coded + done