X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fadmin-inc.php;h=ab634e0ca872dfad7789785751e57988d764b735;hp=4d11ed13fe65819b2ce304461a28c9b83fd5f624;hb=e01fcf1ca8ddeb72af76465df3ef72301a1cdae7;hpb=c5e685ff1b1bd296243b9bfcd8921969fa09d53f diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php index 4d11ed13fe..ab634e0ca8 100644 --- a/inc/modules/admin/admin-inc.php +++ b/inc/modules/admin/admin-inc.php @@ -10,7 +10,12 @@ * -------------------------------------------------------------------- * * Kurzbeschreibung : Fuer die Administration benoetigte Funktionen * * -------------------------------------------------------------------- * - * * + * $Revision:: 856 $ * + * $Date:: 2009-03-06 20:24:32 +0100 (Fr, 06. March 2009) $ * + * $Tag:: 0.2.1-FINAL $ * + * $Author:: stelzi $ * + * Needs to be in all Files and every File needs "svn propset * + * svn:keywords Date Revision" (autoprobset!) at least!!!!!! * * -------------------------------------------------------------------- * * Copyright (c) 2003 - 2008 by Roland Haeder * * For more information visit: http://www.mxchange.org * @@ -38,19 +43,19 @@ if (!defined('__SECURITY')) { } // Register an administrator account -function REGISTER_ADMIN ($user, $md5, $email=WEBMASTER) { +function REGISTER_ADMIN ($user, $md5, $email) { // Login does already exist $ret = "already"; - // Lookup the user + // Lookup the admin $result = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_admins` WHERE login='%s' LIMIT 1", - array($user), __FILE__, __LINE__); + array($user), __FUNCTION__, __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')", - array($user, $md5, $email), __FILE__, __LINE__); + array($user, $md5, $email), __FUNCTION__, __LINE__); $ret = "done"; } // END - if @@ -60,10 +65,9 @@ function REGISTER_ADMIN ($user, $md5, $email=WEBMASTER) { // Return result return $ret; } + // Only be executed on login procedure! function CHECK_ADMIN_LOGIN ($admin_login, $password) { - global $cacheArray, $cacheInstance; - // By default no admin is found $ret = "404"; @@ -74,25 +78,25 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password) { $data = array('aid' => $aid); // Is the cache valid? - if (isset($cacheArray['admins']['password'][$aid])) { + if (isset($GLOBALS['cache_array']['admins']['password'][$aid])) { // Get password from cache - $data['password'] = $cacheArray['admins']['password'][$aid]; + $data['password'] = $GLOBALS['cache_array']['admins']['password'][$aid]; $ret = "pass"; incrementConfigEntry('cache_hits'); // Include more admins data? if (GET_EXT_VERSION("admins") >= "0.7.0") { // Load them here - $data['login_failures'] = $cacheArray['admins']['login_failures'][$aid]; - $data['last_failure'] = $cacheArray['admins']['last_failure'][$aid]; + $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 = RUN_FILTER('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", - array($aid), __FILE__, __LINE__); + array($aid), __FUNCTION__, __LINE__); // Entry found? if (SQL_NUMROWS($result) == 1) { @@ -141,15 +145,15 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password) { // 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__); + array($data['password'], $aid), __FUNCTION__, __LINE__); } else { // Update password SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admins` SET password='%s' WHERE id=%s LIMIT 1", - array($data['password'], $aid), __FILE__, __LINE__); + array($data['password'], $aid), __FUNCTION__, __LINE__); } // Rebuild cache - REBUILD_CACHE("admins", "admin"); + rebuildCacheFiles("admins", "admin"); // Login has failed by default... ;-) $ret = "failed"; @@ -174,10 +178,10 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password) { if (($ret == "pass") && (GET_EXT_VERSION("admins") >= "0.7.0")) { // Update counter 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__); + array($aid), __FUNCTION__, __LINE__); // Rebuild cache - REBUILD_CACHE("admins", "admin"); + rebuildCacheFiles("admins", "admin"); } // END - if // Return the result @@ -187,16 +191,14 @@ function CHECK_ADMIN_LOGIN ($admin_login, $password) { // Try to login the admin by setting some session/cookie variables function LOGIN_ADMIN ($adminLogin, $passHash) { - global $cacheInstance; - // 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_failures=0,last_failure='0000-00-00 00:00:00' WHERE login='%s' LIMIT 1", - array($adminLogin), __FILE__, __LINE__); + array($adminLogin), __FUNCTION__, __LINE__); // Rebuild cache - REBUILD_CACHE("admins", "admin"); + rebuildCacheFiles("admins", "admin"); } // END - if // Now set all session variables and return the result @@ -208,14 +210,14 @@ function LOGIN_ADMIN ($adminLogin, $passHash) { ) && ( set_session('admin_last', time()) ) && ( - set_session('admin_to', bigintval($_POST['timeout'])) + set_session('admin_to', bigintval(REQUEST_POST('timeout'))) ) ); } // Only be executed on cookie checking function CHECK_ADMIN_COOKIES ($admin_login, $password) { - global $cacheArray; + // By default no admin cookies are found $ret = "404"; $pass = ""; // Get hash @@ -233,86 +235,11 @@ function CHECK_ADMIN_COOKIES ($admin_login, $password) { // Return result return $ret; } -// -function admin_WriteData ($file, $comment, $prefix, $suffix, $DATA, $seek=0) { - // Initialize some variables - $done = false; - $seek++; - $next=-1; - $found = false; - - // Is the file there and read-/write-able? - if ((FILE_READABLE($file)) && (is_writeable($file))) { - $search = "CFG: ".$comment; - $tmp = $file.".tmp"; - - // Open the source 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."
"); - - // Is the resource again valid? - if (is_resource($fp_tmp)) { - while (!feof($fp)) { - // Read from source file - $line = fgets ($fp, 1024); - - if (strpos($line, $search) > -1) { $next = 0; $found = true; } - - if ($next > -1) { - if ($next === $seek) { - $next = -1; - $line = $prefix . $DATA . $suffix."\n"; - } else { - $next++; - } - } - - // Write to temp file - fputs($fp_tmp, $line); - } - - // Close temp file - fclose($fp_tmp); - - // Finished writing tmp file - $done = true; - } - - // Close source file - fclose($fp); - - if (($done) && ($found)) { - // Copy back tmp file and delete tmp :-) - @copy($tmp, $file); - @unlink($tmp); - define('_FATAL', false); - } elseif (!$found) { - OUTPUT_HTML("CHANGE: 404!"); - define('_FATAL', true); - } else { - OUTPUT_HTML("TMP: UNDONE!"); - define('_FATAL', true); - } - } - } else { - // File not found, not readable or writeable - OUTPUT_HTML("404: ".$file."
"); - } -} // -function ADMIN_DO_ACTION($wht) { - global $menuDesription, $menuTitle, $cacheArray, $DATA; - +function ADMIN_DO_ACTION ($wht) { + global $DATA; //* DEBUG: */ echo __LINE__."*".$wht."/".$GLOBALS['module']."/".$GLOBALS['action']."/".$GLOBALS['what']."*
\n"; - if (EXT_IS_ACTIVE("cache")) { - // Include cache instance - global $cacheInstance; - } // Remove any spaces from variable if (empty($wht)) { @@ -345,27 +272,26 @@ 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')) -LIMIT 1", array($act, $wht, $wht), __FILE__, __LINE__); +LIMIT 1", array($act, $wht, $wht), __FUNCTION__, __LINE__); if (SQL_NUMROWS($result_action) == 1) { - // Is valid but does the inlcude file exists? $INC = sprintf("inc/modules/admin/action-%s.php", $act); - if ((FILE_READABLE($INC)) && (VALIDATE_MENU_ACTION("admin", $act, $wht)) && (__ACL_ALLOW == true)) { + if ((INCLUDE_READABLE($INC)) && (VALIDATE_MENU_ACTION("admin", $act, $wht)) && ($GLOBALS['acl_allow'] === true)) { // Ok, we finally load the admin action module LOAD_INC($INC); - } elseif (__ACL_ALLOW == false) { + } elseif ($GLOBALS['acl_allow'] === false) { // Access denied LOAD_TEMPLATE("admin_menu_failed", false, getMessage('ADMIN_ACCESS_DENIED')); - addFatalMessage(getMessage('ADMIN_ACCESS_DENIED')); + addFatalMessage(__FUNCTION__, __LINE__, getMessage('ADMIN_ACCESS_DENIED')); } else { // Include file not found! :-( LOAD_TEMPLATE("admin_menu_failed", false, sprintf(getMessage('ADMIN_ACTION_404'), $act)); - addFatalMessage(getMessage('ADMIN_ACTION_404'), $act); + addFatalMessage(__FUNCTION__, __LINE__, getMessage('ADMIN_ACTION_404'), $act); } } else { // Invalid action/what pair found! LOAD_TEMPLATE("admin_menu_failed", false, sprintf(getMessage('ADMIN_ACTION_INVALID'), $act."/".$wht)); - addFatalMessage(getMessage('ADMIN_ACTION_INVALID'), $act."/".$wht); + addFatalMessage(__FUNCTION__, __LINE__, getMessage('ADMIN_ACTION_INVALID'), $act."/".$wht); } // Free memory @@ -374,35 +300,34 @@ LIMIT 1", array($act, $wht, $wht), __FILE__, __LINE__); // Tableset footer LOAD_TEMPLATE("admin_main_footer"); } -// -function ADD_ADMIN_MENU($act, $wht, $return=false) { - global $menuDesription, $menuTitle, $cacheInstance; +// +function ADD_ADMIN_MENU ($act, $wht, $return=false) { // Init variables $SUB = false; $OUT = ""; // Menu descriptions - $menuDesription = array(); - $menuTitle = array(); + $GLOBALS['menu']['description'] = array(); + $GLOBALS['menu']['title'] = array(); // Is there a cache instance? - if ((is_object($cacheInstance)) && (getConfig('cache_admin_menu') == "Y")) { + if ((isCacheInstanceValid()) && (getConfig('cache_admin_menu') == "Y")) { // Create cache name $cacheName = "admin_".$act."_".$wht."_".GET_LANGUAGE()."_".strtolower(get_session('admin_login')); // Is that cache there? - if ($cacheInstance->loadCacheFile($cacheName)) { + if ($GLOBALS['cache_instance']->loadCacheFile($cacheName)) { // Then load it - $data = $cacheInstance->getArrayFromCache(); + $data = $GLOBALS['cache_instance']->getArrayFromCache(); // Extract all parts $OUT = base64_decode($data['output'][0]); - $menuTitle = unserialize(base64_decode($data['title'][0])); - $menuDescription = unserialize(base64_decode($data['descr'][0])); + $GLOBALS['menu']['title'] = unserialize(base64_decode($data['title'][0])); + $GLOBALS['menu']['description'] = unserialize(base64_decode($data['descr'][0])); // Return or output content? - if ($return) { + if ($return === true) { return $OUT; } else { OUTPUT_HTML($OUT); @@ -411,111 +336,97 @@ 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) - { + $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"; - while (list($menu, $title, $descr) = SQL_FETCHROW($result_main)) - { - if ((EXT_IS_ACTIVE("admins")) && (GET_EXT_VERSION("admins") > "0.2")) - { + // @TODO Rewrite this to $content = SQL_FETCHARRAY() + 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; + $GLOBALS['menu']['title'][$menu] = $title; + $GLOBALS['menu']['description'][$menu] = $descr; } $OUT .= " + $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__); + array($menu), __FUNCTION__, __LINE__); if ((SQL_NUMROWS($result_what) > 0) && ($act == $menu)) { - $menuDesription = array(); - $menuTitle = array(); $SUB = true; + $GLOBALS['menu']['description'] = array(); + $GLOBALS['menu']['title'] = array(); $SUB = true; $OUT .= "
 
-  · "; - if (($menu == $act) && (empty($wht))) - { +  · "; + if (($menu == $act) && (empty($wht))) { $OUT .= ""; - } - else - { + } else { $OUT .= "["; } + $OUT .= $title; - if (($menu == $act) && (empty($wht))) - { + + if (($menu == $act) && (empty($wht))) { $OUT .= ""; - } - else - { + } else { $OUT .= "]"; } - $OUT .= "
  \n"; + // @TODO Rewrite this to $content = SQL_FETCHARRAY() while (list($wht_sub, $title_what, $desc_what) = SQL_FETCHROW($result_what)) { // Filename - $INC = sprintf("%sinc/modules/admin/what-%s.php", constant('PATH'), $wht_sub); + $INC = sprintf("inc/modules/admin/what-%s.php", $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) { + + // Is the file readable? + $readable = INCLUDE_READABLE($INC); + + // Access allowed? + if ($ACL === true) { // Insert compiled title and description - $menuTitle[$wht_sub] = $title_what; - $menuDesription[$wht_sub] = $desc_what; + $GLOBALS['menu']['title'][$wht_sub] = $title_what; + $GLOBALS['menu']['description'][$wht_sub] = $desc_what; $OUT .= " + $OUT .= "\n"; } } @@ -535,59 +446,57 @@ function ADD_ADMIN_MENU($act, $wht, $return=false) { $OUT .= "
-  --> "; - if ($readable) - { - if ($wht == $wht_sub) - { +  --> "; + if ($readable === true) { + if ($wht == $wht_sub) { $OUT .= ""; - } - else - { + } else { $OUT .= "["; } - } - else - { + } else { $OUT .= ""; } + $OUT .= $title_what; - if ($readable) - { - if ($wht == $wht_sub) - { + + if ($readable === true) { + if ($wht == $wht_sub) { $OUT .= ""; - } - else - { + } else { $OUT .= "]"; } - } - else - { + } else { $OUT .= ""; } - $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($eval); - // Is there a cache instance again? - if ((is_object($cacheInstance)) && (getConfig('cache_admin_menu') == "Y")) { + if ((isCacheInstanceValid()) && (getConfig('cache_admin_menu') == "Y")) { // Init cache - $cacheInstance->init($cacheName); + $GLOBALS['cache_instance']->init($cacheName); // Prepare cache data $data = array( 'output' => base64_encode($OUT), - 'title' => $menuTitle, - 'descr' => $menuDesription + 'title' => $GLOBALS['menu']['title'], + 'descr' => $GLOBALS['menu']['description'] ); // Write the data away - $cacheInstance->addRow($data); + $GLOBALS['cache_instance']->addRow($data); // Close cache - $cacheInstance->finalize(); + $GLOBALS['cache_instance']->finalize(); } // END - if // Return or output content? - if ($return) { + if ($return === true) { return $OUT; } else { OUTPUT_HTML($OUT); } } -// -function ADD_MEMBER_SELECTION_BOX ($def="0", $add_all=false, $return=false, $none=false, $field="userid") -{ + +// Create member selection box +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", __FUNCTION__, __LINE__); + + // Default output $OUT = ""; // USe this only for adding points (e.g. adding refs really makes no sence ;-) ) - if ($add_all) $OUT = " \n"; - elseif ($none) $OUT = " \n"; - while (list($id, $sname, $fname) = SQL_FETCHROW($result)) - { - $OUT .= " \n"; + elseif ($none === true) $OUT = " \n"; + + while ($content = SQL_FETCHARRAY($result)) { + $OUT .= " \n"; // Walk through all files while ($file = readdir($handle)) { @@ -778,13 +697,11 @@ function ADMIN_USER_PROFILE_LINK ($uid, $title="", $wht="list_user") { //* DEBUG: */ echo "a:".$title."
"; // Return link - return "".$title.""; + return "".$title.""; } // Check "logical-area-mode" function ADMIN_CHECK_MENU_MODE () { - global $cacheArray; - // Set the global mode as the mode for all admins $MODE = getConfig('admin_menu'); $ADMIN = $MODE; @@ -793,14 +710,14 @@ function ADMIN_CHECK_MENU_MODE () { $aid = GET_CURRENT_ADMIN_ID(); // Check individual settings of current admin - if (isset($cacheArray['admins']['la_mode'][$aid])) { + if (isset($GLOBALS['cache_array']['admins']['la_mode'][$aid])) { // Load from cache - $ADMIN = $cacheArray['admins']['la_mode'][$aid]; + $ADMIN = $GLOBALS['cache_array']['admins']['la_mode'][$aid]; incrementConfigEntry('cache_hits'); } elseif (GET_EXT_VERSION("admins") >= "0.6.7") { // Load from database when version of "admins" is enough $result = SQL_QUERY_ESC("SELECT la_mode FROM `{!_MYSQL_PREFIX!}_admins` WHERE id=%s LIMIT 1", - array($aid), __FILE__, __LINE__); + array($aid), __FUNCTION__, __LINE__); if (SQL_NUMROWS($result) == 1) { // Load data list($ADMIN) = SQL_FETCHROW($result); @@ -830,7 +747,7 @@ function ADMIN_CHANGE_ACTIVATION_STATUS ($IDs, $table, $row, $idRow = "id") { if (!empty($selected)) { // Determine new status $result = SQL_QUERY_ESC("SELECT %s FROM `{!_MYSQL_PREFIX!}_%s` WHERE %s=%s LIMIT 1", - array($row, $table, $idRow, $id), __FILE__, __LINE__); + array($row, $table, $idRow, $id), __FUNCTION__, __LINE__); // Row found? if (SQL_NUMROWS($result) == 1) { @@ -842,7 +759,7 @@ function ADMIN_CHANGE_ACTIVATION_STATUS ($IDs, $table, $row, $idRow = "id") { // Change this status SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_%s` SET %s='%s' WHERE %s=%s LIMIT 1", - array($table, $row, $newStatus, $idRow, $id), __FILE__, __LINE__); + array($table, $row, $newStatus, $idRow, $id), __FUNCTION__, __LINE__); // Count up affected rows $cnt += SQL_AFFECTEDROWS(); @@ -854,7 +771,7 @@ function ADMIN_CHANGE_ACTIVATION_STATUS ($IDs, $table, $row, $idRow = "id") { } // END - foreach // Output status - LOAD_TEMPLATE("admin_settings_saved", false, ADMIN_STATUS_CHANGED_1.$cnt.ADMIN_STATUS_CHANGED_2.count($IDs).ADMIN_STATUS_CHANGED_3); + LOAD_TEMPLATE("admin_settings_saved", false, sprintf(getMessage('ADMIN_STATUS_CHANGED'), $cnt, count($IDs))); } else { // Nothing selected! LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_NOTHING_SELECTED_CHANGE')); @@ -873,9 +790,9 @@ function ADMIN_SEND_BUILD_MAILS ($mode, $table, $content, $id, $subjectPart="") } // END - if // Is the raw userid set? - if ($_POST['uid_raw'][$id] > 0) { + if (REQUEST_POST('uid_raw', $id) > 0) { // Generate subject - $subjectLine = constant('MEMBER_'.strtoupper($subject).'_'.strtoupper($table).'_SUBJECT'); + $subjectLine = getMessage('MEMBER_'.strtoupper($subject).'_'.strtoupper($table).'_SUBJECT'); // Load email template if (!empty($subjectPart)) { @@ -885,17 +802,17 @@ function ADMIN_SEND_BUILD_MAILS ($mode, $table, $content, $id, $subjectPart="") } // Send email out - SEND_EMAIL($_POST['uid_raw'][$id], $subjectLine, $mail); + SEND_EMAIL(REQUEST_POST('uid_raw', $id), $subjectLine, $mail); } // END - if // Generate subject - $subjectLine = constant('ADMIN_'.strtoupper($subject).'_'.strtoupper($table).'_SUBJECT'); + $subjectLine = getMessage('ADMIN_'.strtoupper($subject).'_'.strtoupper($table).'_SUBJECT'); // Send admin notification out if (!empty($subjectPart)) { - SEND_ADMIN_NOTIFICATION($subjectLine, "admin_".$mode."_".strtolower($subjectPart)."_".$table, $content, $_POST['uid_raw'][$id]); + SEND_ADMIN_NOTIFICATION($subjectLine, "admin_".$mode."_".strtolower($subjectPart)."_".$table, $content, REQUEST_POST('uid_raw', $id)); } else { - SEND_ADMIN_NOTIFICATION($subjectLine, "admin_".$mode."_".$table, $content, $_POST['uid_raw'][$id]); + SEND_ADMIN_NOTIFICATION($subjectLine, "admin_".$mode."_".$table, $content, REQUEST_POST('uid_raw', $id)); } } @@ -909,7 +826,7 @@ function ADMIN_BUILD_LIST ($listType, $IDs, $table, $columns, $filterFunctions, $id = bigintval($id); // Get result from a given column array and table name - $result = SQL_RESULT_FROM_ARRAY($table, $columns, $idColumn, $id, __FILE__, __LINE__); + $result = SQL_RESULT_FROM_ARRAY($table, $columns, $idColumn, $id, __FUNCTION__, __LINE__); // Is there one entry? if (SQL_NUMROWS($result) == 1) { @@ -964,13 +881,13 @@ function ADMIN_BUILD_STATUS_HANDLER ($mode, $IDs, $table, $columns, $filterFunct // "Walk" through all entries foreach ($IDs as $id => $sel) { // Construct SQL query - $SQL = sprintf("UPDATE `{!_MYSQL_PREFIX!}_%s` SET", + $sql = sprintf("UPDATE `{!_MYSQL_PREFIX!}_%s` SET", SQL_ESCAPE($table) ); // Load data of entry $result = SQL_QUERY_ESC("SELECT * FROM `{!_MYSQL_PREFIX!}_%s` WHERE %s=%s LIMIT 1", - array($table, $idColumn, $id), __FILE__, __LINE__); + array($table, $idColumn, $id), __FUNCTION__, __LINE__); // Fetch the data $content = SQL_FETCHARRAY($result); @@ -986,7 +903,7 @@ function ADMIN_BUILD_STATUS_HANDLER ($mode, $IDs, $table, $columns, $filterFunct // Does the entry exist? if ((isset($content[$column])) && (isset($statusInfo[$content[$column]]))) { // Add these entries for update - $SQL .= sprintf(" %s='%s',", SQL_ESCAPE($column), SQL_ESCAPE($statusInfo[$content[$column]])); + $sql .= sprintf(" %s='%s',", SQL_ESCAPE($column), SQL_ESCAPE($statusInfo[$content[$column]])); // Remember status if ($statusColumn == "unknown") { @@ -1002,16 +919,16 @@ function ADMIN_BUILD_STATUS_HANDLER ($mode, $IDs, $table, $columns, $filterFunct } // END - foreach // Add other columns as well - foreach ($_POST as $key => $entries) { + foreach (REQUEST_POST_ARRAY() as $key => $entries) { // Skip id, raw userid and 'do_$mode' if (!in_array($key, array($idColumn, 'uid_raw', ('do_'.$mode)))) { // Are there brackets () at the end? if (substr($entries[$id], -2, 2) == "()") { // Direct SQL command found - $SQL .= sprintf(" %s=%s,", SQL_ESCAPE($key), SQL_ESCAPE($entries[$id])); + $sql .= sprintf(" %s=%s,", SQL_ESCAPE($key), SQL_ESCAPE($entries[$id])); } else { // Add regular entry - $SQL .= sprintf(" %s='%s',", SQL_ESCAPE($key), SQL_ESCAPE($entries[$id])); + $sql .= sprintf(" %s='%s',", SQL_ESCAPE($key), SQL_ESCAPE($entries[$id])); // Add entry $content[$key] = $entries[$id]; @@ -1020,7 +937,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, @@ -1028,7 +945,7 @@ function ADMIN_BUILD_STATUS_HANDLER ($mode, $IDs, $table, $columns, $filterFunct ); // Run the SQL - SQL_QUERY($SQL, __FILE__, __LINE__); + SQL_QUERY($sql, __FUNCTION__, __LINE__); // Do we have an URL? if (isset($content['url'])) { @@ -1049,16 +966,16 @@ function ADMIN_DELETE_ENTRIES_CONFIRM ($IDs, $table, $columns=array(), $filterFu // Shall we delete here or list for deletion? if ($deleteNow) { // The base SQL command: - $SQL = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_%s` WHERE %s IN (%s)"; + $sql = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_%s` WHERE %s IN (%s)"; // Delete them all $idList = ""; foreach ($IDs as $id => $sel) { // Is there a userid? - if (isset($_POST['uid_raw'][$id])) { + if (REQUEST_ISSET_POST('uid_raw', $id)) { // Load all data from that id $result = SQL_QUERY_ESC("SELECT * FROM `{!_MYSQL_PREFIX!}_%s` WHERE %s=%s LIMIT 1", - array($table, $idColumn, $id), __FILE__, __LINE__); + array($table, $idColumn, $id), __FUNCTION__, __LINE__); // Fetch the data $content = SQL_FETCHARRAY($result); @@ -1075,7 +992,7 @@ function ADMIN_DELETE_ENTRIES_CONFIRM ($IDs, $table, $columns=array(), $filterFu } // END - foreach // Run the query - SQL_QUERY($SQL, array($table, $idColumn, substr($idList, 0, -1)), __FILE__, __LINE__); + SQL_QUERY($sql, array($table, $idColumn, substr($idList, 0, -1)), __FUNCTION__, __LINE__); // Was this fine? if (SQL_AFFECTEDROWS() == count($IDs)) { @@ -1083,7 +1000,7 @@ function ADMIN_DELETE_ENTRIES_CONFIRM ($IDs, $table, $columns=array(), $filterFu LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_ALL_ENTRIES_REMOVED')); } else { // Some are still there :( - LOAD_TEMPLATE("admin_settings_saved", false, sprintf(ADMIN_SOME_ENTRIES_NOT_DELETED, SQL_AFFECTEDROWS(), count($IDs))); + LOAD_TEMPLATE("admin_settings_saved", false, sprintf(getMessage('ADMIN_SOME_ENTRIES_NOT_DELETED'), SQL_AFFECTEDROWS(), count($IDs))); } } else { // List for deletion confirmation @@ -1105,10 +1022,10 @@ function ADMIN_EDIT_ENTRIES_CONFIRM ($IDs, $table, $columns=array(), $filterFunc $content = array(); // Prepare SQL for this row - $SQL = sprintf("UPDATE `{!_MYSQL_PREFIX!}_ SET", + $sql = sprintf("UPDATE `{!_MYSQL_PREFIX!}_ SET", SQL_ESCAPE($table) ); - foreach ($_POST as $key => $entries) { + foreach (REQUEST_POST_ARRAY() as $key => $entries) { // Skip raw userid which is always invalid if ($key == "uid_raw") { // Continue with next field @@ -1127,7 +1044,7 @@ function ADMIN_EDIT_ENTRIES_CONFIRM ($IDs, $table, $columns=array(), $filterFunc } // END - if // Then add this value - $SQL .= sprintf(" %s='%s',", + $sql .= sprintf(" %s='%s',", SQL_ESCAPE($key), SQL_ESCAPE($entries[$id]) ); @@ -1144,17 +1061,17 @@ function ADMIN_EDIT_ENTRIES_CONFIRM ($IDs, $table, $columns=array(), $filterFunc } // END - foreach // Finish SQL command - $SQL = substr($SQL, 0, -1) . " WHERE ".$idColumn."=".bigintval($id)." LIMIT 1"; + $sql = substr($sql, 0, -1) . " WHERE ".$idColumn."=".bigintval($id)." LIMIT 1"; // Run this query - SQL_QUERY($SQL, __FILE__, __LINE__); + SQL_QUERY($sql, __FUNCTION__, __LINE__); // Add affected rows $affected += SQL_AFFECTEDROWS(); // Load all data from that id $result = SQL_QUERY_ESC("SELECT * FROM `{!_MYSQL_PREFIX!}_%s` WHERE %s=%s LIMIT 1", - array($table, $idColumn, $id), __FILE__, __LINE__); + array($table, $idColumn, $id), __FUNCTION__, __LINE__); // Fetch the data global $DATA; @@ -1173,7 +1090,7 @@ function ADMIN_EDIT_ENTRIES_CONFIRM ($IDs, $table, $columns=array(), $filterFunc LOAD_TEMPLATE("admin_settings_saved", false, getMessage('ADMIN_ALL_ENTRIES_EDITED')); } else { // Some are still there :( - LOAD_TEMPLATE("admin_settings_saved", false, sprintf(ADMIN_SOME_ENTRIES_NOT_EDITED, $affected, count($IDs))); + LOAD_TEMPLATE("admin_settings_saved", false, sprintf(getMessage('ADMIN_SOME_ENTRIES_NOT_EDITED'), $affected, count($IDs))); } } else { // List for editing @@ -1214,10 +1131,8 @@ function ADMIN_UNDELETE_ENTRIES_CONFIRM ($IDs, $table, $columns=array(), $filter // Checks proxy settins by fetching check-updates3.php from www.mxchange.org function ADMIN_TEST_PROXY_SETTINGS ($settingsArray) { - global $_CONFIG; - // Set temporary the new settings - $_CONFIG = merge_array($_CONFIG, $settingsArray); + mergeConfig($settingsArray); // Now get the test URL $content = GET_URL("check-updates3.php"); @@ -1239,7 +1154,7 @@ function ADMIN_SEND_PASSWORD_RESET_LINK ($email) { // Look up administator login $result = SQL_QUERY_ESC("SELECT id, login, password FROM `{!_MYSQL_PREFIX!}_admins` WHERE email='%s' LIMIT 1", - array($email), __FILE__, __LINE__); + array($email), __FUNCTION__, __LINE__); // Is there an account? if (SQL_NUMROWS($result) == 0) { @@ -1280,7 +1195,7 @@ function ADMIN_VALIDATE_RESET_LINK_HASH_LOGIN ($hash, $login) { // Then try to find that user $result = SQL_QUERY_ESC("SELECT id, password, email FROM `{!_MYSQL_PREFIX!}_admins` WHERE login='%s' LIMIT 1", - array($login), __FILE__, __LINE__); + array($login), __FUNCTION__, __LINE__); // Is an account here? if (SQL_NUMROWS($result) == 1) { @@ -1316,10 +1231,10 @@ function ADMIN_RESET_PASSWORD ($login, $password) { // Update database SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admins` SET password='%s' WHERE login='%s' LIMIT 1", - array($passHash, $login), __FILE__, __LINE__); + array($passHash, $login), __FUNCTION__, __LINE__); // Run filters - RUN_FILTER('post_admin_reset_pass', array('login' => $login, 'hash' => $passHash)); + runFilterChain('post_admin_reset_pass', array('login' => $login, 'hash' => $passHash)); // Return output return ADMIN_PASSWORD_RESET_DONE; @@ -1338,7 +1253,7 @@ function ADMIN_DELETE_TASK ($id) { function ADMIN_UPDATE_TASK_DATA ($id, $row, $data) { // Update the task SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_task_system` SET %s='%s' WHERE id=%s LIMIT 1", - array($row, $data, bigintval($id)), __FILE__, __LINE__); + array($row, $data, bigintval($id)), __FUNCTION__, __LINE__); } // ?>