X-Git-Url: https://git.mxchange.org/?p=mailer.git;a=blobdiff_plain;f=inc%2Flibs%2Fadmins_functions.php;h=1c43c5ec22a8f2581c2b3a19e67569784850cde4;hp=354a3f055b6387172d3dbc0542613e9573117e43;hb=e5527fd38a6585c8466dc28d013f12d21eb7c07a;hpb=c3b4eaf29946349ff058691db2dcb615a5379bb2 diff --git a/inc/libs/admins_functions.php b/inc/libs/admins_functions.php index 354a3f055b..1c43c5ec22 100644 --- a/inc/libs/admins_functions.php +++ b/inc/libs/admins_functions.php @@ -16,8 +16,8 @@ * $Author:: $ * * -------------------------------------------------------------------- * * Copyright (c) 2003 - 2009 by Roland Haeder * - * Copyright (c) 2009 - 2011 by Mailer Developer Team * - * For more information visit: http://www.mxchange.org * + * Copyright (c) 2009 - 2013 by Mailer Developer Team * + * For more information visit: http://mxchange.org * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -38,20 +38,21 @@ // Some security stuff... if (!defined('__SECURITY')) { die(); -} +} // END - if // Check ACL for menu combination -function adminsCheckAdminAcl ($action, $what) { - // If action is login or logout allow allways! - $default = 'allow'; - if (($action == 'login') || ($action == 'logout')) return true; - - // Default is deny - $ret = false; - +function isAdminsAllowedByAcl ($action, $what) { // Get admin's id $adminId = getCurrentAdminId(); + if (($action == 'login') || ($action == 'logout')) { + // If action is login or logout allow allways! + return TRUE; + } elseif (isset($GLOBALS[__FUNCTION__][$adminId][$action][$what])) { + // If we have cache, use it + return $GLOBALS[__FUNCTION__][$adminId][$action][$what]; + } + // Get admin's defult access right $default = getAdminDefaultAcl($adminId); @@ -61,91 +62,109 @@ function adminsCheckAdminAcl ($action, $what) { $parent_action = getActionFromModuleWhat('admin', $what); // Check with this function... - $parent = adminsCheckAdminAcl($parent_action, ''); + $parent = isAdminsAllowedByAcl($parent_action, ''); } else { // Anything else is true! - $parent = false; + $parent = FALSE; } // Shall I test for a main or sub menu? (action or what?) - $acl_mode = 'failed'; + $aclMode = 'failed'; if ((isExtensionInstalledAndNewer('cache', '0.1.2')) && (isset($GLOBALS['cache_array']['admin_acls'])) && (count($GLOBALS['cache_array']['admin_acls']) > 0)) { // Lookup in cache - if ((!empty($action)) && (isset($GLOBALS['cache_array']['admin_acls']['action_menu'][$adminId])) & ($GLOBALS['cache_array']['admin_acls']['action_menu'][$adminId] == $action)) { + if ((!empty($action)) && (isset($GLOBALS['cache_array']['admin_acls']['action_menu'][$adminId])) & (in_array($action, $GLOBALS['cache_array']['admin_acls']['action_menu'][$adminId]))) { + // Search for it + $key = array_search($action, $GLOBALS['cache_array']['admin_acls']['action_menu'][$adminId]); + // Main menu line found - $acl_mode = $GLOBALS['cache_array']['admin_acls']['access_mode'][$adminId]; + $aclMode = $GLOBALS['cache_array']['admin_acls']['access_mode'][$adminId][$key]; + + // Log debug message + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'action=' . $action . ',key=' . $key . ',acl_mode=' . $aclMode); // Count cache hits incrementStatsEntry('cache_hits'); - } elseif ((!empty($what)) && (isset($GLOBALS['cache_array']['admin_acls']['what_menu'][$adminId])) && ($GLOBALS['cache_array']['admin_acls']['what_menu'][$adminId] == $what)) { + } elseif ((!empty($what)) && (isset($GLOBALS['cache_array']['admin_acls']['what_menu'][$adminId])) && (in_array($what, $GLOBALS['cache_array']['admin_acls']['what_menu'][$adminId]))) { + // Search for it + $key = array_search($action, $GLOBALS['cache_array']['admin_acls']['what_menu'][$adminId]); + // Check sub menu - $acl_mode = $GLOBALS['cache_array']['admin_acls']['access_mode'][$adminId]; + $aclMode = $GLOBALS['cache_array']['admin_acls']['access_mode'][$adminId][$key]; + + // Log debug message + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'what=' . $what . ',key=' . $key . ',acl_mode=' . $aclMode); // Count cache hits incrementStatsEntry('cache_hits'); } } elseif (!isExtensionActive('cache')) { - // Old version, so load it from database - $result = false; + // Extension ext-cache is absent, so load it from database + $result = FALSE; if (!empty($action)) { // Main menu - $result = SQL_QUERY_ESC("SELECT `access_mode` FROM `{?_MYSQL_PREFIX?}_admins_acls` WHERE `admin_id`=%s AND `action_menu`='%s' LIMIT 1", + $result = sqlQueryEscaped("SELECT `access_mode` FROM `{?_MYSQL_PREFIX?}_admins_acls` WHERE `admin_id`=%s AND `action_menu`='%s' LIMIT 1", array(bigintval($adminId), $action), __FUNCTION__, __LINE__); } elseif (!empty($what)) { // Sub menu - $result = SQL_QUERY_ESC("SELECT `access_mode` FROM `{?_MYSQL_PREFIX?}_admins_acls` WHERE `admin_id`=%s AND `what_menu`='%s' LIMIT 1", + $result = sqlQueryEscaped("SELECT `access_mode` FROM `{?_MYSQL_PREFIX?}_admins_acls` WHERE `admin_id`=%s AND `what_menu`='%s' LIMIT 1", array(bigintval($adminId), $what), __FUNCTION__, __LINE__); } // Is an entry found? - if (SQL_NUMROWS($result) == 1) { + if (sqlNumRows($result) == 1) { // Load ACL - list($acl_mode) = SQL_FETCHROW($result); + list($aclMode) = sqlFetchRow($result); } // END - if // Free memory - SQL_FREERESULT($result); + sqlFreeResult($result); } + // But default result is failed + $GLOBALS[__FUNCTION__][$adminId][$action][$what] = FALSE; + // Check ACL and (maybe) allow - //* DEBUG: */ debugOutput('default='.$default.',acl_mode='.$acl_mode.',parent='.intval($parent)); - if (($default == 'allow') || (($default == 'deny') && ($acl_mode == 'allow')) || ($parent === true) || (($default == '***') && ($acl_mode == 'failed') && ($parent === false))) { + //* DEBUG: */ debugOutput('default='.$default.',acl_mode='.$aclMode.',parent='.intval($parent)); + if ((($default == 'allow') && ($aclMode != 'deny')) || (($default == 'deny') && ($aclMode == 'allow')) || ($parent === TRUE) || (($default == 'NO-ACL') && ($aclMode == 'failed') && ($parent === FALSE))) { // Access is granted - $ret = true; + $GLOBALS[__FUNCTION__][$adminId][$action][$what] = TRUE; } // END - if // Return value - //* DEBUG: */ debugOutput(__FUNCTION__.'['.__LINE__.']:act='.$action.',wht='.$what.',default='.$default.',acl_mode='.$acl_mode); - return $ret; + //* DEBUG: */ debugOutput(__FUNCTION__.'['.__LINE__.']:act='.$action.',wht='.$what.',default='.$default.',aclMode='.$aclMode); + return $GLOBALS[__FUNCTION__][$adminId][$action][$what]; } // Create email link to admins's account function generateAdminEmailLink ($email, $mod = 'admin') { // Is it an email? - if (strpos($email, '@') !== false) { + if (isInString('@', $email)) { // Create email link - $result = SQL_QUERY_ESC("SELECT `id` + $result = sqlQueryEscaped("SELECT `id` FROM `{?_MYSQL_PREFIX?}_admins` WHERE - `email`='%s' + '%s' REGEXP `email` LIMIT 1", array($email), __FUNCTION__, __LINE__); // Is there an entry? - if (SQL_NUMROWS($result) == 1) { + if (sqlNumRows($result) == 1) { // Load userid - list($adminId) = SQL_FETCHROW($result); + list($adminId) = sqlFetchRow($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)) { + sqlFreeResult($result); + } elseif (isValidId($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 + reportBug(__FUNCTION__, __LINE__, 'email[' . gettype($email) . ']=' . $email . ',mod=' . $mod . ' - This should not happen.'); } // Return rewritten (?) email address @@ -153,32 +172,41 @@ LIMIT 1", } // Change a lot admin account -function adminsChangeAdminAccount ($postData, $element = '') { +function adminsChangeAdminAccount ($postData, $element = '', $displayMessage = TRUE) { // Begin the update $cache_update = '0'; + $message = ''; + foreach ($postData['login'] as $id => $login) { // Secure id number $id = bigintval($id); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'id=' . $id . ',login=' . $login); // When both passwords match update admin account if ((!empty($element)) && (isset($postData[$element]))) { // Save this setting - SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_admins` SET `%s`='%s' WHERE `id`=%s LIMIT 1", - array($element, $postData[$element][$id], $id), __FUNCTION__, __LINE__); + sqlQueryEscaped("UPDATE `{?_MYSQL_PREFIX?}_admins` SET `%s`='%s' WHERE `id`=%s LIMIT 1", + array( + $element, + $postData[$element][$id], + $id + ), __FUNCTION__, __LINE__); // Admin account saved $message = '{--ADMIN_ACCOUNT_SAVED--}'; - } elseif ((isset($postData['pass1'])) && (isset($postData['pass2']))) { + } elseif ((!empty($postData['password1'])) && (!empty($postData['password2']))) { // Update only if both passwords match - if (($postData['pass1'][$id] == $postData['pass2'][$id])) { + if (($postData['password1'][$id] == $postData['password2'][$id])) { // Save only when both passwords are the same (also when they are empty) $add = ''; $cache_update = 1; // Generate hash - $hash = generateHash($postData['pass1'][$id]); + $hash = generateHash($postData['password1'][$id]); // Save password when set - if (!empty($postData['pass1'][$id])) $add = sprintf(", `password`='%s'", SQL_ESCAPE($hash)); + if (!empty($postData['password1'][$id])) { + $add = sprintf(",`password`='%s'", sqlEscapeString($hash)); + } // END - if // Get admin's id $adminId = getCurrentAdminId(); @@ -197,7 +225,7 @@ function adminsChangeAdminAccount ($postData, $element = '') { if (!empty($add)) { setAdminMd5($hash); } // END - if - } elseif (generateHash($postData['pass1'][$id], $salt) != getAdminMd5()) { + } elseif (generateHash($postData['password1'][$id], $salt) != getAdminMd5()) { // Update password cookie setAdminMd5($hash); } @@ -209,7 +237,7 @@ function adminsChangeAdminAccount ($postData, $element = '') { // Update admin account if ($default == 'allow') { // Allow changing default ACL - SQL_QUERY_ESC("UPDATE + sqlQueryEscaped("UPDATE `{?_MYSQL_PREFIX?}_admins` SET `login`='%s'" . $add . ", @@ -222,13 +250,13 @@ LIMIT 1", array( $login, $postData['email'][$id], - $postData['mode'][$id], + $postData['access_mode'][$id], $postData['la_mode'][$id], $id ), __FUNCTION__, __LINE__); } else { // Do not allow it here - SQL_QUERY_ESC("UPDATE + sqlQueryEscaped("UPDATE `{?_MYSQL_PREFIX?}_admins` SET `login`='%s'" . $add . ", @@ -249,43 +277,37 @@ LIMIT 1", $message = '{--ADMIN_ACCOUNT_SAVED--}'; } else { // Passwords did not match - $message = '{--ADMINS_ERROR_PASS_MISMATCH--}'; + $message = '{--ADMIN_ADMINS_ERROR_PASS_MISMATCH--}'; } } 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; - - // 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__); + sqlQueryEscaped($SQL, array(bigintval($id)), __FUNCTION__, __LINE__); + + // Was it updated? + if (sqlAffectedRows() == 1) { + // Admin account saved + $message = '{--ADMIN_ACCOUNT_SAVED--}'; + } else { + // Passwords did not match + $message = '{--ADMIN_ADMINS_ERROR_PASS_MISMATCH--}'; + } } } // END - foreach - // Display message - if (!empty($message)) { - loadTemplate('admin_settings_saved', false, $message); + // Display message if not empty and allowed + if ((!empty($message)) && ($displayMessage === TRUE)) { + // Display it + displayMessage($message); } // END - if // Remove cache file runFilterChain('post_form_submited', postRequestArray()); + + // Return message + return $message; } // Make admin accounts editable @@ -300,39 +322,92 @@ function adminsEditAdminAccount ($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 = sqlQueryEscaped('SELECT `login`, `email` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1', array($id), __FUNCTION__, __LINE__); - if ((SQL_NUMROWS($result) == 1) && ($selected == 1)) { + if ((sqlNumRows($result) == 1) && ($selected == 1)) { // Entry found - $content = SQL_FETCHARRAY($result); - SQL_FREERESULT($result); + $content = sqlFetchArray($result); // Prepare some more data for the template $content['id'] = $id; // Shall we allow changing default ACL? if ($currMode == 'allow') { - // Allow chaning it - $content['mode'] = generateOptionList('/ARRAY/', array('allow', 'deny'), array('{--ADMINS_ALLOW_MODE--}', '{--ADMINS_DENY_MODE--}'), $content['mode']); + // Allow changing it + $content['access_mode'] = '{%pipe,generateAdminAccessModeSelectionBox=' . $id . '%}'; } else { // Don't allow it - $content['mode'] = ' '; + $content['access_mode'] = ' '; } - $content['la_mode'] = generateOptionList('/ARRAY/', array('global', 'OLD', 'NEW'), array('{--ADMINS_GLOBAL_LA_SETTING--}', '{--ADMINS_OLD_LA_SETTING--}', '{--ADMINS_NEW_LA_SETTING--}'), $content['la_mode']); // Load row template and switch color - $OUT .= loadTemplate('admin_edit_admins_row', true, $content); + $OUT .= loadTemplate('admin_edit_admins_row', TRUE, $content); } // END - if + + // Free result + sqlFreeResult($result); } // END - foreach // Load template - loadTemplate('admin_edit_admins', false, $OUT); + loadTemplate('admin_edit_admins', FALSE, $OUT); +} + +// Generate access mode selection box for given admin id +function generateAdminAccessModeSelectionBox ($adminId = NULL) { + // Start the selection box + $OUT = ''; + + // Return content + return $OUT; +} + +// Generate menu mode selection box for given admin it +function generateAdminMenuModeSelectionBox ($adminId = NULL) { + // Start the selection box + $OUT = ''; + + // Return content + return $OUT; } // Delete given admin accounts function adminsDeleteAdminAccount ($postData) { // Check if this account is the last one which cannot be deleted... - if (countSumTotalData('', 'admins', 'id', '', true) > 1) { + if (countSumTotalData('', 'admins', 'id', '', TRUE) > 1) { // Delete accounts $OUT = ''; foreach ($postData['sel'] as $id => $selected) { @@ -340,32 +415,41 @@ 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 = sqlQueryEscaped('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) { + // Is there an entry? + if (sqlNumRows($result) == 1) { // Entry found, so load data - $content = SQL_FETCHARRAY($result); - $content['mode'] = '{--ADMINS_' . strtoupper($content['mode']) . '_MODE--}'; - $content['la_mode'] = '{--ADMINS_' . strtoupper($content['la_mode']) . '_LA_SETTING--}'; + $content = sqlFetchArray($result); + $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; // Load row template and switch color - $OUT .= loadTemplate('admin_delete_admins_row', true, $content); + $OUT .= loadTemplate('admin_delete_admins_row', TRUE, $content); } // END - if // Free result - SQL_FREERESULT($result); + sqlFreeResult($result); } // END - foreach // Load template - loadTemplate('admin_delete_admins', false, $OUT); + loadTemplate('admin_delete_admins', FALSE, $OUT); } else { // Cannot delete last account! - loadTemplate('admin_settings_saved', false, '{--ADMIN_ADMINS_CANNOT_DELETE_LAST--}'); + displayMessage('{--ADMIN_ADMINS_CANNOT_DELETE_LAST--}'); } } @@ -380,11 +464,11 @@ function adminsRemoveAdminAccount ($postData) { // Delete only when it's not your own account! if (($del == 1) && (getCurrentAdminId() != $id)) { // Rewrite his tasks to all admins - SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_task_system` SET `assigned_admin`=0 WHERE `assigned_admin`=%s", + sqlQueryEscaped('UPDATE `{?_MYSQL_PREFIX?}_task_system` SET `assigned_admin`=NULL WHERE `assigned_admin`=%s', array($id), __FUNCTION__, __LINE__); // Remove account - SQL_QUERY_ESC("DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1", + sqlQueryEscaped('DELETE LOW_PRIORITY FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1', array($id), __FUNCTION__, __LINE__); } } @@ -396,27 +480,36 @@ 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 = sqlQuery('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)) { + while ($content = sqlFetchArray($result)) { // Compile some variables - $content['mode'] = '{--ADMINS_' . strtoupper($content['mode']) . '_MODE--}'; - $content['la_mode'] = '{--ADMINS_' . strtoupper($content['la_mode']) . '_LA_SETTING--}'; + $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); + $OUT .= loadTemplate('admin_list_admins_row', TRUE, $content); } // END - while // Free memory - SQL_FREERESULT($result); + sqlFreeResult($result); // Load template - loadTemplate('admin_list_admins', false, $OUT); + loadTemplate('admin_list_admins', FALSE, $OUT); } // Sends out mail to all administrators // IMPORTANT: Please use sendAdminNotification() instead of calling this function directly -function sendAdminsEmails ($subj, $template, $content, $userid) { +function sendAdminsEmails ($subject, $template, $content, $userid) { // Trim template name $template = trim($template); @@ -424,58 +517,82 @@ function sendAdminsEmails ($subj, $template, $content, $userid) { $message = loadEmailTemplate($template, $content, $userid); // Check which admin shall receive this mail - $result = SQL_QUERY_ESC("SELECT `admin_id` FROM `{?_MYSQL_PREFIX?}_admins_mails` WHERE `mail_template`='%s' ORDER BY `admin_id` ASC", + $result = sqlQueryEscaped("SELECT `admin_id` FROM `{?_MYSQL_PREFIX?}_admins_mails` WHERE `mail_template`='%s' ORDER BY `admin_id` ASC", array($template), __FUNCTION__, __LINE__); - if (SQL_HASZERONUMS($result)) { - // Create new entry (to all admins) - SQL_QUERY_ESC("INSERT INTO `{?_MYSQL_PREFIX?}_admins_mails` (`admin_id`, `mail_template`) VALUES (0, '%s')", - array($template), __FUNCTION__, __LINE__); + + // No entries found? + if (ifSqlHasZeroNums($result)) { + // Is ext-admins' version at least 0.7.9? + if (isExtensionInstalledAndNewer('admins', '0.7.9')) { + // Create new entry (to all admins) + sqlQueryEscaped("INSERT INTO `{?_MYSQL_PREFIX?}_admins_mails` (`admin_id`, `mail_template`) VALUES (NULL, '%s')", + array($template), __FUNCTION__, __LINE__); + } // END - if + + // Select all email adresses (default) + $result = sqlQuery('SELECT `email` FROM `{?_MYSQL_PREFIX?}_admins` ORDER BY `id` ASC', + __FUNCTION__, __LINE__); } else { // Load admin ids... // @TODO This can be, somehow, rewritten $adminIds = array(); - while ($content = SQL_FETCHARRAY($result)) { - $adminIds[] = $content['admin_id']; + while ($content = sqlFetchArray($result)) { + array_push($adminIds, $content['admin_id']); } // END - while // Free memory - SQL_FREERESULT($result); + sqlFreeResult($result); // Init result - $result = false; + $result = FALSE; // "implode" ids and query string $adminId = implode(',', $adminIds); + + // To which admin shall we sent it? if ($adminId == '-1') { + // Is an "event" if (isExtensionActive('events')) { // Add line to user events - EVENTS_ADD_LINE($subj, $message, $userid); + EVENTS_ADD_LINE($subject, $message, $userid); } else { // Log error for debug - logDebugMessage(__FUNCTION__, __LINE__, sprintf("Extension 'events' missing: tpl=%s,subj=%s,userid=%s", + logDebugMessage(__FUNCTION__, __LINE__, sprintf('Extension ext-events missing: template=%s,subj=%s,userid=%s', $template, - $subj, + $subject, $userid )); } + + // Abort here as below while() loop will cause problems + return; } elseif (($adminId == '0') || (empty($adminId))) { // Select all email adresses - $result = SQL_QUERY('SELECT `email` FROM `{?_MYSQL_PREFIX?}_admins` ORDER BY `id` ASC', + $result = sqlQuery('SELECT `email` FROM `{?_MYSQL_PREFIX?}_admins` ORDER BY `id` ASC', __FUNCTION__, __LINE__); } else { // If Admin-Id is not "to-all" select - $result = SQL_QUERY_ESC("SELECT `email` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id` IN (%s) ORDER BY `id` ASC", + $result = sqlQueryEscaped('SELECT `email` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id` IN (%s) ORDER BY `id` ASC', array($adminId), __FUNCTION__, __LINE__); } } + // Default is no special mail header + $mailHeader = ''; + + // Is the template a bug report? + if ($template == 'admin_report_bug') { + // Then set 'Reply-To:' again + $mailHeader = 'Reply-To: webmaster@mxchange.org' . PHP_EOL; + } // END - if + // Load email addresses and send away - while ($content = SQL_FETCHARRAY($result)) { - sendEmail($content['email'], $subj, $message); + while ($content = sqlFetchArray($result)) { + sendEmail($content['email'], $subject, $message, 'N', $mailHeader); } // END - while // Free memory - SQL_FREERESULT($result); + sqlFreeResult($result); } // "Getter" for current admin's expert settings @@ -495,20 +612,20 @@ function getAminsExpertSettings () { incrementStatsEntry('cache_hits'); } elseif (!isExtensionInstalled('cache')) { // Load from database - $result = SQL_QUERY_ESC("SELECT `expert_settings` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1", + $result = sqlQueryEscaped('SELECT `expert_settings` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1', array($adminId), __FUNCTION__, __LINE__); // Entry found? - if (SQL_NUMROWS($result) == 1) { + if (sqlNumRows($result) == 1) { // Fetch data - $data = SQL_FETCHARRAY($result); + $data = sqlFetchArray($result); // Set cache $GLOBALS['cache_array']['admin']['expert_settings'][$adminId] = $data['expert_settings']; } // END - if // Free memory - SQL_FREERESULT($result); + sqlFreeResult($result); } // Return the result @@ -532,20 +649,20 @@ function getAminsExpertWarning () { incrementStatsEntry('cache_hits'); } elseif (!isExtensionInstalled('cache')) { // Load from database - $result = SQL_QUERY_ESC("SELECT `expert_warning` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1", + $result = sqlQueryEscaped('SELECT `expert_warning` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1', array($adminId), __FUNCTION__, __LINE__); // Entry found? - if (SQL_NUMROWS($result) == 1) { + if (sqlNumRows($result) == 1) { // Fetch data - $data = SQL_FETCHARRAY($result); + $data = sqlFetchArray($result); // Set cache $GLOBALS['cache_array']['admin']['expert_warning'][$adminId] = $data['expert_warning']; } // END - if // Free memory - SQL_FREERESULT($result); + sqlFreeResult($result); } // Return the result @@ -556,11 +673,11 @@ function getAminsExpertWarning () { function getAdminLoginFailures ($adminId) { // Admin login should not be empty if (empty($adminId)) { - debug_report_bug(__FUNCTION__, __LINE__, 'adminId is empty.'); + reportBug(__FUNCTION__, __LINE__, 'adminId is empty.'); } // END - if // By default no admin is found - $data['login_failures'] = '-1'; + $data['login_failures'] = -1; // Check cache if (isset($GLOBALS['cache_array']['admin']['login_failures'][$adminId])) { @@ -571,17 +688,17 @@ function getAdminLoginFailures ($adminId) { incrementStatsEntry('cache_hits'); } elseif (!isExtensionActive('cache')) { // Load from database - $result = SQL_QUERY_ESC("SELECT `login_failures` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1", + $result = sqlQueryEscaped('SELECT `login_failures` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1', array($adminId), __FUNCTION__, __LINE__); - // Do we have an entry? - if (SQL_NUMROWS($result) == 1) { + // Is there an entry? + if (sqlNumRows($result) == 1) { // Get it - $data = SQL_FETCHARRAY($result); + $data = sqlFetchArray($result); } // END - if // Free result - SQL_FREERESULT($result); + sqlFreeResult($result); } // Return the login_failures @@ -592,11 +709,11 @@ function getAdminLoginFailures ($adminId) { function getAdminLastFailure ($adminId) { // Admin login should not be empty if (empty($adminId)) { - debug_report_bug(__FUNCTION__, __LINE__, 'adminId is empty.'); + reportBug(__FUNCTION__, __LINE__, 'adminId is empty.'); } // END - if // By default no admin is found - $data['last_failure'] = '-1'; + $data['last_failure'] = -1; // Check cache if (isset($GLOBALS['cache_array']['admin']['last_failure'][$adminId])) { @@ -607,17 +724,17 @@ function getAdminLastFailure ($adminId) { incrementStatsEntry('cache_hits'); } elseif (!isExtensionActive('cache')) { // Load from database - $result = SQL_QUERY_ESC("SELECT UNIX_TIMESTAMP(`last_failure`) AS `last_failure` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1", + $result = sqlQueryEscaped('SELECT UNIX_TIMESTAMP(`last_failure`) AS `last_failure` FROM `{?_MYSQL_PREFIX?}_admins` WHERE `id`=%s LIMIT 1', array($adminId), __FUNCTION__, __LINE__); - // Do we have an entry? - if (SQL_NUMROWS($result) == 1) { + // Is there an entry? + if (sqlNumRows($result) == 1) { // Get it - $data = SQL_FETCHARRAY($result); + $data = sqlFetchArray($result); } // END - if // Free result - SQL_FREERESULT($result); + sqlFreeResult($result); } // Return the last_failure @@ -625,80 +742,17 @@ function getAdminLastFailure ($adminId) { } //----------------------------------------------------------------------------- -// Filter Functions +// Wrapper functions //----------------------------------------------------------------------------- -// Filter for adding extra data to the query -function FILTER_ADD_EXTRA_SQL_DATA ($add = '') { - // Is the admins extension updated? (should be!) - if (isExtensionInstalledAndNewer('admins', '0.3.0')) $add .= ', `default_acl` AS def_acl'; - if (isExtensionInstalledAndNewer('admins', '0.6.7')) $add .= ', `la_mode`'; - if (isExtensionInstalledAndNewer('admins', '0.7.2')) $add .= ', `login_failures`, UNIX_TIMESTAMP(`last_failure`) AS last_failure'; - if (isExtensionInstalledAndNewer('admins', '0.7.3')) $add .= ', `expert_settings`, `expert_warning`'; - - // Return it - return $add; +// Wrapper function to check whether expert setting warning is enabled +function isAdminsExpertWarningEnabled () { + return (getAminsExpertWarning() == 'Y'); } -// Reset the login failures -function FILTER_RESET_ADMINS_LOGIN_FAILURES ($data) { - // Store it in session - setSession('mailer_admin_failures' , getAdminLoginFailures($data['id'])); - setSession('mailer_admin_last_failure', getAdminLastFailure($data['id'])); - - // Prepare update data - $postData['login'][getCurrentAdminId()] = $data['login']; - $postData['login_failures'][getCurrentAdminId()] = '0'; - $postData['last_failure'][getCurrentAdminId()] = null; - - // Change it in the admin - adminsChangeAdminAccount($postData); - - // Always make sure the cache is destroyed - rebuildCache('admin'); - - // Return the data for further processing - return $data; -} - -// Count the login failure -function FILTER_COUNT_ADMINS_LOGIN_FAILURE ($data) { - // Prepare update data - $postData['login'][getCurrentAdminId()] = $data['login']; - $postData['login_failures'][getCurrentAdminId()] = '`login_failures`+1'; - $postData['last_failure'][getCurrentAdminId()] = 'NOW()'; - - // Change it in the admin - adminsChangeAdminAccount($postData); - - // Always make sure the cache is destroyed - rebuildCache('admin'); - - // Return the data for further processing - return $data; -} - -// Rehashes the given plain admin password and stores it the database -function FILTER_REHASH_ADMINS_PASSWORD ($data) { - // Generate new hash - $newHash = generateHash($data['plain_pass']); - - // Prepare update data - $postData['login'][getCurrentAdminId()] = $data['login']; - $postData['password'][getCurrentAdminId()] = $newHash; - - // Change it in the admin - adminsChangeAdminAccount($postData); - - // Update cookie/session and data array - setAdminMd5(encodeHashForCookie($newHash)); - $data['pass_hash'] = $newHash; - - // Always make sure the cache is destroyed - rebuildCache('admin'); - - // Return the data for further processing - return $data; +// Wrapper function to check whether expert setting is enabled +function isAdminsExpertSettingEnabled () { + return (getAminsExpertSettings() == 'Y'); } // [EOF]