Changeset 1182 in ExiteCMS for trunk/administration/modules.php

Timestamp:

12/25/07 17:32:57 (4 years ago)

Author:

hverton

Message:

added support for multiple panels per module
updated English locale file
update dbsetup_include.php
files in the template cache now have a more logical name
after login, check if the user theme exists before selecting it. If not, fall back to the site default. If this theme doesn't exist either, terminate with an error message
new CSS tag for optgroups

File:

• trunk/administration/modules.php (modified) (3 diffs)

trunk/administration/modules.php

@@ -84 +84 @@
 
             // determine to which menu panel this link needs to be added
-            $link_panel = ($mod_link['panel'] != "" ? ($mod_link['panel']."_") : "").'menu_panel';
-
-            // check if this panel is installed
-            $result = dbquery("SELECT panel_id FROM ".$db_prefix."panels WHERE panel_filename = '$link_panel'");
-            if (dbrows($result) == 0) {
-                // if the panel doesn't exist, try to find another menu panel (if multiple are installed, pick the first one in the ordered list)
-                $result = dbquery("SELECT panel_filename FROM ".$db_prefix."panels WHERE panel_filename LIKE '%_menu_panel' ORDER BY panel_order LIMIT 1");
-                if (dbrows($result)) {
-                    $data = dbarray($result);
-                    $link_panel = $data['panel_filename'];
-                } else {
-                    // if still not found, fall back to the CMS default
-                    $link_panel = "main_menu_panel";
-                }
+            if (isset($mod_link['panel']) && $mod_link['panel'] != "") {
+                if (substr($mod_link['panel'],-4) != ".php") {
+                    $link_panel = $mod_link['panel']."/".$mod_link['panel'].".php";
+                }
+                // check if this panel is installed
+                $result = dbquery("SELECT panel_id FROM ".$db_prefix."panels WHERE panel_filename = '$link_panel'");
+                if (dbrows($result) == 0) {
+                    // if the panel doesn't exist, try to find another menu panel (if multiple are installed, pick the first one in the ordered list)
+                    $result = dbquery("SELECT panel_filename FROM ".$db_prefix."panels WHERE panel_filename LIKE '%_menu_panel.php' ORDER BY panel_order LIMIT 1");
+                    if (dbrows($result)) {
+                        $data = dbarray($result);
+                        $link_panel = $data['panel_filename'];
+                    } else {
+                        // if still not found, fall back to the CMS default
+                        $link_panel = "main_menu_panel/main_menu_panel.php";
+                    }
+                }
+            } else {
+                // use the CMS default
+                $link_panel = "main_menu_panel/main_menu_panel.php";
             }
 
@@ -213 +219 @@
             if ($link_url{0} == "/") $link_url = substr($link_url,1);
             
-            // determine to which menu panel this link has been added
-            $link_panel = ($mod_link['panel'] != "" ? ($mod_link['panel']."_") : "").'menu_panel';
+            // determine to which menu panel this link needs to be added
+            if (isset($mod_link['panel']) && $mod_link['panel'] != "") {
+                if (substr($mod_link['panel'],-4) != ".php") {
+                    $link_panel = $mod_link['panel']."/".$mod_link['panel'].".php";
+                }
+                // check if this panel is installed
+                $result = dbquery("SELECT panel_id FROM ".$db_prefix."panels WHERE panel_filename = '$link_panel'");
+                if (dbrows($result) == 0) {
+                    // if the panel doesn't exist, try to find another menu panel (if multiple are installed, pick the first one in the ordered list)
+                    $result = dbquery("SELECT panel_filename FROM ".$db_prefix."panels WHERE panel_filename LIKE '%_menu_panel.php' ORDER BY panel_order LIMIT 1");
+                    if (dbrows($result)) {
+                        $data = dbarray($result);
+                        $link_panel = $data['panel_filename'];
+                    } else {
+                        // if still not found, fall back to the CMS default
+                        $link_panel = "main_menu_panel/main_menu_panel.php";
+                    }
+                }
+            } else {
+                // use the CMS default
+                $link_panel = "main_menu_panel/main_menu_panel.php";
+            }
 
             // if this panel doesn't exist (anymore), use the default menu panel
             $result = dbquery("SELECT panel_id FROM ".$db_prefix."panels WHERE panel_filename = '$link_panel'");
-            if (dbrows($result) == 0) $link_panel = "main_menu_panel";
+            if (dbrows($result) == 0) $link_panel = "main_menu_panel/main_menu_panel.php";
 
             // check if we have a menu entry for this link
@@ -334 +360 @@
 
             // determine to which menu panel this link needs to be added
-            $link_panel = ($mod_link['panel'] != "" ? ($mod_link['panel']."_") : "").'menu_panel';
+            if (isset($mod_link['panel']) && $mod_link['panel'] != "") {
+                if (substr($mod_link['panel'],-4) != ".php") {
+                    $link_panel = $mod_link['panel']."/".$mod_link['panel'].".php";
+                }
+                // check if this panel is installed
+                $result = dbquery("SELECT panel_id FROM ".$db_prefix."panels WHERE panel_filename = '$link_panel'");
+                if (dbrows($result) == 0) {
+                    // if the panel doesn't exist, try to find another menu panel (if multiple are installed, pick the first one in the ordered list)
+                    $result = dbquery("SELECT panel_filename FROM ".$db_prefix."panels WHERE panel_filename LIKE '%_menu_panel.php' ORDER BY panel_order LIMIT 1");
+                    if (dbrows($result)) {
+                        $data = dbarray($result);
+                        $link_panel = $data['panel_filename'];
+                    } else {
+                        // if still not found, fall back to the CMS default
+                        $link_panel = "main_menu_panel/main_menu_panel.php";
+                    }
+                }
+            } else {
+                // use the CMS default
+                $link_panel = "main_menu_panel/main_menu_panel.php";
+            }
 
             // if the panel doesn't exist, use the default menu panel
             $result = dbquery("SELECT panel_id FROM ".$db_prefix."panels WHERE panel_filename = '$link_panel'");
-            if (dbrows($result) == 0) $link_panel = "main_menu_panel";
+            if (dbrows($result) == 0) $link_panel = "main_menu_panel/main_menu_panel.php";
 
             // check if the menu link is already defined