X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fadmin-inc.php;h=f0aff19e6aae954eef2d6e6ef8e1995794ab4d95;hp=54817b580cc4c8d609a0b606159509f58ff7d861;hb=b29dab42eab7c64ca1945eb70fa7713f8898f6ae;hpb=414570c5081d337bb6c28dcf521bd8bca02f69e7 diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php index 54817b580c..f0aff19e6a 100644 --- a/inc/modules/admin/admin-inc.php +++ b/inc/modules/admin/admin-inc.php @@ -10,10 +10,10 @@ * -------------------------------------------------------------------- * * Kurzbeschreibung : Fuer die Administration benoetigte Funktionen * * -------------------------------------------------------------------- * - * $Revision:: 856 $ * - * $Date:: 2009-03-06 20:24:32 +0100 (Fr, 06. Mär 2009) $ * + * $Revision:: $ * + * $Date:: $ * * $Tag:: 0.2.1-FINAL $ * - * $Author:: stelzi $ * + * $Author:: $ * * Needs to be in all Files and every File needs "svn propset * * svn:keywords Date Revision" (autoprobset!) at least!!!!!! * * -------------------------------------------------------------------- * @@ -85,17 +85,17 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password) { incrementConfigEntry('cache_hits'); // Include more admins data? - if (GET_EXT_VERSION("admins") >= "0.7.0") { + if (GET_EXT_VERSION("admins") >= "0.7.2") { // Load them here $data['login_failures'] = $GLOBALS['cache_array']['admins']['login_failures'][$aid]; $data['last_failure'] = $GLOBALS['cache_array']['admins']['last_failure'][$aid]; } // 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 = "\n"; @@ -357,7 +357,8 @@ function ADD_ADMIN_MENU ($act, $wht, $return=false) { } $OUT .= " + + $OUT .= "\n"; + + // Check for menu entries $result_what = SQL_QUERY_ESC("SELECT what, title, descr FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE `action`='%s' AND `what` != '' AND `what` IS NOT NULL ORDER BY `sort`, id DESC", array($menu), __FUNCTION__, __LINE__); - if ((SQL_NUMROWS($result_what) > 0) && ($act == $menu)) - { + + // Remember the count for later checks + setAdminMenuHasEntries($menu, ((SQL_NUMROWS($result_what) > 0) && ($act == $menu))); + + // Do we have entries? + if ((ifAdminMenuHasEntries($menu)) && (SQL_NUMROWS($result_what) > 0)) { $GLOBALS['menu']['description'] = array(); $GLOBALS['menu']['title'] = array(); $SUB = true; $OUT .= " @@ -404,7 +412,7 @@ function ADD_ADMIN_MENU ($act, $wht, $return=false) { $GLOBALS['menu']['description'][$wht_sub] = $desc_what; $OUT .= " + $OUT .= "\n"; } } @@ -437,6 +445,7 @@ function ADD_ADMIN_MENU ($act, $wht, $return=false) { \n"; } + $OUT .= "\n"; } } @@ -513,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) { @@ -647,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 = "\n"; // Return contents return $OUT; } -// + +// Creates a user-profile link for the admin. This function can also be used for many other purposes function ADMIN_USER_PROFILE_LINK ($uid, $title="", $wht="list_user") { if (($title == "") && ($title != "0")) { // Set userid as title @@ -914,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 @@ -937,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, @@ -1215,6 +1224,7 @@ function ADMIN_VALIDATE_RESET_LINK_HASH_LOGIN ($hash, $login) { // Return result return $valid; } + // Reset the password for the login. Do NOT call this function without calling above function first! function ADMIN_RESET_PASSWORD ($login, $password) { // Init hash @@ -1239,21 +1249,65 @@ function ADMIN_RESET_PASSWORD ($login, $password) { // Return output return ADMIN_PASSWORD_RESET_DONE; } + // Solves a task by given id number function ADMIN_SOLVE_TASK ($id) { // Update the task data ADMIN_UPDATE_TASK_DATA($id, "status", "SOLVED"); } + // Marks a given task as deleted function ADMIN_DELETE_TASK ($id) { // Update the task data ADMIN_UPDATE_TASK_DATA($id, "status", "DELETED"); } + // Function to update task data function ADMIN_UPDATE_TASK_DATA ($id, $row, $data) { + // Is the id not set, then we need a backtrace here... :( + if ($id <= 0) { + // Initiate backtrace + debug_report_bug(sprintf("id is invalid: %s. row=%s, data=%s", + $id, + $row, + $data + )); + } // END - if + // Update the task SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_task_system` SET %s='%s' WHERE id=%s LIMIT 1", array($row, $data, bigintval($id)), __FUNCTION__, __LINE__); } + +// Checks wether if the admin menu has entries +function ifAdminMenuHasEntries ($action) { + return ( + (( + isset($GLOBALS['admin_menu_has_entries'][$action]) + ) && ( + $GLOBALS['admin_menu_has_entries'][$action] === true + )) || ( + $action == "login" + ) + ); +} + +// Setter for 'admin_menu_has_entries' +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&what=list_user&uid=".bigintval($uid); + } // END - if + + // Return a link to the user list + return "{!URL!}/modules.php?module=admin&what=list_user"; +} + // ?>
 
-  · "; +
 · "; + if (($menu == $act) && (empty($wht))) { $OUT .= ""; } else { @@ -371,12 +372,19 @@ function ADD_ADMIN_MENU ($act, $wht, $return=false) { } else { $OUT .= "]"; } - $OUT .= "
-  --> "; +
 --> "; if ($readable === true) { if ($wht == $wht_sub) { $OUT .= ""; @@ -426,7 +434,7 @@ function ADD_ADMIN_MENU ($act, $wht, $return=false) { } else { $OUT .= ""; } - $OUT .= "