X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fadmin-inc.php;h=7ab5e1283ab55aa84f147e8d87058e4efb97c780;hp=fe98128a1ecfdf694383b0bd41b77988cf1888c2;hb=7989ec603971c0dc8dc35d8be4e72f8098b83baa;hpb=3daede4c904e23905c3e48dd6749019deca0a0e0 diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php index fe98128a1e..7ab5e1283a 100644 --- a/inc/modules/admin/admin-inc.php +++ b/inc/modules/admin/admin-inc.php @@ -43,13 +43,13 @@ function REGISTER_ADMIN ($user, $md5, $email=WEBMASTER) { $ret = "already"; // Lookup the user - $result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_admins WHERE login='%s' LIMIT 1", + $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_admins` WHERE login='%s' LIMIT 1", array($user), __FILE__, __LINE__); // Is the entry there? if (SQL_NUMROWS($result) == 0) { // Ok, let's create the admin login - SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_admins (login, password, email) VALUES ('%s', '%s', '%s')", + SQL_QUERY_ESC("INSERT INTO `{!_MYSQL_PREFIX!}_admins` (login, password, email) VALUES ('%s', '%s', '%s')", array($user, $md5, $email), __FILE__, __LINE__); $ret = "done"; } // END - if @@ -83,15 +83,15 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password) { // Include more admins data? if (GET_EXT_VERSION("admins") >= "0.7.0") { // Load them here - $data['login_failtures'] = $cacheArray['admins']['login_failtures'][$aid]; - $data['last_failture'] = $cacheArray['admins']['last_failture'][$aid]; + $data['login_failures'] = $cacheArray['admins']['login_failures'][$aid]; + $data['last_failure'] = $cacheArray['admins']['last_failure'][$aid]; } // END - if } elseif (!EXT_IS_ACTIVE("cache")) { // Add extra data via filter now $ADD = RUN_FILTER('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), __FILE__, __LINE__); // Entry found? @@ -133,18 +133,18 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password) { $data['password'] = generateHash($password); // Do we have 0.7.0 of admins or later? - // Remmeber login failtures if available - if (GET_EXT_VERSION("admins") >= "0.7.0") { + // Remmeber login failures if available + if (GET_EXT_VERSION("admins") >= "0.7.2") { // Store it in session - set_session('mxchange_admin_failtures', $data['login_failtures']); - set_session('mxchange_admin_last_fail', $data['last_failture']); + set_session('mxchange_admin_failures', $data['login_failures']); + set_session('mxchange_admin_last_fail', $data['last_failure']); - // Update password and reset login failtures - SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_admins SET password='%s',login_failtures=0,last_failture='0000-00-00 00:00:00' WHERE id=%s LIMIT 1", + // Update password and reset login failures + SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admins` SET password='%s',login_failures=0,last_failure='0000-00-00 00:00:00' WHERE id=%s LIMIT 1", array($data['password'], $aid), __FILE__, __LINE__); } else { // Update password - SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_admins SET password='%s' WHERE id=%s LIMIT 1", + SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admins` SET password='%s' WHERE id=%s LIMIT 1", array($data['password'], $aid), __FILE__, __LINE__); } @@ -170,10 +170,10 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password) { } // END - if } - // Count login failture if admins extension version is 0.7.0+ + // Count login failure if admins extension version is 0.7.0+ if (($ret == "pass") && (GET_EXT_VERSION("admins") >= "0.7.0")) { // Update counter - SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_admins SET login_failtures=login_failtures+1,last_failture=NOW() WHERE id=%s LIMIT 1", + SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admins` SET login_failures=login_failures+1,last_failure=NOW() WHERE id=%s LIMIT 1", array($aid), __FILE__, __LINE__); // Rebuild cache @@ -189,10 +189,10 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password) { function LOGIN_ADMIN ($adminLogin, $passHash) { global $cacheInstance; - // Reset failture counter on matching admins version + // Reset failure counter on matching admins version if ((GET_EXT_VERSION("admins") >= "0.7.0") && ((EXT_VERSION_IS_OLDER("sql_patches", "0.3.6")) || (GET_EXT_VERSION("sql_patches") == ""))) { // Reset counter on out-dated sql_patches version - SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_admins SET login_failtures=0,last_failture='0000-00-00 00:00:00' WHERE login='%s' LIMIT 1", + SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admins` SET login_failures=0,last_failure='0000-00-00 00:00:00' WHERE login='%s' LIMIT 1", array($adminLogin), __FILE__, __LINE__); // Rebuild cache @@ -247,12 +247,12 @@ function admin_WriteData ($file, $comment, $prefix, $suffix, $DATA, $seek=0) { $tmp = $file.".tmp"; // Open the source file - $fp = @fopen($file, 'r') or OUTPUT_HTML("READ: ".$file."
"); + $fp = @fopen($file, 'r') or OUTPUT_HTML("READ: ".$file."
"); // Is the resource valid? if (is_resource($fp)) { // Open temporary file - $fp_tmp = @fopen($tmp, 'w') or OUTPUT_HTML("WRITE: ".$tmp."
"); + $fp_tmp = @fopen($tmp, 'w') or OUTPUT_HTML("WRITE: ".$tmp."
"); // Is the resource again valid? if (is_resource($fp_tmp)) { @@ -291,16 +291,16 @@ function admin_WriteData ($file, $comment, $prefix, $suffix, $DATA, $seek=0) { @unlink($tmp); define('_FATAL', false); } elseif (!$found) { - OUTPUT_HTML("CHANGE: 404!"); + OUTPUT_HTML("CHANGE: 404!"); define('_FATAL', true); } else { - OUTPUT_HTML("TMP: UNDONE!"); + OUTPUT_HTML("TMP: UNDONE!"); define('_FATAL', true); } } } else { // File not found, not readable or writeable - OUTPUT_HTML("404: ".$file."
"); + OUTPUT_HTML("404: ".$file."
"); } } @@ -343,29 +343,29 @@ function ADMIN_DO_ACTION($wht) { LOAD_TEMPLATE("admin_main_header"); // 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')) + $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')) LIMIT 1", array($act, $wht, $wht), __FILE__, __LINE__); if (SQL_NUMROWS($result_action) == 1) { // Is valid but does the inlcude file exists? - $INC = sprintf("%sinc/modules/admin/action-%s.php", PATH, $act); - if ((FILE_READABLE($INC)) && (VALIDATE_MENU_ACTION("admin", $act, $wht)) && (__ACL_ALLOW == true)) { + $INC = sprintf("inc/modules/admin/action-%s.php", $act); + if ((INCLUDE_READABLE($INC)) && (VALIDATE_MENU_ACTION("admin", $act, $wht)) && (__ACL_ALLOW == true)) { // Ok, we finally load the admin action module - include($INC); + LOAD_INC($INC); } elseif (__ACL_ALLOW == false) { // Access denied - LOAD_TEMPLATE("admin_menu_failed", false, ADMIN_ACCESS_DENIED); - addFatalMessage(ADMIN_ACCESS_DENIED); + LOAD_TEMPLATE("admin_menu_failed", false, getMessage('ADMIN_ACCESS_DENIED')); + addFatalMessage(getMessage('ADMIN_ACCESS_DENIED')); } else { // Include file not found! :-( - LOAD_TEMPLATE("admin_menu_failed", false, ADMIN_404_ACTION); - addFatalMessage(ADMIN_404_ACTION_1.$act.ADMIN_404_ACTION_2); + LOAD_TEMPLATE("admin_menu_failed", false, sprintf(getMessage('ADMIN_ACTION_404'), $act)); + addFatalMessage(getMessage('ADMIN_ACTION_404'), $act); } } else { // Invalid action/what pair found! - LOAD_TEMPLATE("admin_menu_failed", false, ADMIN_INVALID_ACTION); - addFatalMessage(ADMIN_INVALID_ACTION_1.$act."/".$wht.ADMIN_INVALID_ACTION_2); + LOAD_TEMPLATE("admin_menu_failed", false, sprintf(getMessage('ADMIN_ACTION_INVALID'), $act."/".$wht)); + addFatalMessage(getMessage('ADMIN_ACTION_INVALID'), $act."/".$wht); } // Free memory @@ -411,133 +411,127 @@ 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", __FILE__, __LINE__); - if (SQL_NUMROWS($result_main) > 0) - { - $OUT = " -\n"; - while (list($menu, $title, $descr) = SQL_FETCHROW($result_main)) - { - if ((EXT_IS_ACTIVE("admins")) && (GET_EXT_VERSION("admins") > "0.2")) - { + $result_main = SQL_QUERY("SELECT action, title, descr FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE (what='' OR `what` IS NULL) ORDER BY `sort`, id DESC", __FILE__, __LINE__); + if (SQL_NUMROWS($result_main) > 0) { + $OUT = "
 
+\n"; + while (list($menu, $title, $descr) = SQL_FETCHROW($result_main)) { + if ((EXT_IS_ACTIVE("admins")) && (GET_EXT_VERSION("admins") > "0.2")) { $ACL = ADMINS_CHECK_ACL($menu, ""); - } - else - { + } else { // ACL is "allow"... hmmm $ACL = true; } - if ($ACL) - { - if (!$SUB) - { + + if ($ACL === true) { + if (!$SUB) { // Insert compiled menu title and description $menuTitle[$menu] = $title; $menuDesription[$menu] = $descr; } - $OUT .= " - + -\n"; - $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), __FILE__, __LINE__); + $OUT .= " +\n"; + $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), __FILE__, __LINE__); if ((SQL_NUMROWS($result_what) > 0) && ($act == $menu)) { $menuDesription = array(); $menuTitle = array(); $SUB = true; - $OUT .= " - - +\n"; } - $OUT .= "\n"; + $OUT .= "\n"; } } // Free memory SQL_FREERESULT($result_main); - $OUT .= "
 
-  · "; + $OUT .= "
+  · "; if (($menu == $act) && (empty($wht))) { - $OUT .= ""; + $OUT .= ""; } else { - $OUT .= "["; + $OUT .= "["; } $OUT .= $title; if (($menu == $act) && (empty($wht))) { - $OUT .= ""; + $OUT .= ""; } else { - $OUT .= "]"; + $OUT .= "]"; } - $OUT .= "
  - \n"; + $OUT .= " + + -\n"; + $OUT .= "
  + \n"; while (list($wht_sub, $title_what, $desc_what) = SQL_FETCHROW($result_what)) { // Filename - $INC = sprintf("%sinc/modules/admin/what-%s.php", PATH, $wht_sub); + $INC = sprintf("%sinc/modules/admin/what-%s.php", constant('PATH'), $wht_sub); if ((EXT_IS_ACTIVE("admins")) && (GET_EXT_VERSION("admins") > "0.2")) { $ACL = ADMINS_CHECK_ACL("", $wht_sub); } else { // ACL is "allow"... hmmm $ACL = true; } - $readable = FILE_READABLE($INC); - if ($ACL) { + $readable = INCLUDE_READABLE($INC); + if ($ACL === true) { // Insert compiled title and description $menuTitle[$wht_sub] = $title_what; $menuDesription[$wht_sub] = $desc_what; - $OUT .= " - + -\n"; + $OUT .= " +\n"; } } // Free memory SQL_FREERESULT($result_what); - $OUT .= "
-  --> "; - if ($readable) + $OUT .= "
+  --> "; + if ($readable === true) { if ($wht == $wht_sub) { - $OUT .= ""; + $OUT .= ""; } else { - $OUT .= "["; + $OUT .= "["; } } else { - $OUT .= ""; + $OUT .= ""; } $OUT .= $title_what; - if ($readable) + if ($readable === true) { if ($wht == $wht_sub) { - $OUT .= ""; + $OUT .= ""; } else { - $OUT .= "]"; + $OUT .= "]"; } } else { - $OUT .= ""; + $OUT .= ""; } - $OUT .= "
-
+
\n"; + $OUT .= "\n"; } // Compile and run the code here. This inserts all constants into the // HTML output. Costs me some time to figure this out... *sigh* Quix0r - $eval = "\$OUT = \"".COMPILE_CODE(addslashes($OUT))."\";"; + $eval = "\$OUT = \"".COMPILE_CODE(SQL_ESCAPE($OUT))."\";"; eval($eval); // Is there a cache instance again? @@ -570,17 +564,17 @@ function ADD_ADMIN_MENU($act, $wht, $return=false) { function ADD_MEMBER_SELECTION_BOX ($def="0", $add_all=false, $return=false, $none=false, $field="userid") { // Output selection form with all confirmed user accounts listed - $result = SQL_QUERY("SELECT userid, surname, family FROM `"._MYSQL_PREFIX."_user_data` ORDER BY userid", __FILE__, __LINE__); + $result = SQL_QUERY("SELECT userid, surname, family FROM `{!_MYSQL_PREFIX!}_user_data` ORDER BY userid", __FILE__, __LINE__); $OUT = ""; // USe this only for adding points (e.g. adding refs really makes no sence ;-) ) - if ($add_all) $OUT = " \n"; - elseif ($none) $OUT = " \n"; + if ($add_all) $OUT = " \n"; + elseif ($none) $OUT = " \n"; while (list($id, $sname, $fname) = SQL_FETCHROW($result)) { - $OUT .= " \n"; } // Free memory @@ -602,25 +596,25 @@ function ADD_MEMBER_SELECTION_BOX ($def="0", $add_all=false, $return=false, $non } // function ADMIN_MENU_SELECTION($MODE, $default="", $defid="") { - $wht = "what != ''"; - 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", + $wht = "`what` != ''"; + 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), __FILE__, __LINE__); if (SQL_NUMROWS($result) > 0) { // Load menu as selection - $OUT = "\n"; + $OUT .= "\n"; } else { // No menus??? $OUT = ADMIN_PROBLEM_NO_MENU; @@ -632,7 +626,7 @@ function ADMIN_MENU_SELECTION($MODE, $default="", $defid="") { // Save settings to the database function ADMIN_SAVE_SETTINGS (&$POST, $tableName="_config", $whereStatement="config=0", $translateComma=array(), $alwaysAdd=false) { - global $_CONFIG, $cacheArray, $cacheInstance; + global $cacheArray, $cacheInstance; // Prepare all arrays, variables $DATA = array(); @@ -667,7 +661,7 @@ function ADMIN_SAVE_SETTINGS (&$POST, $tableName="_config", $whereStatement="con } // Update current configuration - $_CONFIG[$id] = $val; + setConfigEntry($id, $val); } // END - if } // END - if } // END - foreach @@ -676,9 +670,9 @@ function ADMIN_SAVE_SETTINGS (&$POST, $tableName="_config", $whereStatement="con $result = false; if (!$alwaysAdd) { if (!empty($whereStatement)) { - $result = SQL_QUERY("SELECT * FROM `"._MYSQL_PREFIX.$tableName."` WHERE ".$whereStatement." LIMIT 1", __FILE__, __LINE__); + $result = SQL_QUERY("SELECT * FROM `{!_MYSQL_PREFIX!}".$tableName."` WHERE ".$whereStatement." LIMIT 1", __FILE__, __LINE__); } else { - $result = SQL_QUERY("SELECT * FROM `"._MYSQL_PREFIX.$tableName."` LIMIT 1", __FILE__, __LINE__); + $result = SQL_QUERY("SELECT * FROM `{!_MYSQL_PREFIX!}".$tableName."` LIMIT 1", __FILE__, __LINE__); } } // END - if @@ -687,7 +681,7 @@ function ADMIN_SAVE_SETTINGS (&$POST, $tableName="_config", $whereStatement="con $DATA_UPDATE = implode(", ", $DATA); // Generate SQL string - $SQL = sprintf("UPDATE `"._MYSQL_PREFIX."%s` SET %s WHERE %s LIMIT 1", + $SQL = sprintf("UPDATE `{!_MYSQL_PREFIX!}%s` SET %s WHERE %s LIMIT 1", $tableName, $DATA_UPDATE, $whereStatement @@ -706,7 +700,7 @@ function ADMIN_SAVE_SETTINGS (&$POST, $tableName="_config", $whereStatement="con $VALUEs = implode(", ", $VALUEs); // Generate SQL string - $SQL = sprintf("INSERT INTO "._MYSQL_PREFIX."%s (%s) VALUES (%s)", + $SQL = sprintf("INSERT INTO {!_MYSQL_PREFIX!}%s (%s) VALUES (%s)", $tableName, $KEYs, $VALUEs @@ -723,13 +717,13 @@ function ADMIN_SAVE_SETTINGS (&$POST, $tableName="_config", $whereStatement="con REBUILD_CACHE("config", "config"); // Settings saved - LOAD_TEMPLATE("admin_settings_saved", false, SETTINGS_SAVED); + LOAD_TEMPLATE("admin_settings_saved", false, getMessage('SETTINGS_SAVED')); } // Generate a selection box function ADMIN_MAKE_MENU_SELECTION ($menu, $type, $name, $default="") { // Open the requested menu directory - $handle = opendir(sprintf("%sinc/modules/%s/", PATH, $menu)) or mxchange_die("Cannot load menu ".$menu."!"); + $handle = opendir(sprintf("%sinc/modules/%s/", constant('PATH'), $menu)) or mxchange_die("Cannot load menu ".$menu."!"); // Init the selection box $OUT = "