Checking new member registrations is now done with list_user (was: chk_regs) and...

[mailer.git] / inc / modules / admin / admin-inc.php

diff --git a/inc/modules/admin/admin-inc.php b/inc/modules/admin/admin-inc.php
index 4eadcc4894a63950df4e26ff2c6f864fd6ccd864..1716bf3549da10bc1ca53b6609be36581742f719 100644 (file)
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -216,14 +216,14 @@ LIMIT 1",
                        loadInclude($inc);
                } elseif ($GLOBALS['acl_allow'] === false) {
                        // Access denied
-                       loadTemplate('admin_menu_failed', false, getMaskedMessage('ADMIN_ACCESS_DENIED', $what));
+                       loadTemplate('admin_menu_failed', false, '{%message,ADMIN_ACCESS_DENIED=' . $what . '%}');
                } else {
                        // Include file not found :-(
-                       loadTemplate('admin_menu_failed', false, getMaskedMessage('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, getMaskedMessage('ADMIN_ACTION_INVALID', $action . '/' . $what));
+               loadTemplate('admin_menu_failed', false, '{%message,ADMIN_ACTION_INVALID=' . $action . '/' . $what . '%}');
        }
 
        // Free memory
@@ -240,7 +240,7 @@ function isAdminAllowedAccessMenu ($action, $what = null) {
        if (!isset($GLOBALS[__FUNCTION__][$action][$what])) {
                // ACL is always 'allow' when no ext-admins is installed
                // @TODO This can be rewritten into a filter
-               $GLOBALS[__FUNCTION__][$action][$what] = ((!isExtensionInstalledAndNewer('admins', '0.2.0')) || (adminsCheckAdminAcl($action, $what)));
+               $GLOBALS[__FUNCTION__][$action][$what] = ((!isExtensionInstalledAndNewer('admins', '0.2.0')) || (isAdminsAllowedByAcl($action, $what)));
        } // END - if
 
        // Return the cached value
@@ -296,7 +296,7 @@ ORDER BY
                                                $OUT .= '[<a href="{%url=modules.php?module=admin&amp;action=' . $menu . '%}">';
                                        }
                                } else {
-                                       $OUT .= '<em style="cursor:help" class="notice" title="{%message,MENU_ACTION_404=' . $menu . '}">';
+                                       $OUT .= '<em style="cursor:help" class="notice" title="{%message,ADMIN_MENU_ACTION_404_TITLE=' . $menu . '%}">';
                                }
 
                                $OUT .= $title;
@@ -334,7 +334,8 @@ ORDER BY
                                // Do we have entries?
                                if ((ifAdminMenuHasEntries($menu)) && (!SQL_HASZERONUMS($result_what))) {
                                        $GLOBALS['menu']['description'] = array();
-                                       $GLOBALS['menu']['title'] = array(); $SUB = true;
+                                       $GLOBALS['menu']['title'] = array();
+                                       $SUB = true;
                                        $OUT .= '<li class="admin_menu_sub"><ul class="admin_menu_sub">';
                                        // @TODO Rewrite this to $content = SQL_FETCHARRAY()
                                        while (list($what_sub, $title_what, $desc_what) = SQL_FETCHROW($result_what)) {
@@ -358,7 +359,7 @@ ORDER BY
                                                                        $OUT .= '[<a href="{%url=modules.php?module=admin&amp;what=' . $what_sub . '%}">';
                                                                }
                                                        } else {
-                                                               $OUT .= '<em style="cursor:help" class="notice" title="{%message,MENU_WHAT_404=' . $what_sub . '%}">';
+                                                               $OUT .= '<em style="cursor:help" class="notice" title="{%message,ADMIN_MENU_WHAT_404_TITLE=' . $what_sub . '%}">';
                                                        }
 
                                                        $OUT .= $title_what;
@@ -437,8 +438,8 @@ function addMemberSelectionBox ($def = 0, $add_all = false, $return = false, $no
 // @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'";
+       $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",
                array($mode), __FUNCTION__, __LINE__);
@@ -489,7 +490,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, $tableData, $id, $skip);
+                       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')) {
@@ -576,7 +577,7 @@ function adminSaveSettings (&$postData, $tableName = '_config', $whereStatement
        rebuildCache('config', 'config');
 
        // Settings saved, so display message?
-       if ($displayMessage === true) loadTemplate('admin_settings_saved', false, '{--SETTINGS_SAVED--}');
+       if ($displayMessage === true) displayMessage('{--SETTINGS_SAVED--}');
 
        // Return affected rows
        return $affected;
@@ -638,7 +639,11 @@ function generateUserProfileLink ($userid, $title = '', $what = 'list_user') {
                $nick = getNickname($userid);
 
                // Is it not empty, use it as title else the userid
-               if (!empty($nick)) $title = $nick . '(' . $userid . ')'; else $title = $userid;
+               if (!empty($nick)) {
+                       $title = $nick . '(' . $userid . ')';
+               } else {
+                       $title = $userid;
+               }
        }
 
        // Return link
@@ -648,7 +653,14 @@ function generateUserProfileLink ($userid, $title = '', $what = 'list_user') {
 // Check "logical-area-mode"
 function adminGetMenuMode () {
        // Set the default menu mode as the mode for all admins
-       $mode = getAdminMenu();
+       $mode = 'global';
+
+       // If sql_patches is up-to-date enough, use the configuration
+       if (isExtensionInstalledAndNewer('sql_patches', '0.3.2')) {
+               $mode = getAdminMenu();
+       } // END - if
+
+       // Backup it
        $adminMode = $mode;
 
        // Get admin id
@@ -685,7 +697,7 @@ function adminGetMenuMode () {
 
 // Change activation status
 function adminChangeActivationStatus ($IDs, $table, $row, $idRow = 'id') {
-       $count = '0'; $newStatus = 'Y';
+       $count = '0';
        if ((is_array($IDs)) && (count($IDs) > 0)) {
                // "Walk" all through and count them
                foreach ($IDs as $id => $selected) {
@@ -696,7 +708,12 @@ function adminChangeActivationStatus ($IDs, $table, $row, $idRow = 'id') {
                        if (!empty($selected)) {
                                // Determine new status
                                $result = SQL_QUERY_ESC("SELECT %s FROM `{?_MYSQL_PREFIX?}_%s` WHERE %s=%s LIMIT 1",
-                               array($row, $table, $idRow, $id), __FUNCTION__, __LINE__);
+                                       array(
+                                               $row,
+                                               $table,
+                                               $idRow,
+                                               $id
+                                       ), __FUNCTION__, __LINE__);
 
                                // Row found?
                                if (SQL_NUMROWS($result) == 1) {
@@ -704,11 +721,17 @@ function adminChangeActivationStatus ($IDs, $table, $row, $idRow = 'id') {
                                        list($currStatus) = SQL_FETCHROW($result);
 
                                        // And switch it N<->Y
-                                       if ($currStatus == 'Y') $newStatus = 'N'; else $newStatus = 'Y';
+                                       $newStatus = convertBooleanToYesNo(!($currStatus == 'Y'));
 
                                        // Change this status
                                        SQL_QUERY_ESC("UPDATE `{?_MYSQL_PREFIX?}_%s` SET %s='%s' WHERE %s=%s LIMIT 1",
-                                       array($table, $row, $newStatus, $idRow, $id), __FUNCTION__, __LINE__);
+                                               array(
+                                                       $table,
+                                                       $row,
+                                                       $newStatus,
+                                                       $idRow,
+                                                       $id
+                                               ), __FUNCTION__, __LINE__);
 
                                        // Count up affected rows
                                        $count += SQL_AFFECTEDROWS();
@@ -720,10 +743,10 @@ function adminChangeActivationStatus ($IDs, $table, $row, $idRow = 'id') {
                } // END - foreach
 
                // Output status
-               loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_STATUS_CHANGED'), $count, count($IDs)));
+               displayMessage(sprintf(getMessage('ADMIN_STATUS_CHANGED'), $count, count($IDs)));
        } else {
                // Nothing selected!
-               loadTemplate('admin_settings_saved', false, '{--ADMIN_NOTHING_SELECTED_CHANGE--}');
+               displayMessage('{--ADMIN_NOTHING_SELECTED_CHANGE--}');
        }
 }
 
@@ -739,7 +762,7 @@ function sendAdminBuildMails ($mode, $table, $content, $id, $subjectPart = '', $
        } // END - if
 
        // Is the raw userid set?
-       if (postRequestParameter($userid, $id) > 0) {
+       if (postRequestParameter($useridColumn, $id) > 0) {
                // Load email template
                if (!empty($subjectPart)) {
                        $mail = loadEmailTemplate('member_' . $mode . '_' . strtolower($subjectPart) . '_' . $table, $content);
@@ -748,7 +771,7 @@ function sendAdminBuildMails ($mode, $table, $content, $id, $subjectPart = '', $
                }
 
                // Send email out
-               sendEmail(postRequestParameter($userid, $id), strtoupper('{--MEMBER_' . $subject . '_' . $table . '_SUBJECT--}'), $mail);
+               sendEmail(postRequestParameter($useridColumn, $id), strtoupper('{--MEMBER_' . $subject . '_' . $table . '_SUBJECT--}'), $mail);
        } // END - if
 
        // Generate subject
@@ -756,9 +779,9 @@ function sendAdminBuildMails ($mode, $table, $content, $id, $subjectPart = '', $
 
        // Send admin notification out
        if (!empty($subjectPart)) {
-               sendAdminNotification($subject, 'admin_' . $mode . '_' . strtolower($subjectPart) . '_' . $table, $content, postRequestParameter($userid, $id));
+               sendAdminNotification($subject, 'admin_' . $mode . '_' . strtolower($subjectPart) . '_' . $table, $content, postRequestParameter($useridColumn, $id));
        } else {
-               sendAdminNotification($subject, 'admin_' . $mode . '_' . $table, $content, postRequestParameter($userid, $id));
+               sendAdminNotification($subject, 'admin_' . $mode . '_' . $table, $content, postRequestParameter($useridColumn, $id));
        }
 }
 
@@ -954,10 +977,10 @@ function adminDeleteEntriesConfirm ($IDs, $table, $columns = array(), $filterFun
                        // Was this fine?
                        if (SQL_AFFECTEDROWS() == count($IDs)) {
                                // All deleted
-                               loadTemplate('admin_settings_saved', false, '{--ADMIN_ALL_ENTRIES_REMOVED--}');
+                               displayMessage('{--ADMIN_ALL_ENTRIES_REMOVED--}');
                        } else {
                                // Some are still there :(
-                               loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_SOME_ENTRIES_NOT_DELETED'), SQL_AFFECTEDROWS(), count($IDs)));
+                               displayMessage(sprintf(getMessage('ADMIN_SOME_ENTRIES_NOT_DELETED'), SQL_AFFECTEDROWS(), count($IDs)));
                        }
                } else {
                        // List for deletion confirmation
@@ -1043,10 +1066,10 @@ function adminEditEntriesConfirm ($IDs, $table, $columns = array(), $filterFunct
                        // Was this fine?
                        if ($affected == count($IDs)) {
                                // All deleted
-                               loadTemplate('admin_settings_saved', false, '{--ADMIN_ALL_ENTRIES_EDITED--}');
+                               displayMessage('{--ADMIN_ALL_ENTRIES_EDITED--}');
                        } else {
                                // Some are still there :(
-                               loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_SOME_ENTRIES_NOT_EDITED'), $affected, count($IDs)));
+                               displayMessage(sprintf(getMessage('ADMIN_SOME_ENTRIES_NOT_EDITED'), $affected, count($IDs)));
                        }
                } else {
                        // List for editing
@@ -1122,20 +1145,20 @@ function sendAdminPasswordResetLink ($email) {
        SQL_FREERESULT($result);
 
        // Generate hash for reset link
-       $content['hash'] = generateHash(getUrl() . ':' . $content['id'] . ':' . $content['login'] . ':' . $content['password'], substr($content['password'], 10));
+       $content['hash'] = generateHash(getUrl() . getEncryptSeperator() . $content['id'] . getEncryptSeperator() . $content['login'] . getEncryptSeperator() . $content['password'], substr($content['password'], getSaltLength()));
 
        // Remove some data
        unset($content['id']);
        unset($content['password']);
 
        // Prepare email
-       $mailText = loadEmailTemplate('form_reset_password', $content);
+       $mailText = loadEmailTemplate('admin_reset_password', $content);
 
        // Send it out
-       sendEmail($email, '{--ADMIN_RESET_PASS_LINK_SUBJECT--}', $mailText);
+       sendEmail($email, '{--ADMIN_RESET_PASSWORD_LINK_SUBJECT--}', $mailText);
 
        // Prepare output
-       return '{--ADMIN_RESET_LINK_SENT--}';
+       return '{--ADMIN_RESET_PASSWORD_LINK_SENT--}';
 }
 
 // Validate hash and login for password reset
@@ -1153,7 +1176,7 @@ function adminResetValidateHashLogin ($hash, $login) {
                $content = SQL_FETCHARRAY($result);
 
                // Generate hash again
-               $hashFromData = generateHash(getUrl() . ':' . $content['id'] . ':' . $login . ':' . $content['password'], substr($content['password'], 10));
+               $hashFromData = generateHash(getUrl() . getEncryptSeperator() . $content['id'] . getEncryptSeperator() . $login . getEncryptSeperator() . $content['password'], substr($content['password'], getSaltLength()));
 
                // Does both match?
                $valid = ($hash == $hashFromData);
@@ -1272,11 +1295,11 @@ function generateAdminLink ($adminId) {
                                $adminLink = '<a href="' . generateEmailLink(getAdminEmail($adminId), 'admins') . '" title="{--ADMIN_CONTACT_LINK_TITLE--}">' . $login . '</a>';
                        } else {
                                // Extension not found
-                               $adminLink = getMaskedMessage('ADMIN_TASK_ROW_EXTENSION_NOT_INSTALLED', 'admins');
+                               $adminLink = '{%message,ADMIN_TASK_ROW_EXTENSION_NOT_INSTALLED=admins%}';
                        }
                } else {
                        // Maybe deleted?
-                       $adminLink = '<div class="notice">' . getMaskedMessage('ADMIN_ID_404', $adminId) . '</div>';
+                       $adminLink = '<div class="notice">{%message,ADMIN_ID_404=' . $adminId . '%}</div>';
                }
        } // END - if
 
@@ -1304,7 +1327,7 @@ function doVerifyExpertSettings () {
                // Is he allowed?
                if ($expertSettings == 'Y') {
                        // Okay, does he want to see them?
-                       if (getAminsExpertWarning() == 'Y') {
+                       if (isAdminsExpertWarningEnabled()) {
                                // Ask for them
                                if (isFormSent()) {
                                        // Is the element set, then we need to change the admin
@@ -1345,7 +1368,7 @@ function doVerifyExpertSettings () {
        // 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) . '--}');
+               displayMessage('{--ADMIN_EXPERT_SETTINGS_STATUS_' . strtoupper($return) . '--}');
        } // END - if
 
        // Return status
@@ -1477,17 +1500,17 @@ function adminProcessMenuEditForm ($type, $subMenu) {
 
                        default: // Unexpected action
                                logDebugMessage(__FILE__, __LINE__, sprintf("Unsupported action %s detected.", postRequestParameter('ok')));
-                               loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_UNKNOWN_OKAY', postRequestParameter('ok')));
+                               displayMessage('{%message,ADMIN_UNKNOWN_OKAY=' . postRequestParameter('ok') . '%}');
                                break;
                } // END - switch
        } // END - foreach
 
        // Load template
-       loadTemplate('admin_settings_saved', false, '{--SETTINGS_SAVED--}');
+       displayMessage('{--SETTINGS_SAVED--}');
 }
 
 // Handle weightning
-function doAdminProcessMenuWeightning ($type) {
+function doAdminProcessMenuWeightning ($type, $AND) {
        // Are there all required (generalized) GET parameter?
        if ((isGetRequestParameterSet('act')) && (isGetRequestParameterSet('tid')) && (isGetRequestParameterSet('fid'))) {
                // Init variables