Fix consistency of backup result message

Dolibarr · May 18, 2015 · 6d03ba2 · 6d03ba2
1 parent e230d72
commit 6d03ba2
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 9 deletions.
diff --git a/htdocs/admin/tools/dolibarr_export.php b/htdocs/admin/tools/dolibarr_export.php
@@ -439,6 +439,26 @@ function hideoptions () {
 <div align="center"><input type="submit" class="button"
 	value="<?php echo $langs->trans("GenerateBackup") ?>" id="buttonGo" /><br>
 <br>
+
+<?php
+if (! empty($_SESSION["commandbackuplastdone"]))
+{
+	print '<br><b>'.$langs->trans("RunCommandSummary").':</b><br>'."\n";
+    print '<textarea rows="'.ROWS_2.'" class="centpercent">'.$_SESSION["commandbackuplastdone"].'</textarea><br>'."\n";
+    print '<br>';
+
+    //print $paramclear;
+
+    // Now run command and show result
+    print '<b>'.$langs->trans("BackupResult").':</b> ';
+	print $_SESSION["commandbackupresult"];
+
+	$_SESSION["commandbackuplastdone"]='';
+	$_SESSION["commandbackuptorun"]='';
+	$_SESSION["commandbackupresult"]='';
+}
+?>
+
 </div>
 
 <?php

diff --git a/htdocs/admin/tools/export.php b/htdocs/admin/tools/export.php
@@ -70,6 +70,10 @@
  * View
  */
 
+$_SESSION["commandbackuplastdone"]='';
+$_SESSION["commandbackuptorun"]='';
+$_SESSION["commandbackupresult"]='';
+
 // Increase limit of time. Works only if we are not in safe mode
 $ExecTimeLimit=600;
 if (!empty($ExecTimeLimit))
@@ -354,21 +358,24 @@
     if ($errormsg)
     {
     	setEventMessage($langs->trans("Error")." : ".$errormsg, 'errors');
-    	/*
-        print '<div class="error">'.$langs->trans("Error")." : ".$errormsg.'</div>';
-        print '<br>';
-        print '<br>';*/
+
+    	$resultstring='';
+        $resultstring.='<div class="error">'.$langs->trans("Error")." : ".$errormsg.'</div>';
+
+        $_SESSION["commandbackupresult"]=$resultstring;
     }
     else
 	{
 		if ($what)
 		{
 	        setEventMessage($langs->trans("BackupFileSuccessfullyCreated").'.<br>'.$langs->trans("YouCanDownloadBackupFile"));
-	        /*print '<div class="ok">';
-	        print $langs->trans("BackupFileSuccessfullyCreated").'.<br>';
-	        print $langs->trans("YouCanDownloadBackupFile");
-	        print '</div>';
-	        print '<br>';*/
+
+	        $resultstring='<div class="ok">';
+	        $resultstring.=$langs->trans("BackupFileSuccessfullyCreated").'.<br>';
+	        $resultstring.=$langs->trans("YouCanDownloadBackupFile");
+	        $resultstring.='<div>';
+
+	        $_SESSION["commandbackupresult"]=$resultstring;
 		}
 		else
 		{