unified error msg variable

serghey-rodin · serghey-rodin · commit 849d5369934c · 2013-11-02T16:43:40.000+02:00
diff --git a/web/bulk/restore/index.php b/web/bulk/restore/index.php
@@ -26,14 +26,14 @@
 if ($action == 'restore') {
     exec (VESTA_CMD."v-schedule-user-restore ".$user." ".$backup." ".$web." ".$dns." ".$mail." ".$db." ".$cron." ".$udir, $output, $return_var);
     if ($return_var == 0) {
-        $_SESSION['restore_msg'] = __('RESTORE_SCHEDULED');
+        $_SESSION['error_msg'] = __('RESTORE_SCHEDULED');
     } else {
-        $_SESSION['restore_msg'] = implode('<br>', $output);
-        if (empty($_SESSION['restore_msg'])) {
-            $_SESSION['restore_msg'] = __('Error: vesta did not return any output.');
+        $_SESSION['error_msg'] = implode('<br>', $output);
+        if (empty($_SESSION['error_msg'])) {
+            $_SESSION['error_msg'] = __('Error: vesta did not return any output.');
         }
         if ($return_var == 4) {
-            $_SESSION['restore_msg'] = __('RESTORE_EXISTS');
+            $_SESSION['error_msg'] = __('RESTORE_EXISTS');
         }
     }
 }
diff --git a/web/inc/main.php b/web/inc/main.php
@@ -213,23 +213,24 @@ function send_email($to,$subject,$mailtext,$from) {
 function display_error_block() {
     if (!empty($_SESSION['error_msg'])) {
         echo '
-                        <script type="text/javascript">
-                            $(function() {
-                                $( "#dialog:ui-dialog" ).dialog( "destroy" );
-                                $( "#dialog-message" ).dialog({
-                                    modal: true,
-                                    buttons: {
-                                        Ok: function() {
-                                            $( this ).dialog( "close" );
-                                        }
-                                    }
-                                });
-                            });
-                    </script>
-                    <div id="dialog-message" title="Error">
-                        <p>';
-        echo $_SESSION['error_msg'];
-        echo "</p>\n                        </div>\n";
+            <div>
+                <script type="text/javascript">
+                    $(function() {
+                        $( "#dialog:ui-dialog" ).dialog( "destroy" );
+                        $( "#dialog-message" ).dialog({
+                            modal: true,
+                            buttons: {
+                                Ok: function() {
+                                    $( this ).dialog( "close" );
+                                }
+                            }
+                        });
+                    });
+                </script>
+                <div id="dialog-message" title="">
+                    <p>'. $_SESSION['error_msg'] .'</p>
+                </div>
+            </div>'."\n";
         unset($_SESSION['error_msg']);
     }
 }
diff --git a/web/restart/service/index.php b/web/restart/service/index.php
@@ -13,7 +13,7 @@
     if ($return_var != 0) {
         $error = implode('<br>', $output);
         if (empty($error)) $error =  __('SERVICE_ACTION_FAILED',__('restart'),$v_service);
-            $_SESSION['error_srv'] = $error;
+            $_SESSION['error_msg'] = $error;
     }
     unset($output);
 }
diff --git a/web/restart/system/index.php b/web/restart/system/index.php
@@ -8,7 +8,7 @@
 if ($_SESSION['user'] == 'admin') {
     if (!empty($_GET['hostname'])) {
         exec (VESTA_CMD."v-restart-system yes", $output, $return_var);
-        $_SESSION['error_srv'] = 'The system is going down for reboot NOW!';
+        $_SESSION['error_msg'] = 'The system is going down for reboot NOW!';
     }
     unset($output);
 }
diff --git a/web/schedule/backup/index.php b/web/schedule/backup/index.php
@@ -8,15 +8,15 @@
 $v_username = escapeshellarg($user);
 exec (VESTA_CMD."v-schedule-user-backup ".$v_username, $output, $return_var);
 if ($return_var == 0) {
-    $_SESSION['backup_msg'] = __('BACKUP_SCHEDULED');
+    $_SESSION['error_msg'] = __('BACKUP_SCHEDULED');
 } else {
-    $_SESSION['backup_msg'] = implode('<br>', $output);
-    if (empty($_SESSION['backup_msg'])) {
-        $_SESSION['backup_msg'] = __('Error: vesta did not return any output.');
+    $_SESSION['error_msg'] = implode('<br>', $output);
+    if (empty($_SESSION['error_msg'])) {
+        $_SESSION['error_msg'] = __('Error: vesta did not return any output.');
     }
 
     if ($return_var == 4) {
-        $_SESSION['backup_msg'] = __('BACKUP_EXISTS');
+        $_SESSION['error_msg'] = __('BACKUP_EXISTS');
     }
 
 }
diff --git a/web/schedule/restore/index.php b/web/schedule/restore/index.php
@@ -30,14 +30,14 @@
 
 exec ($restore_cmd, $output, $return_var);
 if ($return_var == 0) {
-    $_SESSION['restore_msg'] = __('RESTORE_SCHEDULED');
+    $_SESSION['error_msg'] = __('RESTORE_SCHEDULED');
 } else {
-    $_SESSION['restore_msg'] = implode('<br>', $output);
-    if (empty($_SESSION['restore_msg'])) {
-        $_SESSION['restore_msg'] = __('Error: vesta did not return any output.');
+    $_SESSION['error_msg'] = implode('<br>', $output);
+    if (empty($_SESSION['error_msg'])) {
+        $_SESSION['error_msg'] = __('Error: vesta did not return any output.');
     }
     if ($return_var == 4) {
-        $_SESSION['restore_msg'] = __('RESTORE_EXISTS');
+        $_SESSION['error_msg'] = __('RESTORE_EXISTS');
     }
 }
 
diff --git a/web/update/vesta/index.php b/web/update/vesta/index.php
@@ -14,7 +14,7 @@
     if ($return_var != 0) {
         $error = implode('<br>', $output);
         if (empty($error)) $error = 'Error: '.$v_pkg.' update failed';
-            $_SESSION['error_upd'] = $error;
+            $_SESSION['error_msg'] = $error;
     }
     unset($output);
 }

Original file line number	Diff line number	Diff line change
`@@ -26,14 +26,14 @@`
`26`	`26`	`if ($action == 'restore') {`
`27`	`27`	`exec (VESTA_CMD."v-schedule-user-restore ".$user." ".$backup." ".$web." ".$dns." ".$mail." ".$db." ".$cron." ".$udir, $output, $return_var);`
`28`	`28`	`if ($return_var == 0) {`
`29`		`- $_SESSION['restore_msg'] = __('RESTORE_SCHEDULED');`
	`29`	`+ $_SESSION['error_msg'] = __('RESTORE_SCHEDULED');`
`30`	`30`	`} else {`
`31`		`- $_SESSION['restore_msg'] = implode('<br>', $output);`
`32`		`- if (empty($_SESSION['restore_msg'])) {`
`33`		`- $_SESSION['restore_msg'] = __('Error: vesta did not return any output.');`
	`31`	`+ $_SESSION['error_msg'] = implode('<br>', $output);`
	`32`	`+ if (empty($_SESSION['error_msg'])) {`
	`33`	`+ $_SESSION['error_msg'] = __('Error: vesta did not return any output.');`
`34`	`34`	`}`
`35`	`35`	`if ($return_var == 4) {`
`36`		`- $_SESSION['restore_msg'] = __('RESTORE_EXISTS');`
	`36`	`+ $_SESSION['error_msg'] = __('RESTORE_EXISTS');`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`if ($return_var != 0) {`
`14`	`14`	`$error = implode('<br>', $output);`
`15`	`15`	`if (empty($error)) $error = __('SERVICE_ACTION_FAILED',__('restart'),$v_service);`
`16`		`- $_SESSION['error_srv'] = $error;`
	`16`	`+ $_SESSION['error_msg'] = $error;`
`17`	`17`	`}`
`18`	`18`	`unset($output);`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`if ($_SESSION['user'] == 'admin') {`
`9`	`9`	`if (!empty($_GET['hostname'])) {`
`10`	`10`	`exec (VESTA_CMD."v-restart-system yes", $output, $return_var);`
`11`		`- $_SESSION['error_srv'] = 'The system is going down for reboot NOW!';`
	`11`	`+ $_SESSION['error_msg'] = 'The system is going down for reboot NOW!';`
`12`	`12`	`}`
`13`	`13`	`unset($output);`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,15 +8,15 @@`
`8`	`8`	`$v_username = escapeshellarg($user);`
`9`	`9`	`exec (VESTA_CMD."v-schedule-user-backup ".$v_username, $output, $return_var);`
`10`	`10`	`if ($return_var == 0) {`
`11`		`- $_SESSION['backup_msg'] = __('BACKUP_SCHEDULED');`
	`11`	`+ $_SESSION['error_msg'] = __('BACKUP_SCHEDULED');`
`12`	`12`	`} else {`
`13`		`- $_SESSION['backup_msg'] = implode('<br>', $output);`
`14`		`- if (empty($_SESSION['backup_msg'])) {`
`15`		`- $_SESSION['backup_msg'] = __('Error: vesta did not return any output.');`
	`13`	`+ $_SESSION['error_msg'] = implode('<br>', $output);`
	`14`	`+ if (empty($_SESSION['error_msg'])) {`
	`15`	`+ $_SESSION['error_msg'] = __('Error: vesta did not return any output.');`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`if ($return_var == 4) {`
`19`		`- $_SESSION['backup_msg'] = __('BACKUP_EXISTS');`
	`19`	`+ $_SESSION['error_msg'] = __('BACKUP_EXISTS');`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,14 +30,14 @@`
`30`	`30`
`31`	`31`	`exec ($restore_cmd, $output, $return_var);`
`32`	`32`	`if ($return_var == 0) {`
`33`		`- $_SESSION['restore_msg'] = __('RESTORE_SCHEDULED');`
	`33`	`+ $_SESSION['error_msg'] = __('RESTORE_SCHEDULED');`
`34`	`34`	`} else {`
`35`		`- $_SESSION['restore_msg'] = implode('<br>', $output);`
`36`		`- if (empty($_SESSION['restore_msg'])) {`
`37`		`- $_SESSION['restore_msg'] = __('Error: vesta did not return any output.');`
	`35`	`+ $_SESSION['error_msg'] = implode('<br>', $output);`
	`36`	`+ if (empty($_SESSION['error_msg'])) {`
	`37`	`+ $_SESSION['error_msg'] = __('Error: vesta did not return any output.');`
`38`	`38`	`}`
`39`	`39`	`if ($return_var == 4) {`
`40`		`- $_SESSION['restore_msg'] = __('RESTORE_EXISTS');`
	`40`	`+ $_SESSION['error_msg'] = __('RESTORE_EXISTS');`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`if ($return_var != 0) {`
`15`	`15`	`$error = implode('<br>', $output);`
`16`	`16`	`if (empty($error)) $error = 'Error: '.$v_pkg.' update failed';`
`17`		`- $_SESSION['error_upd'] = $error;`
	`17`	`+ $_SESSION['error_msg'] = $error;`
`18`	`18`	`}`
`19`	`19`	`unset($output);`
`20`	`20`	`}`