X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fadmin-inc.php;h=12d20dcf4abdd854c4a16fe3898d5bc0daa4da70;hb=e5dde615db05fb62ebe91bd1c030f40c9b91fe17;hp=0903d1311ab4b072d8bf6c045a39252cecc757e3;hpb=06a24901c58897845bafc1e5b428fee99024bc64;p=mailer.git
diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index 0903d1311a..12d20dcf4a 100644
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -1,7 +1,7 @@
$aid);
-
- // Is the cache valid?
- if (isset($GLOBALS['cache_array']['admins']['password'][$aid])) {
- // Get password from cache
- $data['password'] = $GLOBALS['cache_array']['admins']['password'][$aid];
- $ret = 'pass';
- incrementConfigEntry('cache_hits');
-
- // Include more admins data?
- if (GET_EXT_VERSION('admins') >= '0.7.2') {
- // Load them here
- $data['login_failures'] = $GLOBALS['cache_array']['admins']['login_failures'][$aid];
- $data['last_failure'] = $GLOBALS['cache_array']['admins']['last_failure'][$aid];
- } // END - if
- } elseif (!EXT_IS_ACTIVE('cache')) {
- // Add extra data via filter now
- $add = runFilterChain('sql_admin_extra_data');
-
- // Get password from DB
- $result = SQL_QUERY_ESC("SELECT password" . $add . " FROM `{!_MYSQL_PREFIX!}_admins` WHERE `id`=%s LIMIT 1",
- array($aid), __FUNCTION__, __LINE__);
-
- // Entry found?
- if (SQL_NUMROWS($result) == 1) {
- // Login password found
- $ret = 'pass';
-
- // Fetch data
- $data = SQL_FETCHARRAY($result);
- } // END - if
-
- // Free result
- SQL_FREERESULT($result);
- }
+ // Get admin id from login
+ $adminId = getAdminId($adminLogin);
- //* DEBUG: */ echo "*".$data['password'].'/'.md5($password).'/'.$ret." ";
- 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') == '')) {
- // Old hashing way
- return $ret;
- } elseif (!isset($data['password'])) {
- // Password not found, so no valid login!
- return $ret;
- }
-
- // Generate salt of password
- define('__SALT', substr($data['password'], 0, -40));
- $salt = __SALT;
-
- // Check if password is same
- //* DEBUG: */ echo "*".$ret.','.$data['password'].','.$password.','.$salt."* \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);
-
- // Do we have 0.7.0 of admins or later?
- // Remmeber login failures if available
- if (GET_EXT_VERSION('admins') >= '0.7.2') {
- // Store it in session
- 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__);
- } else {
- // Update password
- SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admins` SET password='%s' WHERE `id`=%s LIMIT 1",
- array($data['password'], $aid), __FUNCTION__, __LINE__);
- }
+ // Continue only with found admin ids
+ if ($adminId > 0) {
+ // Then we need to lookup the login name by getting the admin hash
+ $adminHash = getAdminHash($adminId);
- // Rebuild cache
- rebuildCacheFiles('admins', 'admin');
+ // If this is fine, we can continue
+ if ($adminHash != '-1') {
+ // Get admin id and set it as current
+ setCurrentAdminId($adminId);
- // Login has failed by default... ;-)
- $ret = 'failed';
+ // Now, we need to encode the password in the same way the one is encoded in database
+ $testHash = generateHash($adminPassword, $adminHash);
- // Password matches so login here
- if (LOGIN_ADMIN($admin_login, $data['password'])) {
- // All done now
- $ret = 'done';
- } // END - if
- } elseif ((empty($salt)) && ($ret == 'pass')) {
- // Something bad went wrong
- $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';
+ // If they both match, the login data is valid
+ if ($testHash == $adminHash) {
+ // All fine
+ $ret = 'done';
+ } else {
+ // Set status
+ $ret = 'pass';
+ }
} // 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__);
-
- // Rebuild cache
- rebuildCacheFiles('admins', 'admin');
} // END - if
- // Return the result
- //* DEBUG: */ die("RETURN=".$ret);
- return $ret;
-}
-
-// 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') == ''))) {
- // 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__);
+ // Prepare data array
+ $data = array(
+ 'id' => $adminId,
+ 'login' => $adminLogin,
+ 'plain_pass' => $adminPassword,
+ 'pass_hash' => $adminHash
+ );
- // Rebuild cache
- rebuildCacheFiles('admins', 'admin');
- } // END - if
+ // Run a special filter
+ runFilterChain('do_admin_login_' . $ret, $data);
- // Now set all session variables and return the result
- return ((
- setSession('admin_md5', generatePassString($passHash))
- ) && (
- setSession('admin_login', $adminLogin)
- ) && (
- setSession('admin_last', time())
- ) && (
- setSession('admin_to', bigintval(REQUEST_POST('timeout')))
- ));
+ // Return status
+ return $ret;
}
// Only be executed on cookie checking
-function CHECK_ADMIN_COOKIES ($admin_login, $password) {
- // By default no admin cookies are found
- $ret = '404';
- $pass = '';
+function ifAdminCookiesAreValid ($adminLogin, $passHash) {
+ // First of all, no admin login is found
+ $ret = '404';
- // Get hash
- $pass = GET_ADMIN_HASH(GET_ADMIN_ID($admin_login));
- if ($pass != '-1') $ret = 'pass';
+ // Then we need to lookup the login name by getting the admin hash
+ $adminHash = getAdminHash($adminLogin);
- //* DEBUG: */ print __FUNCTION__."(".__LINE__." ):".generatePassString($pass).'('.strlen($pass).")/".$password.'('.strlen($password).") \n";
+ // If this is fine, we can continue
+ if ($adminHash != '-1') {
+ // Now, we need to encode the password in the same way the one is encoded in database
+ $testHash = encodeHashForCookie($adminHash);
+ //* DEBUG: */ debugOutput('adminLogin=' . $adminLogin . ',passHash='.$passHash.',adminHash='.$adminHash.',testHash='.$testHash);
- // Check if password matches
- if (($ret == 'pass') && ((generatePassString($pass) == $password) || ($pass == $password) || ((strlen($pass) == 32) && (md5($password) == $pass)))) {
- // Passwords matches!
- $ret = 'done';
+ // If they both match, the login data is valid
+ if ($testHash == $passHash) {
+ // All fine
+ $ret = 'done';
+ } else {
+ // Set status
+ $ret = 'pass';
+ }
} // END - if
- // Return result
+ // Return status
+ //* DEBUG: */ debugOutput('ret='.$ret);
return $ret;
}
-//
-function ADMIN_DO_ACTION ($wht) {
- global $DATA;
- //* DEBUG: */ echo __LINE__."*".$wht.'/'.getModule().'/'.getAction().'/'.getWhat()."* \n";
+// Do an admin action
+function doAdminAction () {
+ // Get default what
+ $what = getWhat();
+
+ //* DEBUG: */ debugOutput(__LINE__.'*'.$what.'/'.getModule().'/'.getAction().'/'.getWhat().'*');
// Remove any spaces from variable
- if (empty($wht)) {
+ if (empty($what)) {
// Default admin action is the overview page
- $wht = 'overview';
+ $what = 'overview';
} else {
- // Compile out some chars
- $wht = COMPILE_CODE($wht, false, false, false);
+ // Secure it
+ $what = secureString($what);
}
// Get action value
- $act = getModeAction(getModule(), $wht);
+ $action = getActionFromModuleWhat(getModule(), $what);
- // Define admin login name and ID number
- define('__ADMIN_LOGIN', getSession('admin_login'));
- define('__ADMIN_ID' , getCurrentAdminId());
+ // Define admin login name and id number
+ $content['login'] = getAdminLogin(getSession('admin_id'));
+ $content['id'] = getCurrentAdminId();
// Preload templates
- if (EXT_IS_ACTIVE('admins')) {
- define('__ADMIN_WELCOME', LOAD_TEMPLATE('admin_welcome_admins', true));
+ if (isExtensionActive('admins')) {
+ $content['welcome'] = loadTemplate('admin_welcome_admins', true, $content);
} else {
- define('__ADMIN_WELCOME', LOAD_TEMPLATE('admin_welcome', true));
+ $content['welcome'] = loadTemplate('admin_welcome', true, $content);
}
- define('__ADMIN_FOOTER' , LOAD_TEMPLATE('admin_footer' , true));
- define('__ADMIN_MENU' , ADD_ADMIN_MENU($act, $wht, true));
+ $content['footer'] = loadTemplate('admin_footer' , true, $content);
+ $content['menu'] = addAdminMenu($action, $what, true);
// Tableset header
- LOAD_TEMPLATE('admin_main_header');
+ loadTemplate('admin_main_header', false, $content);
// 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), __FUNCTION__, __LINE__);
+ $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(
+ $action,
+ $what,
+ $what
+ ), __FUNCTION__, __LINE__);
+
+ // Do we have an entry?
if (SQL_NUMROWS($result_action) == 1) {
// Is valid but does the inlcude file exists?
- $INC = sprintf("inc/modules/admin/action-%s.php", $act);
- if ((isIncludeReadable($INC)) && (isMenuActionValid('admin', $act, $wht)) && ($GLOBALS['acl_allow'] === true)) {
+ $inc = sprintf("inc/modules/admin/action-%s.php", $action);
+ if ((isIncludeReadable($inc)) && (isMenuActionValid('admin', $action, $what)) && ($GLOBALS['acl_allow'] === true)) {
// Ok, we finally load the admin action module
- loadInclude($INC);
+ loadInclude($inc);
} elseif ($GLOBALS['acl_allow'] === false) {
// Access denied
- LOAD_TEMPLATE('admin_menu_failed', false, getMessage('ADMIN_ACCESS_DENIED'));
- addFatalMessage(__FUNCTION__, __LINE__, getMessage('ADMIN_ACCESS_DENIED'));
+ loadTemplate('admin_menu_failed', false, getMaskedMessage('ADMIN_ACCESS_DENIED', $what));
} else {
// Include file not found! :-(
- LOAD_TEMPLATE('admin_menu_failed', false, sprintf(getMessage('ADMIN_ACTION_404'), $act));
- addFatalMessage(__FUNCTION__, __LINE__, getMessage('ADMIN_ACTION_404'), $act);
+ loadTemplate('admin_menu_failed', false, getMaskedMessage('ADMIN_ACTION_404', $action));
}
} 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);
+ loadTemplate('admin_menu_failed', false, getMaskedMessage('ADMIN_ACTION_INVALID', $action . '/' . $what));
}
// Free memory
SQL_FREERESULT($result_action);
// Tableset footer
- LOAD_TEMPLATE('admin_main_footer');
+ loadTemplate('admin_main_footer', false, $content);
}
-//
-function ADD_ADMIN_MENU ($act, $wht, $return=false) {
+// Adds an admin menu
+function addAdminMenu ($action, $what, $return=false) {
// Init variables
$SUB = false;
$OUT = '';
@@ -310,268 +244,256 @@ function ADD_ADMIN_MENU ($act, $wht, $return=false) {
$GLOBALS['menu']['description'] = array();
$GLOBALS['menu']['title'] = array();
- // Is there a cache instance?
- if ((isCacheInstanceValid()) && (getConfig('cache_admin_menu') == 'Y')) {
- // Create cache name
- $cacheName = 'admin_' . $act . '_' . $wht . '_' . getLanguage() . '_' . strtolower(getSession('admin_login'));
-
- // Is that cache there?
- if ($GLOBALS['cache_instance']->loadCacheFile($cacheName)) {
- // Then load it
- $data = $GLOBALS['cache_instance']->getArrayFromCache();
-
- // Extract all parts
- $OUT = base64_decode($data['output'][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 === true) {
- return $OUT;
- } else {
- OUTPUT_HTML($OUT);
- }
- } // END - if
- } // END - if
-
// Build main menu
- $result_main = SQL_QUERY("SELECT action, title, descr FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE (`what`='' OR `what` IS NULL) ORDER BY `sort`, id DESC", __FUNCTION__, __LINE__);
- if (SQL_NUMROWS($result_main) > 0) {
- $OUT = "
\n";
- $OUT .= "\n";
+ $result_main = SQL_QUERY("SELECT
+ `action`, `title`, `descr`
+FROM
+ `{?_MYSQL_PREFIX?}_admin_menu`
+WHERE
+ (`what`='' OR `what` IS NULL)
+ORDER BY
+ `sort` ASC,
+ `id` DESC", __FUNCTION__, __LINE__);
+
+ // Do we have entries?
+ if (!SQL_HASZERONUMS($result_main)) {
+ $OUT .= '';
// @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')) {
+ if (isExtensionInstalledAndNewer('admins', '0.2.0')) {
$ACL = adminsCheckAdminAcl($menu, '');
} else {
// @TODO ACL is 'allow'... hmmm
$ACL = true;
}
+ // Filename
+ $inc = sprintf("inc/modules/admin/action-%s.php", $menu);
+
+ // Is the file readable?
+ $readable = isIncludeReadable($inc);
+
if ($ACL === true) {
- if (!$SUB) {
+ if ($SUB === false) {
// Insert compiled menu title and description
$GLOBALS['menu']['title'][$menu] = $title;
$GLOBALS['menu']['description'][$menu] = $descr;
}
- $OUT .= "';
// 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",
+ $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` ASC,
+ `id` DESC",
array($menu), __FUNCTION__, __LINE__);
// Remember the count for later checks
- setAdminMenuHasEntries($menu, ((SQL_NUMROWS($result_what) > 0) && ($act == $menu)));
+ setAdminMenuHasEntries($menu, ((!SQL_HASZERONUMS($result_what)) && ($action == $menu)));
// Do we have entries?
- if ((ifAdminMenuHasEntries($menu)) && (SQL_NUMROWS($result_what) > 0)) {
+ if ((ifAdminMenuHasEntries($menu)) && (!SQL_HASZERONUMS($result_what))) {
$GLOBALS['menu']['description'] = array();
$GLOBALS['menu']['title'] = array(); $SUB = true;
- $OUT .= "';
+ } // END - if
+ } // END - if
+ } // END - while
// Free memory
SQL_FREERESULT($result_main);
- $OUT .= " \n";
+ $OUT .= ' ';
}
// Is there a cache instance again?
- if ((isCacheInstanceValid()) && (getConfig('cache_admin_menu') == 'Y')) {
- // Init cache
- $GLOBALS['cache_instance']->init($cacheName);
-
- // Prepare cache data
- $data = array(
- 'output' => base64_encode($OUT),
- 'title' => $GLOBALS['menu']['title'],
- 'descr' => $GLOBALS['menu']['description']
- );
-
- // Write the data away
- $GLOBALS['cache_instance']->addRow($data);
-
- // Close cache
- $GLOBALS['cache_instance']->finalize();
- } // END - if
-
// Return or output content?
if ($return === true) {
return $OUT;
} else {
- OUTPUT_HTML($OUT);
+ outputHtml($OUT);
}
}
// Create member selection box
-function ADD_MEMBER_SELECTION_BOX ($def='0', $add_all=false, $return=false, $none=false, $field='userid') {
+function addMemberSelectionBox ($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` ASC", __FUNCTION__, __LINE__);
+ $result = SQL_QUERY("SELECT `userid`, `surname`, `family` FROM `{?_MYSQL_PREFIX?}_user_data` ORDER BY `userid` ASC", __FUNCTION__, __LINE__);
// Default output
$OUT = '';
// USe this only for adding points (e.g. adding refs really makes no sence ;-) )
- if ($add_all === true) $OUT = " {--ALL_MEMBERS--} \n";
- elseif ($none === true) $OUT = " {--SELECT_NONE--} \n";
+ if ($add_all === true) $OUT = ' {--ALL_MEMBERS--} ';
+ elseif ($none === true) $OUT = ' {--SELECT_NONE--} ';
while ($content = SQL_FETCHARRAY($result)) {
- $OUT .= " \n";
+ $OUT .= '>' . $content['surname'] . ' ' . $content['family'] . ' (' . bigintval($content['userid']) . ') ';
} // END - while
// Free memory
SQL_FREERESULT($result);
- if (!$return) {
+ if ($return === false) {
// Remeber options in constant
- // @TODO Rewrite these both constants
- define('_MEMBER_SELECTION', $OUT);
-
- // Display selection box
- define('__LANG_VALUE', getLanguage());
+ $content['member_selection'] = $OUT;
+ $content['what'] = getWhat();
// Load template
- LOAD_TEMPLATE('admin_member_selection_box', false, getWhat());
+ loadTemplate('admin_member_selection_box', false, $content);
} else {
// Return content in selection frame
- return "\n".$OUT." \n";
+ return '' . $OUT . ' ';
}
}
// Create a menu selection box for given menu system
-function ADMIN_MENU_SELECTION ($mode, $default = '', $defid = '') {
- $wht = "`what` != ''";
- if ($mode == 'action') $wht = "(`what`='' OR `what` IS NULL) AND action !='login'";
- $result = SQL_QUERY_ESC("SELECT %s, title FROM `{!_MYSQL_PREFIX!}_admin_menu` WHERE ".$wht." ORDER BY `sort`",
- array($mode), __FUNCTION__, __LINE__);
- if (SQL_NUMROWS($result) > 0) {
+// @TODO Try to rewrite this to adminAddMenuSelectionBox()
+// @DEPRECATED
+function adminMenuSelectionBox_DEPRECATED ($mode, $default = '', $defid = '') {
+ $what = "`what` != ''";
+ if ($mode == 'action') $what = "(`what`='' OR `what` IS NULL) AND `action` !='login'";
+
+ $result = SQL_QUERY_ESC("SELECT `%s` AS `menu`, `title` FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE ".$what." ORDER BY `sort` ASC",
+ array($mode), __FUNCTION__, __LINE__);
+ if (!SQL_HASZERONUMS($result)) {
// Load menu as selection
- $OUT = "
- {--SELECT_NONE--} \n";
- // @TODO Try to rewrite this to $content = SQL_FETCHARRAY(). Please look some lines above for the dynamic query
- while (list($menu, $title) = SQL_FETCHROW($result)) {
- $OUT .= " \n";
+ $OUT = '
+ {--SELECT_NONE--} ';
+ // Load all entries
+ while ($content = SQL_FETCHARRAY($result)) {
+ $OUT .= '';
} // END - while
// Free memory
SQL_FREERESULT($result);
- $OUT .= " \n";
+
+ // Add closing select-tag
+ $OUT .= ' ';
} else {
// No menus???
- $OUT = getMessage('ADMIN_PROBLEM_NO_MENU');
+ $OUT = '{--ADMIN_PROBLEM_NO_MENU--}';
}
// Return output
return $OUT;
}
-// Wrapper for $_POST and ADMIN_SAVE_SETTINGS
-function ADMIN_SAVE_SETTINGS_POST () {
+// Wrapper for $_POST and adminSaveSettings
+function adminSaveSettingsFromPostData ($tableName = '_config', $whereStatement = '`config`=0', $translateComma = array(), $alwaysAdd = false, $displayMessage = true) {
// Get the array
- $POST = REQUEST_POST_ARRAY();
+ $postData = postRequestArray();
// Call the lower function
- ADMIN_SAVE_SETTINGS($POST);
+ adminSaveSettings($postData, $tableName, $whereStatement, $translateComma, $alwaysAdd, $displayMessage);
}
// Save settings to the database
-function ADMIN_SAVE_SETTINGS (&$POST, $tableName = "_config", $whereStatement = "config=0", $translateComma = array(), $alwaysAdd = false) {
+function adminSaveSettings (&$postData, $tableName = '_config', $whereStatement = '`config`=0', $translateComma = array(), $alwaysAdd = false, $displayMessage = true) {
// Prepare all arrays, variables
- $DATA = array();
+ $tableData = array();
$skip = false;
// Now, walk through all entries and prepare them for saving
- foreach ($POST as $id => $val) {
+ foreach ($postData as $id => $val) {
// Process only formular field but not submit buttons ;)
if ($id != 'ok') {
// Do not save the ok value
- convertSelectionsToTimestamp($POST, $DATA, $id, $skip);
-
- // Shall we process this ID? It muss not be empty, of course
- if ((!$skip) && (!empty($id))) {
- // Save this entry
- $val = COMPILE_CODE($val);
+ convertSelectionsToTimestamp($postData, $tableData, $id, $skip);
+ // Shall we process this id? It muss not be empty, of course
+ if (($skip === false) && (!empty($id)) && ((!isset($GLOBALS['skip_config'][$id]))) || ($tableName != '_config')) {
// Translate the value? (comma to dot!)
if ((is_array($translateComma)) && (in_array($id, $translateComma))) {
// Then do it here... :)
@@ -580,14 +502,20 @@ function ADMIN_SAVE_SETTINGS (&$POST, $tableName = "_config", $whereStatement =
// Shall we add numbers or strings?
$test = (float)$val;
- if ("".$val."" == ''.$test."") {
+ if ('' . $val . '' == '' . $test . '') {
// Add numbers
- $DATA[] = sprintf("`%s`=%s", $id, $test);
+ $tableData[] = sprintf("`%s`=%s", $id, $test);
+ } elseif (is_null($val)) {
+ // Add NULL
+ $tableData[] = sprintf("`%s`=NULL", $id);
} else {
// Add strings
- $DATA[] = sprintf("`%s`='%s'", $id, trim($val));
+ $tableData[] = sprintf("`%s`='%s'", $id, trim($val));
}
+ // Do not add a config entry twice
+ $GLOBALS['skip_config'][$id] = true;
+
// Update current configuration
setConfigEntry($id, $val);
} // END - if
@@ -596,42 +524,43 @@ function ADMIN_SAVE_SETTINGS (&$POST, $tableName = "_config", $whereStatement =
// Check if entry does exist
$result = false;
- if (!$alwaysAdd) {
+ if ($alwaysAdd === false) {
if (!empty($whereStatement)) {
- $result = SQL_QUERY("SELECT * FROM `{!_MYSQL_PREFIX!}".$tableName."` WHERE ".$whereStatement." LIMIT 1", __FUNCTION__, __LINE__);
+ $result = SQL_QUERY("SELECT * FROM `{?_MYSQL_PREFIX?}" . $tableName . "` WHERE " . $whereStatement . " LIMIT 1", __FUNCTION__, __LINE__);
} else {
- $result = SQL_QUERY("SELECT * FROM `{!_MYSQL_PREFIX!}".$tableName."` LIMIT 1", __FUNCTION__, __LINE__);
+ $result = SQL_QUERY("SELECT * FROM `{?_MYSQL_PREFIX?}" . $tableName . "` LIMIT 1", __FUNCTION__, __LINE__);
}
} // END - if
if (SQL_NUMROWS($result) == 1) {
// "Implode" all data to single string
- $DATA_UPDATE = implode(", ", $DATA);
+ $updatedData = implode(', ', $tableData);
// Generate SQL string
- $sql = sprintf("UPDATE `{!_MYSQL_PREFIX!}%s` SET %s WHERE %s LIMIT 1",
- $tableName,
- $DATA_UPDATE,
- $whereStatement
+ $sql = sprintf("UPDATE `{?_MYSQL_PREFIX?}%s` SET %s WHERE %s LIMIT 1",
+ $tableName,
+ $updatedData,
+ $whereStatement
);
} else {
// Add Line (does only work with auto_increment!
- $KEYs = array(); $values = array();
- foreach ($DATA as $entry) {
+ $keys = array(); $values = array();
+ foreach ($tableData as $entry) {
// Split up
$line = explode('=', $entry);
- $KEYs[] = $line[0]; $values[] = $line[1];
+ $keys[] = $line[0];
+ $values[] = $line[1];
} // END - foreach
// Add both in one line
- $KEYs = implode(", ", $KEYs);
- $values = implode(", ", $values);
+ $keys = implode('`, `', $keys);
+ $values = implode(', ', $values);
// Generate SQL string
- $sql = sprintf("INSERT INTO {!_MYSQL_PREFIX!}%s (%s) VALUES (%s)",
- $tableName,
- $KEYs,
- $values
+ $sql = sprintf("INSERT INTO `{?_MYSQL_PREFIX?}%s` (%s) VALUES (%s)",
+ $tableName,
+ $keys,
+ $values
);
}
@@ -641,116 +570,131 @@ function ADMIN_SAVE_SETTINGS (&$POST, $tableName = "_config", $whereStatement =
// Simply run generated SQL string
SQL_QUERY($sql, __FUNCTION__, __LINE__);
+ // Remember affected rows
+ $affected = SQL_AFFECTEDROWS();
+
// Rebuild cache
- rebuildCacheFiles("config", "config");
+ rebuildCache('config', 'config');
+
+ // Settings saved, so display message?
+ if ($displayMessage === true) loadTemplate('admin_settings_saved', false, '{--SETTINGS_SAVED--}');
- // Settings saved
- LOAD_TEMPLATE('admin_settings_saved', false, getMessage('SETTINGS_SAVED'));
+ // Return affected rows
+ return $affected;
}
// Generate a selection box
-function ADMIN_MAKE_MENU_SELECTION ($menu, $type, $name, $default = '') {
+function adminAddMenuSelectionBox ($menu, $type, $name, $default = '') {
// Open the requested menu directory
$menuArray = getArrayFromDirectory(sprintf("inc/modules/%s/", $menu), '', false, false);
// Init the selection box
- $OUT = "
- {--IS_TOP_MENU--} \n";
+ $OUT = '{--IS_TOP_MENU--} ';
// Walk through all files
foreach ($menuArray as $file) {
// Is this a PHP script?
- if ((!isDirectory($file)) && (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);
+ $test = sprintf("inc/modules/%s/%s", $menu, $file);
// Is the file there?
- if (isFileReadable($test)) {
+ if (isIncludeReadable($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 .= " \n";
+ $OUT .= '>' . $part . ' ';
} // END - if
} // END - if
} // END - if
} // END - foreach
// Close selection box
- $OUT .= " \n";
+ $OUT .= ' ';
// Return contents
return $OUT;
}
// Creates a user-profile link for the admin. This function can also be used for many other purposes
-function generateUserProfileLink ($uid, $title = '', $wht="list_user") {
- if (($title == '') && ($title != '0')) {
+function generateUserProfileLink ($userid, $title = '', $what = 'list_user') {
+ if (($title == '') && ($userid > 0)) {
// Set userid as title
- $title = $uid;
- } // END - if
+ $title = $userid;
+ } elseif ($userid == 0) {
+ // User id zero is invalid
+ return '' . $userid . ' ';
+ }
- if (($title == '0') && ($wht == "list_refs")) {
+ if (($title == '0') && ($what == 'list_refs')) {
// Return title again
return $title;
- } // END - if
+ } elseif (isExtensionActive('nickname')) {
+ // Get nickname
+ $nick = getNickname($userid);
+
+ // Is it not empty, use it as title else the userid
+ if (!empty($nick)) $title = $nick . '(' . $userid . ')'; else $title = $userid;
+ }
- //* DEBUG: */ echo "a:".$title." ";
// Return link
- return "".$title." ";
+ return '[' . $title . ' ]';
}
// Check "logical-area-mode"
-function ADMIN_CHECK_MENU_MODE () {
- // Set the global mode as the mode for all admins
+function adminGetMenuMode () {
+ // Set the default menu mode as the mode for all admins
$mode = getConfig('admin_menu');
- $ADMIN = $mode;
+ $adminMode = $mode;
// Get admin id
- $aid = getCurrentAdminId();
+ $adminId = getCurrentAdminId();
// Check individual settings of current admin
- if (isset($GLOBALS['cache_array']['admins']['la_mode'][$aid])) {
+ if (isset($GLOBALS['cache_array']['admin']['la_mode'][$adminId])) {
// Load from cache
- $ADMIN = $GLOBALS['cache_array']['admins']['la_mode'][$aid];
- incrementConfigEntry('cache_hits');
- } elseif (GET_EXT_VERSION('admins') >= '0.6.7') {
+ $adminMode = $GLOBALS['cache_array']['admin']['la_mode'][$adminId];
+ incrementStatsEntry('cache_hits');
+ } elseif (isExtensionInstalledAndNewer('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($adminId), __FUNCTION__, __LINE__);
+
+ // Do we have an entry?
if (SQL_NUMROWS($result) == 1) {
// Load data
- list($ADMIN) = SQL_FETCHROW($result);
- }
+ list($adminMode) = SQL_FETCHROW($result);
+ } // END - if
// Free memory
SQL_FREERESULT($result);
}
- // Check what the admin wants and set it when it's not the global mode
- if ($ADMIN != 'global') $mode = $ADMIN;
+ // Check what the admin wants and set it when it's not the default mode
+ if ($adminMode != 'global') $mode = $adminMode;
// Return admin-menu's mode
return $mode;
}
// Change activation status
-function ADMIN_CHANGE_ACTIVATION_STATUS ($IDs, $table, $row, $idRow = 'id') {
- $cnt = 0; $newStatus = 'Y';
+function adminChangeActivationStatus ($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) {
- // Secure the ID number
+ // Secure the id number
$id = bigintval($id);
// 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",
+ $result = SQL_QUERY_ESC("SELECT %s FROM `{?_MYSQL_PREFIX?}_%s` WHERE %s=%s LIMIT 1",
array($row, $table, $idRow, $id), __FUNCTION__, __LINE__);
// Row found?
@@ -762,7 +706,7 @@ function ADMIN_CHANGE_ACTIVATION_STATUS ($IDs, $table, $row, $idRow = 'id') {
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",
+ SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_%s` SET %s='%s' WHERE %s=%s LIMIT 1",
array($table, $row, $newStatus, $idRow, $id), __FUNCTION__, __LINE__);
// Count up affected rows
@@ -775,15 +719,15 @@ function ADMIN_CHANGE_ACTIVATION_STATUS ($IDs, $table, $row, $idRow = 'id') {
} // END - foreach
// Output status
- LOAD_TEMPLATE('admin_settings_saved', false, sprintf(getMessage('ADMIN_STATUS_CHANGED'), $cnt, count($IDs)));
+ loadTemplate('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'));
+ loadTemplate('admin_settings_saved', false, '{--ADMIN_NOTHING_SELECTED_CHANGE--}');
}
}
// Send mails for del/edit/lock build modes
-function ADMIN_SEND_BUILD_MAILS ($mode, $table, $content, $id, $subjectPart = '') {
+function sendAdminBuildMails ($mode, $table, $content, $id, $subjectPart = '', $userid = 'userid') {
// Default subject is the subject part
$subject = $subjectPart;
@@ -794,39 +738,39 @@ function ADMIN_SEND_BUILD_MAILS ($mode, $table, $content, $id, $subjectPart = ''
} // END - if
// Is the raw userid set?
- if (REQUEST_POST('uid_raw', $id) > 0) {
+ if (postRequestParameter($userid, $id) > 0) {
// Generate subject
- $subjectLine = getMessage('MEMBER_'.strtoupper($subject).'_'.strtoupper($table).'_SUBJECT');
+ $subject = '{--MEMBER_' . strtoupper($subject) . '_' . strtoupper($table) . '_SUBJECT--}';
// Load email template
if (!empty($subjectPart)) {
- $mail = LOAD_EMAIL_TEMPLATE("member_".$mode."_".strtolower($subjectPart)."_".$table, $content);
+ $mail = loadEmailTemplate('member_' . $mode . '_' . strtolower($subjectPart) . '_' . $table, $content);
} else {
- $mail = LOAD_EMAIL_TEMPLATE("member_".$mode."_".$table, $content);
+ $mail = loadEmailTemplate('member_' . $mode . '_' . $table, $content);
}
// Send email out
- sendEmail(REQUEST_POST('uid_raw', $id), $subjectLine, $mail);
+ sendEmail(postRequestParameter($userid, $id), $subject, $mail);
} // END - if
// Generate subject
- $subjectLine = getMessage('ADMIN_'.strtoupper($subject).'_'.strtoupper($table).'_SUBJECT');
+ $subject = '{--ADMIN_' . strtoupper($subject) . '_' . strtoupper($table) . '_SUBJECT--}';
// Send admin notification out
if (!empty($subjectPart)) {
- sendAdminNotification($subjectLine, "admin_".$mode."_".strtolower($subjectPart)."_".$table, $content, REQUEST_POST('uid_raw', $id));
+ sendAdminNotification($subject, 'admin_' . $mode . '_' . strtolower($subjectPart) . '_' . $table, $content, postRequestParameter($userid, $id));
} else {
- sendAdminNotification($subjectLine, "admin_".$mode."_".$table, $content, REQUEST_POST('uid_raw', $id));
+ sendAdminNotification($subject, 'admin_' . $mode . '_' . $table, $content, postRequestParameter($userid, $id));
}
}
// Build a special template list
-function ADMIN_BUILD_LIST ($listType, $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn) {
- $OUT = ''; $SW = 2;
+function adminListBuilder ($listType, $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $userid = 'userid') {
+ $OUT = '';
// "Walk"Â through all entries
foreach ($IDs as $id => $selected) {
- // Secure ID number
+ // Secure id number
$id = bigintval($id);
// Get result from a given column array and table name
@@ -843,27 +787,30 @@ function ADMIN_BUILD_LIST ($listType, $IDs, $table, $columns, $filterFunctions,
$idx = array_search($key, $columns, true);
//Â Do we have a userid?
- if ($key == 'userid') {
+ if ($key == $userIdColumn) {
// Add it again as raw id
- $content['uid'] = bigintval($value);
+ $content[$userIdColumn] = bigintval($value);
+ $content[$userIdColumn . '_raw'] = $content[$userIdColumn];
+ } // END - if
+
+ // If the key matches the idColumn variable, we need to temporary remember it
+ //* DEBUG: */ debugOutput('key=' . $key . ',idColumn=' . $idColumn . ',value=' . $value);
+ if ($key == $idColumn) {
+ // Found, so remember it
+ $GLOBALS['admin_list_builder_id_value'] = $value;
} // END - if
// Handle the call in external function
+ //* DEBUG: */ debugOutput('key=' . $key . ',fucntion=' . $filterFunctions[$idx] . ',value=' . $value);
$content[$key] = handleExtraValues($filterFunctions[$idx], $value, $extraValues[$idx]);
} // END - foreach
- // Add color switching
- $content['sw'] = $SW;
-
// Then list it
- $OUT .= LOAD_TEMPLATE(sprintf("admin_%s_%s_row",
- $listType,
- $table
- ), true, $content
+ $OUT .= loadTemplate(sprintf("admin_%s_%s_row",
+ $listType,
+ $table
+ ), true, $content
);
-
- // Switch color
- $SW = 3 - $SW;
} // END - if
// Free the result
@@ -871,24 +818,24 @@ function ADMIN_BUILD_LIST ($listType, $IDs, $table, $columns, $filterFunctions,
} // END - foreach
// Load master template
- LOAD_TEMPLATE(sprintf("admin_%s_%s",
- $listType,
- $table
- ), false, $OUT
+ loadTemplate(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) {
+function adminBuilderStatusHandler ($mode, $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $statusArray, $userid = 'userid') {
// All valid entries? (We hope so here!)
if ((is_array($IDs)) && (count($IDs) > 0) && (count($columns) == count($filterFunctions)) && (count($columns) == count($extraValues)) && (count($statusArray) > 0)) {
// "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",
+ $result = SQL_QUERY_ESC("SELECT * FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`=%s LIMIT 1",
array($table, $idColumn, $id), __FUNCTION__, __LINE__);
// Fetch the data
@@ -916,16 +863,19 @@ function ADMIN_BUILD_STATUS_HANDLER ($mode, $IDs, $table, $columns, $filterFunct
} // END - if
} elseif (isset($content[$column])) {
// Unfinished!
- app_die(__FUNCTION__, __LINE__, ":UNFINISHED: id={$id}/{$column}[".gettype($statusInfo)."] = {$content[$column]}");
+ debug_report_bug(__FUNCTION__, __LINE__, ":UNFINISHED: id={$id}/{$column}[".gettype($statusInfo)."] = {$content[$column]}");
}
} // END - foreach
// Add other columns as well
- foreach (REQUEST_POST_ARRAY() as $key => $entries) {
+ foreach (postRequestArray() as $key => $entries) {
+ // Debug message
+ logDebugMessage(__FUNCTION__, __LINE__, 'Found entry: ' . $key);
+
// Skip id, raw userid and 'do_$mode'
- if (!in_array($key, array($idColumn, 'uid_raw', ('do_'.$mode)))) {
+ if (!in_array($key, array($idColumn, $userid, ('do_' . $mode)))) {
// Are there brackets () at the end?
- if (substr($entries[$id], -2, 2) == "()") {
+ if (substr($entries[$id], -2, 2) == '()') {
// Direct SQL command found
$sql .= sprintf(" %s=%s,", SQL_ESCAPE($key), SQL_ESCAPE($entries[$id]));
} else {
@@ -935,15 +885,18 @@ function ADMIN_BUILD_STATUS_HANDLER ($mode, $IDs, $table, $columns, $filterFunct
// Add entry
$content[$key] = $entries[$id];
}
- } // END - if
+ } else {
+ // Skipped entry
+ logDebugMessage(__FUNCTION__, __LINE__, 'Skipped: ' . $key);
+ }
} // END - foreach
// 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
@@ -952,32 +905,36 @@ function ADMIN_BUILD_STATUS_HANDLER ($mode, $IDs, $table, $columns, $filterFunct
// Do we have an URL?
if (isset($content['url'])) {
// Then add a framekiller test as well
- $content['frametester'] = FRAMETESTER($content['url']);
+ $content['frametester'] = generateFrametesterUrl($content['url']);
} // END - if
// Send "build mails" out
- ADMIN_SEND_BUILD_MAILS($mode, $table, $content, $id, $statusInfo[$content[$column]]);
+ sendAdminBuildMails($mode, $table, $content, $id, $statusInfo[$content[$column]]);
} // END - foreach
} // END - if
}
-// 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') {
+// Delete rows by given id numbers
+function adminDeleteEntriesConfirm ($IDs, $table, $columns = array(), $filterFunctions = array(), $extraValues = array(), $deleteNow = false, $idColumn = 'id', $userIdColumn = 'userid', $userid = '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 ($deleteNow) {
+ if ($deleteNow === true) {
// 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 (REQUEST_ISSET_POST('uid_raw', $id)) {
+ if (isPostRequestParameterSet($userid, $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__);
+ $result = SQL_QUERY_ESC("SELECT * FROM `{?_MYSQL_PREFIX?}_%s` WHERE `%s`=%s LIMIT 1",
+ array(
+ $table,
+ $idColumn,
+ $id
+ ), __FUNCTION__, __LINE__);
// Fetch the data
$content = SQL_FETCHARRAY($result);
@@ -986,7 +943,7 @@ function ADMIN_DELETE_ENTRIES_CONFIRM ($IDs, $table, $columns=array(), $filterFu
SQL_FREERESULT($result);
// Send "build mails" out
- ADMIN_SEND_BUILD_MAILS('del', $table, $content, $id);
+ sendAdminBuildMails('del', $table, $content, $id);
} // END - if
// Add id number
@@ -994,42 +951,42 @@ 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)), __FUNCTION__, __LINE__);
+ SQL_QUERY_ESC($sql, array($table, $idColumn, substr($idList, 0, -1)), __FUNCTION__, __LINE__);
// Was this fine?
if (SQL_AFFECTEDROWS() == count($IDs)) {
// All deleted
- LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_ALL_ENTRIES_REMOVED'));
+ loadTemplate('admin_settings_saved', false, '{--ADMIN_ALL_ENTRIES_REMOVED--}');
} else {
// Some are still there :(
- LOAD_TEMPLATE('admin_settings_saved', false, sprintf(getMessage('ADMIN_SOME_ENTRIES_NOT_DELETED'), SQL_AFFECTEDROWS(), count($IDs)));
+ loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_SOME_ENTRIES_NOT_DELETED'), SQL_AFFECTEDROWS(), count($IDs)));
}
} else {
// List for deletion confirmation
- ADMIN_BUILD_LIST('del', $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);
+ adminListBuilder('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') {
+// Edit rows by given id numbers
+function adminEditEntriesConfirm ($IDs, $table, $columns = array(), $filterFunctions = array(), $extraValues = array(), $editNow = false, $idColumn = 'id', $userIdColumn = 'userid', $userid = '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?
- if ($editNow) {
+ if ($editNow === true) {
// Change them all
- $affected = 0;
+ $affected = '0';
foreach ($IDs as $id => $sel) {
// Prepare content array (new values)
$content = array();
// Prepare SQL for this row
- $sql = sprintf("UPDATE `{!_MYSQL_PREFIX!}_ SET",
- SQL_ESCAPE($table)
+ $sql = sprintf("UPDATE `{?_MYSQL_PREFIX?}_%s` SET",
+ SQL_ESCAPE($table)
);
- foreach (REQUEST_POST_ARRAY() as $key => $entries) {
+ foreach (postRequestArray() as $key => $entries) {
// Skip raw userid which is always invalid
- if ($key == "uid_raw") {
+ if ($key == $userid) {
// Continue with next field
continue;
} // END - if
@@ -1046,9 +1003,9 @@ function ADMIN_EDIT_ENTRIES_CONFIRM ($IDs, $table, $columns=array(), $filterFunc
} // END - if
// Then add this value
- $sql .= sprintf(" %s='%s',",
- SQL_ESCAPE($key),
- SQL_ESCAPE($entries[$id])
+ $sql .= sprintf(" `%s`='%s',",
+ SQL_ESCAPE($key),
+ SQL_ESCAPE($entries[$id])
);
} elseif (($key != $idColumn) && (!is_array($entries))) {
// Add normal entries as well!
@@ -1056,14 +1013,14 @@ function ADMIN_EDIT_ENTRIES_CONFIRM ($IDs, $table, $columns=array(), $filterFunc
}
// Do we have an URL?
- if ($key == "url") {
+ if ($key == 'url') {
// Then add a framekiller test as well
- $content['frametester'] = FRAMETESTER($content[$key]);
+ $content['frametester'] = generateFrametesterUrl($content[$key]);
} // END - if
} // 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__);
@@ -1072,67 +1029,66 @@ function ADMIN_EDIT_ENTRIES_CONFIRM ($IDs, $table, $columns=array(), $filterFunc
$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;
- $DATA = SQL_FETCHARRAY($result);
+ // Fetch the data and merge it into $content
+ $content = merge_array($content, SQL_FETCHARRAY($result));
// Free the result
SQL_FREERESULT($result);
// Send "build mails" out
- ADMIN_SEND_BUILD_MAILS('edit', $table, $content, $id);
+ sendAdminBuildMails('edit', $table, $content, $id);
} // END - foreach
// Was this fine?
if ($affected == count($IDs)) {
// All deleted
- LOAD_TEMPLATE('admin_settings_saved', false, getMessage('ADMIN_ALL_ENTRIES_EDITED'));
+ loadTemplate('admin_settings_saved', false, '{--ADMIN_ALL_ENTRIES_EDITED--}');
} else {
// Some are still there :(
- LOAD_TEMPLATE('admin_settings_saved', false, sprintf(getMessage('ADMIN_SOME_ENTRIES_NOT_EDITED'), $affected, count($IDs)));
+ loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_SOME_ENTRIES_NOT_EDITED'), $affected, count($IDs)));
}
} else {
// List for editing
- ADMIN_BUILD_LIST('edit', $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);
+ adminListBuilder('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') {
+// Un-/lock rows by given id numbers
+function adminLockEntriesConfirm ($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))) {
+ if ((is_array($IDs)) && (count($IDs) > 0) && (count($columns) == count($filterFunctions)) && (count($columns) == count($extraValues)) && (($lockNow === false) || (count($statusArray) == 1))) {
// Shall we un-/lock here or list for locking?
- if ($lockNow) {
+ if ($lockNow === true) {
// Un-/lock entries
- ADMIN_BUILD_STATUS_HANDLER("lock", $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $statusArray);
+ adminBuilderStatusHandler('lock', $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $statusArray);
} else {
// List for editing
- ADMIN_BUILD_LIST("lock", $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);
+ adminListBuilder('lock', $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);
}
} // END - if
}
-// 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') {
+// Undelete rows by given id numbers
+function adminUndeleteEntriesConfirm ($IDs, $table, $columns=array(), $filterFunctions=array(), $extraValues=array(), $statusArray=array(), $undeleteNow=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))) {
+ if ((is_array($IDs)) && (count($IDs) > 0) && (count($columns) == count($filterFunctions)) && (count($columns) == count($extraValues)) && (($undeleteNow === false) || (count($statusArray) == 1))) {
// Shall we un-/lock here or list for locking?
- if ($lockNow) {
+ if ($undeleteNow === true) {
// Undelete entries
- ADMIN_BUILD_STATUS_HANDLER("undelete", $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $statusArray);
+ adminBuilderStatusHandler('undelete', $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $statusArray);
} else {
// List for editing
- ADMIN_BUILD_LIST("undelete", $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);
+ adminListBuilder('undelete', $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);
}
} // END - if
}
// Checks proxy settins by fetching check-updates3.php from www.mxchange.org
-function ADMIN_TEST_PROXY_SETTINGS ($settingsArray) {
+function adminTestProxySettings ($settingsArray) {
// Set temporary the new settings
mergeConfig($settingsArray);
@@ -1147,21 +1103,18 @@ function ADMIN_TEST_PROXY_SETTINGS ($settingsArray) {
}
// Sends out a link to the given email adress so the admin can reset his/her password
-function ADMIN_SEND_PASSWORD_RESET_LINK ($email) {
+function sendAdminPasswordResetLink ($email) {
// Init output
$OUT = '';
- // Compile out security characters (must be for looking up!)
- $email = COMPILE_CODE($email);
-
//Â 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__);
+ $result = SQL_QUERY_ESC("SELECT `id`, `login`, `password` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `email`='%s' LIMIT 1",
+ array($email), __FUNCTION__, __LINE__);
// Is there an account?
- if (SQL_NUMROWS($result) == 0) {
+ if (SQL_HASZERONUMS($result)) {
// No account found!
- return getMessage('ADMIN_NO_LOGIN_WITH_EMAIL');
+ return '{--ADMIN_NO_LOGIN_WITH_EMAIL--}';
} // END - if
// Load all data
@@ -1171,33 +1124,30 @@ function ADMIN_SEND_PASSWORD_RESET_LINK ($email) {
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(getUrl() . ':' . $content['id'] . ':' . $content['login'] . ':' . $content['password'], substr($content['password'], 10));
// Remove some data
unset($content['id']);
unset($content['password']);
// Prepare email
- $mailText = LOAD_EMAIL_TEMPLATE("admin_reset_password", $content);
+ $mailText = loadEmailTemplate('admin_reset_password', $content);
// Send it out
- sendEmail($email, getMessage('ADMIN_RESET_PASS_LINK_SUBJ'), $mailText);
+ sendEmail($email, '{--ADMIN_RESET_PASS_LINK_SUBJECT--}', $mailText);
// Prepare output
- return getMessage('ADMIN_RESET_LINK_SENT');
+ return '{--ADMIN_RESET_LINK_SENT--}';
}
// Validate hash and login for password reset
-function ADMIN_VALIDATE_RESET_LINK_HASH_LOGIN ($hash, $login) {
+function adminResetValidateHashLogin ($hash, $login) {
// By default nothing validates... ;)
$valid = false;
- // Compile the login for lookup
- $login = COMPILE_CODE($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), __FUNCTION__, __LINE__);
+ $result = SQL_QUERY_ESC("SELECT `id`, `password`, `email` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `login`='%s' LIMIT 1",
+ array($login), __FUNCTION__, __LINE__);
// Is an account here?
if (SQL_NUMROWS($result) == 1) {
@@ -1205,7 +1155,7 @@ function ADMIN_VALIDATE_RESET_LINK_HASH_LOGIN ($hash, $login) {
$content = SQL_FETCHARRAY($result);
// Generate hash again
- $hashFromData = generateHash(URL.':'.$content['id'].':'.$login.':'.$content['password'], substr($content['password'], 10));
+ $hashFromData = generateHash(getUrl() . ':' . $content['id'] . ':' . $login . ':' . $content['password'], substr($content['password'], 10));
// Does both match?
$valid = ($hash == $hashFromData);
@@ -1219,67 +1169,71 @@ function ADMIN_VALIDATE_RESET_LINK_HASH_LOGIN ($hash, $login) {
}
// Reset the password for the login. Do NOT call this function without calling above function first!
-function ADMIN_RESET_PASSWORD ($login, $password) {
- // Init hash
- $passHash = '';
-
- // Now check if we have sql_patches installed
- if (GET_EXT_VERSION('sql_patches') >= '0.3.6') {
- // Use new way of hashing
- $passHash = generateHash($password);
- } else {
- // Old MD5 method
- $passHash = md5($password);
- }
+function doResetAdminPassword ($login, $password) {
+ // Generate hash (we already check for sql_patches in generateHash())
+ $passHash = generateHash($password);
// Update database
- SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_admins` SET password='%s' WHERE login='%s' LIMIT 1",
- array($passHash, $login), __FUNCTION__, __LINE__);
+ SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_admins` SET `password`='%s' WHERE `login`='%s' LIMIT 1",
+ array($passHash, $login), __FUNCTION__, __LINE__);
// Run filters
runFilterChain('post_admin_reset_pass', array('login' => $login, 'hash' => $passHash));
// Return output
- return ADMIN_PASSWORD_RESET_DONE;
+ return '{--ADMIN_PASSWORD_RESET_DONE--}';
}
// Solves a task by given id number
-function ADMIN_SOLVE_TASK ($id) {
+function adminSolveTask ($id) {
// Update the task data
- ADMIN_UPDATE_TASK_DATA($id, 'status', "SOLVED");
+ adminUpdateTaskData($id, 'status', 'SOLVED');
}
// Marks a given task as deleted
-function ADMIN_DELETE_TASK ($id) {
+function adminDeleteTask ($id) {
// Update the task data
- ADMIN_UPDATE_TASK_DATA($id, 'status', "DELETED");
+ adminUpdateTaskData($id, 'status', 'DELETED');
}
// Function to update task data
-function ADMIN_UPDATE_TASK_DATA ($id, $row, $data) {
+function adminUpdateTaskData ($id, $row, $data) {
+ // Should be admin!
+ if (!isAdmin()) {
+ // Not an admin so redirect better
+ redirectToUrl('modules.php?module=index');
+ } // END - if
+
// Is the id not set, then we need a backtrace here... :(
if ($id <= 0) {
// Initiate backtrace
- debug_report_bug(sprintf("id is invalid: %s. row=%s, data=%s",
- $id,
- $row,
- $data
+ debug_report_bug(__FUNCTION__, __LINE__, sprintf("id is invalid: %s. row=%s, data=%s",
+ $id,
+ $row,
+ $data
));
} // END - if
// Update the task
- SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_task_system` SET %s='%s' WHERE `id`=%s LIMIT 1",
- array($row, $data, bigintval($id)), __FUNCTION__, __LINE__);
+ SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_task_system` SET `%s`='%s' WHERE `id`=%s LIMIT 1",
+ array(
+ $row,
+ $data,
+ bigintval($id)
+ ), __FUNCTION__, __LINE__);
}
// Checks wether if the admin menu has entries
function ifAdminMenuHasEntries ($action) {
return (
((
+ // Is the entry set?
isset($GLOBALS['admin_menu_has_entries'][$action])
) && (
+ // And do we have a menu for this action?
$GLOBALS['admin_menu_has_entries'][$action] === true
)) || (
+ // Login has always a menu
$action == 'login'
)
);
@@ -1291,16 +1245,191 @@ function setAdminMenuHasEntries ($action, $hasEntries) {
}
// Creates a link to the user's admin-profile
-function ADMIN_CREATE_USERID_LINK ($uid) {
+function adminCreateUserLink ($userid) {
// Is the userid set correctly?
- if ($uid > 0) {
+ if ($userid > 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&userid=' . bigintval($userid) . '%}';
} // 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%}';
}
+// Generate a "link" for the given admin id (admin_id)
+function generateAdminLink ($adminId) {
+ // No assigned admin is default
+ $adminLink = '{--ADMIN_NO_ADMIN_ASSIGNED--} ';
+
+ // Zero? = Not assigned
+ if (bigintval($adminId) > 0) {
+ // Load admin's login
+ $login = getAdminLogin($adminId);
+
+ // Is the login valid?
+ if ($login != '***') {
+ // Is the extension there?
+ if (isExtensionActive('admins')) {
+ // Admin found
+ $adminLink = '' . $login . ' ';
+ } else {
+ // Extension not found
+ $adminLink = getMaskedMessage('EXTENSION_PROBLEM_EXTENSION_NOT_INSTALLED', 'admins');
+ }
+ } else {
+ // Maybe deleted?
+ $adminLink = '' . getMaskedMessage('ADMIN_ID_404', $adminId) . '
';
+ }
+ } // END - if
+
+ // Return result
+ return $adminLink;
+}
+
+// Verifies if the current admin has confirmed to alter expert settings
//
+// Return values:
+// 'failed' = Something goes wrong (default)
+// 'agreed' = Has verified and and confirmed it to see them
+// 'forbidden' = Has not the proper right to alter them
+// 'update' = Need to update extension 'admins'
+// 'ask' = A form was send to the admin
+function doVerifyExpertSettings () {
+ // Default return status is failed
+ $return = 'failed';
+
+ // Is the extension installed and recent?
+ if (isExtensionInstalledAndNewer('admins', '0.7.3')) {
+ // Okay, load the status
+ $expertSettings = getAminsExpertSettings();
+
+ // Is he allowed?
+ if ($expertSettings == 'Y') {
+ // Okay, does he want to see them?
+ if (getAminsExpertWarning() == 'Y') {
+ // Ask for them
+ if (isFormSent()) {
+ // Is the element set, then we need to change the admin
+ if (isPostRequestParameterSet('expert_settings')) {
+ // Get it and prepare final post data array
+ $postData['login'][getCurrentAdminId()] = getAdminLogin(getCurrentAdminId());
+ $postData['expert_warning'][getCurrentAdminId()] = 'N';
+
+ // Change it in the admin
+ adminsChangeAdminAccount($postData, 'expert_warning');
+
+ // Clear form
+ unsetPostRequestParameter('ok');
+ } // END - if
+
+ // All fine!
+ $return = 'agreed';
+ } else {
+ // Send form
+ loadTemplate('admin_expert_settings_form');
+
+ // Asked for it
+ $return = 'ask';
+ }
+ } else {
+ // Do not display
+ $return = 'agreed';
+ }
+ } else {
+ // Forbidden
+ $return = 'forbidden';
+ }
+ } else {
+ // Out-dated extension or not installed
+ $return = 'update';
+ }
+
+ // Output message for other status than ask/agreed
+ if (($return != 'ask') && ($return != 'agreed')) {
+ // Output message
+ loadTemplate('admin_settings_saved', false, '{--ADMIN_EXPERT_SETTINGS_STATUS_' . strtoupper($return) . '--}');
+ } // END - if
+
+ // Return status
+ return $return;
+}
+
+// Generate link to unconfirmed mails for admin
+function generateUnconfirmedAdminLink ($id, $unconfirmed, $type = 'bid') {
+ // Init output
+ $OUT = $unconfirmed;
+
+ // Do we have unconfirmed mails?
+ if ($unconfirmed > 0) {
+ // Add link to list_unconfirmed what-file
+ $OUT = '' . translateComma($unconfirmed) . ' ';
+ } // END - if
+
+ // Return it
+ return $OUT;
+}
+
+// Generates a navigation row for listing emails
+function addEmailNavigation ($numPages, $offset, $show_form, $colspan, $return=false) {
+ // Don't do anything if $numPages is 1
+ if ($numPages == 1) {
+ // Abort here with empty content
+ return '';
+ } // END - if
+
+ $TOP = '';
+ if ($show_form === false) {
+ $TOP = ' top';
+ } // END - if
+
+ $NAV = '';
+ for ($page = 1; $page <= $numPages; $page++) {
+ // Is the page currently selected or shall we generate a link to it?
+ if (($page == getRequestParameter('page')) || ((!isGetRequestParameterSet('page')) && ($page == 1))) {
+ // Is currently selected, so only highlight it
+ $NAV .= '-';
+ } else {
+ // Open anchor tag and add base URL
+ $NAV .= '';
+ }
+ $NAV .= $page;
+ if (($page == getRequestParameter('page')) || ((!isGetRequestParameterSet('page')) && ($page == 1))) {
+ // Is currently selected, so only highlight it
+ $NAV .= '- ';
+ } else {
+ // Close anchor tag
+ $NAV .= '';
+ }
+
+ // Add seperator if we have not yet reached total pages
+ if ($page < $numPages) {
+ // Add it
+ $NAV .= '|';
+ } // END - if
+ } // END - for
+
+ // Define constants only once
+ $content['nav'] = $NAV;
+ $content['span'] = $colspan;
+ $content['top'] = $TOP;
+
+ // Load navigation template
+ $OUT = loadTemplate('admin_email_nav_row', true, $content);
+
+ if ($return === true) {
+ // Return generated HTML-Code
+ return $OUT;
+ } else {
+ // Output HTML-Code
+ outputHtml($OUT);
+ }
+}
+
+// [EOF]
?>