More misc fixes and rewrites (sorry, lame description)

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

diff --git a/inc/modules/admin/what-admins_edit.php b/inc/modules/admin/what-admins_edit.php
index 2ba1e8bab2bbdd6ec1fa9a77a18dda7d72ac27a1..45c18bfeac8a5b0d89012acaa1258a5ae06f71e3 100644 (file)
--- a/inc/modules/admin/what-admins_edit.php
+++ b/inc/modules/admin/what-admins_edit.php
@@ -38,12 +38,12 @@
 
 // Some security stuff...
 if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
-       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+       $INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
        require($INC);
 }
 
 // Add description as navigation point
-ADD_DESCR("admin", __FILE__);
+ADD_DESCR('admin', __FILE__);
 
 // Set selection data to empty array when it is empty
 if (!REQUEST_ISSET_POST('sel')) REQUEST_SET_POST('sel', array());
@@ -54,27 +54,27 @@ if (REQUEST_ISSET_GET('admin')) {
        $aid = bigintval(REQUEST_GET('admin'));
 
        // Set required fields
-       REQUEST_SET_POST('edit', "1");
-       REQUEST_SET_POST(array('sel', $aid), "1");
-}
+       REQUEST_SET_POST('edit', '1');
+       REQUEST_SET_POST('sel', array($aid => '1'));
+} // END - if
 
-if ((REQUEST_ISSET_POST('edit')) && (SELECTION_COUNT(REQUEST_POST('sel')) > 0)) {
+if ((REQUEST_ISSET_POST('edit')) && (countPostSelection() > 0)) {
        // Edit account(s)
-       ADMINS_EDIT_ADMIN_ACCOUNTS(REQUEST_POST_ARRAY());
+       adminsEditAdminAccount(REQUEST_POST_ARRAY());
 } elseif ((REQUEST_ISSET_POST('change')) && (count(REQUEST_POST('login')) > 0)) {
        // Change admin accounts
-       ADMINS_CHANGE_ADMIN_ACCOUNT(REQUEST_POST_ARRAY());
-} elseif ((REQUEST_ISSET_POST('del')) && (SELECTION_COUNT(REQUEST_POST('sel')) > 0)) {
+       adminsChangeAdminAccount(REQUEST_POST_ARRAY());
+} elseif ((REQUEST_ISSET_POST('del')) && (countPostSelection() > 0)) {
        // Show admin accounts for deletetion
-       ADMINS_DELETE_ADMIN_ACCOUNTS(REQUEST_POST_ARRAY());
+       adminsDeleteAdminAccount(REQUEST_POST_ARRAY());
 } else {
-       if ((REQUEST_ISSET_POST('remove')) && (SELECTION_COUNT(REQUEST_POST('sel')) > 0)) {
+       if ((REQUEST_ISSET_POST('remove')) && (countPostSelection() > 0)) {
                // Remove accounts now
-               ADMINS_REMOVE_ADMIN_ACCOUNTS(REQUEST_POST_ARRAY());
-       }
+               adminsRemoveAdminAccount(REQUEST_POST_ARRAY());
+       } // END - if
 
        // List all admin accounts
-       ADMINS_LIST_ADMIN_ACCOUNTS();
+       adminsListAdminAccounts();
 }
 
 //