Fixes/rewrites for missing sql_patches and check on admin's default access mode ...

[mailer.git] / inc / modules / admin / admin-inc.php

diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index 5cdf0371c1d472de0ce2b4ed16758cbd35ca6410..f0aff19e6aae954eef2d6e6ef8e1995794ab4d95 100644 (file)
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -92,10 +92,10 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password) {
                } // END - if
        } elseif (!EXT_IS_ACTIVE("cache")) {
                // Add extra data via filter now
-               $ADD = runFilterChain('sql_admin_extra_data');
+               $add = runFilterChain('sql_admin_extra_data');
 
                // Get password from DB
-               $result = SQL_QUERY_ESC("SELECT password".$ADD." FROM `{!_MYSQL_PREFIX!}_admins` WHERE id=%s LIMIT 1",
+               $result = SQL_QUERY_ESC("SELECT password".$add." FROM `{!_MYSQL_PREFIX!}_admins` WHERE id=%s LIMIT 1",
                        array($aid), __FUNCTION__, __LINE__);
 
                // Entry found?
@@ -271,7 +271,7 @@ function ADMIN_DO_ACTION ($wht) {
 
        // Check if action/what pair is valid
        $result_action = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_admin_menu`
-WHERE `action`='%s' AND ((what='%s' AND what != 'overview') OR ((what='' OR `what` IS NULL) AND '%s'='overview'))
+WHERE `action`='%s' AND ((`what`='%s' AND what != 'overview') OR ((`what`='' OR `what` IS NULL) AND '%s'='overview'))
 LIMIT 1", array($act, $wht, $wht), __FUNCTION__, __LINE__);
        if (SQL_NUMROWS($result_action) == 1) {
                // Is valid but does the inlcude file exists?
@@ -336,7 +336,7 @@ function ADD_ADMIN_MENU ($act, $wht, $return=false) {
        } // END - if
 
        // Build main menu
-       $result_main = SQL_QUERY("SELECT action, title, descr FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE (what='' OR `what` IS NULL) ORDER BY `sort`, id DESC", __FUNCTION__, __LINE__);
+       $result_main = SQL_QUERY("SELECT action, title, descr FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE (`what`='' OR `what` IS NULL) ORDER BY `sort`, id DESC", __FUNCTION__, __LINE__);
        if (SQL_NUMROWS($result_main) > 0) {
                $OUT = "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"admin_menu_main\">
 <tr><td colspan=\"2\" height=\"7\" class=\"seperator\">&nbsp;</td></tr>\n";
@@ -357,7 +357,7 @@ function ADD_ADMIN_MENU ($act, $wht, $return=false) {
                                }
                                $OUT .= "<tr>
        <td class=\"admin_menu\" colspan=\"2\">
-               <nobr>&nbsp;<strong>&middot;</strong>&nbsp;";
+               <div class=\"nobr\">&nbsp;<strong>&middot;</strong>&nbsp;";
 
                                if (($menu == $act) && (empty($wht))) {
                                        $OUT .= "<strong>";
@@ -373,7 +373,7 @@ function ADD_ADMIN_MENU ($act, $wht, $return=false) {
                                        $OUT .= "</a>]";
                                }
 
-                               $OUT .= "</nobr></td>
+                               $OUT .= "</div></td>
 </tr>\n";
 
                                // Check for menu entries
@@ -384,7 +384,7 @@ function ADD_ADMIN_MENU ($act, $wht, $return=false) {
                                setAdminMenuHasEntries($menu, ((SQL_NUMROWS($result_what) > 0) && ($act == $menu)));
 
                                // Do we have entries?
-                               if (ifAdminMenuHasEntries($menu)) {
+                               if ((ifAdminMenuHasEntries($menu)) && (SQL_NUMROWS($result_what) > 0)) {
                                        $GLOBALS['menu']['description'] = array();
                                        $GLOBALS['menu']['title'] = array(); $SUB = true;
                                        $OUT .= "<tr>
@@ -412,7 +412,7 @@ function ADD_ADMIN_MENU ($act, $wht, $return=false) {
                                                        $GLOBALS['menu']['description'][$wht_sub] = $desc_what;
                                                        $OUT .= "<tr>
        <td class=\"admin_menu\" colspan=\"2\">
-               <nobr>&nbsp;<strong>--&gt;</strong>&nbsp;";
+               <div class=\"nobr\">&nbsp;<strong>--&gt;</strong>&nbsp;";
                                                        if ($readable === true) {
                                                                if ($wht == $wht_sub) {
                                                                        $OUT .= "<strong>";
@@ -434,7 +434,7 @@ function ADD_ADMIN_MENU ($act, $wht, $return=false) {
                                                        } else {
                                                                $OUT .= "</em>";
                                                        }
-                                                       $OUT .= "</nobr></td>
+                                                       $OUT .= "</div></td>
 </tr>\n";
                                                }
                                        }
@@ -522,7 +522,7 @@ function ADD_MEMBER_SELECTION_BOX ($def="0", $add_all=false, $return=false, $non
 // Create a menu selection box for given menu system
 function ADMIN_MENU_SELECTION ($MODE, $default="", $defid="") {
        $wht = "`what` != ''";
-       if ($MODE == "action") $wht = "(what='' OR `what` IS NULL) AND action !='login'";
+       if ($MODE == "action") $wht = "(`what`='' OR `what` IS NULL) AND action !='login'";
        $result = SQL_QUERY_ESC("SELECT %s, title FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE ".$wht." ORDER BY `sort`",
                array($MODE), __FUNCTION__, __LINE__);
        if (SQL_NUMROWS($result) > 0) {
@@ -656,14 +656,14 @@ function ADMIN_SAVE_SETTINGS (&$POST, $tableName = "_config", $whereStatement =
 // Generate a selection box
 function ADMIN_MAKE_MENU_SELECTION ($menu, $type, $name, $default="") {
        // Open the requested menu directory
-       $handle = opendir(sprintf("%sinc/modules/%s/", constant('PATH'), $menu)) or mxchange_die("Cannot load menu ".$menu."!");
+       $menuArray = GET_DIR_AS_ARRAY(sprintf("inc/modules/%s/", $menu), "", false, false);
 
        // Init the selection box
        $OUT = "<select name=\"".$name."\" class=\"admin_select\" size=\"1\">
        <option value=\"\">{--IS_TOP_MENU--}</option>\n";
 
        // Walk through all files
-       while ($file = readdir($handle)) {
+       foreach ($menuArray as $file) {
                // Is this a PHP script?
                if (($file != ".") && ($file != "..") && ($file != "lost+found") && (strpos($file, "".$type."-") > -1) && (strpos($file, ".php") > 0)) {
                        // Then test if the file is readable
@@ -683,10 +683,9 @@ function ADMIN_MAKE_MENU_SELECTION ($menu, $type, $name, $default="") {
                                } // END - if
                        } // END - if
                } // END - if
-       } // END - while
+       } // END - foreach
 
-       // Close dir and selection box
-       closedir($handle);
+       // Close selection box
        $OUT .= "</select>\n";
        
        // Return contents
@@ -924,7 +923,7 @@ function ADMIN_BUILD_STATUS_HANDLER ($mode, $IDs, $table, $columns, $filterFunct
                                        } // END - if
                                } elseif (isset($content[$column])) {
                                        // Unfinished!
-                                       mxchange_die("{--".__FUNCTION__."--}:".__LINE__.":UNFINISHED: id={$id}/{$column}[".gettype($statusInfo)."] = {$content[$column]}");
+                                       app_die(__FUNCTION__, __LINE__, ":UNFINISHED: id={$id}/{$column}[".gettype($statusInfo)."] = {$content[$column]}");
                                }
                        } // END - foreach
 
@@ -947,7 +946,7 @@ function ADMIN_BUILD_STATUS_HANDLER ($mode, $IDs, $table, $columns, $filterFunct
                        } // END - foreach
 
                        // Finish SQL statement
-                       $sql = substr($sql, 0, -1) . sprintf(" WHERE %s=%s AND %s='%s' LIMIT 1",
+                       $sql = substr($sql, 0, -1) . sprintf(" WHERE `%s`=%s AND `%s`='%s' LIMIT 1",
                                $idColumn,
                                bigintval($id),
                                $statusColumn,
@@ -1298,5 +1297,17 @@ function setAdminMenuHasEntries ($action, $hasEntries) {
        $GLOBALS['admin_menu_has_entries'][$action] = (bool) $hasEntries;
 }
 
+// Creates a link to the user's admin-profile
+function ADMIN_CREATE_USERID_LINK ($uid) {
+       // Is the userid set correctly?
+       if ($uid > 0) {
+               // Create a link to that profile
+               return "{!URL!}/modules.php?module=admin&amp;what=list_user&amp;uid=".bigintval($uid);
+       } // END - if
+
+       // Return a link to the user list
+       return "{!URL!}/modules.php?module=admin&amp;what=list_user";
+}
+
 //
 ?>