From fbb2e87b6b3fb87e3f1a22097a152cc8caf723c4 Mon Sep 17 00:00:00 2001 From: Jason Cleeland Date: Sat, 6 Dec 2003 05:31:32 +0000 Subject: [PATCH] Code tidying git-svn-id: file:///Users/Shitiz/Downloads/lssvn/trunk/unstable@801 b72ed6b6-b9f8-46b5-92b4-906544132732 --- survey.php | 140 ++++++++++++++++++++++++++--------------------------- 1 file changed, 70 insertions(+), 70 deletions(-) diff --git a/survey.php b/survey.php index b4d15e62473..927ef6977cf 100644 --- a/survey.php +++ b/survey.php @@ -234,10 +234,11 @@ { echo templatereplace($op); } - echo "
"._ERROR."

\n"; - echo _BADSUBMIT1."

\n"; - echo ""._BADSUBMIT2."
\n"; - echo "


"; + echo "
" + ._ERROR."

\n" + ._BADSUBMIT1."

\n" + .""._BADSUBMIT2."
\n" + ."


"; exit; } //COMMIT CHANGES TO DATABASE @@ -248,10 +249,10 @@ { echo templatereplace($op); } - $completed = "
"._DIDNOTSAVE."

\n\n"; - $completed .= _NOTACTIVE1."

\n"; - $completed .= ""._CLEARRESP."

\n"; - $completed .= "$subquery\n"; + $completed = "
"._DIDNOTSAVE."

\n\n" + . _NOTACTIVE1."

\n" + . ""._CLEARRESP."

\n" + . "$subquery\n"; } else { @@ -268,9 +269,11 @@ { echo templatereplace($op); } - $completed = "
"._THANKS."

\n\n"; - $completed .= _SURVEYREC."
\n"; - $completed .= ""._CLOSEWIN."

\n"; + $completed = "
" + . _THANKS."

\n\n" + . _SURVEYREC."
\n" + . "" + . _CLOSEWIN."

\n"; if ($_POST['token']) { $utquery = "UPDATE {$dbprefix}tokens_$sid SET completed='Y' WHERE token='{$_POST['token']}'"; @@ -297,12 +300,12 @@ if ($cnfrow['email']) {mail($to, $subject, $message, $headers);} //Only send confirmation email if there is an email address //DEBUG INFO: CAN BE REMOVED - echo "\n"; + echo "\n"; //END DEBUG } } @@ -311,12 +314,12 @@ $id = $savedid; $to = $surveyadminemail; $subject = "$sitename Survey Submitted"; - $message = _CONFIRMATION_MESSAGE1." $surveyname\r\n"; - $message.= "\r\n"; - $message.= _CONFIRMATION_MESSAGE2."\r\n"; - $message.= " $homeurl/browse.php?sid=$sid&action=id&id=$id\r\n\r\n"; - $message.= _CONFIRMATION_MESSAGE3."\r\n"; - $message.= " $homeurl/statistics.php?sid=$sid\r\n\r\n"; + $message = _CONFIRMATION_MESSAGE1." $surveyname\r\n" + . "\r\n" + . _CONFIRMATION_MESSAGE2."\r\n" + . " $homeurl/browse.php?sid=$sid&action=id&id=$id\r\n\r\n" + . _CONFIRMATION_MESSAGE3."\r\n" + . " $homeurl/statistics.php?sid=$sid\r\n\r\n"; if ($sendnotification > 1) { //Send results as well. Currently just bare-bones - will be extended in later release $message .= "----------------------------\r\n"; @@ -345,16 +348,16 @@ if ($adminemail) { $completed .= _DIDNOTSAVE3."

\n"; - $email=_DNSAVEEMAIL1." $sid\n\n"; - $email .= DNSAVEEMAIL2.":\n"; + $email= _DNSAVEEMAIL1." $sid\n\n" + . _DNSAVEEMAIL2.":\n"; foreach ($_SESSION['insertarray'] as $value) { $email .= "$value: {$_SESSION[$value]}\n"; } - $email .= "\n"._DNSAVEEMAIL3.":\n"; - $email .= "$subquery\n\n"; - $email .= _DNSAVEEMAIL4.":\n"; - $email .= mysql_error()."\n\n"; + $email .= "\n"._DNSAVEEMAIL3.":\n" + . "$subquery\n\n" + . _DNSAVEEMAIL4.":\n" + . mysql_error()."\n\n"; mail($surveyadminemail, _DNSAVEEMAIL5, $email); } else @@ -386,9 +389,8 @@ { echo templatereplace($op); } - echo "\n
\n"; - - echo "\n\n\n"; + echo "\n\n" + ."\n\n\n"; foreach(file("$thistpl/survey.pstpl") as $op) { echo "\t\t".templatereplace($op); @@ -410,11 +412,11 @@ { echo templatereplace($op); } - echo "\n"; - echo "\n\n"; - echo "\n\n"; - echo "\n\n"; - echo "\n
\n"; + echo "\n" + ."\n\n" + ."\n\n" + ."\n\n" + ."\n\n"; exit; } @@ -427,8 +429,8 @@ { echo templatereplace($op); } - echo "\t

\n"; - echo "\t"._SURVEYNOEXIST."
 \n"; + echo "\t

\n" + ."\t"._SURVEYNOEXIST."
 \n"; foreach(file("$thistpl/endpage.pstpl") as $op) { echo templatereplace($op); @@ -451,22 +453,22 @@ { echo templatereplace($op); } - echo "\t

\n"; - echo "\t

\n"; - echo "\t"._NOTOKEN1."

\n"; - echo "\t"._NOTOKEN2."
 \n"; - echo "\t"; - echo "\t\n"; - echo "\t\n"; - echo "\t\t\n"; - echo "\t\t\t\n"; - echo "\t\t\n"; - echo "\t\n"; - echo "\t
\n"; - echo "\t\t\t"._TOKEN.": \n"; - echo "\t\t\t\n"; - echo "\t\t\t
\n"; - echo "\t
 
\n"; + echo "\t

\n" + ."\t

\n" + ."\t"._NOTOKEN1."

\n" + ."\t"._NOTOKEN2."
 \n" + ."\t" + ."\t\n" + ."\t\n" + ."\t\t\n" + ."\t\t\t\n" + ."\t\t\n" + ."\t\n" + ."\t
\n" + ."\t\t\t"._TOKEN.": \n" + ."\t\t\t\n" + ."\t\t\t
\n" + ."\t
 
\n"; foreach(file("$thistpl/endpage.pstpl") as $op) { echo templatereplace($op); @@ -492,11 +494,11 @@ { echo "\t".templatereplace($op); } - echo "\t

\n"; - echo "\t"._NOTOKEN1."

\n"; - echo "\t"._NOTOKEN3."\n"; - echo "\t"._FURTHERINFO." $surveyadminname ($surveyadminemail)

\n"; - echo "\t"._CLOSEWIN."
 \n"; + echo "\t

\n" + ."\t"._NOTOKEN1."

\n" + ."\t"._NOTOKEN3."\n" + ."\t"._FURTHERINFO." $surveyadminname ($surveyadminemail)

\n" + ."\t"._CLOSEWIN."
 \n"; foreach(file("$thistpl/endpage.pstpl") as $op) { echo templatereplace($op); @@ -529,10 +531,10 @@ { echo "\t".templatereplace($op); } - echo "\t

\n"; - echo "\t"._NOQUESTIONS."

\n"; - echo "\t"._FURTHERINFO." $surveyadminname ($surveyadminemail)

\n"; - echo "\t"._CLOSEWIN."
 \n"; + echo "\t

\n" + ."\t"._NOQUESTIONS."

\n" + ."\t"._FURTHERINFO." $surveyadminname ($surveyadminemail)

\n" + ."\t"._CLOSEWIN."
 \n"; foreach(file("$thistpl/endpage.pstpl") as $op) { echo templatereplace($op); @@ -838,10 +840,10 @@ echo "\n"; } -echo "\n"; -echo "\n"; -echo "\n"; -echo "\n"; +echo "\n" + ."\n" + ."\n" + ."\n"; function surveymover() { @@ -861,6 +863,4 @@ function surveymover() {$surveymover .= "\t\t\t\t\t\n";} return $surveymover; } - - ?>