require($INC);
}
-//
-function REGISTER_ADMIN ($user, $md5, $email=WEBMASTER)
-{
- $ret = "failed";
+// Register an administrator account
+function REGISTER_ADMIN ($user, $md5, $email=WEBMASTER) {
+ // Login does already exist
+ $ret = "already";
+
+ // Lookup the user
$result = SQL_QUERY_ESC("SELECT id FROM "._MYSQL_PREFIX."_admins WHERE login='%s' LIMIT 1",
- array($user), __FILE__, __LINE__);
+ array($user), __FILE__, __LINE__);
+
+ // Is the entry there?
if (SQL_NUMROWS($result) == 0) {
// Ok, let's create the admin login
- $result = SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_admins (login, password, email) VALUES ('%s', '%s', '%s')",
- array($user, $md5, $email), __FILE__, __LINE__);
+ SQL_QUERY_ESC("INSERT INTO "._MYSQL_PREFIX."_admins (login, password, email) VALUES ('%s', '%s', '%s')",
+ array($user, $md5, $email), __FILE__, __LINE__);
$ret = "done";
- } else {
- // Free memory
- SQL_FREERESULT($result);
+ } // END - if
- // Login does already exist
- $ret = "already";
- }
+ // Free memory
+ SQL_FREERESULT($result);
+
+ // Return result
return $ret;
}
// Only be executed on login procedure!
-function CHECK_ADMIN_LOGIN ($admin_login, $password)
-{
- global $cacheArray, $_CONFIG, $cacheInstance;
+function CHECK_ADMIN_LOGIN ($admin_login, $password) {
+ global $cacheArray, $cacheInstance;
- // Init variables
+ // By default no admin is found
$ret = "404";
- $data = array();
+
+ // Get admin id
+ $aid = GET_ADMIN_ID($admin_login);
+
+ // Init array with admin id by default
+ $data = array('aid' => $aid);
// Is the cache valid?
- if (!empty($cacheArray['admins']['password'][$admin_login])) {
+ if (isset($cacheArray['admins']['password'][$aid])) {
// Get password from cache
- $data['password'] = $cacheArray['admins']['password'][$admin_login];
+ $data['password'] = $cacheArray['admins']['password'][$aid];
$ret = "pass";
- if (isset($_CONFIG['cache_hits'])) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
+ incrementConfigEntry('cache_hits');
// Include more admins data?
if (GET_EXT_VERSION("admins") >= "0.7.0") {
// Load them here
- $data['login_failtures'] = $cacheArray['admins']['login_failtures'][$admin_login];
- $data['last_failture'] = $cacheArray['admins']['last_failture'][$admin_login];
+ $data['login_failures'] = $cacheArray['admins']['login_failures'][$aid];
+ $data['last_failure'] = $cacheArray['admins']['last_failure'][$aid];
} // END - if
} elseif (!EXT_IS_ACTIVE("cache")) {
- $ADD = "";
- if (GET_EXT_VERSION("admins") >= "0.7.0") {
- // Load them here
- $ADD = ", login_failtures, UNIX_TIMESTAMP(last_failture) AS last_failture";
- } // END - if
+ // 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 login='%s' LIMIT 1",
- array($admin_login), __FILE__, __LINE__);
+ $result = SQL_QUERY_ESC("SELECT password".$ADD." FROM "._MYSQL_PREFIX."_admins WHERE id=%s LIMIT 1",
+ array($aid), __FILE__, __LINE__);
+
+ // Entry found?
if (SQL_NUMROWS($result) == 1) {
// Login password found
$ret = "pass";
$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
- $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_admins SET password='%s',login_failtures=0,last_failture='0000-00-00 00:00:00' WHERE login='%s' LIMIT 1",
- array($data['password'], $admin_login), __FILE__, __LINE__);
+ // 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
- $result = SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_admins SET password='%s' WHERE login='%s' LIMIT 1",
- array($data['password'], $admin_login), __FILE__, __LINE__);
+ SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_admins SET password='%s' WHERE id=%s LIMIT 1",
+ array($data['password'], $aid), __FILE__, __LINE__);
}
// Rebuild cache
} // 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 login='%s' LIMIT 1",
- array($admin_login), __FILE__, __LINE__);
+ 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
REBUILD_CACHE("admins", "admin");
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
// Now set all session variables and return the result
return (
(
- set_session("admin_md5", generatePassString($passHash))
+ set_session('admin_md5', generatePassString($passHash))
) && (
- set_session("admin_login", $adminLogin)
+ set_session('admin_login', $adminLogin)
) && (
- set_session("admin_last", time())
+ set_session('admin_last', time())
) && (
- set_session("admin_to", bigintval($_POST['timeout']))
+ set_session('admin_to', bigintval($_POST['timeout']))
)
);
}
// Only be executed on cookie checking
function CHECK_ADMIN_COOKIES ($admin_login, $password) {
- global $cacheArray, $_CONFIG;
+ global $cacheArray;
$ret = "404"; $pass = "";
// Get hash
- $pass = GET_ADMIN_HASH($admin_login);
+ $pass = GET_ADMIN_HASH(GET_ADMIN_ID($admin_login));
if ($pass != "-1") $ret = "pass";
//* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):".generatePassString($pass)."(".strlen($pass).")/".$password."(".strlen($password).")<br />\n";
$tmp = $file.".tmp";
// Open the source file
- $fp = @fopen($file, 'r') or OUTPUT_HTML("<STRONG>READ:</STRONG> ".$file."<br />");
+ $fp = @fopen($file, 'r') or OUTPUT_HTML("<strong>READ:</strong> ".$file."<br />");
// Is the resource valid?
if (is_resource($fp)) {
// Open temporary file
- $fp_tmp = @fopen($tmp, 'w') or OUTPUT_HTML("<STRONG>WRITE:</STRONG> ".$tmp."<br />");
+ $fp_tmp = @fopen($tmp, 'w') or OUTPUT_HTML("<strong>WRITE:</strong> ".$tmp."<br />");
// Is the resource again valid?
if (is_resource($fp_tmp)) {
@unlink($tmp);
define('_FATAL', false);
} elseif (!$found) {
- OUTPUT_HTML("<STRONG>CHANGE:</STRONG> 404!");
+ OUTPUT_HTML("<strong>CHANGE:</strong> 404!");
define('_FATAL', true);
} else {
- OUTPUT_HTML("<STRONG>TMP:</STRONG> UNDONE!");
+ OUTPUT_HTML("<strong>TMP:</strong> UNDONE!");
define('_FATAL', true);
}
}
} else {
// File not found, not readable or writeable
- OUTPUT_HTML("<STRONG>404:</STRONG> ".$file."<br />");
+ OUTPUT_HTML("<strong>404:</strong> ".$file."<br />");
}
}
//
function ADMIN_DO_ACTION($wht) {
- global $menuDesription, $menuTitle, $_CONFIG, $cacheArray, $DATA, $DEPTH;
+ global $menuDesription, $menuTitle, $cacheArray, $DATA;
//* DEBUG: */ echo __LINE__."*".$wht."/".$GLOBALS['module']."/".$GLOBALS['action']."/".$GLOBALS['what']."*<br />\n";
if (EXT_IS_ACTIVE("cache")) {
// Define admin login name and ID number
define('__ADMIN_LOGIN', get_session('admin_login'));
- define('__ADMIN_ID' , GET_ADMIN_ID(get_session('admin_login')));
+ define('__ADMIN_ID' , GET_CURRENT_ADMIN_ID());
// Preload templates
if (EXT_IS_ACTIVE("admins")) {
$INC = sprintf("%sinc/modules/admin/action-%s.php", PATH, $act);
if ((FILE_READABLE($INC)) && (VALIDATE_MENU_ACTION("admin", $act, $wht)) && (__ACL_ALLOW == true)) {
// Ok, we finally load the admin action module
- include($INC);
+ require($INC);
} elseif (__ACL_ALLOW == false) {
// Access denied
- LOAD_TEMPLATE("admin_menu_failed", false, ADMINS_ACCESS_DENIED);
- ADD_FATAL(ADMINS_ACCESS_DENIED);
+ LOAD_TEMPLATE("admin_menu_failed", false, ADMIN_ACCESS_DENIED);
+ addFatalMessage(ADMIN_ACCESS_DENIED);
} else {
// Include file not found! :-(
LOAD_TEMPLATE("admin_menu_failed", false, ADMIN_404_ACTION);
- ADD_FATAL(ADMIN_404_ACTION_1.$act.ADMIN_404_ACTION_2);
+ addFatalMessage(ADMIN_404_ACTION_1.$act.ADMIN_404_ACTION_2);
}
} else {
// Invalid action/what pair found!
LOAD_TEMPLATE("admin_menu_failed", false, ADMIN_INVALID_ACTION);
- ADD_FATAL(ADMIN_INVALID_ACTION_1.$act."/".$wht.ADMIN_INVALID_ACTION_2);
+ addFatalMessage(ADMIN_INVALID_ACTION_1.$act."/".$wht.ADMIN_INVALID_ACTION_2);
}
// Free memory
}
//
function ADD_ADMIN_MENU($act, $wht, $return=false) {
- global $menuDesription, $menuTitle, $cacheInstance, $_CONFIG;
+ global $menuDesription, $menuTitle, $cacheInstance;
// Init variables
$SUB = false;
$menuTitle = array();
// Is there a cache instance?
- if ((is_object($cacheInstance)) && (isset($_CONFIG['cache_admin_menu'])) && ($_CONFIG['cache_admin_menu'] == "Y")) {
+ if ((is_object($cacheInstance)) && (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->cache_file($cacheName, true)) {
+ if ($cacheInstance->loadCacheFile($cacheName)) {
// Then load it
- $data = $cacheInstance->cache_load();
+ $data = $cacheInstance->getArrayFromCache();
// Extract all parts
$OUT = base64_decode($data['output'][0]);
} // 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__);
+ $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 = "<TABLE border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"admin_menu_main\">
-<TR><TD colspan=\"2\" height=\"7\" class=\"seperator\"> </TD></TR>\n";
+ $OUT = "<table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"admin_menu_main\">
+<tr><td colspan=\"2\" height=\"7\" class=\"seperator\"> </td></tr>\n";
while (list($menu, $title, $descr) = SQL_FETCHROW($result_main))
{
if ((EXT_IS_ACTIVE("admins")) && (GET_EXT_VERSION("admins") > "0.2"))
$menuTitle[$menu] = $title;
$menuDesription[$menu] = $descr;
}
- $OUT .= "<TR>
- <TD class=\"admin_menu\" colspan=\"2\">
- <NOBR> <STRONG>·</STRONG> ";
+ $OUT .= "<tr>
+ <td class=\"admin_menu\" colspan=\"2\">
+ <NOBR> <strong>·</strong> ";
if (($menu == $act) && (empty($wht)))
{
- $OUT .= "<STRONG>";
+ $OUT .= "<strong>";
}
else
{
- $OUT .= "[<A href=\"".URL."/modules.php?module=admin&action=".$menu."\">";
+ $OUT .= "[<a href=\"".URL."/modules.php?module=admin&action=".$menu."\">";
}
$OUT .= $title;
if (($menu == $act) && (empty($wht)))
{
- $OUT .= "</STRONG>";
+ $OUT .= "</strong>";
}
else
{
- $OUT .= "</A>]";
+ $OUT .= "</a>]";
}
- $OUT .= "</NOBR></TD>
-</TR>\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",
+ $OUT .= "</NOBR></td>
+</tr>\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 .= "<TR>
- <TD width=\"10\" class=\"seperator\"> </TD>
- <TD class=\"admin_menu\">
- <TABLE border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"admin_menu_sub\">\n";
+ $OUT .= "<tr>
+ <td width=\"10\" class=\"seperator\"> </td>
+ <td class=\"admin_menu\">
+ <table border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"admin_menu_sub\">\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);
// Insert compiled title and description
$menuTitle[$wht_sub] = $title_what;
$menuDesription[$wht_sub] = $desc_what;
- $OUT .= "<TR>
- <TD class=\"admin_menu\" colspan=\"2\">
- <NOBR> <STRONG>--></STRONG> ";
+ $OUT .= "<tr>
+ <td class=\"admin_menu\" colspan=\"2\">
+ <NOBR> <strong>--></strong> ";
if ($readable)
{
if ($wht == $wht_sub)
{
- $OUT .= "<STRONG>";
+ $OUT .= "<strong>";
}
else
{
- $OUT .= "[<A href=\"".URL."/modules.php?module=admin&what=".$wht_sub."\">";
+ $OUT .= "[<a href=\"".URL."/modules.php?module=admin&what=".$wht_sub."\">";
}
}
else
{
if ($wht == $wht_sub)
{
- $OUT .= "</STRONG>";
+ $OUT .= "</strong>";
}
else
{
- $OUT .= "</A>]";
+ $OUT .= "</a>]";
}
}
else
{
- $OUT .= "</I>";
+ $OUT .= "</em>";
}
- $OUT .= "</NOBR></TD>
-</TR>\n";
+ $OUT .= "</NOBR></td>
+</tr>\n";
}
}
// Free memory
SQL_FREERESULT($result_what);
- $OUT .= " </TABLE>
- </TD>
-</TR>\n";
+ $OUT .= " </table>
+ </td>
+</tr>\n";
}
- $OUT .= "<TR><TD height=\"7\" colspan=\"2\"></TD></TR>\n";
+ $OUT .= "<tr><td height=\"7\" colspan=\"2\"></td></tr>\n";
}
}
// Free memory
SQL_FREERESULT($result_main);
- $OUT .= "</TABLE>\n";
+ $OUT .= "</table>\n";
}
// Compile and run the code here. This inserts all constants into the
eval($eval);
// Is there a cache instance again?
- if ((is_object($cacheInstance)) && (isset($_CONFIG['cache_admin_menu'])) && ($_CONFIG['cache_admin_menu'] == "Y")) {
+ if ((is_object($cacheInstance)) && (getConfig('cache_admin_menu') == "Y")) {
// Init cache
- $cacheInstance->cache_init($cacheName);
+ $cacheInstance->init($cacheName);
// Prepare cache data
$data = array(
);
// Write the data away
- $cacheInstance->add_row($data);
+ $cacheInstance->addRow($data);
// Close cache
- $cacheInstance->cache_close();
+ $cacheInstance->finalize();
} // END - if
// Return or output content?
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 = " <OPTION value=\"all\">".ALL_MEMBERS."</OPTION>\n";
- elseif ($none) $OUT = " <OPTION value=\"0\">".SELECT_NONE."</OPTION>\n";
+ if ($add_all) $OUT = " <option value=\"all\">".ALL_MEMBERS."</option>\n";
+ elseif ($none) $OUT = " <option value=\"0\">".SELECT_NONE."</option>\n";
while (list($id, $sname, $fname) = SQL_FETCHROW($result))
{
- $OUT .= " <OPTION value=\"".bigintval($id)."\"";
+ $OUT .= " <option value=\"".bigintval($id)."\"";
if ($def == $id) $OUT .= " selected=\"selected\"";
- $OUT .= ">".$sname." ".$fname." (".bigintval($id).")</OPTION>\n";
+ $OUT .= ">".$sname." ".$fname." (".bigintval($id).")</option>\n";
}
// Free memory
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",
+ $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 = "<SELECT name=\"".$MODE."_menu";
+ $OUT = "<select name=\"".$MODE."_menu";
if ((!empty($defid)) || ($defid == "0")) $OUT .= "[".$defid."]";
$OUT .= "\" size=\"1\" class=\"admin_select\">
- <OPTION value=\"\">".SELECT_NONE."</OPTION>\n";
+ <option value=\"\">".SELECT_NONE."</option>\n";
while (list($menu, $title) = SQL_FETCHROW($result)) {
- $OUT .= " <OPTION value=\"".$menu."\"";
+ $OUT .= " <option value=\"".$menu."\"";
if ((!empty($default)) && ($default == $menu)) $OUT .= " selected=\"selected\"";
- $OUT .= ">".$title."</OPTION>\n";
+ $OUT .= ">".$title."</option>\n";
} // END - while
// Free memory
SQL_FREERESULT($result);
- $OUT .= "</SELECT>\n";
+ $OUT .= "</select>\n";
} else {
// No menus???
$OUT = ADMIN_PROBLEM_NO_MENU;
// Return output
return $OUT;
}
+
// Save settings to the database
function ADMIN_SAVE_SETTINGS (&$POST, $tableName="_config", $whereStatement="config=0", $translateComma=array(), $alwaysAdd=false) {
global $_CONFIG, $cacheArray, $cacheInstance;
$test = (float)$val;
if ("".$val."" == "".$test."") {
// Add numbers
- $DATA[] = $id."=".$val."";
+ $DATA[] = sprintf("`%s`=%s", $id, $test);
} else {
// Add strings
- $DATA[] = $id."='".trim($val)."'";
+ $DATA[] = sprintf("`%s`='%s'", $id, trim($val));
}
// Update current configuration
$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
$DATA_UPDATE = implode(", ", $DATA);
// Generate SQL string
- $SQL = "UPDATE "._MYSQL_PREFIX.$tableName." SET ".$DATA_UPDATE." WHERE ".$whereStatement." LIMIT 1";
+ $SQL = sprintf("UPDATE `"._MYSQL_PREFIX."%s` SET %s WHERE %s LIMIT 1",
+ $tableName,
+ $DATA_UPDATE,
+ $whereStatement
+ );
} else {
// Add Line (does only work with auto_increment!
$KEYs = array(); $VALUEs = array();
$VALUEs = implode(", ", $VALUEs);
// Generate SQL string
- $SQL = "INSERT INTO "._MYSQL_PREFIX.$tableName." (".$KEYs.") VALUES (".$VALUEs.")";
+ $SQL = sprintf("INSERT INTO "._MYSQL_PREFIX."%s (%s) VALUES (%s)",
+ $tableName,
+ $KEYs,
+ $VALUEs
+ );
}
// Free memory
SQL_FREERESULT($result);
// Simply run generated SQL string
- $result = SQL_QUERY($SQL, __FILE__, __LINE__);
+ SQL_QUERY($SQL, __FILE__, __LINE__);
// Rebuild cache
REBUILD_CACHE("config", "config");
// Settings saved
- LOAD_TEMPLATE("admin_settings_saved", false, "<STRONG class=\"admin_done\">".SETTINGS_SAVED."</STRONG>");
+ LOAD_TEMPLATE("admin_settings_saved", false, SETTINGS_SAVED);
}
-//
-function ADMIN_MAKE_MENU_SELECTION($menu, $type, $name, $default="") {
+
+// 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."!");
// Init the selection box
- $OUT = "<SELECT name=\"".$name."\" class=\"admin_select\" size=\"1\">\n <OPTION value=\"\">".IS_TOP_MENU."</OPTION>\n";
+ $OUT = "<select name=\"".$name."\" class=\"admin_select\" size=\"1\">\n <option value=\"\">".IS_TOP_MENU."</option>\n";
// Walk through all files
while ($file = readdir($handle)) {
if (($file != ".") && ($file != "..") && ($file != "lost+found") && (strpos($file, "".$type."-") > -1) && (strpos($file, ".php") > 0)) {
// Then test if the file is readable
$test = sprintf("%sinc/modules/%s/%s", PATH, $menu, $file);
- if ((is_file($test)) && (is_readable($test))) {
+
+ // Is the file there?
+ if (FILE_READABLE($test)) {
// Extract the value for what=xxx
$part = substr($file, (strlen($type) + 1));
$part = substr($part, 0, -4);
// Is that part different from the overview?
if ($part != "overview") {
- $OUT .= " <OPTION value=\"".$part."\"";
- if ($part == $default) $OUT .= "selected";
- $OUT .= ">".$part."</OPTION>\n";
+ $OUT .= " <option value=\"".$part."\"";
+ if ($part == $default) $OUT .= " selected=\"selected\"";
+ $OUT .= ">".$part."</option>\n";
} // END - if
} // END - if
} // END - if
// Close dir and selection box
closedir($handle);
- $OUT .= "</SELECT>\n";
+ $OUT .= "</select>\n";
+
+ // Return contents
return $OUT;
}
//
-function ADMIN_USER_PROFILE_LINK($uid, $title="", $wht="list_user") {
+function ADMIN_USER_PROFILE_LINK ($uid, $title="", $wht="list_user") {
if (($title == "") && ($title != "0")) {
// Set userid as title
$title = $uid;
return $title;
} // END - if
- //* DEBUG: */ echo "A:".$title."<br />";
+ //* DEBUG: */ echo "a:".$title."<br />";
// Return link
- return "<A href=\"".URL."/modules.php?module=admin&what=".$wht."&u_id=".$uid."\" title=\"".ADMIN_USER_PROFILE_TITLE."\">".$title."</A>";
+ return "<a href=\"".URL."/modules.php?module=admin&what=".$wht."&u_id=".$uid."\" title=\"".ADMIN_USER_PROFILE_TITLE."\">".$title."</a>";
}
//
function ADMIN_CHECK_MENU_MODE() {
- global $_CONFIG, $cacheArray;
+ global $cacheArray;
// Set the global mode as the mode for all admins
- $MODE = $_CONFIG['admin_menu']; $ADMIN = $MODE;
+ $MODE = getConfig('admin_menu');
+ $ADMIN = $MODE;
+
+ // Get admin id
+ $aid = GET_CURRENT_ADMIN_ID();
// Check individual settings of current admin
- if (isset($cacheArray['admins']['la_mode'][get_session('admin_login')])) {
+ if (isset($cacheArray['admins']['la_mode'][$aid])) {
// Load from cache
- $ADMIN = $cacheArray['admins']['la_mode'][get_session('admin_login')];
- if (isset($_CONFIG['cache_hits'])) { $_CONFIG['cache_hits']++; } else { $_CONFIG['cache_hits'] = 1; }
+ $ADMIN = $cacheArray['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 login='%s' LIMIT 1",
- array(get_session('admin_login')), __FILE__, __LINE__);
+ $result = SQL_QUERY_ESC("SELECT la_mode FROM "._MYSQL_PREFIX."_admins WHERE id=%s LIMIT 1",
+ array($aid), __FILE__, __LINE__);
if (SQL_NUMROWS($result) == 1) {
// Load data
list($ADMIN) = SQL_FETCHROW($result);
// Return admin-menu's mode
return $MODE;
}
+
// Change activation status
function ADMIN_CHANGE_ACTIVATION_STATUS ($IDs, $table, $row, $idRow = "id") {
- global $_CONFIG;
$cnt = 0; $newStatus = "Y";
if ((is_array($IDs)) && (count($IDs) > 0)) {
// "Walk" all through and count them
// Secure the ID number
$id = bigintval($id);
- // Should always be 1 ;-)
- if ($selected == 1) {
+ // Should always be set... ;-)
+ 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__);
if (SQL_NUMROWS($result) == 1) {
// Load the status
list($currStatus) = SQL_FETCHROW($result);
- if ($currStatus == "Y") $newStatus='N'; else $newStatus = "Y";
+
+ // And switch it N<->Y
+ if ($currStatus == "Y") $newStatus = "N"; else $newStatus = "Y";
// Change this status
SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_%s SET %s='%s' WHERE %s=%s LIMIT 1",
// Count up affected rows
$cnt += SQL_AFFECTEDROWS();
- }
+ } // END - if
// Free the result
SQL_FREERESULT($result);
- }
- }
+ } // END - if
+ } // 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);
}
// Build a special template list
function ADMIN_BUILD_LIST ($listType, $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn) {
- global $_CONFIG;
$OUT = ""; $SW = 2;
// "Walk" through all entries
$content['sw'] = $SW;
// Then list it
- $OUT .= LOAD_TEMPLATE("admin_".$listType."_".$table."_row", true, $content);
+ $OUT .= LOAD_TEMPLATE(sprintf("admin_%s_%s_row",
+ $listType,
+ $table
+ ), true, $content
+ );
// Switch color
$SW = 3 - $SW;
} // END - foreach
// Load master template
- LOAD_TEMPLATE("admin_".$listType."_".$table."", false, $OUT);
+ LOAD_TEMPLATE(sprintf("admin_%s_%s",
+ $listType,
+ $table
+ ), false, $OUT
+ );
}
// Change status of "build" list
function ADMIN_BUILD_STATUS_HANDLER ($mode, $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $statusArray) {
} // END - if
} elseif (isset($content[$column])) {
// Unfinished!
- mxchange_die("{--".__FUNCTION__."--}:UNFINISHED: id={$id}/{$column}[".gettype($statusInfo)."] = {$content[$column]}");
+ mxchange_die("{--".__FUNCTION__."--}:".__LINE__.":UNFINISHED: id={$id}/{$column}[".gettype($statusInfo)."] = {$content[$column]}");
}
} // END - foreach
// Add other columns as well
foreach ($_POST as $key => $entries) {
- // Skip id, raw userid and 'do_lock'
- if (!in_array($key, array($idColumn, 'uid_raw', 'do_lock'))) {
+ // 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
} else {
// Add regular entry
$SQL .= sprintf(" %s='%s',", SQL_ESCAPE($key), SQL_ESCAPE($entries[$id]));
+
+ // Add entry
+ $content[$key] = $entries[$id];
}
} // END - if
- } // END - if
+ } // END - foreach
// Finish SQL statement
- $SQL = substr($SQL, 0, -1) . " WHERE ".$idColumn."=".bigintval($id)." AND ".$statusColumn."='".$oldStatus."' LIMIT 1";
+ $SQL = substr($SQL, 0, -1) . sprintf(" WHERE %s=%s AND %s='%s' LIMIT 1",
+ $idColumn,
+ bigintval($id),
+ $statusColumn,
+ $oldStatus
+ );
// Run the SQL
SQL_QUERY($SQL, __FILE__, __LINE__);
// Shall we un-/lock here or list for locking?
if ($lockNow) {
// Un-/lock entries
- ADMIN_BUILD_STATUS_HANDLER("lock", $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);
+ ADMIN_BUILD_STATUS_HANDLER("lock", $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $statusArray);
} else {
// List for editing
ADMIN_BUILD_LIST("lock", $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);
global $_CONFIG;
// Set temporary the new settings
- $_CONFIG = array_merge($_CONFIG, $settingsArray);
+ $_CONFIG = merge_array($_CONFIG, $settingsArray);
// Now get the test URL
$content = GET_URL("check-updates3.php");
}
// Sends out a link to the given email adress so the admin can reset his/her password
function ADMIN_SEND_PASSWORD_RESET_LINK ($email) {
- global $_CONFIG;
// Init output
$OUT = "";
SQL_QUERY_ESC("UPDATE "._MYSQL_PREFIX."_admins SET password='%s' WHERE login='%s' LIMIT 1",
array($passHash, $login), __FILE__, __LINE__);
+ // Run filters
+ RUN_FILTER('post_admin_reset_pass', array('login' => $login, 'hash' => $passHash));
+
// Return output
return ADMIN_PASSWORD_RESET_DONE;
}