} // END - if
// Register an administrator account
-function addAdminAccount ($adminLogin, $passHash, $adminEmail) {
+function addAdminAccount ($adminLogin, $passHash, $adminEmail, $accessLevel = 'deny') {
// Login does already exist
$ret = 'already';
// Is the entry there?
if (SQL_HASZERONUMS($result)) {
- // Ok, let's create the admin login
- SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_admins` (`login`,`password`,`email`) VALUES ('%s', '%s', '%s')",
- array(
- $adminLogin,
- $passHash,
- $adminEmail
- ), __FUNCTION__, __LINE__);
+ // Is ext-admins installed and version at least 0.3.0?
+ if (isExtensionInstalledAndNewer('admins', '0.3.0')) {
+ // Ok, let's create the admin login
+ SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_admins` (`login`, `password`, `email`, `default_acl`) VALUES ('%s', '%s', '%s', '%s')",
+ array(
+ $adminLogin,
+ $passHash,
+ $adminEmail,
+ $accessLevel
+ ), __FUNCTION__, __LINE__);
+ } else {
+ // Ok, let's create the admin login
+ SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_admins` (`login`, `password`, `email`) VALUES ('%s', '%s', '%s')",
+ array(
+ $adminLogin,
+ $passHash,
+ $adminEmail
+ ), __FUNCTION__, __LINE__);
+ }
// All done
$ret = 'done';
$adminId = getAdminId($adminLogin);
// Continue only with found admin ids
- if ($adminId > 0) {
+ if (isValidId($adminId)) {
// Then we need to lookup the login name by getting the admin hash
$adminHash = getAdminHash($adminId);
//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'adminLogin=' . $adminLogin . ',passHash='.$passHash.',adminHash='.$adminHash.',testHash='.$testHash);
// If they both match, the login data is valid
- if ($testHash == $passHash) {
+ if ($testHash != $passHash) {
+ // Passwords don't match
+ $ret = 'password';
+ } elseif (!isAdmin()) {
+ // Is not valid session
+ $ret = 'session';
+ } else {
// All fine
$ret = 'done';
- } else {
- // Set status
- $ret = 'password';
}
} // END - if
// Load welcome template
if (isExtensionActive('admins')) {
// @TODO This and the next getCurrentAdminId() call might be moved into the templates?
- $content['welcome'] = loadTemplate('admin_welcome_admins', true, getCurrentAdminId());
+ $content['welcome'] = loadTemplate('admin_welcome_admins', TRUE, getCurrentAdminId());
} else {
- $content['welcome'] = loadTemplate('admin_welcome', true, getCurrentAdminId());
+ $content['welcome'] = loadTemplate('admin_welcome', TRUE, getCurrentAdminId());
}
// Load header, footer, render menu
- $content['header'] = loadTemplate('admin_header' , true, $content);
- $content['footer'] = loadTemplate('admin_footer' , true, $content);
+ $content['header'] = loadTemplate('admin_header' , TRUE, $content);
+ $content['footer'] = loadTemplate('admin_footer' , TRUE, $content);
$content['menu'] = addAdminMenu($action, $what);
// Load main template
- loadTemplate('admin_main', false, $content);
+ loadTemplate('admin_main', FALSE, $content);
// Check if action/what pair is valid
$result_action = SQL_QUERY_ESC("SELECT
if (SQL_NUMROWS($result_action) == 1) {
// Is valid but does the inlcude file exists?
$inc = sprintf("inc/modules/admin/action-%s.php", $action);
- if ((isIncludeReadable($inc)) && (isMenuActionValid('admin', $action, $what)) && ($GLOBALS['acl_allow'] === true)) {
+ if ((isIncludeReadable($inc)) && (isMenuActionValid('admin', $action, $what)) && ($GLOBALS['acl_allow'] === TRUE)) {
// Ok, we finally load the admin action module
loadInclude($inc);
- } elseif ($GLOBALS['acl_allow'] === false) {
+ } elseif ($GLOBALS['acl_allow'] === FALSE) {
// Access denied
- loadTemplate('admin_menu_failed', false, '{%message,ADMIN_ACCESS_DENIED=' . $what . '%}');
+ loadTemplate('admin_menu_failed', FALSE, '{%message,ADMIN_ACCESS_DENIED=' . $what . '%}');
} else {
// Include file not found :-(
- loadTemplate('admin_menu_failed', false, '{%message,ADMIN_ACTION_404=' . $action . '%}');
+ loadTemplate('admin_menu_failed', FALSE, '{%message,ADMIN_ACTION_404=' . $action . '%}');
}
} else {
// Invalid action/what pair found
- loadTemplate('admin_menu_failed', false, '{%message,ADMIN_ACTION_INVALID=' . $action . '/' . $what . '%}');
+ loadTemplate('admin_menu_failed', FALSE, '{%message,ADMIN_ACTION_INVALID=' . $action . '/' . $what . '%}');
}
// Free memory
SQL_FREERESULT($result_action);
// Tableset footer
- loadTemplate('admin_main_footer', false, $content);
+ loadTemplate('admin_main_footer', FALSE, $content);
}
/**
// Adds an admin menu
function addAdminMenu ($action, $what) {
// Init variables
- $SUB = false;
+ $SUB = FALSE;
$OUT = '';
// Menu descriptions
// Is the current admin allowed to access this 'action' menu?
if (isAdminAllowedAccessMenu($mainContent['main_action'])) {
- if ($SUB === false) {
+ if ($SUB === FALSE) {
// Insert compiled menu title and description
$GLOBALS['menu']['title'][$mainContent['main_action']] = $mainContent['main_title'];
$GLOBALS['menu']['description'][$mainContent['main_action']] = $mainContent['main_descr'];
// Are there entries?
if (ifAdminMenuHasEntries($mainContent['main_action'])) {
// Sub menu has been called
- $SUB = true;
+ $SUB = TRUE;
// Are there entries?
if (!SQL_HASZERONUMS($result_what)) {
// Load all entries
while ($content = SQL_FETCHARRAY($result)) {
+ // Default is none
+ $content['default'] = '';
+
+ // Is the id the same?
+ if ($content['id'] == $adminId) {
+ // Set this as default
+ $content['default'] = ' selected="selected"';
+ } // END - if
+
// Add the entry
- $OUT .= loadTemplate('select_admins_option', true, $content);
+ $OUT .= loadTemplate('select_admins_option', TRUE, $content);
} // END - if
// Free memory
$content['form_selection'] = $OUT;
// Output form
- loadTemplate('select_admins_box', false, $content);
+ loadTemplate('select_admins_box', FALSE, $content);
}
// Create a member selection box
-function addMemberSelectionBox ($userid = NULL, $add_all = false, $return = false, $none = false, $field = 'userid', $whereStatement = " WHERE `surname` NOT LIKE '{?tester_user_surname_prefix?}%'") {
+function addMemberSelectionBox ($userid = NULL, $add_all = FALSE, $return = FALSE, $none = FALSE, $field = 'userid', $whereStatement = " WHERE `surname` NOT LIKE '{?tester_user_surname_prefix?}%'") {
// Output selection form with all confirmed user accounts listed
$result = SQL_QUERY('SELECT
`userid`,
$OUT = '';
// USe this only for adding points (e.g. adding refs really makes no sence ;-) )
- if ($add_all === true) {
+ if ($add_all === TRUE) {
$OUT = ' <option value="all">{--ALL_MEMBERS--}</option>';
- } elseif ($none === true) {
+ } elseif ($none === TRUE) {
$OUT = ' <option value="0">{--SELECT_NONE--}</option>';
}
while ($content = SQL_FETCHARRAY($result)) {
//* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'userid=' . intval($userid) . '/' . $content['userid']);
$OUT .= '<option value="' . bigintval($content['userid']) . '"';
- if (bigintval($userid) === bigintval($content['userid'])) {
+ if (bigintval($userid, FALSE, FALSE) === bigintval($content['userid'])) {
$OUT .= ' selected="selected"';
} // END - if
$OUT .= '>' . $content['surname'] . ' ' . $content['family'] . ' (' . bigintval($content['userid']) . ')</option>';
// Free memory
SQL_FREERESULT($result);
- if ($return === false) {
+ if ($return === FALSE) {
// Remeber options in constant
$content['form_selection'] = $OUT;
$content['what'] = '{%pipe,getWhat%}';
// Load template
- loadTemplate('admin_form_selection_box', false, $content);
+ loadTemplate('admin_form_selection_box', FALSE, $content);
} else {
// Return content in selection frame
return '<select class="form_select" name="' . handleFieldWithBraces($field) . '" size="1">' . $OUT . '</select>';
$what = "`what` != '' AND `what` IS NOT NULL";
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",
+ $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 name="' . $mode . '_menu';
- if ((!empty($defid)) || ($defid == '0')) $OUT .= '[' . $defid . ']';
+ if (!isValidId($defid)) $OUT .= '[' . intval($defid) . ']';
$OUT .= '" size="1" class="form_select">
<option value="">{--SELECT_NONE--}</option>';
// Load all entries
}
// Wrapper for $_POST and adminSaveSettings
-function adminSaveSettingsFromPostData ($tableName = '_config', $whereStatement = '`config`=0', $translateComma = array(), $alwaysAdd = false, $displayMessage = true) {
+function adminSaveSettingsFromPostData ($tableName = '_config', $whereStatement = '`config`=0', $translateComma = array(), $alwaysAdd = FALSE, $displayMessage = TRUE) {
// Get the array
$postData = postRequestArray();
}
// Save settings to the database
-function adminSaveSettings (&$postData, $tableName = '_config', $whereStatement = '`config`=0', $translateComma = array(), $alwaysAdd = false, $displayMessage = true) {
+function adminSaveSettings (&$postData, $tableName = '_config', $whereStatement = '`config`=0', $translateComma = array(), $alwaysAdd = FALSE, $displayMessage = TRUE) {
// Prepare all arrays, variables
$tableData = array();
- $skip = false;
+ $skip = FALSE;
// Now, walk through all entries and prepare them for saving
+ //* BUG: */ reportBug(__FUNCTION__, __LINE__, '<pre>'.print_r(postRequestArray(), TRUE).'</pre>');
foreach ($postData as $id => $val) {
// Process only formular field but not submit buttons ;)
- if ($id == 'ok') {
+ if ($id == 'save_config') {
// Skip this button
continue;
} // END - if
convertSelectionsToEpocheTime($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')) {
+ 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... :)
$val = convertCommaToDot($val);
} // END - if
- // Shall we add numbers or strings?
+ // Test value on float
$test = (float) $val;
+
+ // Debug message
+ //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'test=' . $test . ',val=' . $val . ',id=' . $id);
+
+ // Shall we add numbers or strings?
if ('' . $val . '' == '' . $test . '') {
// Add numbers
array_push($tableData, sprintf("`%s`=%s", $id, $test));
}
// Do not add a config entry twice
- $GLOBALS['skip_config'][$id] = true;
+ $GLOBALS['skip_config'][$id] = TRUE;
// Update current configuration
setConfigEntry($id, $val);
} // END - foreach
// Check if entry does exist
- $result = false;
- if ($alwaysAdd === false) {
+ $result = FALSE;
+ if ($alwaysAdd === FALSE) {
if (!empty($whereStatement)) {
$result = SQL_QUERY("SELECT * FROM `{?_MYSQL_PREFIX?}" . $tableName . "` WHERE " . $whereStatement . " LIMIT 1", __FUNCTION__, __LINE__);
} else {
} // 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)",
rebuildCache('config', 'config');
// Settings saved, so display message?
- if ($displayMessage === true) displayMessage('{--SETTINGS_SAVED--}');
+ if ($displayMessage === TRUE) {
+ // Display a message
+ displayMessage('{--SETTINGS_SAVED--}');
+ } // END - if
// Return affected rows
return $affected;
// Generate a selection box
function adminAddMenuSelectionBox ($menu, $type, $name, $default = '') {
// Open the requested menu directory
- $menuArray = getArrayFromDirectory(sprintf("inc/modules/%s/", $menu), $type . '-', false, false);
+ $menuArray = getArrayFromDirectory(sprintf("inc/modules/%s/", $menu), $type . '-', FALSE, FALSE);
// Init the selection box
$OUT = '<select name="' . $name . '" class="form_select" size="1"><option value="">{--ADMIN_IS_TOP_MENU--}</option>';
}
// Creates a user-profile link for the admin. This function can also be used for many other purposes
-function generateUserProfileLink ($userid, $title = '', $what = 'list_user') {
- if (($title == '') && (isValidUserId($userid))) {
- // Set userid as title
- $title = $userid;
- } elseif (!isValidUserId($userid)) {
- // User id zero is invalid
- return '<strong>' . convertNullToZero($userid) . '</strong>';
- }
-
- if (($title == '0') && ($what == 'list_refs')) {
- // Return title again
- return $title;
- } elseif (!empty($title)) {
- // Not empty, so skip next one
- } 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 {
+function generateUserProfileLink ($userid, $title = '', $what = '') {
+ // Is there cache?
+ if (!isset($GLOBALS[__FUNCTION__][$userid][$title . '_' . $what])) {
+ // Is title empty and valid userid?
+ if (($title == '') && (isValidId($userid))) {
+ // Set userid as title
$title = $userid;
+ } elseif (!isValidId($userid)) {
+ // User id zero is invalid
+ return '<strong>' . convertNullToZero($userid) . '</strong>';
}
- }
- // Return link
- return '[<a href="{%url=modules.php?module=admin&what=' . $what . '&userid=' . $userid . '%}" title="{--ADMIN_USER_PROFILE_TITLE--}">' . $title . '</a>]';
+ // Is what set?
+ if (empty($what)) {
+ // Then get it to 'list_user'
+ $what = 'list_user';
+ } // END - if
+
+ if (($title == '0') && ($what == 'list_refs')) {
+ // Return title again
+ return $title;
+ } elseif (!empty($title)) {
+ // Not empty, so skip next one
+ } 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;
+ }
+ }
+
+ // Set it in cache
+ $GLOBALS[__FUNCTION__][$userid][$title . '_' . $what] = '[<a href="{%url=modules.php?module=admin&what=' . $what . '&userid=' . $userid . '%}" title="{--ADMIN_USER_PROFILE_TITLE--}">' . $title . '</a>]';
+ } // END - if
+
+ // Return cache
+ return $GLOBALS[__FUNCTION__][$userid][$title . '_' . $what];
}
// Check "logical-area-mode"
// Set the default menu mode as the mode for all admins
$mode = 'global';
- // If sql_patches is up-to-date enough, use the configuration
+ // If ext-sql_patches is up-to-date enough, use the configuration
if (isExtensionInstalledAndNewer('sql_patches', '0.3.2')) {
$mode = getAdminMenu();
} // END - if
}
// Build a special template list
-function adminListBuilder ($listType, $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $rawUserId = array('userid')) {
+// @TODO cacheFiles is not yet supported
+function adminListBuilder ($listType, $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $rawUserId = array('userid'), $content = array()) {
// Call inner (general) function
- doGenericListBuilder('admin', $listType, $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $rawUserId);
+ doGenericListBuilder('admin', $listType, $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $rawUserId, $content);
}
// Change status of "build" list
// Add other columns as well
foreach (postRequestArray() as $key => $entries) {
// Debug message
- logDebugMessage(__FUNCTION__, __LINE__, 'Found entry: ' . $key);
+ /* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'Found entry: ' . $key);
// Skip id, raw userid and 'do_$mode'
if (!in_array($key, array($idColumn[0], $rawUserId[0], ('do_' . $mode)))) {
// Add entry
$content[$key] = $entries[$id];
}
- } else {
+ } elseif (isDebugModeEnabled()) {
// Skipped entry
logDebugMessage(__FUNCTION__, __LINE__, 'Skipped: ' . $key);
}
}
// Delete rows by given id numbers
-function adminDeleteEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $deleteNow = array(false), $idColumn = array('id'), $userIdColumn = array('userid'), $rawUserId = array('userid'), $cacheFiles = array()) {
+function adminDeleteEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $deleteNow = array(FALSE), $idColumn = array('id'), $userIdColumn = array('userid'), $rawUserId = array('userid'), $cacheFiles = array(), $content = array()) {
// $tableName must be an array
if ((!is_array($tableName)) || (count($tableName) != 1)) {
// No tableName specified
} // END - if
// Shall we delete here or list for deletion?
- if ($deleteNow[0] === true) {
+ if ($deleteNow[0] === TRUE) {
// Call generic function
- $affected = doGenericDeleteEntriesConfirm($tableName, $columns, $filterFunctions, $extraValues, $timeColumns, $editNow, $idColumn, $userIdColumn, $rawUserId, $cacheFiles);
+ $affected = doGenericDeleteEntriesConfirm($tableName, $columns, $filterFunctions, $extraValues, $deleteNow, $idColumn, $userIdColumn, $rawUserId, $cacheFiles);
// Was this fine?
if ($affected == countPostSelection($idColumn[0])) {
}
} else {
// List for deletion confirmation
- adminListBuilder('delete', $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);
+ adminListBuilder('delete', $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $rawUserId, $content);
}
}
// Edit rows by given id numbers
-function adminEditEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $timeColumns = array(), $editNow = array(false), $idColumn = array('id'), $userIdColumn = array('userid'), $rawUserId = array('userid'), $cacheFiles = array()) {
+function adminEditEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $timeColumns = array(), $editNow = array(FALSE), $idColumn = array('id'), $userIdColumn = array('userid'), $rawUserId = array('userid'), $cacheFiles = array(), $content = array()) {
// $tableName must be an array
if ((!is_array($tableName)) || (count($tableName) != 1)) {
// No tableName specified
} // END - if
// Shall we change here or list for editing?
- if ($editNow[0] === true) {
+ if ($editNow[0] === TRUE) {
// Call generic change method
$affected = doGenericEditEntriesConfirm($tableName, $columns, $filterFunctions, $extraValues, $timeColumns, $editNow, $idColumn, $userIdColumn, $rawUserId, $cacheFiles);
}
} else {
// List for editing
- adminListBuilder('edit', $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn);
+ adminListBuilder('edit', $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $rawUserId, $content);
}
}
// Un-/lock rows by given id numbers
-function adminLockEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $statusArray = array(), $lockNow = array(false), $idColumn = array('id'), $userIdColumn = array('userid')) {
+// @TODO rawUserId/content is not yet supported
+function adminLockEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $statusArray = array(), $lockNow = array(FALSE), $idColumn = array('id'), $userIdColumn = array('userid')) {
// $tableName must be an array
if ((!is_array($tableName)) || (count($tableName) != 1)) {
// No tableName specified
} // END - if
// Shall we un-/lock here or list for locking?
- if ($lockNow[0] === true) {
+ if ($lockNow[0] === TRUE) {
// Un-/lock entries
adminBuilderStatusHandler('lock', $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $statusArray);
} else {
}
// Undelete rows by given id numbers
-function adminUndeleteEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $statusArray = array(), $undeleteNow = array(false), $idColumn = array('id'), $userIdColumn = array('userid')) {
+// @TODO rawUserId/cacheFiles/content is not yet supported
+function adminUndeleteEntriesConfirm ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $statusArray = array(), $undeleteNow = array(FALSE), $idColumn = array('id'), $userIdColumn = array('userid')) {
// $tableName must be an array
if ((!is_array($tableName)) || (count($tableName) != 1)) {
// No tableName specified
} // END - if
// Shall we un-/lock here or list for locking?
- if ($undeleteNow[0] === true) {
+ if ($undeleteNow[0] === TRUE) {
// Undelete entries
adminBuilderStatusHandler('undelete', $tableName, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $statusArray);
} else {
// Adds a given entry to the database
function adminAddEntries ($tableName, $columns = array(), $filterFunctions = array(), $extraValues = array(), $timeColumns = array(), $columnIndex = NULL) {
+ // Is the userid set?
+ if (!isPostRequestElementSet('userid')) {
+ // Then set NULL here
+ setPostRequestElement('userid', NULL);
+ } // END - if
+
// Call inner function
doGenericAddEntries($tableName, $columns, $filterFunctions, $extraValues, $timeColumns, $columnIndex);
// Entry has been added?
- if ((!SQL_HASZEROAFFECTED()) && ($GLOBALS['__XML_PARSE_RESULT'] === true)) {
+ if ((!SQL_HASZEROAFFECTED()) && ($GLOBALS['__XML_PARSE_RESULT'] === TRUE)) {
// Display success message
displayMessage('{--ADMIN_ENTRY_ADDED--}');
} else {
mergeConfig($settingsArray);
// Now get the test URL
- $content = sendGetRequest('check-updates3.php');
+ $content = sendHttpGetRequest('check-updates3.php');
// Is the first line with "200 OK"?
$valid = isInString('200 OK', $content[0]);
$OUT = '';
// Look up administator login
- $result = SQL_QUERY_ESC("SELECT `id`,`login`,`password` FROM `{?_MYSQL_PREFIX?}_admins` WHERE '%s' REGEXP `email` LIMIT 1",
+ $result = SQL_QUERY_ESC("SELECT `id`, `login`, `password` FROM `{?_MYSQL_PREFIX?}_admins` WHERE '%s' REGEXP `email` LIMIT 1",
array($email), __FUNCTION__, __LINE__);
// Is there an account?
// Validate hash and login for password reset
function adminResetValidateHashLogin ($hash, $login) {
// By default nothing validates... ;)
- $valid = false;
+ $valid = FALSE;
// Then try to find that user
- $result = SQL_QUERY_ESC("SELECT `id`,`password`,`email` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `login`='%s' LIMIT 1",
+ $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?
// Reset the password for the login. Do NOT call this function without calling above function first!
function doResetAdminPassword ($login, $password) {
- // Generate hash (we already check for sql_patches in generateHash())
+ // Generate hash (we already check for ext-sql_patches in generateHash())
$passHash = generateHash($password);
// Prepare fake POST data
);
// Update database
- $message = adminsChangeAdminAccount($postData, '', false);
+ $message = adminsChangeAdminAccount($postData, '', FALSE);
// Run filters
runFilterChain('post_form_reset_pass', array('login' => $login, 'hash' => $passHash, 'message' => $message));
isset($GLOBALS['admin_menu_has_entries'][$action])
) && (
// And do we have a menu for this action?
- $GLOBALS['admin_menu_has_entries'][$action] === true
+ $GLOBALS['admin_menu_has_entries'][$action] === TRUE
)) || (
// Login has always a menu
$action == 'login'
// Creates a link to the user's admin-profile
function adminCreateUserLink ($userid) {
// Is the userid set correctly?
- if (isValidUserId($userid)) {
+ if (isValidId($userid)) {
// Create a link to that profile
return '{%url=modules.php?module=admin&what=list_user&userid=' . bigintval($userid) . '%}';
} // END - if
$adminLink = '{--ADMIN_NO_ADMIN_ASSIGNED--}';
// Zero? = Not assigned
- if (isValidUserId($adminId)) {
+ if (isValidId($adminId)) {
// Load admin's login
$login = getAdminLogin($adminId);
// Okay, does he want to see them?
if (isAdminsExpertWarningEnabled()) {
// Ask for them
- if (isFormSent()) {
+ if (isFormSent('save_expert')) {
// Is the element set, then we need to change the admin
if (isPostRequestElementSet('expert_settings')) {
// Get it and prepare final post data array
// Change it in the admin
adminsChangeAdminAccount($postData, 'expert_warning');
-
- // Clear form
- unsetPostRequestElement('ok');
} // END - if
// All fine!
// Do not display
$return = 'agreed';
}
+
+ // Is a form sent?
+ if ((isFormSent()) && (isPostRequestElementSet('expert_settings'))) {
+ // Clear form
+ unsetPostRequestElement('ok');
+ unsetPostRequestElement('expert_settings');
+ } // END - if
} else {
// Forbidden
$return = 'forbidden';
}
// Generate link to unconfirmed mails for admin
-function generateUnconfirmedAdminLink ($id, $unconfirmed, $type = 'bid') {
+function generateUnconfirmedAdminLink ($id, $unconfirmed, $type) {
// Init output
$OUT = $unconfirmed;
// Is there unconfirmed mails?
if ($unconfirmed > 0) {
// Add link to list_unconfirmed what-file
- $OUT = '<a href="{%url=modules.php?module=admin&what=list_unconfirmed&' . $type . '=' . $id . '%}">{%pipe,translateComma=' . $unconfirmed . '%}</a>';
+ $OUT = '<a href="{%url=modules.php?module=admin&what=list_unconfirmed&type=' . $type . '&id=' . $id . '%}">{%pipe,translateComma=' . $unconfirmed . '%}</a>';
} // END - if
// Return it
} // END - if
$TOP = '';
- if ($show_form === false) {
+ if ($show_form === FALSE) {
$TOP = ' top';
} // END - if
$NAV .= '<a href="{%url=modules.php?module=admin&what=' . getWhat() . '&page=' . $page . '&offset=' . $offset;
// Add userid when we shall show all mails from a single member
- if ((isGetRequestElementSet('userid')) && (isValidUserId(getRequestElement('userid')))) $NAV .= '&userid=' . bigintval(getRequestElement('userid'));
+ if ((isGetRequestElementSet('userid')) && (isValidId(getRequestElement('userid')))) $NAV .= '&userid=' . bigintval(getRequestElement('userid'));
// Close open anchor tag
$NAV .= '%}">';
$content['top'] = $TOP;
// Load navigation template
- $OUT = loadTemplate('admin_email_nav_row', true, $content);
+ $OUT = loadTemplate('admin_email_nav_row', TRUE, $content);
- if ($return === true) {
+ if ($return === TRUE) {
// Return generated HTML-Code
return $OUT;
} else {
} // END - if
}
+// Function to register first admin
+function registerFirstAdmin () {
+ // Make sure that no admin is registered
+ assert(!isAdminRegistered());
+
+ // Admin is not registered so we have to inform the user
+ if ((isFormSent('add_first_admin')) && ((!isPostRequestElementSet('admin_login')) || (!isPostRequestElementSet('admin_password1')) || (strlen(postRequestElement('admin_password1')) < getConfig('minium_admin_pass_length')) || (!isPostRequestElementSet('admin_password2')) || (strlen(postRequestElement('admin_password2')) < getConfig('minium_admin_pass_length')) || (postRequestElement('admin_password1') != postRequestElement('admin_password2')))) {
+ setPostRequestElement('add_first_admin', '***');
+ } // END - if
+
+ // Clear error message
+ $errorMessage = '';
+ $ret = 'init';
+
+ // Is form for first admin sent?
+ if ((isFormSent('add_first_admin')) && (postRequestElement('add_first_admin') != '***')) {
+ // Hash the password with the old function because we are here in install mode
+ $hashedPass = md5(postRequestElement('admin_password1'));
+
+ // Kill maybe existing session variables
+ destroyAdminSession();
+
+ // Do registration
+ $ret = addAdminAccount(postRequestElement('admin_login'), $hashedPass, getWebmaster(), 'allow');
+
+ // Check if registration wents fine
+ switch ($ret) {
+ case 'done':
+ // Change ADMIN_REGISTERED entry
+ $done = changeDataInLocalConfigurationFile('ADMIN-SETUP', "setConfigEntry('ADMIN_REGISTERED', '", "');", 'Y', 0);
+
+ // Was it successfull?
+ if ($done === TRUE) {
+ // Registering is done
+ redirectToUrl('modules.php?module=admin&register=done');
+ } else {
+ // Registration incomplete
+ $errorMessage = '{--ADMIN_CANNOT_COMPLETE--}';
+
+ // Set this to have our error message displayed
+ setPostRequestElement('add_first_admin', '***');
+ }
+ break;
+
+ case 'failed': // Registration has failed
+ $errorMessage = '{--ADMIN_REGISTER_FAILED--}';
+
+ // Set this to have our error message displayed
+ setPostRequestElement('add_first_admin', '***');
+ break;
+
+ case 'already': // Admin does already exists!
+ $errorMessage = '{--ADMIN_LOGIN_ALREADY_REG--}';
+
+ // Set this to have our error message displayed
+ setPostRequestElement('add_first_admin', '***');
+ break;
+
+ default:
+ // Any other kind will be logged
+ $errorMessage = sprintf("Unknown return code %s from ifAdminLoginDataIsValid().", $ret);
+ logDebugMessage(__FUNCTION__, __LINE__, $errorMessage);
+
+ // Set this to have our error message displayed
+ setPostRequestElement('add_first_admin', '***');
+ break;
+ } // END - switch
+ } // END - if
+
+ // Whas that action okay?
+ if ($ret != 'done') {
+ // Init login name
+ $content['admin_login'] = '';
+ if (isPostRequestElementSet('admin_login')) {
+ $content['admin_login'] = postRequestElement('admin_login');
+ } // END - if
+
+ // Init array elements
+ $content['login_message'] = '';
+ $content['password1_message'] = '';
+ $content['password2_message'] = '';
+ $content['error_message'] = '';
+
+ // Yet-another notice-fix
+ if ((isFormSent('add_first_admin')) && (postRequestElement('add_first_admin') == '***')) {
+ // Init variables
+ $loginMessage = '';
+ $password1Message = '';
+ $password2Message = '';
+
+ // No login entered?
+ if (empty($content['admin_login'])) {
+ $loginMessage = '{--ADMIN_NO_LOGIN--}';
+ } // END - if
+
+ // An error comes back from registration?
+ if ((!empty($ret)) && ($ret != 'init')) {
+ $loginMessage = $errorMessage;
+ } // END - if
+
+ // No password 1 entered or to short?
+ if (!isPostRequestElementSet('admin_password1')) {
+ $password1Message = '{--ADMIN_NO_PASSWORD1--}';
+ } elseif (strlen(postRequestElement('admin_password1')) < getConfig('minium_admin_pass_length')) {
+ $password1Message = '{--ADMIN_SHORT_PASSWORD1--}';
+ }
+
+ // No password 2 entered or to short?
+ if (!isPostRequestElementSet('admin_password2')) {
+ $password2Message = '{--ADMIN_NO_PASSWORD2--}';
+ } elseif (strlen(postRequestElement('admin_password2')) < getConfig('minium_admin_pass_length')) {
+ $password2Message = '{--ADMIN_SHORT_PASSWORD2--}';
+ }
+
+ // Both didn't match?
+ if (postRequestElement('admin_password1') != postRequestElement('admin_password2')) {
+ // No match
+ if (empty($password1Message)) $password1Message = '{--ADMIN_PASSWORD1_MISMATCH--}';
+ if (empty($password2Message)) $password2Message = '{--ADMIN_PASSWORD2_MISMATCH--}';
+ } // END - if
+
+ // Output error messages
+ $content['login_message'] = loadTemplate('admin_login_msg', TRUE, $loginMessage);
+ $content['password1_message'] = loadTemplate('admin_login_msg', TRUE, $password1Message);
+ $content['password2_message'] = loadTemplate('admin_login_msg', TRUE, $password2Message);
+ $content['error_message'] = loadTemplate('admin_login_msg', TRUE, $errorMessage);
+ } // END - if
+
+ // Output message in seperate template
+ displayMessage('{--ADMIN_ACCOUNT_NOT_REGISTERED_YET--}');
+
+ // Load register template
+ loadTemplate('admin_reg_form', FALSE, $content);
+ } // END - if
+}
+
// [EOF]
?>
projects / mailer.git / blobdiff