New naming convention applied to many functions, see #118 for details

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

diff --git a/inc/modules/admin/what-lock_user.php b/inc/modules/admin/what-lock_user.php
index 7bc533df5e41f9ecb647854e73330f76ebf9450f..efde7fa314caf417311f89b62be43c878723d92a 100644 (file)
--- a/inc/modules/admin/what-lock_user.php
+++ b/inc/modules/admin/what-lock_user.php
@@ -49,7 +49,7 @@ ADD_DESCR('admin', __FILE__);
 if (REQUEST_ISSET_GET('uid')) {
        // Load user's data
        $result_user = SQL_QUERY_ESC("SELECT status, gender, surname, family, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
-        array(bigintval(REQUEST_GET('uid'))), __FILE__, __LINE__);
+               array(bigintval(REQUEST_GET('uid'))), __FILE__, __LINE__);
        $ACT = false;
        if (SQL_NUMROWS($result_user) == 1) {
                // User found
@@ -77,7 +77,7 @@ if (REQUEST_ISSET_GET('uid')) {
                                $msg = LOAD_EMAIL_TEMPLATE("lock-user", array('text' => REQUEST_POST('reason')), bigintval(REQUEST_GET('uid')));
 
                                // Send away...
-                               SEND_EMAIL(bigintval(REQUEST_GET('uid')), ADMIN_LOCKED_SUBJ, $msg);
+                               sendEmail(bigintval(REQUEST_GET('uid')), ADMIN_LOCKED_SUBJ, $msg);
                        } // END - if
 
                        // Prepare message
@@ -101,7 +101,7 @@ if (REQUEST_ISSET_GET('uid')) {
                                $msg = LOAD_EMAIL_TEMPLATE("unlock-user", array('text' => REQUEST_POST('reason')), bigintval(REQUEST_GET('uid')));
 
                                // Send away...
-                               SEND_EMAIL(bigintval(REQUEST_GET('uid')), getMessage('ADMIN_UNLOCKED_SUBJ'), $msg);
+                               sendEmail(bigintval(REQUEST_GET('uid')), getMessage('ADMIN_UNLOCKED_SUBJ'), $msg);
                                if (EXT_IS_ACTIVE('rallye')) {
                                        RALLYE_AUTOADD_USER(REQUEST_GET('uid'));
                                } // END - if
@@ -113,7 +113,7 @@ if (REQUEST_ISSET_GET('uid')) {
                } elseif (REQUEST_ISSET_POST('del')) {
                        // Delete the account
                        $ACT = true;
-                       LOAD_INC_ONCE("inc/modules/admin/what-del_user.php");
+                       loadIncludeOnce("inc/modules/admin/what-del_user.php");
                } elseif (REQUEST_ISSET_POST(('no'))) {
                        // Do not lock him...
                        $URL = ADMIN_CREATE_USERID_LINK(REQUEST_GET('uid'));
@@ -131,7 +131,7 @@ if (REQUEST_ISSET_GET('uid')) {
 
                                // Transfer data to constants for the template
                                // @TODO Rewrite these all constants
-                               define('__EMAIL', CREATE_EMAIL_LINK($email, "user_data"));
+                               define('__EMAIL', generateMemberEmailLink($email, 'user_data'));
                                define('__SNAME', $sname);
                                define('__FNAME', $fname);
                                define('__UID'  , bigintval(REQUEST_GET('uid')));
@@ -139,27 +139,27 @@ if (REQUEST_ISSET_GET('uid')) {
                                // Realy want to lock?
                                switch ($status)
                                {
-                               case "CONFIRMED": // Yes, lock him down... ;-)
-                                       define('__OK_VALUE'    , "lock");
+                               case 'CONFIRMED': // Yes, lock him down... ;-)
+                                       define('__OK_VALUE'    , 'lock');
                                        define('__HEADER_VALUE', sprintf(getMessage('ADMIN_HEADER_LOCK_ACCOUNT'), constant('__UID')));
                                        define('__TEXT_VALUE'  , sprintf(getMessage('ADMIN_TEXT_LOCK_ACCOUNT'), constant('__UID')));
                                        break;
 
-                               case "LOCKED": // Unlock the user
-                                       define('__OK_VALUE'    , "unlock");
+                               case 'LOCKED': // Unlock the user
+                                       define('__OK_VALUE'    , 'unlock');
                                        define('__HEADER_VALUE', sprintf(getMessage('ADMIN_HEADER_UNLOCK_ACCOUNT'), constant('__UID')));
                                        define('__TEXT_VALUE'  , sprintf(getMessage('ADMIN_TEXT_UNLOCK_ACCOUNT'), constant('__UID')));
                                        break;
 
-                               case "UNCONFIRMED": // Unconfirmed accounts cannot be unlocked!
-                                       define('__OK_VALUE'    , "del");
+                               case 'UNCONFIRMED': // Unconfirmed accounts cannot be unlocked!
+                                       define('__OK_VALUE'    , 'del');
                                        define('__HEADER_VALUE', sprintf(getMessage('ADMIN_HEADER_DEL_ACCOUNT'), constant('__UID')));
                                        define('__TEXT_VALUE'  , sprintf(getMessage('ADMIN_TEXT_DEL_ACCOUNT'), constant('__UID')));
                                        break;
                                }
 
                                // Output form
-                               LOAD_TEMPLATE("admin_lock_user");
+                               LOAD_TEMPLATE('admin_lock_user');
                        } else {
                                // Account does not exists!
                                LOAD_TEMPLATE('admin_settings_saved', false, "<div class=\"admin_failed\">".sprintf(getMessage('ADMIN_MEMBER_404'), REQUEST_GET('uid'))."</div>");
@@ -169,7 +169,7 @@ if (REQUEST_ISSET_GET('uid')) {
                // Is an URL set?
                if (!empty($URL)) {
                        // Reload and die...
-                       LOAD_URL($URL);
+                       redirectToUrl($URL);
                } elseif ($ACT) {
                        // An action was performed...
                        if (!empty($message)) {