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= "
".$clang->gT("Survey")." | ".$clang->gT("Date Created")." | @@ -77,7 +77,7 @@ $datecreated=$rows['datecreated'] ; $listsurveys.="||||
".$rows['short_title']." | ". +".$rows['surveyls_title']." | ". "".$datecreated." | ". "".$visibility." | " . "".$status." | ". @@ -90,7 +90,7 @@ }else{ $listsurveys .= ""; } - $listsurvey .= " |