Some minor rewrites, addPointsAutoPurge() now validates the userid before executing...

[mailer.git] / inc / libs / admins_functions.php

diff --git a/inc/libs/admins_functions.php b/inc/libs/admins_functions.php
index f87aff12df2aa19462b176d2f0639950167b3653..2643cba2c1c50334032c842ce418b1c6a63cc03d 100644 (file)
--- a/inc/libs/admins_functions.php
+++ b/inc/libs/admins_functions.php
@@ -282,7 +282,7 @@ LIMIT 1",
        } // END - if
 
        // Remove cache file
-       runFilterChain('post_admin_edited', postRequestArray());
+       runFilterChain('post_form_submited', postRequestArray());
 }
 
 // Make admin accounts editable
@@ -318,12 +318,12 @@ function adminsEditAdminAccount ($postData) {
                        $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('form_submit_admins_row', true, $content);
                } // END - if
        } // END - foreach
 
        // Load template
-       loadTemplate('admin_edit_admins', false, $OUT);
+       loadTemplate('form_submit_admins', false, $OUT);
 }
 
 // Delete given admin accounts
@@ -387,7 +387,7 @@ function adminsRemoveAdminAccount ($postData) {
        }
 
        // Remove cache if cache system is activated
-       runFilterChain('post_admin_deleted', postRequestArray());
+       runFilterChain('post_form_deleted', postRequestArray());
 }
 
 // List all admin accounts
@@ -400,9 +400,6 @@ function adminsListAdminAccounts() {
                $content['mode']    = '{--ADMINS_' . strtoupper($content['mode'])    . '_MODE--}';
                $content['la_mode'] = '{--ADMINS_' . strtoupper($content['la_mode']) . '_LA_SETTING--}';
 
-               // Prepare some more data
-               $content['email_link'] = generateEmailLink($content['id'], 'admins');
-
                // Load row template and switch color
                $OUT .= loadTemplate('admin_list_admins_row', true, $content);
        } // END - while
@@ -624,9 +621,9 @@ function getAdminLastFailure ($adminId) {
        return $data['last_failure'];
 }
 
-//*****************************************************************************
-//                     Below only filter functions
-//*****************************************************************************
+//-----------------------------------------------------------------------------
+//                                Filter Functions
+//-----------------------------------------------------------------------------
 
 // Filter for adding extra data to the query
 function FILTER_ADD_EXTRA_SQL_DATA ($add = '') {