[geeklog-cvs] geeklog: Clean up page refresh after a plugin upgrade

[geeklog-cvs at lists.geeklog.net]

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/2f3460d4a1d3
changeset: 7340:2f3460d4a1d3
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Sep 27 21:15:19 2009 +0200
description:
Clean up page refresh after a plugin upgrade

diffstat:

 public_html/admin/plugins.php |  41 +++++++++++++++++++++--------------------
 1 files changed, 21 insertions(+), 20 deletions(-)

diffs (61 lines):

diff -r 37fa7ba6f86e -r 2f3460d4a1d3 public_html/admin/plugins.php
--- a/public_html/admin/plugins.php	Sat Sep 26 11:07:25 2009 -0400
+++ b/public_html/admin/plugins.php	Sun Sep 27 21:15:19 2009 +0200
@@ -359,26 +359,29 @@
 
     $retval = '';
 
-    if (strlen($pi_name) == 0) {
-        $retval .= COM_showMessageText($LANG32[12], $LANG32[13]);
-
-        return $retval;
+    if (! empty($pi_name)) {
+        $result = PLG_upgrade($pi_name);
+        if ($result > 0) {
+            if ($result === TRUE) { // Catch returns that are just true/false
+                PLG_pluginStateChange($pi_name, 'upgraded');
+                $retval = COM_refresh($_CONF['site_admin_url']
+                        . '/plugins.php?msg=60');
+            } else {    // Plugin returned a message number
+                $retval = COM_refresh($_CONF['site_admin_url']
+                        . '/plugins.php?msg=' . $result . '&plugin='
+                        . $pi_name);
+            }
+            return $retval;
+        } else {  // Plugin function returned a false
+            $retval = COM_showMessage(95);
+        }
+    } else { // no plugin name given
+        $retval = COM_showMessageText($LANG32[12], $LANG32[13]);
     }
 
-    $result = PLG_upgrade($pi_name);
-    if ($result > 0 ) {
-        if ($result === TRUE) { // Catch returns that are just true/false
-            PLG_pluginStateChange($pi_name, 'upgraded');
-            $retval .= COM_refresh($_CONF['site_admin_url']
-                    . '/plugins.php?msg=60');
-        } else {  // Plugin returned a message number
-            $retval = COM_refresh($_CONF['site_admin_url']
-                    . '/plugins.php?msg=' . $result . '&plugin='
-                    . $pi_name);
-        }
-    } else {  // Plugin function returned a false
-        $retval .= COM_showMessage(95);
-    }
+    $retval = COM_siteHeader('menu', $LANG32[13])
+            . $retval
+            . COM_siteFooter();
 
     return $retval;
 }
@@ -1209,9 +1212,7 @@
 
 } elseif ((($mode == $LANG32[34]) && !empty($LANG32[34])) && SEC_checkToken()) { // update
     $pi_name = COM_applyFilter($_POST['pi_name']);
-    $display .= COM_siteHeader('menu', $LANG32[13]);
     $display .= do_update($pi_name);
-    $display .= COM_siteFooter();
 
 } elseif ($mode == 'edit') {
     $display .= COM_siteHeader('menu', $LANG32[13]);