diff --git a/admin/assessments.php b/admin/assessments.php index 2b99d8b2ff5..0e8fe10c296 100644 --- a/admin/assessments.php +++ b/admin/assessments.php @@ -25,18 +25,12 @@ $js_admin_includes[]= $rooturl.'/scripts/jquery/jquery-ui.js'; // . "\n"; - -$actsurquery = "SELECT edit_survey_property FROM {$dbprefix}surveys_rights WHERE sid=$surveyid AND uid = ".$_SESSION['loginID']; //Getting rights for this survey -$actsurresult = $connect->Execute($actsurquery) or safe_die($connect->ErrorMsg()); -$actsurrows = $actsurresult->FetchRow(); - - $assessmentlangs = GetAdditionalLanguagesFromSurveyID($surveyid); $baselang = GetBaseLanguageFromSurveyID($surveyid); array_unshift($assessmentlangs,$baselang); // makes an array with ALL the languages supported by the survey -> $assessmentlangs -if($_SESSION['USER_RIGHT_SUPERADMIN'] == 1 || $actsurrows['edit_survey_property']){ +if(bHasRight($surveyid, 'edit_survey_property')){ if ($action == "assessmentadd") { $inserttable=$dbprefix."assessments"; diff --git a/admin/browse.php b/admin/browse.php index ac566a1fa67..41296f84615 100644 --- a/admin/browse.php +++ b/admin/browse.php @@ -28,10 +28,6 @@ if (tableExists('survey_'.$surveyid)==false) die("Your results table is missing!"); $surveyinfo=getSurveyInfo($surveyid); -$sumquery5 = "SELECT b.* FROM {$dbprefix}surveys AS a INNER JOIN {$dbprefix}surveys_rights AS b ON a.sid = b.sid WHERE a.sid=$surveyid AND b.uid = ".$_SESSION['loginID']; //Getting rights for this survey and user -$sumresult5 = db_execute_assoc($sumquery5); -$sumrows5 = $sumresult5->FetchRow(); - require_once(dirname(__FILE__).'/sessioncontrol.php'); // Set language for questions and labels to base language of this survey @@ -151,7 +147,7 @@ $fncount = 0; - $fieldmap=createFieldMap($surveyid,'full'); + $fieldmap=createFieldMap($surveyid,'full',false,false,$language); //add token to top of list if survey is not private if ($surveyinfo['private'] == "N") @@ -226,7 +222,7 @@ while ($idrow = $idresult->FetchRow()) { $id=$idrow['id']; - $rlangauge=$idrow['startlanguage']; + $rlanguage=$idrow['startlanguage']; } $next=$id+1; $last=$id-1; @@ -236,13 +232,13 @@ ."\t
\n" ."\n" ."\n"; - if (isset($rlangauge)) + if (isset($rlanguage)) { - $browseoutput .="" ."".$clang->gT("Edit this entry")."\n"; } - if (($sumrows5['delete_survey'] || $_SESSION['USER_RIGHT_SUPERADMIN'] == 1) && isset($rlangauge)) + if (bHasRight($surveyid,'delete_survey') && isset($rlanguage)) { $browseoutput .= "gT("Are you sure you want to delete this entry?","js")."')) {".get2post($scriptname.'?action=dataentry&subaction=delete&id='.$id.'&sid='.$surveyid)."}\" >" @@ -348,7 +344,7 @@ } //Delete Individual answer using inrow delete buttons/links - checked - if (isset($_POST['deleteanswer']) && $_POST['deleteanswer'] != '' && $_POST['deleteanswer'] != 'marked') + if (isset($_POST['deleteanswer']) && $_POST['deleteanswer'] != '' && $_POST['deleteanswer'] != 'marked' && bHasRight($surveyid,'delete_survey')) { $_POST['deleteanswer']=(int) $_POST['deleteanswer']; // sanitize the value @@ -385,7 +381,7 @@ $connect->execute($query) or safe_die("Could not delete response
$dtquery
".$connect->ErrorMsg()); // checked } // Marked responses -> deal with the whole batch of marked responses - else if (isset($_POST['markedresponses']) && count($_POST['markedresponses'])>0) + if (isset($_POST['markedresponses']) && count($_POST['markedresponses'])>0 && bHasRight($surveyid,'delete_survey')) { // Delete the marked responses - checked if (isset($_POST['deleteanswer']) && $_POST['deleteanswer'] === 'marked') @@ -393,8 +389,8 @@ foreach ($_POST['markedresponses'] as $iResponseID) { $iResponseID = (int)$iResponseID; // sanitize the value - $query="delete FROM $surveytable where id={$iResponseID}"; - $connect->execute($query) or safe_die("Could not delete response
$dtquery
".$connect->ErrorMsg()); // checked + $query="delete FROM {$surveytable} where id={$iResponseID}"; + $connect->execute($query) or safe_die("Could not delete response
{$dtquery}
".$connect->ErrorMsg()); // checked } } // Download all files for all marked responses - checked @@ -603,7 +599,7 @@ $fnames[] = array("lastname", "Last Name", $clang->gT("Last Name"), 0); $fnames[] = array("email", "Email", $clang->gT("Email"), 0); } - $fnames[] = array("submitdate", "Completed", $clang->gT("Completed"), "0", 'D'); + $fnames[] = array("submitdate", $clang->gT("Completed"), $clang->gT("Completed"), "0", 'D'); $fields = createFieldMap($surveyid, 'full', false, false, $language); foreach ($fields as $fielddetails) @@ -658,7 +654,7 @@ else {$tableheader .= "\n";} $tableheader .= "\t\n" . "\n" - . "\n"; + . "\n"; foreach ($fnames as $fn) { if (!isset($currentgroup)) {$currentgroup = $fn[1]; $gbc = "oddrow";} @@ -673,10 +669,13 @@ . "\n"; } $tableheader .= "\t\n\n"; + if (bHasRight($surveyid,'delete_survey')) + { $tableheader .= "\t\n\n"; + } $start=returnglobal('start'); @@ -684,92 +683,39 @@ if (!isset($limit) || $limit== '') {$limit = 50;} if (!isset($start) || $start =='') {$start = 0;} - //LETS COUNT THE DATA + //Create the query if ($surveyinfo['private'] == "N" && db_tables_exist($tokentable)) { - $dtquery = "SELECT count(*) FROM $surveytable LEFT JOIN $tokentable ON $surveytable.token = $tokentable.token "; - } else - { - $dtquery = "SELECT count(*) FROM $surveytable "; + $sql_from = "$surveytable LEFT JOIN $tokentable ON $surveytable.token = $tokentable.token"; + } else { + $sql_from = $surveytable; } + + $sql_where = ""; if (incompleteAnsFilterstate() == "inc") { - $dtquery .= "WHERE submitdate IS NULL "; + $sql_where .= "submitdate IS NULL"; } elseif (incompleteAnsFilterstate() == "filter") { - $dtquery .= " WHERE submitdate IS NOT NULL "; + $sql_where .= "submitdate IS NOT NULL"; } + if (isset($_POST['sql']) && stripcslashes($_POST['sql']) !== "" && $_POST['sql'] !== "NULL") + { + if (!empty($sql_where)) $sql_where .= " AND "; + $sql_where .= stripcslashes($_POST['sql']); + } + if (!empty($sql_where)) $sql_where = " WHERE " . $sql_where; + + //LETS COUNT THE DATA + $dtquery = "SELECT count(*) FROM $sql_from $sql_where"; $dtresult=db_execute_num($dtquery) or safe_die("Couldn't get response data
$dtquery
".$connect->ErrorMsg()); while ($dtrow=$dtresult->FetchRow()) {$dtcount=$dtrow[0];} if ($limit > $dtcount) {$limit=$dtcount;} //NOW LETS SHOW THE DATA - if (isset($_POST['sql'])) - { - if ($_POST['sql'] == "NULL" ) - { - if ($surveyinfo['private'] == "N" && db_tables_exist($tokentable)) - $dtquery = "SELECT * FROM $surveytable LEFT JOIN $tokentable ON $surveytable.token = $tokentable.token "; - else - $dtquery = "SELECT * FROM $surveytable "; - if (incompleteAnsFilterstate() == "inc") - { - $dtquery .= "WHERE submitdate IS NULL"; - } - elseif (incompleteAnsFilterstate() == "filter") - { - $dtquery .= " WHERE submitdate IS NOT NULL "; - } - $dtquery .= " ORDER BY id"; - } - else - { - if ($surveytable['private'] == "N" && db_tables_exist($tokentable)) - $dtquery = "SELECT * FROM $surveytable LEFT JOIN $tokentable ON $surveytable.token = $tokentable.token "; - else - $dtquery = "SELECT * FROM $surveytable "; - if (incompleteAnsFilterstate() == "inc") - { - $dtquery .= "submitdate IS NULL "; - if (stripcslashes($_POST['sql']) !== "") - { - $dtquery .= " AND "; - } - } - elseif (incompleteAnsFilterstate() == "filter") - { - $dtquery .= " submitdate IS NOT NULL "; - if (stripcslashes($_POST['sql']) !== "") - { - $dtquery .= " AND "; - } - } - if (stripcslashes($_POST['sql']) !== "") - { - $dtquery .= stripcslashes($_POST['sql'])." "; - } - $dtquery .= " ORDER BY id"; - } - } - else - { - if ($surveyinfo['private'] == "N" && db_tables_exist($tokentable)) - $dtquery = "SELECT * FROM $surveytable LEFT JOIN $tokentable ON $surveytable.token = $tokentable.token "; - else - $dtquery = "SELECT * FROM $surveytable "; - - if (incompleteAnsFilterstate() == "inc") - { - $dtquery .= " WHERE submitdate IS NULL "; - } - elseif (incompleteAnsFilterstate() == "filter") - { - $dtquery .= " WHERE submitdate IS NOT NULL "; - } - $dtquery .= " ORDER BY id"; - } + $dtquery = "SELECT * FROM $sql_from $sql_where ORDER BY id"; if ($order == "desc") {$dtquery .= " DESC";} if (isset($limit)) @@ -864,27 +810,28 @@ ".$clang->gT(".$clang->gT(\n"; + if (bHasRight($surveyid,'delete_survey')) + { + $browseoutput .= "".$clang->gT(\n"; + } + $browseoutput .= ""; $i = 0; + //If not private, display the token info and link to the token screen if ($surveyinfo['private'] == "N" && $dtrow['token'] && db_tables_exist($tokentable)) { - $SQL = "Select * FROM ".db_table_name('tokens_'.$surveyid)." WHERE token=?"; - if ( db_tables_exist(db_table_name_nq('tokens_'.$surveyid)) && - $SQLResult = db_execute_assoc($SQL, $dtrow['token'])) - { - $TokenRow = $SQLResult->FetchRow(); - } - $browseoutput .= "\n"; + $i++; //We skip the first record (=token) as we just outputted that one } - $i++; - } for ($i; $i<$fncount; $i++) { diff --git a/admin/conditionshandling.php b/admin/conditionshandling.php index 3f50f551d84..611a19ed671 100644 --- a/admin/conditionshandling.php +++ b/admin/conditionshandling.php @@ -32,7 +32,11 @@ if (!isset($qid)) {$qid=returnglobal('qid');} if (!isset($gid)) {$gid=returnglobal('gid');} if (!isset($p_scenario)) {$p_scenario=returnglobal('scenario');} -if (!isset($p_cqid)) {$p_cqid=returnglobal('cqid');} +if (!isset($p_cqid)) +{ + $p_cqid=returnglobal('cqid'); + if ($p_cqid == '') $p_cqid=0; // we are not using another question as source of condition +} if (!isset($p_cid)) {$p_cid=returnglobal('cid');} if (!isset($p_subaction)) {$p_subaction=returnglobal('subaction');} if (!isset($p_cquestions)) {$p_cquestions=returnglobal('cquestions');} diff --git a/admin/database.php b/admin/database.php index c4d77bc0c46..58c22255c90 100644 --- a/admin/database.php +++ b/admin/database.php @@ -65,12 +65,7 @@ function get_max_question_order($gid) if(isset($surveyid)) { - $actsurquery = "SELECT define_questions, edit_survey_property, delete_survey FROM {$dbprefix}surveys_rights WHERE sid=$surveyid AND uid = ".$_SESSION['loginID']; //Getting rights for this survey - $actsurresult = db_execute_assoc($actsurquery); // Checked - $actsurrows = $actsurresult->FetchRow(); - - - if ($action == "insertnewgroup" && ( $_SESSION['USER_RIGHT_SUPERADMIN'] == 1 || $actsurrows['define_questions'])) + if ($action == "insertnewgroup" && bHasRight($surveyid, 'define_questions')) { $grplangs = GetAdditionalLanguagesFromSurveyID($postsid); $baselang = GetBaseLanguageFromSurveyID($postsid); @@ -138,7 +133,7 @@ function get_max_question_order($gid) } } - elseif ($action == "updategroup" && ($_SESSION['USER_RIGHT_SUPERADMIN'] == 1 || $actsurrows['define_questions'])) + elseif ($action == "updategroup" && bHasRight($surveyid, 'define_questions')) { $grplangs = GetAdditionalLanguagesFromSurveyID($postsid); $baselang = GetBaseLanguageFromSurveyID($postsid); @@ -182,7 +177,7 @@ function get_max_question_order($gid) } - elseif ($action == "delgroupnone" && ($_SESSION['USER_RIGHT_SUPERADMIN'] == 1 || $actsurrows['define_questions'])) + elseif ($action == "delgroupnone" && bHasRight($surveyid, 'define_questions')) { if (!isset($gid)) $gid=returnglobal('gid'); @@ -204,7 +199,7 @@ function get_max_question_order($gid) } } - elseif ($action == "delgroup" && ($_SESSION['USER_RIGHT_SUPERADMIN'] == 1 || $actsurrows['define_questions'])) + elseif ($action == "delgroup" && bHasRight($surveyid, 'define_questions')) { if (!isset($gid)) $gid=returnglobal('gid'); $query = "SELECT qid FROM ".db_table_name('groups')." g, ".db_table_name('questions')." q WHERE g.gid=q.gid AND g.gid=$gid AND q.parent_qid=0 group by qid"; @@ -236,7 +231,7 @@ function get_max_question_order($gid) } } - elseif ($action == "insertnewquestion" && ($_SESSION['USER_RIGHT_SUPERADMIN'] == 1 || $actsurrows['define_questions'])) + elseif ($action == "insertnewquestion" && bHasRight($surveyid, 'define_questions')) { $baselang = GetBaseLanguageFromSurveyID($postsid); if (strlen($_POST['title']) < 1) @@ -337,7 +332,7 @@ function get_max_question_order($gid) //surveyFixColumns($surveyid); } } - elseif ($action == "renumberquestions" && ($_SESSION['USER_RIGHT_SUPERADMIN'] == 1 || $actsurrows['define_questions'])) + elseif ($action == "renumberquestions" && bHasRight($surveyid, 'define_questions')) { //Automatically renumbers the "question codes" so that they follow //a methodical numbering method @@ -370,13 +365,30 @@ function get_max_question_order($gid) } - elseif ($action == "updatedefaultvalues" && ($_SESSION['USER_RIGHT_SUPERADMIN'] == 1 || $actsurrows['define_questions'])) + elseif ($action == "updatedefaultvalues" && bHasRight($surveyid, 'define_questions')) { $questlangs = GetAdditionalLanguagesFromSurveyID($surveyid); $baselang = GetBaseLanguageFromSurveyID($surveyid); array_unshift($questlangs,$baselang); + // same_default value on/off for question + $uqquery = "UPDATE ".db_table_name('questions'); + if (isset($_POST['samedefault'])) + { + $uqquery .= "SET same_default = '1' "; + } + else + { + $uqquery .= "SET same_default = '0' "; + } + $uqquery .= "WHERE sid='".$postsid."' AND qid='".$postqid."'"; + $uqresult = $connect->Execute($uqquery) or safe_die ("Error Update Question: ".$uqquery."
".$connect->ErrorMsg()); + if (!$uqresult) + { + $databaseoutput .= "\n"; + } + $questiontype=$connect->GetOne("SELECT type FROM ".db_table_name('questions')." WHERE qid=$postqid"); $qtproperties=getqtypelist('','array'); if ($qtproperties[$questiontype]['answerscales']>0 && $qtproperties[$questiontype]['subquestions']==0) @@ -426,7 +438,7 @@ function get_max_question_order($gid) } - elseif ($action == "updatequestion" && ($_SESSION['USER_RIGHT_SUPERADMIN'] == 1 || $actsurrows['define_questions'])) + elseif ($action == "updatequestion" && bHasRight($surveyid, 'define_questions')) { $cqquery = "SELECT type, gid FROM ".db_table_name('questions')." WHERE qid={$postqid}"; $cqresult=db_execute_assoc($cqquery) or safe_die ("Couldn't get question type to check for change
".$cqquery."
".$connect->ErrorMsg()); // Checked @@ -661,7 +673,7 @@ function get_max_question_order($gid) } } - elseif ($action == "copynewquestion" && ($_SESSION['USER_RIGHT_SUPERADMIN'] == 1 || $actsurrows['define_questions'])) + elseif ($action == "copynewquestion" && bHasRight($surveyid, 'define_questions')) { if (!$_POST['title']) @@ -810,7 +822,7 @@ function get_max_question_order($gid) $qid=$newqid; //Sets the qid so that admin.php displays the newly created question } } - elseif ($action == "delquestion" && ($_SESSION['USER_RIGHT_SUPERADMIN'] == 1 || $actsurrows['define_questions'])) + elseif ($action == "delquestion" && bHasRight($surveyid, 'define_questions')) { if (!isset($qid)) {$qid=returnglobal('qid');} //check if any other questions have conditions which rely on this question. Don't delete if there are. @@ -841,7 +853,7 @@ function get_max_question_order($gid) } } - elseif ($action == "updateansweroptions" && ($_SESSION['USER_RIGHT_SUPERADMIN'] == 1 || $actsurrows['define_questions'])) + elseif ($action == "updateansweroptions" && bHasRight($surveyid, 'define_questions')) { $anslangs = GetAdditionalLanguagesFromSurveyID($surveyid); @@ -912,20 +924,9 @@ function get_max_question_order($gid) $sortorderid--; $action='editansweroptions'; - // Special treatment for ranking questions - $surveyinfo=getSurveyInfo($surveyid); - if ($questiontype=='R' && $surveyinfo['active']=='N') - { - $query="update ".db_table_name('question_attributes')." set value='$sortorderid' where attribute='ranking_slots' and qid=$qid"; - if (!$result = $connect->Execute($query)) // Checked - { - $databaseoutput .= "\n"; } - } - - } - elseif ($action == "updatesubquestions" && ($_SESSION['USER_RIGHT_SUPERADMIN'] == 1 || $actsurrows['define_questions'])) + elseif ($action == "updatesubquestions" && bHasRight($surveyid, 'define_questions')) { $anslangs = GetAdditionalLanguagesFromSurveyID($surveyid); @@ -1026,7 +1027,7 @@ function get_max_question_order($gid) } - elseif (($action == "updatesurveysettingsandeditlocalesettings" || $action == "updatesurveysettings") && ($_SESSION['USER_RIGHT_SUPERADMIN'] == 1 || $actsurrows['edit_survey_property'])) + elseif (($action == "updatesurveysettingsandeditlocalesettings" || $action == "updatesurveysettings") && bHasRight($surveyid,'delete_survey')) { $formatdata=getDateFormatData($_SESSION['dateformat']); @@ -1176,7 +1177,7 @@ function get_max_question_order($gid) } } - elseif ($action == "delsurvey" && ($_SESSION['USER_RIGHT_SUPERADMIN'] == 1 || $actsurrows['delete_survey'])) //can only happen if there are no groups, no questions, no answers etc. + elseif ($action == "delsurvey" && bHasRight($surveyid, 'delete_survey')) //can only happen if there are no groups, no questions, no answers etc. { $query = "DELETE FROM {$dbprefix}surveys WHERE sid=$surveyid"; $result = $connect->Execute($query); // Checked @@ -1194,7 +1195,7 @@ function get_max_question_order($gid) // Save the 2nd page from the survey-properties - elseif (($action == "updatesurveylocalesettings") && ($_SESSION['USER_RIGHT_SUPERADMIN'] == 1 || $actsurrows['edit_survey_property'])) + elseif (($action == "updatesurveylocalesettings") && bHasRight($surveyid,'delete_survey')) { $languagelist = GetAdditionalLanguagesFromSurveyID($surveyid); $languagelist[]=GetBaseLanguageFromSurveyID($surveyid); diff --git a/admin/dataentry.php b/admin/dataentry.php index c1ae4b046c6..f347a7674db 100644 --- a/admin/dataentry.php +++ b/admin/dataentry.php @@ -48,12 +48,13 @@ */ include_once("login_check.php"); -$language = $_SESSION['adminlang']; +$sDataEntryLanguage = $_SESSION['adminlang']; //RL: set language for questions and labels to current admin language for browsing responses $action = returnglobal('action'); $surveyid = returnglobal('sid'); $id = returnglobal('id'); +$sDataEntryLanguage = returnglobal('lang'); $saver['scid']=returnglobal('save_scid'); $surveytable = db_table_name("survey_".$surveyid); $dataentryoutput =''; @@ -61,14 +62,14 @@ include_once("login_check.php"); $dateformatdetails=getDateFormatData($_SESSION['dateformat']); -$language = GetBaseLanguageFromSurveyID($surveyid); -$surveyinfo=getSurveyInfo($surveyid); -$actsurquery = "SELECT browse_response FROM ".db_table_name("surveys_rights")." WHERE sid=$surveyid AND uid = ".$_SESSION['loginID']; //Getting rights for this survey -$actsurresult = db_execute_assoc($actsurquery) or safe_die($connect->ErrorMsg()); -$actsurrows = $actsurresult->FetchRow(); +if (!isset($sDataEntryLanguage)) +{ + $sDataEntryLanguage = GetBaseLanguageFromSurveyID($surveyid); +} +$surveyinfo=getSurveyInfo($surveyid); -if ($_SESSION['USER_RIGHT_SUPERADMIN'] == 1 || $actsurrows['browse_response']) +if (bHasRight($surveyid, 'browse_response')) { $surveyoptions = browsemenubar($clang->gT("Browse Responses")); @@ -83,11 +84,6 @@ return; } - if ($subaction == "edit" || $subaction == "" || $subaction == "editsaved" || $subaction == "insert") - { - $language = GetBaseLanguageFromSurveyID($surveyid); - } - if ($subaction == "insert") { $thissurvey=getSurveyInfo($surveyid); @@ -221,7 +217,18 @@ $columns=array(); $values=array(); $_POST['startlanguage']=$baselang; - $_POST['startdate']=$_POST['datestamp']; + if ($thissurvey['datestamp'] == "Y") {$_POST['startdate']=$_POST['datestamp'];} + if (isset($_POST['closerecord'])) + { + if ($thissurvey['datestamp'] == "Y") + { + $_POST['submitdate']=date_shift(date("Y-m-d H:i:s"), "Y-m-d H:i:s", $timeadjust); + } + else + { + $_POST['submitdate']=date("Y-m-d H:i:s",mktime(0,0,0,1,1,1980)); + } + } foreach ($fieldmap as $irow) { $fieldname = $irow['fieldname']; @@ -389,13 +396,12 @@ { $dataentryoutput .= $surveyoptions; - if (!isset($_GET['language'])) $_GET['language'] = GetBaseLanguageFromSurveyID($surveyid); - //FIRST LETS GET THE NAMES OF THE QUESTIONS AND MATCH THEM TO THE FIELD NAMES FOR THE DATABASE - $fnquery = "SELECT * FROM ".db_table_name("questions").", ".db_table_name("groups").", ".db_table_name("surveys")." WHERE - ".db_table_name("questions").".gid=".db_table_name("groups").".gid AND - ".db_table_name("questions").".language = '{$language}' AND ".db_table_name("groups").".language = '{$language}' AND - ".db_table_name("questions").".sid=".db_table_name("surveys").".sid AND ".db_table_name("questions").".sid='$surveyid'"; + $fnquery = "SELECT * FROM ".db_table_name("questions").", ".db_table_name("groups")." g, ".db_table_name("surveys")." WHERE + ".db_table_name("questions").".gid=g.gid AND + ".db_table_name("questions").".language = '{$sDataEntryLanguage}' AND g.language = '{$sDataEntryLanguage}' AND + ".db_table_name("questions").".sid=".db_table_name("surveys").".sid AND ".db_table_name("questions").".sid='$surveyid' + order by group_order, question_order"; $fnresult = db_execute_assoc($fnquery); $fncount = $fnresult->RecordCount(); //$dataentryoutput .= "$fnquery

\n"; @@ -408,12 +414,11 @@ $ipaddr=$fnrow['ipaddr']; } // Get table output into array // Perform a case insensitive natural sort on group name then question title of a multidimensional array - usort($fnrows, 'GroupOrderThenQuestionOrder'); // $fnames = (Field Name in Survey Table, Short Title of Question, Question Type, Field Name, Question Code, Predetermined Answers if exist) $fnames['completed'] = array('fieldname'=>"completed", 'question'=>$clang->gT("Completed"), 'type'=>'completed'); - $fnames=array_merge($fnames,createFieldMap($surveyid,'full')); + $fnames=array_merge($fnames,createFieldMap($surveyid,'full',false,false,$sDataEntryLanguage)); $nfncount = count($fnames)-1; //SHOW INDIVIDUAL RECORD @@ -487,7 +492,7 @@ $dataentryoutput .= "\n" - ."
Actions".$clang->gT('Actions')."
" ."".$clang->gT(" ."".$clang->gT(" ."
\n"; - if (isset($TokenRow) && $TokenRow) + if (isset($dtrow['tid']) && !empty($dtrow['tid'])) { - $browseoutput .= ""; + //If we have a token, create a link to edit it + $browsedatafield = ""; + $browsedatafield .= "{$dtrow['token']}"; + $browsedatafield .= ""; + } else { + //No corresponding token in the token tabel, just display the token + $browsedatafield .= "{$dtrow['token']}"; } - $browseoutput .= "{$dtrow['token']}"; - if (isset($TokenRow) && $TokenRow) - { - $browseoutput .= "\n"; + $browseoutput .= "$browsedatafield
\n"; + ."
\n"; $highlight=false; unset($fnames['lastpage']); foreach ($results as $idrow) @@ -594,7 +599,7 @@ } else { - $lquery = "SELECT * FROM ".db_table_name("answers")." WHERE qid={$fname['qid']} AND language = '{$language}' ORDER BY sortorder, answer"; + $lquery = "SELECT * FROM ".db_table_name("answers")." WHERE qid={$fname['qid']} AND language = '{$sDataEntryLanguage}' ORDER BY sortorder, answer"; $lresult = db_execute_assoc($lquery); $dataentryoutput .= "\t\n" ."\n"; - $dataentryoutput .= "\n" ."\n" @@ -1594,7 +1593,7 @@ function saveshow(value) case "1": $value=substr($conrow['cfieldname'], strpos($conrow['cfieldname'], "X".$conrow['cqid'])+strlen("X".$conrow['cqid']), strlen($conrow['cfieldname'])); $fquery = "SELECT * FROM ".db_table_name("labels")."\n" - . "WHERE lid='{$conrow['lid']}'\n and language='$language' " + . "WHERE lid='{$conrow['lid']}'\n and language='$sDataEntryLanguage' " . "AND code='{$conrow['value']}'"; $fresult=db_execute_assoc($fquery) or safe_die("$fquery
".$connect->ErrorMsg()); while($frow=$fresult->FetchRow()) @@ -1617,7 +1616,7 @@ function saveshow(value) default: $value=substr($conrow['cfieldname'], strpos($conrow['cfieldname'], "X".$conrow['cqid'])+strlen("X".$conrow['cqid']), strlen($conrow['cfieldname'])); $fquery = "SELECT * FROM ".db_table_name("questions")."\n" - . "WHERE qid='{$conrow['cqid']}'\n and language='$language' " + . "WHERE qid='{$conrow['cqid']}'\n and language='$sDataEntryLanguage' " . "AND title='{$conrow['title']}' and scale_id=0"; $fresult=db_execute_assoc($fquery) or safe_die("$fquery
".$connect->ErrorMsg()); if ($fresult->RecordCount() <= 0) die($fquery); @@ -1652,7 +1651,7 @@ function saveshow(value) case ":": case ";": $thiscquestion=$fieldmap[$conrow['cfieldname']]; - $ansquery="SELECT answer FROM ".db_table_name("answers")." WHERE qid='{$conrow['cqid']}' AND code='{$thiscquestion['aid']}' AND language='{$language}'"; + $ansquery="SELECT answer FROM ".db_table_name("answers")." WHERE qid='{$conrow['cqid']}' AND code='{$thiscquestion['aid']}' AND language='{$sDataEntryLanguage}'"; $ansresult=db_execute_assoc($ansquery); $i=0; while ($ansrow=$ansresult->FetchRow()) @@ -1665,7 +1664,7 @@ function saveshow(value) $operator=$blang->gT("AND"); // this is a dirty, DIRTY fix but it works since only array questions seem to be ORd break; default: - $ansquery="SELECT answer FROM ".db_table_name("answers")." WHERE qid='{$conrow['cqid']}' AND code='{$conrow['value']}' AND language='{$language}'"; + $ansquery="SELECT answer FROM ".db_table_name("answers")." WHERE qid='{$conrow['cqid']}' AND code='{$conrow['value']}' AND language='{$sDataEntryLanguage}'"; $ansresult=db_execute_assoc($ansquery); while ($ansrow=$ansresult->FetchRow()) { @@ -1750,7 +1749,7 @@ function saveshow(value) break; case "Q": //MULTIPLE SHORT TEXT case "K": - $deaquery = "SELECT question,title FROM ".db_table_name("questions")." WHERE parent_qid={$deqrow['qid']} AND language='{$language}' ORDER BY question_order"; + $deaquery = "SELECT question,title FROM ".db_table_name("questions")." WHERE parent_qid={$deqrow['qid']} AND language='{$sDataEntryLanguage}' ORDER BY question_order"; $dearesult = db_execute_assoc($deaquery); $dataentryoutput .= "\t
\n"; $dataentryoutput .= "\n"; $dataentryoutput .="\n"; @@ -1316,13 +1312,12 @@ function saveshow(value) - + \n"; } - $dataentryoutput .= "
\n"; $dataentryoutput .= "\t
\n" - ."\n"; + $dataentryoutput .= "\n"; } @@ -1330,7 +1325,7 @@ function saveshow(value) { if ($_SESSION['USER_RIGHT_SUPERADMIN'] != 1 && $surveyinfo['owner_id'] != $_SESSION['loginID']) { - safe_die('You are not allowed to update an existing answer.'); + safe_die('You are not allowed to update an existing response.'); } $baselang = GetBaseLanguageFromSurveyID($surveyid); @@ -1401,6 +1396,10 @@ function saveshow(value) elseif ($subaction == "delete") { + if (!bHasRight($surveyid,'delete_survey')) + { + safe_die('You are not allowed to delete a response.'); + } $dataentryoutput .= "
".$clang->gT("Data Entry")."
\n"; $dataentryoutput .= "
\n"; @@ -1422,14 +1421,14 @@ function saveshow(value) if(!isset($_GET['language']) || !in_array($_GET['language'],$slangs)) { - $language = $baselang; + $sDataEntryLanguage = $baselang; $blang = $clang; } else { $blang = new limesurvey_lang($_GET['language']); - $language = $_GET['language']; + $sDataEntryLanguage = $_GET['language']; } - $langlistbox = languageDropdown($surveyid,$language); + $langlistbox = languageDropdown($surveyid,$sDataEntryLanguage); $thissurvey=getSurveyInfo($surveyid); //This is the default, presenting a blank dataentry form $fieldmap=createFieldMap($surveyid); @@ -1519,12 +1518,12 @@ function saveshow(value) } // SURVEY NAME AND DESCRIPTION TO GO HERE - $degquery = "SELECT * FROM ".db_table_name("groups")." WHERE sid=$surveyid AND language='{$language}' ORDER BY ".db_table_name("groups").".group_order"; + $degquery = "SELECT * FROM ".db_table_name("groups")." WHERE sid=$surveyid AND language='{$sDataEntryLanguage}' ORDER BY ".db_table_name("groups").".group_order"; $degresult = db_execute_assoc($degquery); // GROUP NAME while ($degrow = $degresult->FetchRow()) { - $deqquery = "SELECT * FROM ".db_table_name("questions")." WHERE sid=$surveyid AND parent_qid=0 AND gid={$degrow['gid']} AND language='{$language}'"; + $deqquery = "SELECT * FROM ".db_table_name("questions")." WHERE sid=$surveyid AND parent_qid=0 AND gid={$degrow['gid']} AND language='{$sDataEntryLanguage}'"; $deqresult = db_execute_assoc($deqquery); $dataentryoutput .= "\t
".FlattenText($degrow['group_name'])."
\n"; while ($dearow = $dearesult->FetchRow()) @@ -1772,7 +1771,7 @@ function saveshow(value) while ($dearow = $dearesult->FetchRow()) { // first scale - $delquery = "SELECT * FROM ".db_table_name("answers")." WHERE qid={$deqrow['qid']} AND language='{$language}' and scale_id=0 ORDER BY sortorder, code"; + $delquery = "SELECT * FROM ".db_table_name("answers")." WHERE qid={$deqrow['qid']} AND language='{$sDataEntryLanguage}' and scale_id=0 ORDER BY sortorder, code"; $delresult = db_execute_assoc($delquery); $dataentryoutput .= "\n"; - $delquery = "SELECT * FROM ".db_table_name("answers")." WHERE qid={$deqrow['qid']} AND language='{$language}' and scale_id=1 ORDER BY sortorder, code"; + $delquery = "SELECT * FROM ".db_table_name("answers")." WHERE qid={$deqrow['qid']} AND language='{$sDataEntryLanguage}' and scale_id=1 ORDER BY sortorder, code"; $delresult = db_execute_assoc($delquery); $dataentryoutput .= "" ."\n" ."\n" - ."\n"; + ."\n"; if ($activated != 'Y' && $first) { $vasummary .="\n"; @@ -1891,10 +1878,10 @@ } // Label set browser +//
$vasummary .= "
{$dearow['question']}"; $dataentryoutput .= ""; $dataentryoutput .="\n"; $datatemp=''; @@ -1879,7 +1878,7 @@ function saveshow(value) if ($defexists=="") {$dataentryoutput .= "\n".$datatemp;} else {$dataentryoutput .=$datatemp;} - $oquery="SELECT other FROM ".db_table_name("questions")." WHERE qid={$deqrow['qid']} AND language='{$language}'"; + $oquery="SELECT other FROM ".db_table_name("questions")." WHERE qid={$deqrow['qid']} AND language='{$sDataEntryLanguage}'"; $oresult=db_execute_assoc($oquery) or safe_die("Couldn't get other for list question
".$oquery."
".$connect->ErrorMsg()); while($orow = $oresult->FetchRow()) { @@ -1899,7 +1898,7 @@ function saveshow(value) break; case "O": //LIST WITH COMMENT drop-down/radio-button list + textarea $defexists=""; - $deaquery = "SELECT * FROM ".db_table_name("answers")." WHERE qid={$deqrow['qid']} AND language='{$language}' ORDER BY sortorder, answer"; + $deaquery = "SELECT * FROM ".db_table_name("answers")." WHERE qid={$deqrow['qid']} AND language='{$sDataEntryLanguage}' ORDER BY sortorder, answer"; $dearesult = db_execute_assoc($deaquery); $dataentryoutput .= "\t"; + // Test question Language Selection Popup + $surveysummary .="
".$clang->gT("Please select a language:")."
    "; foreach ($tmp_survlangs as $tmp_lang) { - $surveysummary .= "
"; + $surveysummary .= "
  • ".getLanguageNameFromCode($tmp_lang,false)."
    • "; } - $surveysummary .= "
    ".$clang->gT("Please select a language:")."
    ".getLanguageNameFromCode($tmp_lang,false)."
    ".$clang->gT("Cancel")."
    "; + $surveysummary .= ""; } } else @@ -1517,6 +1502,7 @@ var newansweroption_text='".$clang->gT('New answer option','js')."'; var strcode='".$clang->gT('Code','js')."'; var strlabel='".$clang->gT('Label','js')."'; + var strCantDeleteLastAnswer='".$clang->gT('You cannot delete the last answer option.','js')."'; var lsbrowsertitle='".$clang->gT('Label set browser','js')."'; var quickaddtitle='".$clang->gT('Quick-add subquestions','js')."'; var duplicateanswercode='".$clang->gT('Error: You are trying to use duplicate answer codes.','js')."'; @@ -1640,10 +1626,10 @@ $vasummary .= ""; } // Label set browser +//
    $vasummary .= "
     ".$clang->gT("Code")."".$clang->gT("Subquestion")."".$clang->gT("Subquestion")."".$clang->gT("Action")."
    "; + $browsemenubar .="
    ".$clang->gT("Please select a language:")."
    "; + $browsemenubar .= "
  • ".getLanguageNameFromCode($tmp_lang,false)."
    • "; } - $browsemenubar .= "
    ".$clang->gT("Please select a language:")."
    ".getLanguageNameFromCode($tmp_lang,false)."
    ".$clang->gT("Cancel")."
    "; + $browsemenubar .= ""; } // Display last 50 responses diff --git a/admin/htmleditor-functions.php b/admin/htmleditor-functions.php index b425dbfdead..be746eb3d0b 100644 --- a/admin/htmleditor-functions.php +++ b/admin/htmleditor-functions.php @@ -226,7 +226,7 @@ function getPopupEditor($fieldtype,$fieldname,$fieldtext, $surveyID=null,$gID=nu function getInlineEditor($fieldtype,$fieldname,$fieldtext, $surveyID=null,$gID=null,$qID=null,$action=null) { - global $clang, $imagefiles, $homeurl, $rooturl, $sFCKEditorURL, $fckeditexpandtoolbar; + global $clang, $imagefiles, $homeurl, $rooturl, $sFCKEditorURL, $fckeditexpandtoolbar, $uploadurl; $htmlcode = ''; $imgopts = ''; @@ -274,7 +274,7 @@ function getInlineEditor($fieldtype,$fieldname,$fieldtext, $surveyID=null,$gID=n . "$oFCKeditorVarName.Config[\"LimeReplacementFieldsQID\"] = \"".$qID."\";\n" . "$oFCKeditorVarName.Config[\"LimeReplacementFieldsType\"] = \"".$fieldtype."\";\n" . "$oFCKeditorVarName.Config[\"LimeReplacementFieldsAction\"] = \"".$action."\";\n" - . "$oFCKeditorVarName.Config[\"SmileyPath\"] = \"".$rooturl."/upload/images/smiley/msn/\";\n" + . "$oFCKeditorVarName.Config[\"SmileyPath\"] = \"".$uploadurl."/images/smiley/msn/\";\n" . $htmlformatoption . $toolbaroption; diff --git a/admin/http_importsurvey.php b/admin/http_importsurvey.php index c2a1635d991..3c1ebd1002a 100644 --- a/admin/http_importsurvey.php +++ b/admin/http_importsurvey.php @@ -51,13 +51,18 @@ $importsurvey .= "

    \n"; $surveyid = sanitize_int($_POST['copysurveylist']); $exclude = array(); + if (get_magic_quotes_gpc()) {$sNewSurveyName = stripslashes($_POST['copysurveyname']);} + else{ + $sNewSurveyName=$_POST['copysurveyname']; + } + require_once("../classes/inputfilter/class.inputfilter_clean.php"); $myFilter = new InputFilter('','',1,1,1); if ($filterxsshtml) { - $sNewSurveyName = $myFilter->process($_POST['copysurveyname']); + $sNewSurveyName = $myFilter->process($sNewSurveyName); } else { - $sNewSurveyName = html_entity_decode($_POST['copysurveyname'], ENT_QUOTES, "UTF-8"); + $sNewSurveyName = html_entity_decode($sNewSurveyName, ENT_QUOTES, "UTF-8"); } if (isset($_POST['copysurveyexcludequotas']) && $_POST['copysurveyexcludequotas'] == "on") { diff --git a/admin/importquestion.php b/admin/importquestion.php index cad39b61cde..60f34398ae3 100644 --- a/admin/importquestion.php +++ b/admin/importquestion.php @@ -783,6 +783,9 @@ function XMLImportQuestion($sFullFilepath, $newsid, $newgid) } // Import subquestions -------------------------------------------------------------- + if (isset($xml->subquestions)) + { + foreach ($xml->subquestions->rows->row as $row) { $insertdata=array(); @@ -838,6 +841,7 @@ function XMLImportQuestion($sFullFilepath, $newsid, $newgid) $results['answers']++; } } + } // Import questionattributes -------------------------------------------------------------- if(isset($xml->question_attributes)) diff --git a/admin/install/create-mysql.sql b/admin/install/create-mysql.sql index 2265954ed27..98d1cd9118e 100644 --- a/admin/install/create-mysql.sql +++ b/admin/install/create-mysql.sql @@ -258,8 +258,7 @@ CREATE TABLE `prefix_surveys_languagesettings` ( `surveyls_dateformat` INT UNSIGNED NOT NULL DEFAULT 1, PRIMARY KEY (`surveyls_survey_id`, `surveyls_language`) -) -TYPE = $databasetabletype CHARACTER SET utf8 COLLATE utf8_unicode_ci; +) ENGINE = $databasetabletype CHARACTER SET utf8 COLLATE utf8_unicode_ci; diff --git a/admin/integritycheck.php b/admin/integritycheck.php index c44a86815bd..f4dc0c6dccb 100644 --- a/admin/integritycheck.php +++ b/admin/integritycheck.php @@ -34,6 +34,74 @@ $connect->query("delete FROM {$dbprefix}surveys_rights where sid not in (select sid from {$dbprefix}surveys)"); $connect->query("delete FROM {$dbprefix}surveys_rights where uid not in (select uid from {$dbprefix}users)"); + /***** Check for activate survey tables with missing survey entry **/ + + $sQuery = "show tables like '{$dbprefix}survey\_%'"; + $aResult = db_execute_num($sQuery) or safe_die("Couldn't get list of conditions from database
    $query
    ".$connect->ErrorMsg()); + while ($aRow=$aResult->FetchRow()) + { + $tablename=substr($aRow[0],strlen($dbprefix)); + $iSurveyID=substr($tablename,strpos($tablename,'_')+1); + $qquery="SELECT sid FROM {$dbprefix}surveys WHERE sid='{$iSurveyID}'"; + $qresult=$connect->Execute($qquery) or safe_die ("Couldn't check questions table for qids
    $qquery
    ".$connect->ErrorMsg()); + $qcount=$qresult->RecordCount(); + if ($qcount==0) + { + $date = date('YmdHis').rand(1,1000); + $sOldTable = "survey_{$iSurveyID}"; + $sNewTable = "old_survey_{$iSurveyID}_$date"; + + $deactivatequery = db_rename_table(db_table_name_nq($sOldTable),db_table_name_nq($sNewTable)); + $deactivateresult = $connect->Execute($deactivatequery) or die ("Couldn't make backup of the survey table. Please try again. The database reported the following error:
    ".htmlspecialchars($connect->ErrorMsg())."
    "); + + if ($databasetype=='postgres') + { + // If you deactivate a postgres table you have to rename the according sequence too and alter the id field to point to the changed sequence + $deactivatequery = db_rename_table($sOldTable.'_id_seq',$sNewTable.'_id_seq'); + $deactivateresult = $connect->Execute($deactivatequery) or die ("Couldn't make backup of the survey table. Please try again. The database reported the following error:
    ".htmlspecialchars($connect->ErrorMsg())."

    Survey was not deactivated either.

    ".$clang->gT("Main Admin Screen").""); + $setsequence="ALTER TABLE $sNewTable ALTER COLUMN id SET DEFAULT nextval('{$sNewTable}_id_seq'::regclass);"; + $deactivateresult = $connect->Execute($setsequence) or die ("Couldn't make backup of the survey table. Please try again. The database reported the following error:
    ".htmlspecialchars($connect->ErrorMsg())."

    Survey was not deactivated either.

    ".$clang->gT("Main Admin Screen").""); + } + + } + } + + /***** Check for activate token tables with missing survey entry **/ + + $sQuery = "show tables like '{$dbprefix}tokens\_%'"; + $aResult = db_execute_num($sQuery) or safe_die("Couldn't get list of token tables from database
    $query
    ".$connect->ErrorMsg()); + while ($aRow=$aResult->FetchRow()) + { + $tablename=substr($aRow[0],strlen($dbprefix)); + $iSurveyID=substr($tablename,strpos($tablename,'_')+1); + $qquery="SELECT sid FROM {$dbprefix}surveys WHERE sid='{$iSurveyID}'"; + $qresult=$connect->Execute($qquery) or safe_die ("Couldn't check survey table for sid
    $qquery
    ".$connect->ErrorMsg()); + $qcount=$qresult->RecordCount(); + if ($qcount==0) + { + $date = date('YmdHis').rand(1,1000); + $sOldTable = "tokens_{$iSurveyID}"; + $sNewTable = "old_tokens_{$iSurveyID}_$date"; + $deactivatequery = db_rename_table( db_table_name_nq($sOldTable), db_table_name_nq($sNewTable)); + + if ($databasetype=='postgres') + { + // If you deactivate a postgres table you have to rename the according sequence too and alter the id field to point to the changed sequence + $sOldTableJur = db_table_name_nq($sOldTable); + $deactivatequery = db_rename_table(db_table_name_nq($sOldTable),db_table_name_nq($sNewTable).'_tid_seq'); + $deactivateresult = $connect->Execute($deactivatequery) or die ("oldtable : ".$sOldTable. " / oldtableJur : ". $sOldTableJur . " / ".htmlspecialchars($deactivatequery)." / Could not rename the old sequence for this token table. The database reported the following error:
    ".htmlspecialchars($connect->ErrorMsg())."

    ".$clang->gT("Main Admin Screen").""); + $setsequence="ALTER TABLE ".db_table_name_nq($sNewTable)."_tid_seq ALTER COLUMN tid SET DEFAULT nextval('".db_table_name_nq($sNewTable)."_tid_seq'::regclass);"; + $deactivateresult = $connect->Execute($setsequence) or die (htmlspecialchars($setsequence)." Could not alter the field tid to point to the new sequence name for this token table. The database reported the following error:
    ".htmlspecialchars($connect->ErrorMsg())."

    Survey was not deactivated either.

    ".$clang->gT("Main Admin Screen").""); + $setidx="ALTER INDEX ".db_table_name_nq($sOldTable)."_idx RENAME TO ".db_table_name_nq($sNewTable)."_idx;"; + $deactivateresult = $connect->Execute($setidx) or die (htmlspecialchars($setidx)." Could not alter the index for this token table. The database reported the following error:
    ".htmlspecialchars($connect->ErrorMsg())."

    Survey was not deactivated either.

    ".$clang->gT("Main Admin Screen").""); + } else { + $deactivateresult = $connect->Execute($deactivatequery) or die ("Couldn't deactivate because:
    \n".htmlspecialchars($connect->ErrorMsg())." - Query: ".htmlspecialchars($deactivatequery)."

    \nAdmin\n"); + } + + } + } + + /**********************************************************************/ /* CHECK CONDITIONS */ /**********************************************************************/ @@ -87,25 +155,88 @@ /**********************************************************************/ $query = "SELECT * FROM {$dbprefix}question_attributes ORDER BY qid"; $result = db_execute_assoc($query) or safe_die($connect->ErrorMsg()); + $countQuestionAttributes=0; while($row = $result->FetchRow()) { $aquery = "SELECT * FROM {$dbprefix}questions WHERE qid = {$row['qid']}"; $aresult = $connect->Execute($aquery) or safe_die($connect->ErrorMsg()); $qacount = $aresult->RecordCount(); if (!$qacount) { - $qadelete[]=array("qaid"=>$row['qaid'], "attribute"=>$row['attribute'], "reason"=>$clang->gT("No matching qid")); + $countQuestionAttributes++; } } // while if (isset($qadelete) && $qadelete) { - $integritycheck .= "
  • ".$clang->gT("The following question attributes should be deleted").":

    • \n"; - foreach ($qadelete as $qad) {$integritycheck .= "QAID `{$qad['qaid']}` ATTRIBUTE `{$qad['attribute']}` ".$clang->gT("because")." `{$qad['reason']}`
    \n";} - $integritycheck .= "
    \n"; + $integritycheck .= "
  • ".sprintf($clang->gT("There are %s orphaned question attributes."),$countQuestionAttributes)."
    • "; } else { $integritycheck .= "
  • ".$clang->gT("All question attributes meet consistency standards")."
    • \n"; } + /**********************************************************************/ + /* Check default values */ + /**********************************************************************/ + $sQuery = "SELECT * FROM {$dbprefix}defaultvalues where qid not in (select qid from {$dbprefix}questions)"; + $result = db_execute_assoc($sQuery) or safe_die($connect->ErrorMsg()); + $iCountDefaultValues=$result->RecordCount(); + + if ($iCountDefaultValues>0) { + $integritycheck .= "
  • ".sprintf($clang->gT("There are %s orphaned default value entries which can be deleted."),$iCountDefaultValues)."
    • "; + } + else + { + $integritycheck .= "
  • ".$clang->gT("All default values meet consistency standards")."
    • \n"; + } + + /**********************************************************************/ + /* Check quotas */ + /**********************************************************************/ + $sQuery = "SELECT * FROM {$dbprefix}quota where sid not in (select sid from {$dbprefix}surveys)"; + $result = db_execute_assoc($sQuery) or safe_die($connect->ErrorMsg()); + $iCountQuotas=$result->RecordCount(); + + if ($iCountQuotas>0) { + $integritycheck .= "
  • ".sprintf($clang->gT("There are %s orphaned quota entries which can be deleted."),$iCountQuotas)."
    • "; + } + else + { + $integritycheck .= "
  • ".$clang->gT("All quotas meet consistency standards")."
    • \n"; + } + + + /**********************************************************************/ + /* Check quota languagesettings */ + /**********************************************************************/ + $sQuery = "SELECT * FROM {$dbprefix}quota_languagesettings where quotals_quota_id not in (select id from {$dbprefix}quota)"; + $result = db_execute_assoc($sQuery) or safe_die($connect->ErrorMsg()); + $iCountQuotaLanguageSettings=$result->RecordCount(); + + if ($iCountQuotaLanguageSettings>0) { + $integritycheck .= "
  • ".sprintf($clang->gT("There are %s orphaned quota language settings which can be deleted."),$iCountQuotaLanguageSettings)."
    • "; + } + else + { + $integritycheck .= "
  • ".$clang->gT("All quota language settings meet consistency standards")."
    • \n"; + } + + /**********************************************************************/ + /* Check quota members */ + /**********************************************************************/ + $sQuery = "SELECT * FROM {$dbprefix}quota_members where quota_id not in (select id from {$dbprefix}quota) or qid not in (select qid from {$dbprefix}questions) or sid not in (select sid from {$dbprefix}surveys)"; + $result = db_execute_assoc($sQuery) or safe_die($connect->ErrorMsg()); + $iCountQuotaMembers=$result->RecordCount(); + + + if ($iCountQuotaMembers>0) { + $integritycheck .= "
  • ".sprintf($clang->gT("There are %s orphaned quota members which can be deleted."),$iCountQuotaMembers)."
    • "; + } + else + { + $integritycheck .= "
  • ".$clang->gT("All quota members meet consistency standards")."
    • \n"; + } + + + /**********************************************************************/ /* CHECK ASSESSMENTS */ /**********************************************************************/ @@ -284,6 +415,7 @@ //3: If it doesn't offer it for deletion $tables=$connect->MetaTables(false, false, "{$dbprefix}%old%survey%"); $oldsids=array(); + $sids=array(); foreach($tables as $table) { list($one, $two, $three, $sid, $date)=explode("_", $table); @@ -347,11 +479,12 @@ //3: If it doesn't offer it for deletion $tables=$connect->MetaTables(false, false, "{$dbprefix}%old%token%"); $oldtsids=array(); + $tsids=array(); $folloldtsids=array(); foreach($tables as $table) { - list($one, $two, $three, $sid, $date)=explode("_", $table); + list($one, $two, $sid, $date)=explode("_", substr($table,strlen($dbprefix))); $oldtsids[]=$sid; $fulloldtsids[$sid][]=$table; } @@ -415,12 +548,33 @@ if (!isset($cdelete) && !isset($adelete) && !isset($qdelete) && !isset($gdelete) && !isset($asgdelete) && !isset($sdelete) && !isset($assdelete) && !isset($qadelete) && !isset($oldsdelete) && - !isset($oldtdelete) && !isset($sldelete)) { + !isset($oldtdelete) && !isset($sldelete)&& $iCountDefaultValues==0 && + $iCountQuotas==0 && $iCountQuotaLanguageSettings==0 && $iCountQuotaMembers==0) { $integritycheck .= "
    ".$clang->gT("No database action required"); } else { $integritycheck .= "
    ".$clang->gT("Should we proceed with the delete?")."
    \n"; $integritycheck .= "
    \n"; + if ($iCountQuotaMembers>0) + { + $integritycheck .= "\n"; + } + + if ($iCountQuotaLanguageSettings>0) + { + $integritycheck .= "\n"; + } + + if ($iCountQuotas>0) + { + $integritycheck .= "\n"; + } + + if ($iCountDefaultValues>0) + { + $integritycheck .= "\n"; + } + if (isset($oldsdelete)) { foreach($oldsdelete as $olds) { $integritycheck .= "\n"; @@ -558,8 +712,40 @@ $sldelete=returnglobal('sldelete'); $oldsdelete=returnglobal('oldsdelete'); $oldtdelete=returnglobal('oldtdelete'); + $bDefaultValueDelete=returnglobal('defaultvalue_delete'); + $bQuotaDelete=returnglobal('quota_delete'); + $bQuotaLanguageSettingsDelete=returnglobal('quotalanguagesettings_delete'); + $bQuotaMembersDelete=returnglobal('quotamembers_delete'); + if (isset($bDefaultValueDelete) && $bDefaultValueDelete==1) + { + $integritycheck .= $clang->gT("Deleting orphaned default values.")."
    \n"; + $sSQL = "delete FROM {$dbprefix}defaultvalues where qid not in (select qid from {$dbprefix}questions)"; + $result = $connect->Execute($sSQL) or safe_die ("Couldn't delete default values ($sSQL)
    ".$connect->ErrorMsg()); + } + + if (isset($bQuotaMembersDelete) && $bQuotaMembersDelete==1) + { + $integritycheck .= $clang->gT("Deleting orphaned quotas.")."
    \n"; + $sSQL = "delete FROM {$dbprefix}quota_members where quota_id not in (select id from {$dbprefix}quota) or qid not in (select qid from {$dbprefix}questions) or sid not in (select sid from {$dbprefix}surveys)"; + $result = $connect->Execute($sSQL) or safe_die ("Couldn't delete quota members ($sSQL)
    ".$connect->ErrorMsg()); + } + if (isset($bQuotaDelete) && $bQuotaDelete==1) + { + $integritycheck .= $clang->gT("Deleting orphaned quotas.")."
    \n"; + $sSQL = "delete FROM {$dbprefix}quota where sid not in (select sid from {$dbprefix}surveys)"; + $result = $connect->Execute($sSQL) or safe_die ("Couldn't delete quotas ($sSQL)
    ".$connect->ErrorMsg()); + } + + + if (isset($bQuotaLanguageSettingsDelete) && $bQuotaLanguageSettingsDelete==1) + { + $integritycheck .= $clang->gT("Deleting orphaned language settings.")."
    \n"; + $sSQL = "delete FROM {$dbprefix}quota_languagesettings where quotals_quota_id not in (select id from {$dbprefix}quota)"; + $result = $connect->Execute($sSQL) or safe_die ("Couldn't delete quotas ($sSQL)
    ".$connect->ErrorMsg()); + } + if (isset($oldsdelete)) { $integritycheck .= $clang->gT("Deleting old survey result tables").":
    \n"; foreach ($oldsdelete as $olds) { diff --git a/admin/iterate_survey.php b/admin/iterate_survey.php index 74674e08abe..1d87611c5d2 100644 --- a/admin/iterate_survey.php +++ b/admin/iterate_survey.php @@ -51,7 +51,7 @@ //error_log("TIBO query = $updateqr"); $updateres = $connect->Execute($updateqr) or safe_die("Delete incomplete answers with duplicate tokens failed:
    \n" . $connect->ErrorMsg() . "
    $updateqr"); // Then set all remaining answers to incomplete state - $updateqr = "UPDATE $surveytable SET submitdate=NULL;\n"; + $updateqr = "UPDATE $surveytable SET submitdate=NULL, lastpage=NULL;\n"; $updateres = $connect->Execute($updateqr) or safe_die("UnFinilize answers failed:
    \n" . $connect->ErrorMsg() . "
    $updateqr"); // Finally, reset the token completed and sent status $updateqr="UPDATE ".db_table_name("tokens_$surveyid")." SET sent='N', remindersent='N', remindercount=0, completed='N'"; diff --git a/admin/preview.php b/admin/preview.php index 32dd2d8ffdc..e630821bbab 100644 --- a/admin/preview.php +++ b/admin/preview.php @@ -76,15 +76,14 @@ function noop_checkconditions(value, name, type) } /* ]]> */ - '; $answer=$answers[0][1]; $help=$answers[0][2]; -$questioncode=$answers[0][5]; $question = $answers[0][0]; +$question['code']=$answers[0][5]; $question['class'] = question_class($qrows['type']); $question['essentials'] = 'id="question'.$qrows['qid'].'"'; if ($qrows['mandatory'] == 'Y') @@ -97,24 +96,24 @@ function noop_checkconditions(value, name, type) }; $content = templatereplace(file_get_contents("$thistpl/startpage.pstpl")); +$content .=''; $content .= templatereplace(file_get_contents("$thistpl/startgroup.pstpl")); $question_template = file_get_contents("$thistpl/question.pstpl"); if(substr_count($question_template , '{QUESTION_ESSENTIALS}') > 0 ) // the following has been added for backwards compatiblity. {// LS 1.87 and newer templates -$content .= ''; $content .= "\n".templatereplace($question_template)."\n"; -$content .= ''; } else {// LS 1.86 and older templates -$content .= '
    -
    '; +$content .= '
    '; $content .= "\n".templatereplace($question_template)."\n"; -$content .= "\n\t
    \n"; +$content .= "\n\t
    \n"; }; $content .= templatereplace(file_get_contents("$thistpl/endgroup.pstpl")).$dummy_js; +$content .= '

     '; +$content .= templatereplace(file_get_contents("$thistpl/endpage.pstpl")); echo $content; echo "\n"; diff --git a/admin/printablesurvey.php b/admin/printablesurvey.php index 6bf30a31242..09c46b82873 100644 --- a/admin/printablesurvey.php +++ b/admin/printablesurvey.php @@ -70,35 +70,10 @@ function try_debug($line) } if(isset($_POST['printableexport'])){$pdf->titleintopdf($surveyname,$surveydesc);} -switch($dateformattype) -{ - case 1: $dformat = 'd.m.Y'; // dd.mm.yyyy - break; - case 2: $dformat = 'd-m-Y'; // dd-mm-yyyy - break; - case 5: $dformat = 'd/m/Y'; // dd/mm/yyyy - break; - case 3: $dformat = 'Y.m.d'; // yyyy.mm.dd - break; - case 7: $dformat = 'Y/m/d'; // yyyy/mm/dd - break; - case 6: $dbformat = 'Y-m-d'; // yyyy-mm-dd - break; - case 4: $dformat = 'j.n.Y'; // d.m.yyyy - break; - case 8: $dformat = 'j/n/y'; // d/m/yyyy - break; - case 12: $dbformat = 'j-n-Y'; // d-m-yyyy - break; - case 9: $dformat = 'm-d-Y'; // mm-dd-yyyy - break; - case 10: $dbformat = 'm.d.Y'; // mm.dd.yyyy - break; - case 11: $dbformat = 'm/d/Y'; // mm/dd/yyyy - break; - default: $dformat = 'Y-m-d'; // yyyy-mm-dd - break; -}; + +$dformat=getDateFormatData($dateformattype); +$dformat=$dformat['phpdate']; + $expirytimestamp = strtotime($surveyexpirydate); $expirytimeofday_h = date('H',$expirytimestamp); $expirytimeofday_m = date('i',$expirytimestamp); @@ -871,7 +846,6 @@ function star_replace($input) } if ($deqrow['other'] == 'Y') { - $qidattributes = getQuestionAttributes($deqrow['qid'],$deqrow['type']); if(trim($qidattributes["other_replace_text"])=='') {$qidattributes["other_replace_text"]="Other";} // $printablesurveyoutput .="\t".$wrapper['item-start']."\t\t".input_type_image('radio' , $clang->gT("Other"))."\n\t\t\t".$clang->gT("Other")."\n\t\t\t\n".$wrapper['item-end']; diff --git a/admin/questionhandling.php b/admin/questionhandling.php index 8f00cc860ea..bc14b773063 100644 --- a/admin/questionhandling.php +++ b/admin/questionhandling.php @@ -119,7 +119,7 @@ $baselang = GetBaseLanguageFromSurveyID($surveyid); array_unshift($questlangs,$baselang); - $questionrow=$connect->GetRow("SELECT type, other, title, question FROM ".db_table_name('questions')." WHERE sid=$surveyid AND gid=$gid AND qid=$qid AND language='$baselang'"); + $questionrow=$connect->GetRow("SELECT type, other, title, question, same_default FROM ".db_table_name('questions')." WHERE sid=$surveyid AND gid=$gid AND qid=$qid AND language='$baselang'"); $qtproperties=getqtypelist('','array'); $editdefvalues="

    ".$clang->gT('Edit default answer values')."
    " @@ -128,11 +128,10 @@ foreach ($questlangs as $language) { $editdefvalues .= '

    '.getLanguageNameFromCode($language,false).'

    '; - + $editdefvalues.="
      "; // If there are answerscales if ($qtproperties[$questionrow['type']]['answerscales']>0) { - $editdefvalues.="
        "; for ($scale_id=0;$scale_id<$qtproperties[$questionrow['type']]['answerscales'];$scale_id++) { $editdefvalues.="
        • "; } } - + } if ($language==$baselang && count($questlangs)>1) { - $editdefvalues.="
        • "; + $editdefvalues.="
    \n" ."
    ".$clang->gT("Warning")."
    \n" ."
    ".$clang->gT("Tokens have not been initialised for this survey.")."

    \n"; - if ($sumrows5['edit_survey_property'] || - $sumrows5['activate_survey'] || - $_SESSION['USER_RIGHT_SUPERADMIN'] == 1) + if (bHasRight($surveyid, 'edit_survey_property') || bHasRight($surveyid, 'activate_survey')) { $tokenoutput .= "".$clang->gT("If you initialise tokens for this survey then this survey will only be accessible to users who provide a token either smanually or by URL.") ."

    \n"; @@ -417,9 +406,7 @@ .$clang->gT("No, thanks.")."' onclick=\"window.open('{$scriptname}?sid=$surveyid', '_top')\" />
    \n"; // Do not offer old postgres token tables for restore since these are having an issue with missing index if ($tcount>0 && $databasetype!='postgres' && - ($sumrows5['edit_survey_property'] || - $sumrows5['activate_survey'] || - $_SESSION['USER_RIGHT_SUPERADMIN'] == 1) + (bHasRight($surveyid, 'edit_survey_property') || bHasRight($surveyid, 'activate_survey')) ) { $tokenoutput .= "
    ".$clang->gT("Restore options")."
    \n" @@ -466,9 +453,7 @@ ."" ."".$clang->gT("Display tokens")."\n"; -if ($sumrows5['edit_survey_property'] || -$sumrows5['activate_survey'] || -$_SESSION['USER_RIGHT_SUPERADMIN'] == 1) +if (bHasRight($surveyid, 'edit_survey_property') || bHasRight($surveyid, 'activate_survey')) { $tokenoutput .= "" @@ -485,16 +470,13 @@ ."title='".$clang->gTview("Import tokens from LDAP query")."'> ".$clang->gT("Import tokens from LDAP query").""; } -if ($sumrows5['export'] || $_SESSION['USER_RIGHT_SUPERADMIN'] == 1) +if (bHasRight($surveyid, 'export')) { $tokenoutput .= "". "".$clang->gT("Export tokens to CSV file")."\n"; } - -if ($sumrows5['edit_survey_property'] || -$sumrows5['activate_survey'] || -$_SESSION['USER_RIGHT_SUPERADMIN'] == 1) +if (bHasRight($surveyid, 'edit_survey_property') || bHasRight($surveyid, 'activate_survey')) { $tokenoutput .= "\n" ."gT("Token database administration options")."
    \n" ."