diff --git a/include/limesurvey/admin/activate.php b/include/limesurvey/admin/activate.php index 0bd6acb0..68df1576 100644 --- a/include/limesurvey/admin/activate.php +++ b/include/limesurvey/admin/activate.php @@ -255,7 +255,7 @@ if (!isset($_POST['ok']) || !$_POST['ok']) $activateoutput .= "\t\n"; $activateoutput .= "\t\n"; $activateoutput .= "\t\t\n"; -// $activateoutput .= "\t\t\tgT("Activate Survey")."\" onclick=\"window.open('$scriptname?action=activate&ok=Y&sid={$_GET['sid']}', '_top')\" />\n"; +// $activateoutput .= "\t\t\tgT("Activate Survey")."\" onclick=\"window.open('$scriptname?action=activate&ok=Y&sid={$_GET['sid']}', '_self')\" />\n"; $activateoutput .= "\t\t\tgT("Activate Survey")."\" onclick=\"".get2post("$scriptname?action=activate&ok=Y&sid={$_GET['sid']}")."\" />\n"; $activateoutput .= "\t\t
 \n"; $activateoutput .= "\t\n"; @@ -526,20 +526,20 @@ else // if (isset($surveynotprivate) && $surveynotprivate) //This survey is tracked, and therefore a tokens table MUST exist // { // $activateoutput .= $clang->gT("This is not an anonymous survey. A token table must also be created.")."

\n"; -// $activateoutput .= "\n"; +// $activateoutput .= "\n"; // } // elseif (isset($surveyallowsregistration) && $surveyallowsregistration == "TRUE") if (isset($surveyallowsregistration) && $surveyallowsregistration == "TRUE") { $activateoutput .= $clang->gT("This survey allows public registration. A token table must also be created.")."

\n"; -// $activateoutput .= "\n"; +// $activateoutput .= "\n"; $activateoutput .= "\n"; } else { $activateoutput .= $clang->gT("This survey is now active, and responses can be recorded.")."

\n"; $activateoutput .= "".$clang->gT("Open-access mode").": ".$clang->gT("No invitation code is needed to complete the survey.")."
".$clang->gT("You can switch to the closed-access mode by initialising a token table with the button below.")."

\n"; -// $activateoutput .= $clang->gT("Optional").": \n"; +// $activateoutput .= $clang->gT("Optional").": \n"; $activateoutput .= $clang->gT("Optional").": \n"; } $activateoutput .= "\t\t\t\t
 \n"; diff --git a/include/limesurvey/admin/assessments.php b/include/limesurvey/admin/assessments.php index f0d0fa3c..e67a2c8b 100644 --- a/include/limesurvey/admin/assessments.php +++ b/include/limesurvey/admin/assessments.php @@ -64,7 +64,7 @@ if($_SESSION['USER_RIGHT_SUPERADMIN'] == 1 || $actsurrows['edit_survey_property' $assessmentsoutput.= "\t\n" . "\t\t\n" - . "\t\t\tgT("Return to Survey Administration", "js")."');return false\">" . + . "\t\t\tgT("Return to Survey Administration", "js")."');return false\">" . "\n" . "\t\t\t\n" . "\t\t\t\n" diff --git a/include/limesurvey/admin/browse.php b/include/limesurvey/admin/browse.php index 320d1092..bb8f796e 100644 --- a/include/limesurvey/admin/browse.php +++ b/include/limesurvey/admin/browse.php @@ -68,7 +68,7 @@ if (!$database_exists) //DATABASE DOESN'T EXIST OR CAN'T CONNECT ."".$clang->gT("Error")."
\n" . $clang->gT("The defined LimeSurvey database does not exist")."
\n" . $clang->gT("Either your selected database has not yet been created or there is a problem accessing it.")."

\n" - ."
\n" + ."
\n" ."\n" ."\n"; return; @@ -81,7 +81,7 @@ if (!$surveyid && !$subaction) //NO SID OR ACTION PROVIDED ."".$clang->gT("Error")."
\n" . $clang->gT("You have not selected a survey to browse.")."

\n" ."
\n" + . $clang->gT("Main Admin Screen")."' onclick=\"window.open('$scriptname', '_self')\" />
\n" ."\n"; return; } @@ -105,7 +105,7 @@ if ($actcount > 0) ."".$clang->gT("Error")."
\n" . $clang->gT("This survey has not been activated. There are no results to browse.")."

\n" ."
\n" + . $clang->gT("Main Admin Screen")."' onclick=\"window.open('$scriptname?sid=$surveyid', '_self')\" />
\n" ."\n" ."\n"; return; @@ -119,7 +119,7 @@ else //SURVEY MATCHING $surveyid DOESN'T EXIST ."\t\n" ."".$clang->gT("Error")."
\n" . $clang->gT("There is no matching survey.")." ($surveyid)

\n" - ."
\n" + ."
\n" ."\n" ."\n"; return; diff --git a/include/limesurvey/admin/dataentry.php b/include/limesurvey/admin/dataentry.php index 65e825cd..6fb0dc72 100644 --- a/include/limesurvey/admin/dataentry.php +++ b/include/limesurvey/admin/dataentry.php @@ -47,7 +47,7 @@ if($_SESSION['USER_RIGHT_SUPERADMIN'] == 1 || $actsurrows['browse_response']) .$clang->gT("The defined LimeSurvey database does not exist")."
\n" .$clang->gT("Either your selected database has not yet been created or there is a problem accessing it.")."

\n" ."
\n" + .$clang->gT("Main Admin Screen")."' onclick=\"window.open('$scriptname', '_self')\" />
\n" ."\n" ."\n"; return; @@ -62,7 +62,7 @@ if($_SESSION['USER_RIGHT_SUPERADMIN'] == 1 || $actsurrows['browse_response']) ."".$clang->gT("Error")."
\n" .$clang->gT("You have not selected a survey for data-entry.")."

\n" ."
\n" + .$clang->gT("Main Admin Screen")."' onclick=\"window.open('$scriptname', '_self')\" />
\n" ."\n"; return; } @@ -2471,7 +2471,7 @@ if($_SESSION['USER_RIGHT_SUPERADMIN'] == 1 || $actsurrows['browse_response']) $dataentryoutput .= "\t\t\n"; $dataentryoutput .= "\t\t\t".$clang->gT("Error")."
\n"; $dataentryoutput .= "\t\t\t".$clang->gT("The survey you selected does not exist")."

\n"; - $dataentryoutput .= "\t\t\t\n"; + $dataentryoutput .= "\t\t\t\n"; $dataentryoutput .= "\t\t\n"; $dataentryoutput .= "\t\n"; $dataentryoutput .= ""; diff --git a/include/limesurvey/admin/deactivate.php b/include/limesurvey/admin/deactivate.php index 1fc546ce..c995bc86 100644 --- a/include/limesurvey/admin/deactivate.php +++ b/include/limesurvey/admin/deactivate.php @@ -40,7 +40,7 @@ if (!isset($_POST['ok']) || !$_POST['ok']) $deactivateoutput .= "\t\n"; $deactivateoutput .= "\t\n"; $deactivateoutput .= "\t\t\n"; -// $deactivateoutput .= "\t\t\t\n"; +// $deactivateoutput .= "\t\t\t\n"; $deactivateoutput .= "\t\t\t\n"; $deactivateoutput .= "\t\t
 \n"; $deactivateoutput .= "\t\n"; diff --git a/include/limesurvey/admin/deletesurvey.php b/include/limesurvey/admin/deletesurvey.php index f4354bc8..b1d69fd1 100644 --- a/include/limesurvey/admin/deletesurvey.php +++ b/include/limesurvey/admin/deletesurvey.php @@ -26,7 +26,7 @@ if (!isset($surveyid) || !$surveyid) $deletesurveyoutput .= "\t\n"; $deletesurveyoutput .= "
".$clang->gT("Error")."
\n"; $deletesurveyoutput .= $clang->gT("You have not selected a survey to delete")."

\n"; - $deletesurveyoutput .= "\n"; + $deletesurveyoutput .= "\n"; $deletesurveyoutput .= "\n"; $deletesurveyoutput .= "\n"; return; @@ -57,8 +57,8 @@ if (!isset($deleteok) || !$deleteok) $deletesurveyoutput .= "\t\n"; $deletesurveyoutput .= "\t\n"; $deletesurveyoutput .= "\t\t
\n"; - $deletesurveyoutput .= "\t\t\t
\n"; -// $deletesurveyoutput .= "\t\t\t\n"; + $deletesurveyoutput .= "\t\t\t
\n"; +// $deletesurveyoutput .= "\t\t\t\n"; $deletesurveyoutput .= "\t\t\t\n"; $deletesurveyoutput .= "\t\t\n"; $deletesurveyoutput .= "\t\n"; @@ -120,7 +120,7 @@ else //delete the survey $deletesurveyoutput .= "\t\n"; $deletesurveyoutput .= "\t\t
\n"; $deletesurveyoutput .= "\t\t\t".$clang->gT("This survey has been deleted.")."

\n"; - $deletesurveyoutput .= "\t\t\t\n"; + $deletesurveyoutput .= "\t\t\t\n"; $deletesurveyoutput .= "\t\t\n"; $deletesurveyoutput .= "\t\n"; $surveyid=false; diff --git a/include/limesurvey/admin/dumpgroup.php b/include/limesurvey/admin/dumpgroup.php index d4d3b692..81f03bb4 100644 --- a/include/limesurvey/admin/dumpgroup.php +++ b/include/limesurvey/admin/dumpgroup.php @@ -38,7 +38,7 @@ if (!$gid) echo "\t".$clang->gT("Export Question")."\n"; echo "\t$setfont\n"; echo "$setfont
".$clang->gT("Error")."
\n"._EQ_NOGID."
\n"; - echo "
\n"; + echo "
\n"; echo "\t\n"; echo "\n"; echo "\n"; diff --git a/include/limesurvey/admin/dumplabel.php b/include/limesurvey/admin/dumplabel.php index 1c7ad3ed..91a0c238 100644 --- a/include/limesurvey/admin/dumplabel.php +++ b/include/limesurvey/admin/dumplabel.php @@ -30,7 +30,7 @@ if (!$lid) echo "\t".$clang->gT("Export Label Set")."\n"; echo "\t\n"; echo "
".$clang->gT("Error")."
\n".$clang->gT("No LID has been provided. Cannot dump label set.")."
\n"; - echo "
\n"; + echo "
\n"; echo "\t\n"; echo "\n"; echo "\n"; diff --git a/include/limesurvey/admin/dumpquestion.php b/include/limesurvey/admin/dumpquestion.php index 834273cf..271ebcb3 100644 --- a/include/limesurvey/admin/dumpquestion.php +++ b/include/limesurvey/admin/dumpquestion.php @@ -35,7 +35,7 @@ if (!$qid) echo "\t".$clang->gT("Export Question")."\n"; echo "\t\n"; echo "
".$clang->gT("Error")."
\n".$clang->gT("No QID has been provided. Cannot dump question.")."
\n"; - echo "
\n"; + echo "
\n"; echo "\t\n"; echo "\n"; echo "\n"; diff --git a/include/limesurvey/admin/export_results_fixedwidth.php b/include/limesurvey/admin/export_results_fixedwidth.php index c646d96d..082b9cd7 100644 --- a/include/limesurvey/admin/export_results_fixedwidth.php +++ b/include/limesurvey/admin/export_results_fixedwidth.php @@ -50,7 +50,7 @@ if (!$surveyid) ._ERROR."
\n" ._ES_NOSID."
\n" ."
\n" + ._GO_ADMIN."' onClick=\"window.open('$scriptname', '_self')\">\n" ."\t\n" ."\n" ."\n"; diff --git a/include/limesurvey/admin/export_structure_csv.php b/include/limesurvey/admin/export_structure_csv.php index 79c1d98d..49947fc6 100644 --- a/include/limesurvey/admin/export_structure_csv.php +++ b/include/limesurvey/admin/export_structure_csv.php @@ -47,7 +47,7 @@ if (!$surveyid) .$clang->gT("Error")."
\n" .$clang->gT("No SID has been provided. Cannot dump survey")."
\n" ."
\n" + .$clang->gT("Main Admin Screen")."' onclick=\"window.open('$scriptname', '_self')\">\n" ."\t\n" ."\n" ."\n"; diff --git a/include/limesurvey/admin/export_structure_quexml.php b/include/limesurvey/admin/export_structure_quexml.php index 4c8fd3da..5b82ebc0 100644 --- a/include/limesurvey/admin/export_structure_quexml.php +++ b/include/limesurvey/admin/export_structure_quexml.php @@ -33,7 +33,7 @@ if (!$surveyid) ._ERROR."
\n" ._ES_NOSID."
\n" ."
\n" + ._GO_ADMIN."' onClick=\"window.open('$scriptname', '_self')\">\n" ."\t\n" ."\n" ."\n"; diff --git a/include/limesurvey/admin/html.php b/include/limesurvey/admin/html.php index 017a295e..c94fc3f2 100644 --- a/include/limesurvey/admin/html.php +++ b/include/limesurvey/admin/html.php @@ -132,7 +132,7 @@ if ($action == "listsurveys") { if ($_SESSION['USER_RIGHT_SUPERADMIN'] ==1 || $sidsecurity['activate_survey']) { - $listsurveys .= "gTview("De-activate this Survey")."\" " . "onmouseover=\"showTooltip(event,'".$clang->gT("De-activate this Survey", "js")."');return false\">" @@ -150,7 +150,7 @@ if ($action == "listsurveys") } else { if ( ($_SESSION['USER_RIGHT_SUPERADMIN'] ==1 || $sidsecurity['activate_survey']) && $questionsCount > 0) { - $listsurveys .= "gTview("Activate this Survey")."\"" . "onmouseover=\"showTooltip(event,'".$clang->gT("Activate this Survey", "js")."');return false\">" . @@ -402,7 +402,7 @@ if ($surveyid) . "onmouseover=\"showTooltip(event,'".$clang->gT("This survey is not currently active", "js")."');return false\" />\n"; if(($_SESSION['USER_RIGHT_SUPERADMIN'] == 1 || $sumrows5['activate_survey']) && $sumcount3>0) { - $surveysummary .= "gTview("Activate this Survey")."\"" . "onmouseover=\"showTooltip(event,'".$clang->gT("Activate this Survey", "js")."');return false\">" . @@ -432,7 +432,7 @@ if ($surveyid) } if($_SESSION['USER_RIGHT_SUPERADMIN'] == 1 || $sumrows5['activate_survey']) { - $surveysummary .= "gTview("De-activate this Survey")."\"" . "onmouseover=\"showTooltip(event,'".$clang->gT("De-activate this Survey", "js")."');return false\">" . @@ -450,7 +450,7 @@ if ($surveyid) if($_SESSION['USER_RIGHT_SUPERADMIN'] == 1 || $s1row['owner_id'] == $_SESSION['loginID']) { - $surveysummary .= "\t\t\t\t\tgTview("Survey Security Settings")."\"" . "onmouseover=\"showTooltip(event,'".$clang->gT("Survey Security Settings", "js")."');return false\">" . @@ -507,7 +507,7 @@ if ($surveyid) if($activated == "Y" && ($_SESSION['USER_RIGHT_SUPERADMIN'] == 1 || $sumrows5['browse_response'])) { - $surveysummary .= "gTview("Dataentry Screen for Survey")."\"" . "onmouseover=\"showTooltip(event,'".$clang->gT("Dataentry Screen for Survey", "js")."');return false\">" @@ -569,7 +569,7 @@ if ($surveyid) if($_SESSION['USER_RIGHT_SUPERADMIN'] ==1 || $sumrows5['edit_survey_property']) { - $surveysummary .= "gTview("Edit Current Survey")."\"" . "onmouseover=\"showTooltip(event,'".$clang->gT("Edit Current Survey", "js")."');return false\">" . @@ -583,7 +583,7 @@ if ($surveyid) if ($_SESSION['USER_RIGHT_SUPERADMIN'] == 1 || $sumrows5['delete_survey']) { -// $surveysummary .= "gTview("Delete Current Survey")."\"" @@ -598,7 +598,7 @@ if ($surveyid) if ( $_SESSION['USER_RIGHT_SUPERADMIN'] == 1 || $sumrows5['define_questions']) { if ($sumcount6 > 0) { -// $surveysummary .= "gTview("Reset Survey Logic")."\"" @@ -621,7 +621,7 @@ if ($surveyid) if($activated!="Y" && getGroupSum($surveyid,$s1row['language'])>1 && ($_SESSION['USER_RIGHT_SUPERADMIN'] == 1 || $sumrows5['define_questions'])) { - $surveysummary .= "gTview("Change Group Order")."\"" . "onmouseover=\"showTooltip(event,'".$clang->gT("Change Group Order", "js")."');return false\">" . @@ -634,7 +634,7 @@ if ($surveyid) if ($_SESSION['USER_RIGHT_SUPERADMIN'] == 1 || $sumrows5['export']) { - $surveysummary .= "gTview("Export Survey Structure")."\"" . "onmouseover=\"showTooltip(event,'".$clang->gT("Export Survey Structure", "js")."');return false\">" . @@ -648,7 +648,7 @@ if ($surveyid) if ($_SESSION['USER_RIGHT_SUPERADMIN'] == 1 || $sumrows5['edit_survey_property']) { $surveysummary .= "\t\t\t\t\t\n" - . "gTview("Set Assessment Rules")."\"" . "onmouseover=\"showTooltip(event,'".$clang->gT("Set Assessment Rules", "js")."');return false\">" . @@ -662,7 +662,7 @@ if ($surveyid) if ($_SESSION['USER_RIGHT_SUPERADMIN'] == 1 || $sumrows5['edit_survey_property']) { $surveysummary .= "\t\t\t\t\t\n" - . "gTview("Set Survey Quotas")."\"" . "onmouseover=\"showTooltip(event,'".$clang->gT("Set Survey Quotas", "js")."');return false\">" . @@ -676,7 +676,7 @@ if ($surveyid) if ($activated == "Y" && ($_SESSION['USER_RIGHT_SUPERADMIN'] == 1 || $sumrows5['browse_response'])) { $surveysummary .= "\t\t\t\t\t\n" - . "gTview("Browse Responses For This Survey")."\"" . "onmouseover=\"showTooltip(event,'".$clang->gT("Browse Responses For This Survey", "js")."');return false\">" . @@ -684,7 +684,7 @@ if ($surveyid) . "\t\t\t\t\t\n"; if ($s1row['allowsave'] == "Y") { - $surveysummary .= "gTview("View Saved but not submitted Responses")."\"" . "onmouseover=\"showTooltip(event,'".$clang->gT("View Saved but not submitted Responses", "js")."');return false\">" @@ -696,7 +696,7 @@ if ($surveyid) { if ($activated == "Y") { - $surveysummary .="gTview("Activate/Edit Tokens for this Survey")."\"" . "onmouseover=\"showTooltip(event,'".$clang->gT("Activate/Edit Tokens for this Survey", "js")."');return false\">" . @@ -719,7 +719,7 @@ if ($surveyid) if (!$gid) { $surveysummary .= "\t\t\t\t\t\n"; + . "onclick=\"window.open('$scriptname', '_self')\" />\n"; } else { @@ -738,7 +738,7 @@ if ($surveyid) } elseif($_SESSION['USER_RIGHT_SUPERADMIN'] == 1 || $sumrows5['define_questions']) { - $surveysummary .= "gTview("Add New Group to Survey")."\"" . "onmouseover=\"showTooltip(event,'".$clang->gT("Add New Group to Survey", "js")."');return false\"> " . @@ -746,7 +746,7 @@ if ($surveyid) } $surveysummary .= "".$clang->gT("Groups").":" . "\t\t\n"; + . "onclick=\"window.open('$scriptname?sid=$surveyid', '_self')\" />\n"; } else { @@ -1060,10 +1060,10 @@ if ($surveyid && $gid ) // Show the group toolbar ."title=\"".$clang->gTview("Add New Question to Group")."\"" ."onmouseover=\"showTooltip(event,'".$clang->gT("Add New Question to Group", "js")."');return false\">" . "\n"; + "align='right' name='AddNewQuestion' onclick=\"window.open('', '_self')\" />\n"; } $groupsummary .= "\t\t\t\t\t".$clang->gT("Questions").": \n" . "\t\t\t\t\n" @@ -1282,7 +1282,7 @@ if ($surveyid && $gid && $qid) // Show the question toolbar . "\t\t\t\t\t\n" . "\t\t\t\t\t\n" + . "onclick=\"window.open('$scriptname?sid=$surveyid&gid=$gid', '_self')\" />\n" . "\t\t\t\t\t" @@ -1327,7 +1327,7 @@ if ($surveyid && $gid && $qid) // Show the question toolbar . $clang->gT("Warning").": ". $clang->gT("You need to add answers to this question")." " . "\n"; + . "onclick=\"window.open('".$scriptname."?sid=$surveyid&gid=$gid&qid=$qid&viewanswer=Y', '_self')\" />\n"; } // For Labelset Questions show the label set and warn if there is no label set configured diff --git a/include/limesurvey/admin/import_resources_zip.php b/include/limesurvey/admin/import_resources_zip.php index c7286297..fc3cdd01 100644 --- a/include/limesurvey/admin/import_resources_zip.php +++ b/include/limesurvey/admin/import_resources_zip.php @@ -47,7 +47,7 @@ if ($action == "importsurvresources" && $surveyid) { { $importsurvresourcesoutput .= "".$clang->gT("Error")."
\n"; $importsurvresourcesoutput .= sprintf ($clang->gT("Incorrect permissions in your %s folder."),$basedestdir)."

\n"; - $importsurvresourcesoutput .= "\n"; + $importsurvresourcesoutput .= "\n"; $importsurvresourcesoutput .= "
 \n"; return; } @@ -71,7 +71,7 @@ if ($action == "importsurvresources" && $surveyid) { { $importsurvresourcesoutput .= "".$clang->gT("Error")."
\n"; $importsurvresourcesoutput .= $clang->gT("This file is not a valid ZIP file archive. Import failed.")."

\n"; - $importsurvresourcesoutput .= "\n"; + $importsurvresourcesoutput .= "\n"; $importsurvresourcesoutput .= "
 \n"; return; } @@ -141,7 +141,7 @@ if ($action == "importsurvresources" && $surveyid) { $importsurvresourcesoutput .= "".$clang->gT("Error")."
\n"; $importsurvresourcesoutput .= $clang->gT("This ZIP archive contains no valid Resources files. Import failed.")."

\n"; $importsurvresourcesoutput .= $clang->gT("Remember that we do not support subdirectories in ZIP Archive.")."

\n"; - $importsurvresourcesoutput .= "\n"; + $importsurvresourcesoutput .= "\n"; $importsurvresourcesoutput .= "
 \n"; return; @@ -184,12 +184,12 @@ if ($action == "importsurvresources" && $surveyid) { { $importsurvresourcesoutput .= "".$clang->gT("Error")."
\n"; $importsurvresourcesoutput .= sprintf ($clang->gT("An error occurred uploading your file. This may be caused by incorrect permissions in your %s folder."),$basedestdir)."

\n"; - $importsurvresourcesoutput .= "\n"; + $importsurvresourcesoutput .= "\n"; $importsurvresourcesoutput .= "
 \n"; return; } // Final Back not needed if files have been imported -// $importsurvresourcesoutput .= "\n"; +// $importsurvresourcesoutput .= "\n"; $importsurvresourcesoutput .= "
 \n"; } @@ -217,7 +217,7 @@ if ($action == "importlabelresources" && $lid) { $importlabelresourcesoutput .= "".$clang->gT("Error")."
\n"; $importlabelresourcesoutput .= sprintf ($clang->gT("Incorrect permissions in your %s folder."),$basedestdir)."

\n"; - $importlabelresourcesoutput .= "\n"; + $importlabelresourcesoutput .= "\n"; $importlabelresourcesoutput .= "
 \n"; return; } @@ -241,7 +241,7 @@ if ($action == "importlabelresources" && $lid) { $importlabelresourcesoutput .= "".$clang->gT("Error")."
\n"; $importlabelresourcesoutput .= $clang->gT("This file is not a valid ZIP file archive. Import failed.")."

\n"; - $importlabelresourcesoutput .= "\n"; + $importlabelresourcesoutput .= "\n"; $importlabelresourcesoutput .= "
 \n"; return; } @@ -311,7 +311,7 @@ if ($action == "importlabelresources" && $lid) $importlabelresourcesoutput .= "".$clang->gT("Error")."
\n"; $importlabelresourcesoutput .= $clang->gT("This ZIP archive contains no valid Resources files. Import failed.")."

\n"; $importlabelresourcesoutput .= $clang->gT("Remember that we do not support subdirectories in ZIP Archive.")."

\n"; - $importlabelresourcesoutput .= "\n"; + $importlabelresourcesoutput .= "\n"; $importlabelresourcesoutput .= "
 \n"; return; @@ -354,11 +354,11 @@ if ($action == "importlabelresources" && $lid) { $importlabelresourcesoutput .= "".$clang->gT("Error")."
\n"; $importlabelresourcesoutput .= sprintf ($clang->gT("An error occurred uploading your file. This may be caused by incorrect permissions in your %s folder."),$basedestdir)."

\n"; - $importlabelresourcesoutput .= "\n"; + $importlabelresourcesoutput .= "\n"; $importlabelresourcesoutput .= "
 \n"; return; } - $importlabelresourcesoutput .= "\n"; + $importlabelresourcesoutput .= "\n"; } diff --git a/include/limesurvey/admin/importgroup.php b/include/limesurvey/admin/importgroup.php index 57ac4a93..98bf34f8 100644 --- a/include/limesurvey/admin/importgroup.php +++ b/include/limesurvey/admin/importgroup.php @@ -28,7 +28,7 @@ if (!@move_uploaded_file($_FILES['the_file']['tmp_name'], $the_full_file_path)) { $importgroup .= "".$clang->gT("Error")."
\n"; $importgroup .= sprintf ($clang->gT("An error occurred uploading your file. This may be caused by incorrect permissions in your %s folder."),$tempdir)."

\n"; - $importgroup .= "\n"; + $importgroup .= "\n"; $importgroup .= "\n"; return; } @@ -38,7 +38,7 @@ if (!returnglobal('sid')) { $importquestion .= $clang->gT("No SID (Survey) has been provided. Cannot import group.")."

\n" ."\n" + .$clang->gT("Main Admin Screen")."' onclick=\"window.open('$scriptname', '_self')\">\n" ."\n"; unlink($the_full_file_path); return; @@ -66,7 +66,7 @@ if (substr($bigarray[0], 0, 23) != "# LimeSurvey Group Dump" && substr($bigarray { $importgroup .= "".$clang->gT("Error")."
\n"; $importgroup .= $clang->gT("This file is not a LimeSurvey group file. Import failed.")."

\n"; - $importgroup .= "\n"; + $importgroup .= "\n"; $importgroup .= "\n"; unlink($the_full_file_path); return; @@ -247,7 +247,7 @@ if (isset($grouparray)) { $importgroup .= "".$clang->gT("Error")."
\n"; $importgroup .= $clang->gT("You can't import a group which doesn't support the current survey's base language.")."

\n"; - $importgroup .= "\n"; + $importgroup .= "\n"; $importgroup .= "\n"; unlink($the_full_file_path); return; @@ -263,7 +263,7 @@ if (isset($questionarray)) { $importgroup .= "".$clang->gT("Error")."
\n"; $importgroup .= $clang->gT("You can't import a question which doesn't support the current survey's base language.")."

\n"; - $importgroup .= "\n"; + $importgroup .= "\n"; $importgroup .= "\n"; unlink($the_full_file_path); return; diff --git a/include/limesurvey/admin/importlabel.php b/include/limesurvey/admin/importlabel.php index e5981087..fa9b7486 100644 --- a/include/limesurvey/admin/importlabel.php +++ b/include/limesurvey/admin/importlabel.php @@ -29,7 +29,7 @@ if (!@move_uploaded_file($_FILES['the_file']['tmp_name'], $the_full_file_path)) { $importlabeloutput .= "".$clang->gT("Error")."
\n"; $importlabeloutput .= sprintf ($clang->gT("An error occurred uploading your file. This may be caused by incorrect permissions in your %s folder."),$tempdir)."

\n"; - $importlabeloutput .= "\n"; + $importlabeloutput .= "\n"; $importlabeloutput .= "
 \n"; return; } @@ -53,7 +53,7 @@ if (substr($bigarray[0], 0, 27) != "# LimeSurvey Label Set Dump" && substr($biga { $importlabeloutput .= "".$clang->gT("Error")."
\n"; $importlabeloutput .= $clang->gT("This file is not a LimeSurvey label set file. Import failed.")."

\n"; - $importlabeloutput .= "\n"; + $importlabeloutput .= "\n"; $importlabeloutput .= "\n"; $importlabeloutput .= "\n\n"; unlink($the_full_file_path); @@ -209,7 +209,7 @@ if (isset($labelsetsarray) && $labelsetsarray) { $importlabeloutput .= "".$clang->gT("Import of Label Set is completed.")."
\n"; -$importlabeloutput .= "\n"; +$importlabeloutput .= "\n"; $importlabeloutput .= "\n"; unlink($the_full_file_path); diff --git a/include/limesurvey/admin/importquestion.php b/include/limesurvey/admin/importquestion.php index 8d1c62a1..74d1410c 100644 --- a/include/limesurvey/admin/importquestion.php +++ b/include/limesurvey/admin/importquestion.php @@ -31,7 +31,7 @@ if (!@move_uploaded_file($_FILES['the_file']['tmp_name'], $the_full_file_path)) $importquestion .= "".$clang->gT("Error")."
\n"; $importquestion .= sprintf ($clang->gT("An error occurred uploading your file. This may be caused by incorrect permissions in your %s folder."),$tempdir)."

\n" ."\n" + .$clang->gT("Main Admin Screen")."' onclick=\"window.open('$scriptname', '_self')\">\n" ."\n"; unlink($the_full_file_path); return; @@ -42,7 +42,7 @@ if (!returnglobal('sid')) { $importquestion .= $clang->gT("No SID (Survey) has been provided. Cannot import question.")."

\n" ."\n" + .$clang->gT("Main Admin Screen")."' onclick=\"window.open('$scriptname', '_self')\">\n" ."\n"; unlink($the_full_file_path); return; diff --git a/include/limesurvey/admin/labels.php b/include/limesurvey/admin/labels.php index c9665018..c1843221 100644 --- a/include/limesurvey/admin/labels.php +++ b/include/limesurvey/admin/labels.php @@ -81,13 +81,13 @@ if($_SESSION['USER_RIGHT_SUPERADMIN'] == 1 || $_SESSION['USER_RIGHT_MANAGE_LABEL ."alt='". $clang->gT("Show Help")."' align='right' />" ."\t\n" ."\t\n" - ."gTview("Add New Label Set")."\"" ."onmouseover=\"showTooltip(event,'".$clang->gT("Add New Label Set", "js")."');return false\">" ."". $clang->gT("Add new label set")."\n" ."\t".$clang->gT("Labelsets").": " - ."\t\n"; $labelsets=getlabelsets(); if (count($labelsets)>0) { @@ -124,7 +124,7 @@ if($_SESSION['USER_RIGHT_SUPERADMIN'] == 1 || $_SESSION['USER_RIGHT_MANAGE_LABEL ."\t\n" ."\n" ."\n"; + ."onclick=\"window.open('admin.php?action=labels&lid=$lid', '_self')\" />\n"; if ($action == "newlabelset") {$labelsoutput.= $clang->gT("Create or Import New Label Set"); $langids="en"; $tabitem=$clang->gT("Create New Label Set");} else {$labelsoutput.= $clang->gT("Edit Label Set"); $tabitem=$clang->gT("Edit Label Set");} $langidsarray=explode(" ",trim($langids)); //Make an array of it @@ -248,7 +248,7 @@ if($_SESSION['USER_RIGHT_SUPERADMIN'] == 1 || $_SESSION['USER_RIGHT_MANAGE_LABEL ."\t\n" ."\t\n" + ."onclick=\"window.open('admin.php?action=labels', '_self')\" />\n" ."\t\n" ."\t\n" ."\tgTview("Edit label set")."\" onmouseover=\"showTooltip(event,'".$clang->gT("Edit label set", "js")."');return false\">" . diff --git a/include/limesurvey/admin/listcolumn.php b/include/limesurvey/admin/listcolumn.php index 0919a911..44cfbfd1 100644 --- a/include/limesurvey/admin/listcolumn.php +++ b/include/limesurvey/admin/listcolumn.php @@ -53,10 +53,10 @@ if ($order == "alpha") $result=db_execute_assoc($query) or safe_die("Error with query: ".$query."
".$connect->ErrorMsg()); $listcolumnoutput= "\n"; -$listcolumnoutput.= "\n"; +$listcolumnoutput.= "\n"; $listcolumnoutput.= "\n"; while ($row=$result->FetchRow()) { diff --git a/include/limesurvey/admin/resetsurveylogic.php b/include/limesurvey/admin/resetsurveylogic.php index e73818ea..8479aa09 100644 --- a/include/limesurvey/admin/resetsurveylogic.php +++ b/include/limesurvey/admin/resetsurveylogic.php @@ -27,7 +27,7 @@ if (!isset($surveyid) || !$surveyid) $resetsurveylogicoutput .= "\t
"; if ($connect->databaseType != 'odbc_mssql') - { $listcolumnoutput.= ""; } + { $listcolumnoutput.= ""; } $listcolumnoutput.= "
\n"; $resetsurveylogicoutput .= "
".$clang->gT("Error")."
\n"; $resetsurveylogicoutput .= $clang->gT("You have not selected a survey to delete")."

\n"; - $resetsurveylogicoutput .= "\n"; + $resetsurveylogicoutput .= "\n"; $resetsurveylogicoutput .= "
\n"; $resetsurveylogicoutput .= "\n"; return; @@ -47,8 +47,8 @@ if (!isset($ok) || !$ok) $resetsurveylogicoutput .= "\t\n"; $resetsurveylogicoutput .= "\t\n"; $resetsurveylogicoutput .= "\t\t
\n"; - $resetsurveylogicoutput .= "\t\t\t
\n"; -// $resetsurveylogicoutput .= "\t\t\t\n"; + $resetsurveylogicoutput .= "\t\t\t
\n"; +// $resetsurveylogicoutput .= "\t\t\t\n"; $resetsurveylogicoutput .= "\t\t\t\n"; $resetsurveylogicoutput .= "\t\t\n"; $resetsurveylogicoutput .= "\t\n"; @@ -66,7 +66,7 @@ else //delete conditions in the survey $resetsurveylogicoutput .= "\t\n"; $resetsurveylogicoutput .= "\t\t
\n"; $resetsurveylogicoutput .= "\t\t\t".$clang->gT("All conditions in this survey have been deleted.")."

\n"; - $resetsurveylogicoutput .= "\t\t\t\n"; + $resetsurveylogicoutput .= "\t\t\t\n"; $resetsurveylogicoutput .= "\t\t\n"; $resetsurveylogicoutput .= "\t\n"; $surveyid=false; diff --git a/include/limesurvey/admin/saved.php b/include/limesurvey/admin/saved.php index f0746a1f..f5815a90 100644 --- a/include/limesurvey/admin/saved.php +++ b/include/limesurvey/admin/saved.php @@ -128,7 +128,7 @@ function savedmenubar() . "\t\t\tgT("Display Responses", "js")."')\">" . "\n" //. "\t\t\t\n" + //. $clang->gT("Display Last 50 Responses")."' align='left' onclick=\"window.open('saved.php?sid=$surveyid&action=all&limit=50&order=desc', '_self')\">\n" . "\t\t\t\n" . "\t\t\n" . "\t\n"; diff --git a/include/limesurvey/admin/statistics.php b/include/limesurvey/admin/statistics.php index 36b71713..cc270b83 100644 --- a/include/limesurvey/admin/statistics.php +++ b/include/limesurvey/admin/statistics.php @@ -729,7 +729,7 @@ if (isset($usejpgraph) && $usejpgraph == 1) $statisticsoutput .= "\t\t\n\t\t\t
\n" ."\t\t\t\n" -."\t\t\t\n" +."\t\t\t\n" ."\t\t
 \n" ."\t\t\n" ."\t\t\n" diff --git a/include/limesurvey/admin/templates.php b/include/limesurvey/admin/templates.php index 70876846..33dfca96 100644 --- a/include/limesurvey/admin/templates.php +++ b/include/limesurvey/admin/templates.php @@ -161,7 +161,7 @@ if ($action == "templateupload") if (!@move_uploaded_file($_FILES['the_file']['tmp_name'], $the_full_file_path)) { echo "".$clang->gT("Error")."
\n"; echo sprintf ($clang->gT("An error occurred uploading your file. This may be caused by incorrect permissions in your %s folder."),$tempdir)."

\n"; - echo "\n"; + echo "\n"; echo "\n"; echo "\n\n"; exit; @@ -173,7 +173,7 @@ if ($action == "templateupload") @unlink($_FILES['the_file']['tmp_name']); echo "".$clang->gT("Error")."
\n"; echo $clang->gT("This file type is not allowed to be uploaded.")."

\n"; - echo "\n"; + echo "\n"; echo "\n"; echo "\n\n"; exit; @@ -185,7 +185,7 @@ if ($action == "templateupload") @unlink($_FILES['the_file']['tmp_name']); echo "".$clang->gT("Error")."
\n"; echo $clang->gT("This file type is not allowed to be uploaded.")."

\n"; - echo "\n"; + echo "\n"; echo "\n"; echo "\n\n"; exit; @@ -529,7 +529,7 @@ $templatesoutput= "