Extension ext-admins improved:

[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 14d65d059e27bea41ac2d2d196f45f970dcaa4f8..a3f48e84807e750c7f283eb3606d99ae961abf23 100644 (file)
--- a/inc/modules/admin/admin-inc.php
+++ b/inc/modules/admin/admin-inc.php
@@ -389,7 +389,7 @@ ORDER BY
                // Free memory
                SQL_FREERESULT($result_main);
                $OUT .= '</ul>';
-       }
+       } // END - if
 
        // Is there a cache instance again?
        // Return or output content?
@@ -400,24 +400,65 @@ ORDER BY
        }
 }
 
-// Create an admin selection box
-function generateAdminSelectionBox ($adminId = NULL) {
-       // Return content
-       return $OUT;
+// Create an admin selection box form
+function addAdminSelectionBox ($adminId = NULL, $special = '') {
+       // Default is email as "special column"
+       $ADD = ',`email` AS `special`';
+
+       // Is a special column given?
+       if (!empty($special)) {
+               // Additional column for SQL query
+               $ADD = ',`' . $special . '` AS `special`';
+       } // END - if
+
+       // Query all entries
+       $result = SQL_QUERY('SELECT
+       `id`,`login`' . $ADD . '
+FROM
+       `{?_MYSQL_PREFIX?}_admins`
+ORDER BY
+       `login` ASC', __FUNCTION__, __LINE__);
+
+       // Init output
+       $OUT = '';
+
+       // Load all entries
+       while ($content = SQL_FETCHARRAY($result)) {
+               // Add the entry
+               $OUT .= loadTemplate('select_admins_option', true, $content);
+       } // END - if
+
+       // Free memory
+       SQL_FREERESULT($result);
+
+       // Add form to content
+       $content['form_selection'] = $OUT;
+
+       // Output form
+       loadTemplate('select_admins_box', false, $content);
 }
 
 // Create a member selection box
 function addMemberSelectionBox ($userid = NULL, $add_all = false, $return = false, $none = false, $field = 'userid') {
        // Output selection form with all confirmed user accounts listed
-       $result = SQL_QUERY('SELECT `userid`,`surname`,`family` FROM `{?_MYSQL_PREFIX?}_user_data` ORDER BY `userid` ASC', __FUNCTION__, __LINE__);
+       $result = SQL_QUERY('SELECT
+       `userid`,`surname`,`family`
+FROM
+       `{?_MYSQL_PREFIX?}_user_data`
+ORDER BY
+       `userid` ASC', __FUNCTION__, __LINE__);
 
        // Default output
        $OUT = '';
 
        // USe this only for adding points (e.g. adding refs really makes no sence ;-) )
-       if ($add_all === true)   $OUT = '      <option value="all">{--ALL_MEMBERS--}</option>';
-        elseif ($none === true) $OUT = '      <option value="0">{--SELECT_NONE--}</option>';
+       if ($add_all === true) {
+               $OUT = '      <option value="all">{--ALL_MEMBERS--}</option>';
+       } elseif ($none === true) {
+               $OUT = '      <option value="0">{--SELECT_NONE--}</option>';
+       }
 
+       // Load all entries
        while ($content = SQL_FETCHARRAY($result)) {
                $OUT .= '<option value="' . bigintval($content['userid']) . '"';
                if ($userid == $content['userid']) $OUT .= ' selected="selected"';