[geeklog-cvs] geeklog: Simplified block enable/disable code

[geeklog-cvs at lists.geeklog.net]

changeset 7737:68e131cc90cc
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/68e131cc90cc
user: Dirk Haun <dirk at haun-online.de>
date: Sat Feb 20 15:17:35 2010 +0100
description:
Simplified block enable/disable code

diffstat:

 public_html/admin/block.php |   6 ++----
 system/lib-admin.php        |  10 +++++-----
 2 files changed, 7 insertions(+), 9 deletions(-)

diffs (43 lines):

diff -r e6e3f00d2e53 -r 68e131cc90cc public_html/admin/block.php
--- a/public_html/admin/block.php	Sat Feb 20 14:32:17 2010 +0100
+++ b/public_html/admin/block.php	Sat Feb 20 15:17:35 2010 +0100
@@ -761,9 +761,7 @@
 {
     global $_CONF, $_TABLES;
 
-    $enabled  = array_keys($enabledblocks);
-    $visible  = array_keys($visibleblocks);
-    $disabled = array_diff($visible, $enabled);
+    $disabled = array_diff($visibleblocks, $enabledblocks);
 
     // disable blocks
     $in = implode(',', $disabled);
@@ -771,7 +769,7 @@
     DB_query($sql);
 
     // enable blocks
-    $in = implode(',', $enabled);
+    $in = implode(',', $enabledblocks);
     $sql = "UPDATE {$_TABLES['blocks']} SET is_enabled = 1 WHERE bid IN ($in)";
     DB_query($sql);
 }
diff -r e6e3f00d2e53 -r 68e131cc90cc system/lib-admin.php
--- a/system/lib-admin.php	Sat Feb 20 14:32:17 2010 +0100
+++ b/system/lib-admin.php	Sat Feb 20 15:17:35 2010 +0100
@@ -665,11 +665,11 @@
                 } else {
                     $switch = '';
                 }
-                $retval = '<input type="checkbox" name="enabledblocks['
-                            . $A['bid'] . ']" onclick="submit()" value="'
-                            . $A['onleft'] . '"' . $switch . XHTML . '>'
-                        . '<input type="hidden" name="visibleblocks['
-                            . $A['bid'] . ']" value="1"' . XHTML . '>';
+                $retval = '<input type="checkbox" name="enabledblocks[]" '
+                            . 'onclick="submit()" value="' . $A['bid'] . '"'
+                            . $switch . XHTML . '>'
+                        . '<input type="hidden" name="visibleblocks[]" value="'
+                            . $A['bid'] . '"' . XHTML . '>';
             }
             break;