X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fadmin-inc.php;h=66e71dc1597fabab8b6131b71bebfce077362659;hp=1041fabe3ffcb4eac27e1d76a5c9c0efc3aec778;hb=57227d33e870ec5cd271209c4a978a52b45c2dd6;hpb=3c0c6ad28a250c08b3fe8b166c589d0d49441ad3 diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php index 1041fabe3f..66e71dc159 100644 --- a/inc/modules/admin/admin-inc.php +++ b/inc/modules/admin/admin-inc.php @@ -116,12 +116,13 @@ function ifAdminLoginDataIsValid ($admin, $password) { SQL_FREERESULT($result); } - //* DEBUG: */ outputHtml("*".$data['password'].'/'.md5($password).'/'.$ret."
"); + //* DEBUG: */ outputHtml('*' . $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! + //* DEBUG: */ outputHtml($ret . ',' . intval(isExtensionInstalledAndOlder('sql_patches', '0.3.6')) . '/' . intval(!isExtensionInstalled('sql_patches')).'
'); if (($ret == 'pass') && ((isExtensionInstalledAndOlder('sql_patches', '0.3.6')) || (!isExtensionInstalled('sql_patches')))) $ret = 'done'; } elseif ((isExtensionInstalledAndOlder('sql_patches', '0.3.6')) || (!isExtensionInstalled('sql_patches'))) { // Old hashing way @@ -135,8 +136,8 @@ function ifAdminLoginDataIsValid ($admin, $password) { $salt = substr($data['password'], 0, -40); // Check if password is same - //* DEBUG: */ outputHtml("*".$ret.','.$data['password'].','.$password.','.$salt."*
"); - if (($ret == 'pass') && ($data['password'] == generateHash($password, $salt)) && ((!empty($salt))) || ($data['password'] == $password)) { + //* DEBUG: */ outputHtml('*' . $ret . ',' . $data['password'] . ',' . $password . ',' . $salt . '*
'); + if (($ret == 'pass') && ($data['password'] == generateHash($password, $salt)) && ((!empty($salt))) || ($data['password'] == md5($password))) { // Re-hash the plain passord with new random salt $data['password'] = generateHash($password); @@ -306,14 +307,14 @@ LIMIT 1", loadInclude($inc); } elseif ($GLOBALS['acl_allow'] === false) { // Access denied - loadTemplate('admin_menu_failed', false, sprintf(getMessage('ADMIN_ACCESS_DENIED'), $what)); + loadTemplate('admin_menu_failed', false, getMaskedMessage('ADMIN_ACCESS_DENIED', $what)); } else { // Include file not found! :-( - loadTemplate('admin_menu_failed', false, sprintf(getMessage('ADMIN_ACTION_404'), $action)); + loadTemplate('admin_menu_failed', false, getMaskedMessage('ADMIN_ACTION_404', $action)); } } else { // Invalid action/what pair found! - loadTemplate('admin_menu_failed', false, sprintf(getMessage('ADMIN_ACTION_INVALID'), $action . '/' . $what)); + loadTemplate('admin_menu_failed', false, getMaskedMessage('ADMIN_ACTION_INVALID', $action . '/' . $what)); } // Free memory @@ -346,8 +347,8 @@ ORDER BY // Do we have entries? if (SQL_NUMROWS($result_main) > 0) { - $OUT = "
 
\n"; - $OUT .= "'; } // Is there a cache instance again? @@ -501,13 +502,13 @@ function addMemberSelectionBox ($def=0, $add_all=false, $return=false, $none=fal $OUT = ''; // USe this only for adding points (e.g. adding refs really makes no sence ;-) ) - if ($add_all === true) $OUT = " \n"; - elseif ($none === true) $OUT = " \n"; + if ($add_all === true) $OUT = ' '; + elseif ($none === true) $OUT = ' '; while ($content = SQL_FETCHARRAY($result)) { - $OUT .= " '; } // END - while // Free memory @@ -522,7 +523,7 @@ function addMemberSelectionBox ($def=0, $add_all=false, $return=false, $none=fal loadTemplate('admin_member_selection_box', false, $content); } else { // Return content in selection frame - return "\n"; + return ''; } } @@ -531,7 +532,8 @@ function addMemberSelectionBox ($def=0, $add_all=false, $return=false, $none=fal // @DEPRECATED function adminMenuSelectionBox_DEPRECATED ($mode, $default = '', $defid = '') { $what = "`what` != ''"; - if ($mode == 'action') $what = "(`what`='' OR `what` IS NULL) AND action !='login'"; + if ($mode == 'action') $what = "(`what`='' OR `what` IS NULL) AND `action` !='login'"; + $result = SQL_QUERY_ESC("SELECT %s, `title` FROM `{?_MYSQL_PREFIX?}_admin_menu` WHERE ".$what." ORDER BY `sort` ASC", array($mode), __FUNCTION__, __LINE__); if (SQL_NUMROWS($result) > 0) { @@ -560,18 +562,18 @@ function adminMenuSelectionBox_DEPRECATED ($mode, $default = '', $defid = '') { } // Wrapper for $_POST and adminSaveSettings -function adminSaveSettingsFromPostData ($tableName = '_config', $whereStatement = '`config`=0', $translateComma = array(), $alwaysAdd = false) { +function adminSaveSettingsFromPostData ($tableName = '_config', $whereStatement = '`config`=0', $translateComma = array(), $alwaysAdd = false, $displayMessage = true) { // Get the array $postData = postRequestArray(); // Call the lower function - adminSaveSettings($postData, $tableName, $whereStatement, $translateComma, $alwaysAdd); + adminSaveSettings($postData, $tableName, $whereStatement, $translateComma, $alwaysAdd, $displayMessage); } // Save settings to the database -function adminSaveSettings (&$postData, $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 @@ -579,7 +581,7 @@ function adminSaveSettings (&$postData, $tableName = '_config', $whereStatement // Process only formular field but not submit buttons ;) if ($id != 'ok') { // Do not save the ok value - convertSelectionsToTimestamp($postData, $DATA, $id, $skip); + 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]))) { @@ -593,10 +595,10 @@ function adminSaveSettings (&$postData, $tableName = '_config', $whereStatement $test = (float)$val; if ('' . $val . '' == '' . $test . '') { // Add numbers - $DATA[] = sprintf("`%s`=%s", $id, $test); + $tableData[] = sprintf("`%s`=%s", $id, $test); } else { // Add strings - $DATA[] = sprintf("`%s`='%s'", $id, trim($val)); + $tableData[] = sprintf("`%s`='%s'", $id, trim($val)); } // Do not add a config entry twice @@ -612,39 +614,40 @@ function adminSaveSettings (&$postData, $tableName = '_config', $whereStatement $result = false; 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, + $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); + $keys = implode('`, `', $keys); $values = implode(', ', $values); // Generate SQL string $sql = sprintf("INSERT INTO `{?_MYSQL_PREFIX?}%s` (%s) VALUES (%s)", $tableName, - $KEYs, + $keys, $values ); } @@ -655,11 +658,17 @@ function adminSaveSettings (&$postData, $tableName = '_config', $whereStatement // Simply run generated SQL string SQL_QUERY($sql, __FUNCTION__, __LINE__); + // Remember affected rows + $affected = SQL_AFFECTEDROWS(); + // Rebuild cache rebuildCacheFile('config', 'config'); - // Settings saved - loadTemplate('admin_settings_saved', false, getMessage('SETTINGS_SAVED')); + // Settings saved, so display message? + if ($displayMessage === true) loadTemplate('admin_settings_saved', false, getMessage('SETTINGS_SAVED')); + + // Return affected rows + return $affected; } // Generate a selection box @@ -706,7 +715,10 @@ function generateUserProfileLink ($userid, $title = '', $what = 'list_user') { if (($title == '') && ($userid > 0)) { // Set userid as title $title = $userid; - } // END - if + } elseif ($userid == 0) { + // User id zero is invalid + return '' . $userid . ''; + } if (($title == '0') && ($what == 'list_refs')) { // Return title again @@ -720,14 +732,14 @@ function generateUserProfileLink ($userid, $title = '', $what = 'list_user') { } // Return link - return '[' . $title . ']'; + return '[' . $title . ']'; } // Check "logical-area-mode" function adminGetMenuMode () { // Set the global mode as the mode for all admins $mode = getConfig('admin_menu'); - $ADMIN = $mode; + $adminMode = $mode; // Get admin id $adminId = getCurrentAdminId(); @@ -735,23 +747,25 @@ function adminGetMenuMode () { // Check individual settings of current admin if (isset($GLOBALS['cache_array']['admin']['la_mode'][$adminId])) { // Load from cache - $ADMIN = $GLOBALS['cache_array']['admin']['la_mode'][$adminId]; + $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($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; + if ($adminMode != 'global') $mode = $adminMode; // Return admin-menu's mode return $mode; @@ -813,7 +827,7 @@ function sendAdminBuildMails ($mode, $table, $content, $id, $subjectPart = '') { } // END - if // Is the raw userid set? - if (postRequestElement('userid_raw', $id) > 0) { + if (postRequestParameter('userid_raw', $id) > 0) { // Generate subject $subjectLine = getMessage('MEMBER_'.strtoupper($subject).'_'.strtoupper($table).'_SUBJECT'); @@ -825,7 +839,7 @@ function sendAdminBuildMails ($mode, $table, $content, $id, $subjectPart = '') { } // Send email out - sendEmail(postRequestElement('userid_raw', $id), $subjectLine, $mail); + sendEmail(postRequestParameter('userid_raw', $id), $subjectLine, $mail); } // END - if // Generate subject @@ -833,9 +847,9 @@ function sendAdminBuildMails ($mode, $table, $content, $id, $subjectPart = '') { // Send admin notification out if (!empty($subjectPart)) { - sendAdminNotification($subjectLine, 'admin_' . $mode . '_' . strtolower($subjectPart) . '_' . $table, $content, postRequestElement('userid_raw', $id)); + sendAdminNotification($subjectLine, 'admin_' . $mode . '_' . strtolower($subjectPart) . '_' . $table, $content, postRequestParameter('userid_raw', $id)); } else { - sendAdminNotification($subjectLine, 'admin_' . $mode . '_' . $table, $content, postRequestElement('userid_raw', $id)); + sendAdminNotification($subjectLine, 'admin_' . $mode . '_' . $table, $content, postRequestParameter('userid_raw', $id)); } } @@ -891,9 +905,9 @@ function adminListBuilder ($listType, $IDs, $table, $columns, $filterFunctions, // Load master template loadTemplate(sprintf("admin_%s_%s", - $listType, - $table - ), false, $OUT + $listType, + $table + ), false, $OUT ); } @@ -993,7 +1007,7 @@ function adminDeleteEntriesConfirm ($IDs, $table, $columns=array(), $filterFunct $idList = ''; foreach ($IDs as $id => $sel) { // Is there a userid? - if (isPostRequestElementSet('userid_raw', $id)) { + if (isPostRequestParameterSet('userid_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__); @@ -1082,7 +1096,7 @@ function adminEditEntriesConfirm ($IDs, $table, $columns=array(), $filterFunctio } // 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__); @@ -1126,10 +1140,10 @@ function adminLockEntriesConfirm ($IDs, $table, $columns=array(), $filterFunctio // Shall we un-/lock here or list for locking? if ($lockNow === true) { // Un-/lock entries - adminBuilderStatusHandler("lock", $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $statusArray); + adminBuilderStatusHandler('lock', $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $statusArray); } else { // List for editing - adminListBuilder("lock", $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn); + adminListBuilder('lock', $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn); } } // END - if } @@ -1141,10 +1155,10 @@ function adminUndeleteEntriesConfirm ($IDs, $table, $columns=array(), $filterFun // Shall we un-/lock here or list for locking? if ($undeleteNow === true) { // Undelete entries - adminBuilderStatusHandler("undelete", $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $statusArray); + adminBuilderStatusHandler('undelete', $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn, $statusArray); } else { // List for editing - adminListBuilder("undelete", $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn); + adminListBuilder('undelete', $IDs, $table, $columns, $filterFunctions, $extraValues, $idColumn, $userIdColumn); } } // END - if } @@ -1186,7 +1200,7 @@ function sendAdminPasswordResetLink ($email) { SQL_FREERESULT($result); // Generate hash for reset link - $content['hash'] = generateHash(getConfig('URL').':'.$content['id'].':'.$content['login'].':'.$content['password'], substr($content['password'], 10)); + $content['hash'] = generateHash(getConfig('URL') . ':' . $content['id'] . ':' . $content['login'] . ':' . $content['password'], substr($content['password'], 10)); // Remove some data unset($content['id']); @@ -1287,17 +1301,24 @@ function adminUpdateTaskData ($id, $row, $data) { // Update the task SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_task_system` SET `%s`='%s' WHERE `id`=%s LIMIT 1", - array($row, $data, bigintval($id)), __FUNCTION__, __LINE__); + 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' ) ); @@ -1313,17 +1334,17 @@ function adminCreateUserLink ($userid) { // Is the userid set correctly? if ($userid > 0) { // Create a link to that profile - return '{?URL?}/modules.php?module=admin&what=list_user&userid='.bigintval($userid); + 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--}"; + $adminLink = '{--ADMIN_NO_ADMIN_ASSIGNED--}'; // Zero? = Not assigned if (bigintval($adminId) > 0) { @@ -1335,14 +1356,14 @@ function generateAdminLink ($adminId) { // Is the extension there? if (isExtensionActive('admins')) { // Admin found - $adminLink = "" . $login.""; + $adminLink = '' . $login . ''; } else { // Extension not found - $adminLink = sprintf(getMessage('EXTENSION_PROBLEM_NOT_INSTALLED'), 'admins'); + $adminLink = getMaskedMessage('EXTENSION_PROBLEM_NOT_INSTALLED', 'admins'); } } else { // Maybe deleted? - $adminLink = "
".sprintf(getMessage('ADMIN_ID_404'), $adminId)."
"; + $adminLink = '
' . getMaskedMessage('ADMIN_ID_404', $adminId) . '
'; } } // END - if @@ -1350,5 +1371,73 @@ function generateAdminLink ($adminId) { 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, getMessage('ADMIN_EXPERT_SETTINGS_STATUS_' . strtoupper($return))); + } // END - if + + // Return status + return $return; +} + // [EOF] ?>