diff --git a/admin/admin.php b/admin/admin.php index e8559da3218..8be0c0ac389 100644 --- a/admin/admin.php +++ b/admin/admin.php @@ -227,6 +227,8 @@ if (isset($addsummary )) {$adminoutput.= $addsummary;} if (isset($answersummary )) {$adminoutput.= $answersummary;} if (isset($cssummary )) {$adminoutput.= $cssummary;} + + if (isset($editgroup)) {$adminoutput.= $editgroup;} if (isset($editquestion)) {$adminoutput.= $editquestion;} @@ -238,11 +240,12 @@ if (isset($orderquestions)) {$adminoutput.= $orderquestions;} if (isset($surveysecurity)) {$adminoutput.= $surveysecurity;} if (isset($newsurvey)) {$adminoutput.= $newsurvey;} - if (isset($newgroup)) {$adminoutput.= $newgroup;} - if (isset($newquestion)) {$adminoutput.= $newquestion;} + if (isset($newgroupoutput)) {$adminoutput.= $newgroupoutput;} + if (isset($newquestionoutput)) {$adminoutput.= $newquestionoutput;} if (isset($newanswer)) {$adminoutput.= $newanswer;} if (isset($editanswer)) {$adminoutput.= $editanswer;} if (isset($assessmentsoutput)) {$adminoutput.= $assessmentsoutput;} + if (isset($importsurvey)) {$adminoutput.= $importsurvey;} if (isset($importgroup)) {$adminoutput.= $importgroup;} if (isset($importquestion)) {$adminoutput.= $importquestion;} diff --git a/admin/classes/PEAR/Spreadsheet_Excel_Writer/Writer.php b/admin/classes/PEAR/Spreadsheet_Excel_Writer/Writer.php index d62e9cf8659..5d8c2e52ac5 100644 --- a/admin/classes/PEAR/Spreadsheet_Excel_Writer/Writer.php +++ b/admin/classes/PEAR/Spreadsheet_Excel_Writer/Writer.php @@ -31,7 +31,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -require_once 'PEAR.php'; + require_once 'Spreadsheet/Excel/Writer/Workbook.php'; /** diff --git a/admin/exportresults.php b/admin/exportresults.php index 8a5ba3816dd..62f37ecb252 100644 --- a/admin/exportresults.php +++ b/admin/exportresults.php @@ -742,7 +742,7 @@ break; default: $fielddata=arraySearchByKey($fieldinfo, $fieldmap, "fieldname", 1); - $ftitle=$fielddata['title'].":"; + if (isset($fielddata['title'])) {$ftitle=$fielddata['title'].":";} else {$ftitle='';} } // switch } } diff --git a/admin/html.php b/admin/html.php index f3bb8938e79..c28028cc110 100644 --- a/admin/html.php +++ b/admin/html.php @@ -44,7 +44,7 @@ if($result->RecordCount() > 0) { $listsurveys= "
+ . "cellpadding='1' cellspacing='0' width='800'> @@ -77,7 +77,7 @@ $datecreated=$rows['datecreated'] ; $listsurveys.=" - ". + ". "". "" . "". @@ -90,7 +90,7 @@ }else{ $listsurveys .= ""; } - $listsurvey .= "" ; + $listsurveys .= "" ; } if($_SESSION['USER_RIGHT_CREATE_SURVEY']) { @@ -2083,7 +2083,7 @@ if($sumrows5['define_questions']) { - $newquestion = "\t\n" + $newquestionoutput = "\t\n" . "
".$clang->gT("Survey")." ".$clang->gT("Date Created")."
".$rows['short_title']."".$rows['surveyls_title']."".$datecreated."".$visibility."".$status." 
\n\n" . "\t\n" . "\t\t\n" . "\t\n"; - $newquestion .= "\t\n" + $newquestionoutput .= "\t\n" . "\t\t\n" . "\t\t\n" . "\t\n"; - $newquestion .= "\t\n" + $newquestionoutput .= "\t\n" . "\t\t\n" . "\t\t\n" . "\t\n"; - $newquestion .= "\t\n" + $newquestionoutput .= "\t\n" . "\t\t\n" . "\t\t\n" . "\t\n"; - $newquestion .= "\t\n" + $newquestionoutput .= "\t\n" . "\t\t\n" . "\t\t + $newquestionoutput .= "\t\n"; - $newquestion .= "\t\n" + $newquestionoutput .= "\t\n" . "\t\t
" @@ -2110,31 +2110,31 @@ . "\t\t
".$clang->gT("Validation:")."\n" . "\t\t\n" . "\t\t
".$clang->gT("Mandatory:")."\n" . "\t\t\t" @@ -2157,18 +2157,18 @@ //Question attributes $qattributes=questionAttributes(); - $newquestion .= "\t
".$clang->gT("Question Attributes:")."
"; - if (isset($eqrow)) {$newquestion .= questionjavascript($eqrow['type'], $qattributes);} - else {$newquestion .= questionjavascript('', $qattributes);} + if (isset($eqrow)) {$newquestionoutput .= questionjavascript($eqrow['type'], $qattributes);} + else {$newquestionoutput .= questionjavascript('', $qattributes);} - $newquestion .= "\n" . "\t\n" . "\t\n" @@ -2687,19 +2687,19 @@ $grplangs[] = $baselang; $grplangs = array_reverse($grplangs); - $newgroup = "
" + $newgroupoutput = "
" ."\n" ."\t" ."
\n\t\t".$clang->gT("Add Group")."
\n"; - $newgroup .="\n\t
\n" + $newgroupoutput .="\n\t" . "\t
\n" . '
'; foreach ($grplangs as $grouplang) { - $newgroup .= '

'.GetLanguageNameFromCode($grouplang); - if ($grouplang==$baselang) {$newgroup .= '('.$clang->gT("Base Language").')';} - $newgroup .= "

" + $newgroupoutput .= '

'.GetLanguageNameFromCode($grouplang); + if ($grouplang==$baselang) {$newgroupoutput .= '('.$clang->gT("Base Language").')';} + $newgroupoutput .= "

" . "" . "\t\t\n" . "\t\t\n" @@ -2708,7 +2708,7 @@ . "
".$clang->gT("Title").": ".$clang->gT("Required")."
"; } - $newgroup.= "
" + $newgroupoutput.= "
" . "\t\n" . "\t
\n" @@ -4009,23 +4009,23 @@ function replacenewline ($texttoreplace) function questionjavascript($type, $qattributes) { - $newquestion = "\n"; - return $newquestion; + return $newquestionoutput; } diff --git a/docs/demosurveys/Language_Question_Test.csv b/docs/demosurveys/Language_Question_Test.csv index 8eaed6ff9dd..3c079df880c 100644 --- a/docs/demosurveys/Language_Question_Test.csv +++ b/docs/demosurveys/Language_Question_Test.csv @@ -25,9 +25,9 @@ "49","31565","11","I","code_en","qeustion_en","","questionhelp_en","N","N","0","0","en" "49","31565","11","I","code_en","qeustion_hr","","questionhelp_cr","N","N","0","0","hr" "49","31565","11","I","code_en","qeustion_nl","","questionhelp_nl","N","N","0","0","nl" -"50","31565","11","M","code","question_en","preg","questionhelp_en","N","N","0","1","en" -"50","31565","11","M","code","question_hr","preg","questionhelp_hr","N","N","0","1","hr" -"50","31565","11","M","code","question_nl","preg","questionhelp_nl","N","N","0","1","nl" +"50","31565","11","M","code","question_en","","questionhelp_en","N","N","0","1","en" +"50","31565","11","M","code","question_hr","","questionhelp_hr","N","N","0","1","hr" +"50","31565","11","M","code","question_nl","","questionhelp_nl","N","N","0","1","nl" # # ANSWERS TABLE