From fe1fe6f8e387e72b62fb251094f8a0cf2d408511 Mon Sep 17 00:00:00 2001 From: Jason Cleeland Date: Fri, 6 Feb 2004 22:41:27 +0000 Subject: [PATCH] Javascript mandatory popup now waits until after , now presents $surveyadminname and $surveyadminemail in error messages where survey has been found. git-svn-id: file:///Users/Shitiz/Downloads/lssvn/trunk/unstable@902 b72ed6b6-b9f8-46b5-92b4-906544132732 --- group.php | 1 + index.php | 6 ++++-- qanda.php | 2 +- question.php | 3 +++ survey.php | 1 + 5 files changed, 10 insertions(+), 3 deletions(-) diff --git a/group.php b/group.php index e0e7c464e7a..b2c03c82106 100644 --- a/group.php +++ b/group.php @@ -731,6 +731,7 @@ //READ TEMPLATES, INSERT DATA AND PRESENT PAGE sendcacheheaders(); echo "\n"; +if (isset($popup)) {echo $popup;} foreach(file("$thistpl/startpage.pstpl") as $op) { echo templatereplace($op); diff --git a/index.php b/index.php index de837465e85..30ae9f7b5a8 100644 --- a/index.php +++ b/index.php @@ -97,6 +97,8 @@ $sendnotification = $row['notification']; } +if (!$surveyadminemail) {$surveyadminemail=$siteadminemail;} +if (!$surveyadminname) {$surveyadminname=$siteadminname;} //SEE IF SURVEY USES TOKENS $i = 0; $tokensexist = 0; $tresult = @mysql_list_tables($databasename) or die ("Error getting tokens
".mysql_error()); @@ -128,7 +130,7 @@ } echo "\t\t

\n" ."\t\t\t"._SURVEYEXPIRED."

\n" - ."\t\t\t"._CONTACT1." $siteadminname ($siteadminemail) " + ."\t\t\t"._CONTACT1." $surveyadminname ($surveyadminemail) " ._CONTACT2."

\n"; $output=file("$tpldir/default/endpage.pstpl"); foreach ($output as $op) @@ -154,7 +156,7 @@ echo "\t\t

\n" ."\t\t\t"._ERROR_PS."
\n" ."\t\t\t"._SURVEYCOMPLETE."

\n" - ."\t\t\t"._CONTACT1." $siteadminname ($siteadminemail) " + ."\t\t\t"._CONTACT1." $surveyadminname ($surveyadminemail) " ._CONTACT2."

\n"; $output=file("$tpldir/default/endpage.pstpl"); foreach($output as $op) diff --git a/qanda.php b/qanda.php index a2c7c6dfa2c..12befeba530 100644 --- a/qanda.php +++ b/qanda.php @@ -1101,7 +1101,7 @@ //POPUP WARNING if (!isset($mandatorypopup)) { - echo "\n"; + $popup="\n"; $mandatorypopup="Y"; } } diff --git a/question.php b/question.php index ff94a5a8b05..45085f777f5 100644 --- a/question.php +++ b/question.php @@ -750,6 +750,9 @@ $percentcomplete = makegraph($_SESSION['step'], $_SESSION['totalsteps']); //READ TEMPLATES, INSERT DATA AND PRESENT PAGE +sendcacheheaders(); +echo "\n"; +if (isset($popup)) {echo $popup;} foreach(file("$thistpl/startpage.pstpl") as $op) { echo templatereplace($op); diff --git a/survey.php b/survey.php index b998b7c4205..770a4a1ea0b 100644 --- a/survey.php +++ b/survey.php @@ -686,6 +686,7 @@ //READ TEMPLATES, INSERT DATA AND PRESENT PAGE sendcacheheaders(); echo "\n"; +if(isset($popup)) {echo $popup;} foreach(file("$thistpl/startpage.pstpl") as $op) { echo templatereplace($op);