// Register an administrator account
function REGISTER_ADMIN ($user, $md5, $email) {
// Login does already exist
- $ret = "already";
+ $ret = 'already';
// Lookup the admin
- $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), __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), __FUNCTION__, __LINE__);
- $ret = "done";
+ array($user, $md5, $email), __FUNCTION__, __LINE__);
+ $ret = 'done';
} // END - if
// Free memory
// Only be executed on login procedure!
function CHECK_ADMIN_LOGIN ($admin_login, $password) {
// By default no admin is found
- $ret = "404";
+ $ret = '404';
// Get admin id
$aid = GET_ADMIN_ID($admin_login);
$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?
SQL_FREERESULT($result);
}
- //* DEBUG: */ echo "*".$data['password']."/".md5($password)."/".$ret."<br />";
+ //* DEBUG: */ echo "*".$data['password'].'/'.md5($password).'/'.$ret."<br />";
if ((isset($data['password'])) && (strlen($data['password']) == 32) && ($data['password'] == md5($password))) {
// Generate new hash
$data['password'] = generateHash($password);
// Is the sql_patches not installed, than we cannot have a valid hashed password here!
- if (($ret == 'pass') && ((EXT_VERSION_IS_OLDER('sql_patches', '0.3.6')) || (GET_EXT_VERSION('sql_patches') == ""))) $ret = "done";
- } elseif ((EXT_VERSION_IS_OLDER('sql_patches', '0.3.6')) || (GET_EXT_VERSION('sql_patches') == "")) {
+ if (($ret == 'pass') && ((EXT_VERSION_IS_OLDER('sql_patches', '0.3.6')) || (GET_EXT_VERSION('sql_patches') == ''))) $ret = 'done';
+ } elseif ((EXT_VERSION_IS_OLDER('sql_patches', '0.3.6')) || (GET_EXT_VERSION('sql_patches') == '')) {
// Old hashing way
return $ret;
} elseif (!isset($data['password'])) {
$salt = __SALT;
// Check if password is same
- //* DEBUG: */ echo "*".$ret.",".$data['password'].",".$password.",".$salt."*<br >\n";
+ //* DEBUG: */ echo "*".$ret.','.$data['password'].','.$password.','.$salt."*<br >\n";
if (($ret == 'pass') && ($data['password'] == generateHash($password, $salt)) && ((!empty($salt))) || ($data['password'] == $password)) {
// Re-hash the plain passord with new random salt
$data['password'] = generateHash($password);
// Remmeber login failures if available
if (GET_EXT_VERSION('admins') >= '0.7.2') {
// Store it in session
- set_session('mxchange_admin_failures', $data['login_failures']);
- set_session('mxchange_admin_last_fail', $data['last_failure']);
+ setSession('mxchange_admin_failures', $data['login_failures']);
+ setSession('mxchange_admin_last_fail', $data['last_failure']);
// 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), __FUNCTION__, __LINE__);
+ 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), __FUNCTION__, __LINE__);
} else {
// Update password
- SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admins` SET password='%s' WHERE id=%s LIMIT 1",
- array($data['password'], $aid), __FUNCTION__, __LINE__);
+ SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admins` SET password='%s' WHERE `id`=%s LIMIT 1",
+ array($data['password'], $aid), __FUNCTION__, __LINE__);
}
// Rebuild cache
rebuildCacheFiles('admins', 'admin');
// Login has failed by default... ;-)
- $ret = "failed";
+ $ret = 'failed';
// Password matches so login here
if (LOGIN_ADMIN($admin_login, $data['password'])) {
// All done now
- $ret = "done";
+ $ret = 'done';
} // END - if
} elseif ((empty($salt)) && ($ret == 'pass')) {
// Something bad went wrong
- $ret = "failed";
- } elseif ($ret == "done") {
+ $ret = 'failed';
+ } elseif ($ret == 'done') {
// Try to login here if we have the old hashing way (sql_patches not installed?)
if (!LOGIN_ADMIN($admin_login, $data['password'])) {
// Something went wrong
- $ret = "failed";
+ $ret = 'failed';
} // END - if
}
// 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_failures=login_failures+1,last_failure=NOW() WHERE id=%s LIMIT 1",
- array($aid), __FUNCTION__, __LINE__);
+ SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admins` SET login_failures=login_failures+1,last_failure=NOW() WHERE `id`=%s LIMIT 1",
+ array($aid), __FUNCTION__, __LINE__);
// Rebuild cache
rebuildCacheFiles('admins', 'admin');
// Try to login the admin by setting some session/cookie variables
function LOGIN_ADMIN ($adminLogin, $passHash) {
// 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') == ""))) {
+ 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), __FUNCTION__, __LINE__);
} // END - if
// Now set all session variables and return the result
- return (
- (
- set_session('admin_md5', generatePassString($passHash))
- ) && (
- set_session('admin_login', $adminLogin)
- ) && (
- set_session('admin_last', time())
- ) && (
- set_session('admin_to', bigintval(REQUEST_POST('timeout')))
- )
- );
+ return ((
+ setSession('admin_md5', generatePassString($passHash))
+ ) && (
+ setSession('admin_login', $adminLogin)
+ ) && (
+ setSession('admin_last', time())
+ ) && (
+ setSession('admin_to', bigintval(REQUEST_POST('timeout')))
+ ));
}
// Only be executed on cookie checking
function CHECK_ADMIN_COOKIES ($admin_login, $password) {
// By default no admin cookies are found
- $ret = "404"; $pass = '';
+ $ret = '404';
+ $pass = '';
// Get hash
$pass = GET_ADMIN_HASH(GET_ADMIN_ID($admin_login));
- if ($pass != "-1") $ret = 'pass';
+ if ($pass != '-1') $ret = 'pass';
- //* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):".generatePassString($pass)."(".strlen($pass).")/".$password."(".strlen($password).")<br />\n";
+ //* DEBUG: */ print __FUNCTION__."(<font color=\"#0000aa\">".__LINE__."</font>):".generatePassString($pass).'('.strlen($pass).")/".$password.'('.strlen($password).")<br />\n";
// Check if password matches
if (($ret == 'pass') && ((generatePassString($pass) == $password) || ($pass == $password) || ((strlen($pass) == 32) && (md5($password) == $pass)))) {
// Passwords matches!
- $ret = "done";
- }
+ $ret = 'done';
+ } // END - if
// Return result
return $ret;
//
function ADMIN_DO_ACTION ($wht) {
global $DATA;
- //* DEBUG: */ echo __LINE__."*".$wht."/".$GLOBALS['module']."/".$GLOBALS['action']."/".$GLOBALS['what']."*<br />\n";
+ //* DEBUG: */ echo __LINE__."*".$wht.'/'.getModule().'/'.getAction().'/'.getWhat()."*<br />\n";
// Remove any spaces from variable
if (empty($wht)) {
// Default admin action is the overview page
- $wht = "overview";
+ $wht = 'overview';
} else {
// Compile out some chars
$wht = COMPILE_CODE($wht, false, false, false);
}
// Get action value
- $act = GET_ACTION($GLOBALS['module'], $wht);
+ $act = getModeAction(getModule(), $wht);
// Define admin login name and ID number
- define('__ADMIN_LOGIN', get_session('admin_login'));
- define('__ADMIN_ID' , GET_CURRENT_ADMIN_ID());
+ define('__ADMIN_LOGIN', getSession('admin_login'));
+ define('__ADMIN_ID' , getCurrentAdminId());
// Preload templates
if (EXT_IS_ACTIVE('admins')) {
- define('__ADMIN_WELCOME', LOAD_TEMPLATE("admin_welcome_admins", true));
+ define('__ADMIN_WELCOME', LOAD_TEMPLATE('admin_welcome_admins', true));
} else {
- define('__ADMIN_WELCOME', LOAD_TEMPLATE("admin_welcome", true));
+ define('__ADMIN_WELCOME', LOAD_TEMPLATE('admin_welcome', true));
}
- define('__ADMIN_FOOTER' , LOAD_TEMPLATE("admin_footer" , true));
+ define('__ADMIN_FOOTER' , LOAD_TEMPLATE('admin_footer' , true));
define('__ADMIN_MENU' , ADD_ADMIN_MENU($act, $wht, true));
// Tableset header
- LOAD_TEMPLATE("admin_main_header");
+ LOAD_TEMPLATE('admin_main_header');
// Check if action/what pair is valid
- $result_action = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_admin_menu`
+ $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), __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 ((INCLUDE_READABLE($INC)) && (VALIDATE_MENU_ACTION('admin', $act, $wht)) && ($GLOBALS['acl_allow'] === true)) {
+ if ((isIncludeReadable($INC)) && (isMenuActionValid('admin', $act, $wht)) && ($GLOBALS['acl_allow'] === true)) {
// Ok, we finally load the admin action module
- LOAD_INC($INC);
+ loadInclude($INC);
} elseif ($GLOBALS['acl_allow'] === false) {
// Access denied
- LOAD_TEMPLATE("admin_menu_failed", false, getMessage('ADMIN_ACCESS_DENIED'));
+ LOAD_TEMPLATE('admin_menu_failed', false, 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));
+ LOAD_TEMPLATE('admin_menu_failed', false, sprintf(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(__FUNCTION__, __LINE__, getMessage('ADMIN_ACTION_INVALID'), $act."/".$wht);
+ LOAD_TEMPLATE('admin_menu_failed', false, sprintf(getMessage('ADMIN_ACTION_INVALID'), $act.'/'.$wht));
+ addFatalMessage(__FUNCTION__, __LINE__, getMessage('ADMIN_ACTION_INVALID'), $act.'/'.$wht);
}
// Free memory
SQL_FREERESULT($result_action);
// Tableset footer
- LOAD_TEMPLATE("admin_main_footer");
+ LOAD_TEMPLATE('admin_main_footer');
}
//
// Is there a cache instance?
if ((isCacheInstanceValid()) && (getConfig('cache_admin_menu') == 'Y')) {
// Create cache name
- $cacheName = "admin_".$act."_".$wht."_".GET_LANGUAGE()."_".strtolower(get_session('admin_login'));
+ $cacheName = 'admin_' . $act . '_' . $wht . '_' . getLanguage() . '_' . strtolower(getSession('admin_login'));
// Is that cache there?
if ($GLOBALS['cache_instance']->loadCacheFile($cacheName)) {
// 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__);
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 = "<div style=\"height:7px\" class=\"seperator\"> </div>\n";
+ $OUT .= "<ul class=\"admin_menu_main\">\n";
// @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.0')) {
- $ACL = ADMINS_CHECK_ACL($menu, '');
+ $ACL = adminsCheckAdminAcl($menu, '');
} else {
- // ACL is "allow"... hmmm
+ // @TODO ACL is 'allow'... hmmm
$ACL = true;
}
$GLOBALS['menu']['title'][$menu] = $title;
$GLOBALS['menu']['description'][$menu] = $descr;
}
- $OUT .= "<tr>
- <td class=\"admin_menu\" colspan=\"2\">
- <div class=\"nobr\"> <strong>·</strong> ";
+ $OUT .= "<li class=\"admin_menu\">
+<div class=\"nobr\"><strong>·</strong> ";
if (($menu == $act) && (empty($wht))) {
$OUT .= "<strong>";
$OUT .= "</a>]";
}
- $OUT .= "</div></td>
-</tr>\n";
+ $OUT .= "</div>
+</li>\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",
if ((ifAdminMenuHasEntries($menu)) && (SQL_NUMROWS($result_what) > 0)) {
$GLOBALS['menu']['description'] = array();
$GLOBALS['menu']['title'] = 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 .= "<li class=\"admin_menu_sub\"><ul class=\"admin_menu_sub\">\n";
// @TODO Rewrite this to $content = SQL_FETCHARRAY()
while (list($wht_sub, $title_what, $desc_what) = SQL_FETCHROW($result_what)) {
- // Filename
- $INC = sprintf("inc/modules/admin/what-%s.php", $wht_sub);
+ // Check for access level
if ((EXT_IS_ACTIVE('admins')) && (GET_EXT_VERSION('admins') > '0.2.0')) {
- $ACL = ADMINS_CHECK_ACL("", $wht_sub);
+ $ACL = adminsCheckAdminAcl('', $wht_sub);
} else {
- // ACL is "allow"... hmmm
+ // @TODO ACL is 'allow'... hmmm
$ACL = true;
}
+ // Filename
+ $INC = sprintf("inc/modules/admin/what-%s.php", $wht_sub);
+
// Is the file readable?
- $readable = INCLUDE_READABLE($INC);
+ $readable = isIncludeReadable($INC);
// Access allowed?
if ($ACL === true) {
// Insert compiled title and description
$GLOBALS['menu']['title'][$wht_sub] = $title_what;
$GLOBALS['menu']['description'][$wht_sub] = $desc_what;
- $OUT .= "<tr>
- <td class=\"admin_menu\" colspan=\"2\">
- <div class=\"nobr\"> <strong>--></strong> ";
+ $OUT .= "<li class=\"admin_menu\">
+ <div class=\"nobr\"><strong>--></strong> ";
if ($readable === true) {
if ($wht == $wht_sub) {
$OUT .= "<strong>";
$OUT .= "[<a href=\"{!URL!}/modules.php?module=admin&what=".$wht_sub."\">";
}
} else {
- $OUT .= "<i class=\"admin_note\">";
+ $OUT .= "<em class=\"admin_note\">";
}
$OUT .= $title_what;
} else {
$OUT .= "</em>";
}
- $OUT .= "</div></td>
-</tr>\n";
+ $OUT .= "</div>
+</li>\n";
}
}
// Free memory
SQL_FREERESULT($result_what);
- $OUT .= " </table>
- </td>
-</tr>\n";
+ $OUT .= " </ul>
+</li>\n";
}
- $OUT .= "<tr><td height=\"7\" colspan=\"2\"></td></tr>\n";
+ $OUT .= "<li style=\"height:7px\" class=\"seperator\"> </li>\n";
}
}
// Free memory
SQL_FREERESULT($result_main);
- $OUT .= "</table>\n";
+ $OUT .= "</ul>\n";
}
// Is there a cache instance again?
}
// Create member selection box
-function ADD_MEMBER_SELECTION_BOX ($def="0", $add_all=false, $return=false, $none=false, $field='userid') {
+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", __FUNCTION__, __LINE__);
+ $result = SQL_QUERY("SELECT userid, surname, family FROM `{!_MYSQL_PREFIX!}_user_data` ORDER BY `userid` ASC", __FUNCTION__, __LINE__);
// Default output
$OUT = '';
define('_MEMBER_SELECTION', $OUT);
// Display selection box
- define('__LANG_VALUE', GET_LANGUAGE());
+ define('__LANG_VALUE', getLanguage());
// Load template
- LOAD_TEMPLATE("admin_member_selection_box", false, $GLOBALS['what']);
+ LOAD_TEMPLATE('admin_member_selection_box', false, getWhat());
} else {
// Return content in selection frame
return "<select class=\"admin_select\" name=\"".$field."\" size=\"1\">\n".$OUT."</select>\n";
}
// Create a menu selection box for given menu system
-function ADMIN_MENU_SELECTION ($MODE, $default="", $defid="") {
+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__);
+ array($mode), __FUNCTION__, __LINE__);
if (SQL_NUMROWS($result) > 0) {
// Load menu as selection
- $OUT = "<select name=\"".$MODE."_menu";
- if ((!empty($defid)) || ($defid == "0")) $OUT .= "[".$defid."]";
+ $OUT = "<select name=\"".$mode."_menu";
+ if ((!empty($defid)) || ($defid == '0')) $OUT .= "[".$defid."]";
$OUT .= "\" size=\"1\" class=\"admin_select\">
<option value=\"\">{--SELECT_NONE--}</option>\n";
// @TODO Try to rewrite this to $content = SQL_FETCHARRAY(). Please look some lines above for the dynamic query
// Now, walk through all entries and prepare them for saving
foreach ($POST as $id => $val) {
// Process only formular field but not submit buttons ;)
- if ($id != "ok") {
+ if ($id != 'ok') {
// Do not save the ok value
- CONVERT_SELECTIONS_TO_TIMESTAMP($POST, $DATA, $id, $skip);
+ convertSelectionsToTimestamp($POST, $DATA, $id, $skip);
// Shall we process this ID? It muss not be empty, of course
if ((!$skip) && (!empty($id))) {
// Translate the value? (comma to dot!)
if ((is_array($translateComma)) && (in_array($id, $translateComma))) {
// Then do it here... :)
- $val = REVERT_COMMA($val);
+ $val = convertCommaToDot($val);
} // END - if
// Shall we add numbers or strings?
$test = (float)$val;
- if ("".$val."" == "".$test."") {
+ if ("".$val."" == ''.$test."") {
// Add numbers
$DATA[] = sprintf("`%s`=%s", $id, $test);
} else {
// Generate SQL string
$sql = sprintf("UPDATE `{!_MYSQL_PREFIX!}%s` SET %s WHERE %s LIMIT 1",
- $tableName,
- $DATA_UPDATE,
- $whereStatement
+ $tableName,
+ $DATA_UPDATE,
+ $whereStatement
);
} else {
// Add Line (does only work with auto_increment!
- $KEYs = array(); $VALUEs = array();
+ $KEYs = array(); $values = array();
foreach ($DATA as $entry) {
// Split up
- $line = explode("=", $entry);
- $KEYs[] = $line[0]; $VALUEs[] = $line[1];
+ $line = explode('=', $entry);
+ $KEYs[] = $line[0]; $values[] = $line[1];
} // END - foreach
// Add both in one line
$KEYs = implode(", ", $KEYs);
- $VALUEs = implode(", ", $VALUEs);
+ $values = implode(", ", $values);
// Generate SQL string
$sql = sprintf("INSERT INTO {!_MYSQL_PREFIX!}%s (%s) VALUES (%s)",
- $tableName,
- $KEYs,
- $VALUEs
+ $tableName,
+ $KEYs,
+ $values
);
}
}
// Generate a selection box
-function ADMIN_MAKE_MENU_SELECTION ($menu, $type, $name, $default="") {
+function ADMIN_MAKE_MENU_SELECTION ($menu, $type, $name, $default = '') {
// Open the requested menu directory
- $menuArray = GET_DIR_AS_ARRAY(sprintf("inc/modules/%s/", $menu), '', false, false);
+ $menuArray = getArrayFromDirectory(sprintf("inc/modules/%s/", $menu), '', false, false);
// Init the selection box
$OUT = "<select name=\"".$name."\" class=\"admin_select\" size=\"1\">
// Walk through all files
foreach ($menuArray as $file) {
// Is this a PHP script?
- if (($file != ".") && ($file != "..") && ($file != "lost+found") && (strpos($file, "".$type."-") > -1) && (strpos($file, ".php") > 0)) {
+ if ((!isDirectory($file)) && (strpos($file, "".$type.'-') > -1) && (strpos($file, '.php') > 0)) {
// Then test if the file is readable
$test = sprintf("%sinc/modules/%s/%s", constant('PATH'), $menu, $file);
// Is the file there?
- if (FILE_READABLE($test)) {
+ if (isFileReadable($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") {
+ if ($part != 'overview') {
$OUT .= " <option value=\"".$part."\"";
if ($part == $default) $OUT .= ' selected="selected"';
$OUT .= ">".$part."</option>\n";
// Close selection box
$OUT .= "</select>\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")) {
+function generateUserProfileLink ($uid, $title = '', $wht="list_user") {
+ if (($title == '') && ($title != '0')) {
// Set userid as title
$title = $uid;
} // END - if
- if (($title == "0") && ($wht == "list_refs")) {
+ if (($title == '0') && ($wht == "list_refs")) {
// Return title again
return $title;
} // END - if
// Check "logical-area-mode"
function ADMIN_CHECK_MENU_MODE () {
// Set the global mode as the mode for all admins
- $MODE = getConfig('admin_menu');
- $ADMIN = $MODE;
+ $mode = getConfig('admin_menu');
+ $ADMIN = $mode;
// Get admin id
- $aid = GET_CURRENT_ADMIN_ID();
+ $aid = getCurrentAdminId();
// Check individual settings of current admin
if (isset($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), __FUNCTION__, __LINE__);
+ $result = SQL_QUERY_ESC("SELECT la_mode FROM `{!_MYSQL_PREFIX!}_admins` WHERE `id`=%s LIMIT 1",
+ array($aid), __FUNCTION__, __LINE__);
if (SQL_NUMROWS($result) == 1) {
// Load data
list($ADMIN) = SQL_FETCHROW($result);
}
// Check what the admin wants and set it when it's not the global mode
- if ($ADMIN != "global") $MODE = $ADMIN;
+ if ($ADMIN != 'global') $mode = $ADMIN;
// Return admin-menu's mode
- return $MODE;
+ return $mode;
}
// Change activation status
-function ADMIN_CHANGE_ACTIVATION_STATUS ($IDs, $table, $row, $idRow = "id") {
- $cnt = 0; $newStatus = "Y";
+function ADMIN_CHANGE_ACTIVATION_STATUS ($IDs, $table, $row, $idRow = 'id') {
+ $cnt = 0; $newStatus = 'Y';
if ((is_array($IDs)) && (count($IDs) > 0)) {
// "Walk" all through and count them
foreach ($IDs as $id => $selected) {
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), __FUNCTION__, __LINE__);
+ array($row, $table, $idRow, $id), __FUNCTION__, __LINE__);
// Row found?
if (SQL_NUMROWS($result) == 1) {
list($currStatus) = SQL_FETCHROW($result);
// And switch it N<->Y
- if ($currStatus == 'Y') $newStatus = "N"; else $newStatus = "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",
- array($table, $row, $newStatus, $idRow, $id), __FUNCTION__, __LINE__);
+ array($table, $row, $newStatus, $idRow, $id), __FUNCTION__, __LINE__);
// Count up affected rows
$cnt += SQL_AFFECTEDROWS();
}
// Send mails for del/edit/lock build modes
-function ADMIN_SEND_BUILD_MAILS ($mode, $table, $content, $id, $subjectPart="") {
+function ADMIN_SEND_BUILD_MAILS ($mode, $table, $content, $id, $subjectPart = '') {
// Default subject is the subject part
$subject = $subjectPart;
}
// Send email out
- SEND_EMAIL(REQUEST_POST('uid_raw', $id), $subjectLine, $mail);
+ sendEmail(REQUEST_POST('uid_raw', $id), $subjectLine, $mail);
} // END - if
// Generate subject
// Send admin notification out
if (!empty($subjectPart)) {
- SEND_ADMIN_NOTIFICATION($subjectLine, "admin_".$mode."_".strtolower($subjectPart)."_".$table, $content, REQUEST_POST('uid_raw', $id));
+ sendAdminNotification($subjectLine, "admin_".$mode."_".strtolower($subjectPart)."_".$table, $content, REQUEST_POST('uid_raw', $id));
} else {
- SEND_ADMIN_NOTIFICATION($subjectLine, "admin_".$mode."_".$table, $content, REQUEST_POST('uid_raw', $id));
+ sendAdminNotification($subjectLine, "admin_".$mode."_".$table, $content, REQUEST_POST('uid_raw', $id));
}
}
} // END - if
// Handle the call in external function
- $content[$key] = HANDLE_EXTRA_VALUES($filterFunctions[$idx], $value, $extraValues[$idx]);
+ $content[$key] = handleExtraValues($filterFunctions[$idx], $value, $extraValues[$idx]);
} // END - foreach
// Add color switching
// Then list it
$OUT .= LOAD_TEMPLATE(sprintf("admin_%s_%s_row",
- $listType,
- $table
- ), true, $content
+ $listType,
+ $table
+ ), true, $content
);
// Switch color
// Load master template
LOAD_TEMPLATE(sprintf("admin_%s_%s",
- $listType,
- $table
- ), false, $OUT
+ $listType,
+ $table
+ ), false, $OUT
);
}
// "Walk" through all entries
foreach ($IDs as $id => $sel) {
// Construct SQL query
- $sql = sprintf("UPDATE `{!_MYSQL_PREFIX!}_%s` SET",
- SQL_ESCAPE($table)
- );
+ $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",
SQL_FREERESULT($result);
// Add all status entries (e.g. status column last_updated or so)
- $newStatus = "UNKNOWN";
- $oldStatus = "UNKNOWN";
- $statusColumn = "unknown";
+ $newStatus = 'UNKNOWN';
+ $oldStatus = 'UNKNOWN';
+ $statusColumn = 'unknown';
foreach ($statusArray as $column => $statusInfo) {
// Does the entry exist?
if ((isset($content[$column])) && (isset($statusInfo[$content[$column]]))) {
$sql .= sprintf(" %s='%s',", SQL_ESCAPE($column), SQL_ESCAPE($statusInfo[$content[$column]]));
// Remember status
- if ($statusColumn == "unknown") {
+ if ($statusColumn == 'unknown') {
// Always (!!!) change status column first!
$oldStatus = $content[$column];
$newStatus = $statusInfo[$oldStatus];
// Finish SQL statement
$sql = substr($sql, 0, -1) . sprintf(" WHERE `%s`=%s AND `%s`='%s' LIMIT 1",
- $idColumn,
- bigintval($id),
- $statusColumn,
- $oldStatus
+ $idColumn,
+ bigintval($id),
+ $statusColumn,
+ $oldStatus
);
// Run the SQL
}
// Delete rows by given ID numbers
-function ADMIN_DELETE_ENTRIES_CONFIRM ($IDs, $table, $columns=array(), $filterFunctions=array(), $extraValues=array(), $deleteNow=false, $idColumn="id", $userIdColumn='userid') {
+function ADMIN_DELETE_ENTRIES_CONFIRM ($IDs, $table, $columns=array(), $filterFunctions=array(), $extraValues=array(), $deleteNow=false, $idColumn='id', $userIdColumn='userid') {
// All valid entries? (We hope so here!)
if ((is_array($IDs)) && (count($IDs) > 0) && (count($columns) == count($filterFunctions)) && (count($columns) == count($extraValues))) {
// Shall we delete here or list for deletion?
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), __FUNCTION__, __LINE__);
+ array($table, $idColumn, $id), __FUNCTION__, __LINE__);
// Fetch the data
$content = SQL_FETCHARRAY($result);
SQL_FREERESULT($result);
// Send "build mails" out
- ADMIN_SEND_BUILD_MAILS("del", $table, $content, $id);
+ ADMIN_SEND_BUILD_MAILS('del', $table, $content, $id);
} // END - if
// Add id number
- $idList .= $id.",";
+ $idList .= $id . ',';
} // END - foreach
// Run the query
}
} else {
// List for deletion confirmation
- ADMIN_BUILD_LIST("del", $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);
+ ADMIN_BUILD_LIST('del', $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);
}
} // END - if
}
// Edit rows by given ID numbers
-function ADMIN_EDIT_ENTRIES_CONFIRM ($IDs, $table, $columns=array(), $filterFunctions=array(), $extraValues=array(), $editNow=false, $idColumn="id", $userIdColumn='userid') {
+function ADMIN_EDIT_ENTRIES_CONFIRM ($IDs, $table, $columns=array(), $filterFunctions=array(), $extraValues=array(), $editNow=false, $idColumn='id', $userIdColumn='userid') {
// All valid entries? (We hope so here!)
if ((is_array($IDs)) && (count($IDs) > 0) && (count($columns) == count($filterFunctions)) && (count($columns) == count($extraValues))) {
// Shall we change here or list for editing?
// Prepare SQL for this row
$sql = sprintf("UPDATE `{!_MYSQL_PREFIX!}_ SET",
- SQL_ESCAPE($table)
+ SQL_ESCAPE($table)
);
foreach (REQUEST_POST_ARRAY() as $key => $entries) {
// Skip raw userid which is always invalid
// Send data through the filter function if found
if ((isset($filterFunctions[$key])) && (isset($extraValues[$key]))) {
// Filter function set!
- $entries[$id] = HANDLE_EXTRA_VALUES($filterFunctions[$key], $entries[$id], $extraValues[$key]);
+ $entries[$id] = handleExtraValues($filterFunctions[$key], $entries[$id], $extraValues[$key]);
} // END - if
// Then add this value
$sql .= sprintf(" %s='%s',",
- SQL_ESCAPE($key),
- SQL_ESCAPE($entries[$id])
+ SQL_ESCAPE($key),
+ SQL_ESCAPE($entries[$id])
);
} elseif (($key != $idColumn) && (!is_array($entries))) {
// Add normal entries as well!
} // 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, __FUNCTION__, __LINE__);
$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), __FUNCTION__, __LINE__);
+ $result = SQL_QUERY_ESC("SELECT * FROM `{!_MYSQL_PREFIX!}_%s` WHERE `%s`=%s LIMIT 1",
+ array($table, $idColumn, $id), __FUNCTION__, __LINE__);
// Fetch the data
global $DATA;
SQL_FREERESULT($result);
// Send "build mails" out
- ADMIN_SEND_BUILD_MAILS("edit", $table, $content, $id);
+ ADMIN_SEND_BUILD_MAILS('edit', $table, $content, $id);
} // END - foreach
// Was this fine?
}
} else {
// List for editing
- ADMIN_BUILD_LIST("edit", $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);
+ ADMIN_BUILD_LIST('edit', $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);
}
} // END - if
}
// Un-/lock rows by given ID numbers
-function ADMIN_LOCK_ENTRIES_CONFIRM ($IDs, $table, $columns=array(), $filterFunctions=array(), $extraValues=array(), $statusArray=array(), $lockNow=false, $idColumn="id", $userIdColumn='userid') {
+function ADMIN_LOCK_ENTRIES_CONFIRM ($IDs, $table, $columns=array(), $filterFunctions=array(), $extraValues=array(), $statusArray=array(), $lockNow=false, $idColumn='id', $userIdColumn='userid') {
// All valid entries? (We hope so here!)
if ((is_array($IDs)) && (count($IDs) > 0) && (count($columns) == count($filterFunctions)) && (count($columns) == count($extraValues)) && ((!$lockNow) || (count($statusArray) == 1))) {
// Shall we un-/lock here or list for locking?
}
// Undelete rows by given ID numbers
-function ADMIN_UNDELETE_ENTRIES_CONFIRM ($IDs, $table, $columns=array(), $filterFunctions=array(), $extraValues=array(), $statusArray=array(), $lockNow=false, $idColumn="id", $userIdColumn='userid') {
+function ADMIN_UNDELETE_ENTRIES_CONFIRM ($IDs, $table, $columns=array(), $filterFunctions=array(), $extraValues=array(), $statusArray=array(), $lockNow=false, $idColumn='id', $userIdColumn='userid') {
// All valid entries? (We hope so here!)
if ((is_array($IDs)) && (count($IDs) > 0) && (count($columns) == count($filterFunctions)) && (count($columns) == count($extraValues)) && ((!$lockNow) || (count($statusArray) == 1))) {
// Shall we un-/lock here or list for locking?
mergeConfig($settingsArray);
// Now get the test URL
- $content = GET_URL("check-updates3.php");
+ $content = sendGetRequest('check-updates3.php');
// Is the first line with "200 OK"?
- $valid = eregi("200 OK", $content[0]);
+ $valid = (strpos($content[0], '200 OK') !== false);
// Return result
return $valid;
// Look up administator login
$result = SQL_QUERY_ESC("SELECT id, login, password FROM `{!_MYSQL_PREFIX!}_admins` WHERE email='%s' LIMIT 1",
- array($email), __FUNCTION__, __LINE__);
+ array($email), __FUNCTION__, __LINE__);
// Is there an account?
if (SQL_NUMROWS($result) == 0) {
SQL_FREERESULT($result);
// Generate hash for reset link
- $content['hash'] = generateHash(URL.":".$content['id'].":".$content['login'].":".$content['password'], substr($content['password'], 10));
+ $content['hash'] = generateHash(URL.':'.$content['id'].':'.$content['login'].':'.$content['password'], substr($content['password'], 10));
// Remove some data
unset($content['id']);
$mailText = LOAD_EMAIL_TEMPLATE("admin_reset_password", $content);
// Send it out
- SEND_EMAIL($email, getMessage('ADMIN_RESET_PASS_LINK_SUBJ'), $mailText);
+ sendEmail($email, getMessage('ADMIN_RESET_PASS_LINK_SUBJ'), $mailText);
// Prepare output
return getMessage('ADMIN_RESET_LINK_SENT');
// 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), __FUNCTION__, __LINE__);
+ array($login), __FUNCTION__, __LINE__);
// Is an account here?
if (SQL_NUMROWS($result) == 1) {
$content = SQL_FETCHARRAY($result);
// Generate hash again
- $hashFromData = generateHash(URL.":".$content['id'].":".$login.":".$content['password'], substr($content['password'], 10));
+ $hashFromData = generateHash(URL.':'.$content['id'].':'.$login.':'.$content['password'], substr($content['password'], 10));
// Does both match?
$valid = ($hash == $hashFromData);
// Update database
SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admins` SET password='%s' WHERE login='%s' LIMIT 1",
- array($passHash, $login), __FUNCTION__, __LINE__);
+ array($passHash, $login), __FUNCTION__, __LINE__);
// Run filters
runFilterChain('post_admin_reset_pass', array('login' => $login, 'hash' => $passHash));
// Solves a task by given id number
function ADMIN_SOLVE_TASK ($id) {
// Update the task data
- ADMIN_UPDATE_TASK_DATA($id, "status", "SOLVED");
+ 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");
+ ADMIN_UPDATE_TASK_DATA($id, 'status', "DELETED");
}
// Function to update task data
if ($id <= 0) {
// Initiate backtrace
debug_report_bug(sprintf("id is invalid: %s. row=%s, data=%s",
- $id,
- $row,
- $data
+ $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__);
+ 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
) && (
$GLOBALS['admin_menu_has_entries'][$action] === true
)) || (
- $action == "login"
+ $action == 'login'
)
);
}
// 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);
+ 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";
+ return '{!URL!}/modules.php?module=admin&what=list_user';
}
//
projects / mailer.git / blobdiff