Corrected wrong tempdir message

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey@3215 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · Aug 18, 2007 · e51e236 · e51e236
1 parent b0274be
commit e51e236
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/admin/http_importsurvey.php b/admin/http_importsurvey.php
@@ -28,7 +28,7 @@
 if (!@move_uploaded_file($_FILES['the_file']['tmp_name'], $the_full_file_path))
 {
 	$importsurvey .= "<strong><font color='red'>".$clang->gT("Error")."</font></strong><br />\n";
-	$importsurvey .= $clang->gT("An error occurred uploading your file. This may be caused by incorrect permissions in your /admin/tmp folder folder.")."<br /><br />\n";
+	$importsurvey .= $clang->gT("An error occurred uploading your file. This may be caused by incorrect permissions in your /tmp folder folder.")."<br /><br />\n";
 	$importsurvey .= "</font></td></tr></table>\n";
 	return;
 }

diff --git a/admin/importgroup.php b/admin/importgroup.php
@@ -26,7 +26,7 @@
 if (!@move_uploaded_file($_FILES['the_file']['tmp_name'], $the_full_file_path))
 {
 	$importgroup .= "<strong><font color='red'>".$clang->gT("Error")."</font></strong><br />\n";
-	$importgroup .= $clang->gT("An error occurred uploading your file. This may be caused by incorrect permissions in your /admin/tmp folder folder.")."<br /><br />\n";
+    $importgroup .= sprintf ($clang->gT("An error occurred uploading your file. This may be caused by incorrect permissions in your %s folder."),$tempdir)."<br /><br />\n";
 	$importgroup .= "<input type='submit' value='".$clang->gT("Main Admin Screen")."' onclick=\"window.open('$scriptname', '_top')\">\n";
 	$importgroup .= "</td></tr></table>\n";
 	return;

diff --git a/admin/importquestion.php b/admin/importquestion.php
@@ -26,8 +26,8 @@
 
 if (!@move_uploaded_file($_FILES['the_file']['tmp_name'], $the_full_file_path))
 {
-	$importquestion .= "<strong><font color='red'>".$clang->gT("Error")."</font></strong><br />\n"
-	.$clang->gT("An error occurred uploading your file. This may be caused by incorrect permissions in your /admin/tmp folder folder.")."<br /><br />\n"
+	$importquestion .= "<strong><font color='red'>".$clang->gT("Error")."</font></strong><br />\n";
+    $importquestion .= sprintf ($clang->gT("An error occurred uploading your file. This may be caused by incorrect permissions in your %s folder."),$tempdir)."<br /><br />\n"
 	."<input type='submit' value='"
 	.$clang->gT("Main Admin Screen")."' onclick=\"window.open('$scriptname', '_top')\">\n"
 	."</td></tr></table>\n";

diff --git a/admin/templates.php b/admin/templates.php
@@ -128,7 +128,7 @@
               //Uploads the file into the appropriate directory
               if (!@move_uploaded_file($_FILES['the_file']['tmp_name'], $the_full_file_path)) {
                   echo "<strong><font color='red'>".$clang->gT("Error")."</font></strong><br />\n";
-                  echo $clang->gT("An error occurred uploading your file. This may be caused by incorrect permissions in your /admin/tmp folder folder.")."<br /><br />\n";
+                  echo sprintf ($clang->gT("An error occurred uploading your file. This may be caused by incorrect permissions in your %s folder."),$tempdir)."<br /><br />\n";
                   echo "<input type='submit' value='".$clang->gT("Main Admin Screen")."' onclick=\"window.open('$scriptname', '_top')\" />\n";
                   echo "</td></tr></table>\n";
                   echo "</body>\n</html>\n";

diff --git a/admin/vvimport.php b/admin/vvimport.php
@@ -68,7 +68,7 @@
 	if (!@move_uploaded_file($_FILES['the_file']['tmp_name'], $the_full_file_path))
 	{
 		$vvoutput .= "<strong><font color='red'>".$clang->gT("Error")."</font></strong><br />\n";
-		$vvoutput .= $clang->gT("An error occurred uploading your file. This may be caused by incorrect permissions in your /admin/tmp folder folder.")."<br /><br />\n";
+		$vvoutput .= sprintf ($clang->gT("An error occurred uploading your file. This may be caused by incorrect permissions in your %s folder."),$tempdir)."<br /><br />\n";
 		$vvoutput .= "<input type='submit' value='".$clang->gT("Back to Response Import")."' onclick=\"window.open('$scriptname?action=vvimport&sid=$surveyid', '_top')\">\n";
 		$vvoutput .= "</font></td></tr></table><br />&nbsp;\n";
 		return;