X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Flibs%2Fadmins_functions.php;h=15f781889d7a8200bde175ae1a342b2735776c67;hb=985561270461045c64719266ca6b3a795f6cd76a;hp=27c0a104912ee3a3a3b4da0d0711f0014e1daddb;hpb=6a8deec242fcd1b28090ad693e0cef67a1d0a818;p=mailer.git diff --git a/inc/libs/admins_functions.php b/inc/libs/admins_functions.php index 27c0a10491..15f781889d 100644 --- a/inc/libs/admins_functions.php +++ b/inc/libs/admins_functions.php @@ -153,15 +153,18 @@ LIMIT 1", // Load userid list($adminId) = SQL_FETCHROW($result); - // Rewrite email address to contact link - $email = '{%url=modules.php?module=' . $mod . '&what=admins_contct&admin=' . bigintval($adminId) . '%}'; + // Call this function again + $email = generateAdminEmailLink($adminId, $mod); } // END - if // Free memory SQL_FREERESULT($result); - } elseif ((is_int($email)) && ($email > 0)) { + } elseif (isValidUserId($email)) { // Direct id given - $email = '{%url=modules.php?module=' . $mod . '&what=admins_contct&admin=' . bigintval($email) . '%}'; + $email = '{%url=modules.php?module=' . $mod . '&what=admins_contct&id=' . bigintval($email) . '%}'; + } else { + // This is strange and needs fixing + debug_report_bug(__FUNCTION__, __LINE__, 'email[' . gettype($email) . ']=' . $email . ',mod=' . $mod . ' - This should not happen.'); } // Return rewritten (?) email address @@ -198,7 +201,7 @@ function adminsChangeAdminAccount ($postData, $element = '', $displayMessage = t // Save password when set if (!empty($postData['pass1'][$id])) { - $add = sprintf(", `password`='%s'", SQL_ESCAPE($hash)); + $add = sprintf(",`password`='%s'", SQL_ESCAPE($hash)); } // END - if // Get admin's id @@ -243,7 +246,7 @@ LIMIT 1", array( $login, $postData['email'][$id], - $postData['mode'][$id], + $postData['access_mode'][$id], $postData['la_mode'][$id], $id ), __FUNCTION__, __LINE__); @@ -274,28 +277,7 @@ LIMIT 1", } } else { // Update whole array - $SQL = 'UPDATE `{?_MYSQL_PREFIX?}_admins` SET '; - foreach ($postData as $entry => $value) { - // Skip login/id entry - if (in_array($entry, array('login', 'id'))) { - continue; - } // END - if - - // Do we have a non-string (e.g. number, NULL, NOW() or back-tick at the beginning? - if (is_null($value[$id])) { - // NULL detected - $SQL .= '`' . $entry . '`=NULL, '; - } elseif ((bigintval($value[$id], true, false) === $value[$id]) || ($value[$id] == 'NOW()') || (substr($value[$id], 0, 1) == '`')) { - // No need for ticks (') - $SQL .= '`' . $entry . '`=' . $value[$id] . ', '; - } else { - // Strings need ticks (') around them - $SQL .= '`' . $entry . "`='" . SQL_ESCAPE($value[$id]) . "', "; - } - } // END - foreach - - // Remove last 2 chars and finish query - $SQL = substr($SQL, 0, -2) . ' WHERE `id`=%s LIMIT 1'; + $SQL = getUpdateSqlFromArray($postData, 'admins', 'id', '%s', array('login', 'id'), $id); // Run it SQL_QUERY_ESC($SQL, array(bigintval($id)), __FUNCTION__, __LINE__); @@ -311,11 +293,10 @@ LIMIT 1", } } // END - foreach - // Display message - if (!empty($message)) { - if ($displayMessage === true) { - displayMessage($message); - } // END - if + // Display message if not empty and allowed + if ((!empty($message)) && ($displayMessage === true)) { + // Display it + displayMessage($message); } // END - if // Remove cache file @@ -349,10 +330,10 @@ function adminsEditAdminAccount ($postData) { // Shall we allow changing default ACL? if ($currMode == 'allow') { // Allow changing it - $content['mode'] = '{%pipe,generateAdminAccessModeSelectionBox=' . $id . '%}'; + $content['access_mode'] = '{%pipe,generateAdminAccessModeSelectionBox=' . $id . '%}'; } else { // Don't allow it - $content['mode'] = ' '; + $content['access_mode'] = ' '; } // Load row template and switch color @@ -370,7 +351,7 @@ function adminsEditAdminAccount ($postData) { // Generate access mode selection box for given admin id function generateAdminAccessModeSelectionBox ($adminId = NULL) { // Start the selection box - $OUT = ''; // Add option list $OUT .= generateOptionList('/ARRAY/', array('allow', 'deny'), array('{--ADMIN_ADMINS_ACCESS_MODE_ALLOW--}', '{--ADMIN_ADMINS_ACCESS_MODE_DENY--}'), getAdminDefaultAcl($adminId)); @@ -385,7 +366,7 @@ function generateAdminAccessModeSelectionBox ($adminId = NULL) { // Generate menu mode selection box for given admin it function generateAdminMenuModeSelectionBox ($adminId = NULL) { // Start the selection box - $OUT = ''; // Add option list $OUT .= generateOptionList('/ARRAY/', array('global', 'OLD', 'NEW'), array('{--ADMIN_ADMINS_LA_MODE_GLOBAL--}', '{--ADMIN_ADMINS_LA_MODE_OLD--}', '{--ADMIN_ADMINS_LA_MODE_NEW--}'), getAdminMenuMode($adminId)); @@ -408,15 +389,15 @@ function adminsDeleteAdminAccount ($postData) { $id = bigintval($id); // Get the admin's data - $result = SQL_QUERY_ESC("SELECT `login`,`email`,`default_acl` AS `mode`,`la_mode` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1", + $result = SQL_QUERY_ESC("SELECT `login`,`email`,`default_acl` AS `access_mode`,`la_mode` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1", array($id), __FUNCTION__, __LINE__); // Do we have an entry? if (SQL_NUMROWS($result) == 1) { // Entry found, so load data $content = SQL_FETCHARRAY($result); - $content['mode'] = '{--ADMIN_ADMINS_ACCESS_MODE_' . strtoupper($content['mode']) . '--}'; - $content['la_mode'] = '{--ADMIN_ADMINS_LA_MODE_' . strtoupper($content['la_mode']) . '--}'; + $content['access_mode'] = '{--ADMIN_ADMINS_ACCESS_MODE_' . strtoupper($content['access_mode']) . '--}'; + $content['la_mode'] = '{--ADMIN_ADMINS_LA_MODE_' . strtoupper($content['la_mode']) . '--}'; // Prepare some more data $content['id'] = $id; @@ -464,12 +445,21 @@ function adminsRemoveAdminAccount ($postData) { // List all admin accounts function adminsListAdminAccounts() { // Select all admin accounts - $result = SQL_QUERY('SELECT `id`,`login`,`email`,`default_acl` AS mode, `la_mode` FROM `{?_MYSQL_PREFIX?}_admins` ORDER BY `login` ASC', __FUNCTION__, __LINE__); + $result = SQL_QUERY('SELECT + `id`, + `login`, + `email`, + `default_acl` AS `access_mode`, + `la_mode` +FROM + `{?_MYSQL_PREFIX?}_admins` +ORDER BY + `login` ASC', __FUNCTION__, __LINE__); $OUT = ''; while ($content = SQL_FETCHARRAY($result)) { // Compile some variables - $content['mode'] = '{--ADMIN_ADMINS_ACCESS_MODE_' . strtoupper($content['mode']) . '--}'; - $content['la_mode'] = '{--ADMIN_ADMINS_LA_MODE_' . strtoupper($content['la_mode']) . '--}'; + $content['access_mode'] = '{--ADMIN_ADMINS_ACCESS_MODE_' . strtoupper($content['access_mode']) . '--}'; + $content['la_mode'] = '{--ADMIN_ADMINS_LA_MODE_' . strtoupper($content['la_mode']) . '--}'; // Load row template and switch color $OUT .= loadTemplate('admin_list_admins_row', true, $content);