Complete rewrite of and , wrapper functions added, see bug #101

[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 06c4557c92bb6b21e18b873fb73a9b657d09c333..aff963e0b4a95e311a637110fa0754e50aac0eb9 100644 (file)
--- a/inc/modules/admin/what-lock_user.php
+++ b/inc/modules/admin/what-lock_user.php
@@ -41,10 +41,10 @@ if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
 ADD_DESCR("admin", __FILE__);
 
 // Is a userid set?
 ADD_DESCR("admin", __FILE__);
 
 // Is a userid set?

-if (!empty($_GET['u_id'])) {
+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",
        // 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($_GET['u_id'])), __FILE__, __LINE__);
+        array(bigintval(REQUEST_GET('uid'))), __FILE__, __LINE__);

        $ACT = false;
        if (SQL_NUMROWS($result_user) == 1) {
                // User found
        $ACT = false;
        if (SQL_NUMROWS($result_user) == 1) {
                // User found


@@ -54,67 +54,67 @@ if (!empty($_GET['u_id'])) {
                SQL_FREERESULT($result_user);
 
                // Is a lock reason set?
                SQL_FREERESULT($result_user);
 
                // Is a lock reason set?

-               if ((!empty($_POST['lock'])) && ($status != "LOCKED")) {
+               if ((REQUEST_ISSET_POST(('lock'))) && ($status != "LOCKED")) {

                        // Ok, lock the account!
                        if (GET_EXT_VERSION("user") >= "0.3.5") {
                                // Lock with reason
                                SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET `status`='LOCKED',lock_reason='%s',lock_timestamp=NOW() WHERE userid=%s LIMIT 1",
                        // Ok, lock the account!
                        if (GET_EXT_VERSION("user") >= "0.3.5") {
                                // Lock with reason
                                SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET `status`='LOCKED',lock_reason='%s',lock_timestamp=NOW() WHERE userid=%s LIMIT 1",

-                                       array($_POST['reason'], bigintval($_GET['u_id'])), __FILE__, __LINE__);
+                                       array(REQUEST_POST('reason'), bigintval(REQUEST_GET('uid'))), __FILE__, __LINE__);

                        } else {
                                // Lock with no lock reason saved
                                SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET `status`='LOCKED' WHERE userid=%s LIMIT 1",
                        } else {
                                // Lock with no lock reason saved
                                SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET `status`='LOCKED' WHERE userid=%s LIMIT 1",

-                                       array(bigintval($_GET['u_id'])), __FILE__, __LINE__);
+                                       array(bigintval(REQUEST_GET('uid'))), __FILE__, __LINE__);

                        }
 
                        // Entry updated?
                        if (SQL_AFFECTEDROWS() == 1) {
                                // Send an email to the user! In later version you can optionally switch this feature off
                        }
 
                        // Entry updated?
                        if (SQL_AFFECTEDROWS() == 1) {
                                // Send an email to the user! In later version you can optionally switch this feature off

-                               $msg = LOAD_EMAIL_TEMPLATE("lock-user", array('text' => $_POST['reason']), bigintval($_GET['u_id']));
+                               $msg = LOAD_EMAIL_TEMPLATE("lock-user", array('text' => REQUEST_POST('reason')), bigintval(REQUEST_GET('uid')));

 
                                // Send away...
 
                                // Send away...

-                               SEND_EMAIL(bigintval($_GET['u_id']), ADMIN_LOCKED_SUBJ, $msg);
+                               SEND_EMAIL(bigintval(REQUEST_GET('uid')), ADMIN_LOCKED_SUBJ, $msg);

                        } // END - if
 
                        // Prepare message
                        } // END - if
 
                        // Prepare message

-                       $MSG = USER_ACCOUNT_LOCKED_1.$_GET['u_id'].USER_ACCOUNT_LOCKED_2;
+                       $MSG = USER_ACCOUNT_LOCKED_1.REQUEST_GET('uid').USER_ACCOUNT_LOCKED_2;

                        $ACT = true;
                        $ACT = true;

-               } elseif ((!empty($_POST['unlock'])) && ($status == "LOCKED")) {
+               } elseif ((REQUEST_ISSET_POST(('unlock'))) && ($status == "LOCKED")) {

                        // Ok, unlock the account!
                        if (GET_EXT_VERSION("user") >= "0.3.5") {
                                // Reset lock reason as well
                                SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET `status`='CONFIRMED',lock_reason='',lock_timestamp='0000-00-00 00:00' WHERE userid=%s LIMIT 1",
                        // Ok, unlock the account!
                        if (GET_EXT_VERSION("user") >= "0.3.5") {
                                // Reset lock reason as well
                                SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET `status`='CONFIRMED',lock_reason='',lock_timestamp='0000-00-00 00:00' WHERE userid=%s LIMIT 1",

-                                       array(bigintval($_GET['u_id'])), __FILE__, __LINE__);
+                                       array(bigintval(REQUEST_GET('uid'))), __FILE__, __LINE__);

                        } else {
                                // No lock reason to reset
                                SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET `status`='CONFIRMED' WHERE userid=%s LIMIT 1",
                        } else {
                                // No lock reason to reset
                                SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET `status`='CONFIRMED' WHERE userid=%s LIMIT 1",

-                                       array(bigintval($_GET['u_id'])), __FILE__, __LINE__);
+                                       array(bigintval(REQUEST_GET('uid'))), __FILE__, __LINE__);

                        }
 
                        // Entry updated?
                        if (SQL_AFFECTEDROWS() == 1) {
                                // Send an email to the user! In later version you can optionally switch this feature off
                        }
 
                        // Entry updated?
                        if (SQL_AFFECTEDROWS() == 1) {
                                // Send an email to the user! In later version you can optionally switch this feature off

-                               $msg = LOAD_EMAIL_TEMPLATE("unlock-user", array('text' => $_POST['reason']), bigintval($_GET['u_id']));
+                               $msg = LOAD_EMAIL_TEMPLATE("unlock-user", array('text' => REQUEST_POST('reason')), bigintval(REQUEST_GET('uid')));

 
                                // Send away...
 
                                // Send away...

-                               SEND_EMAIL(bigintval($_GET['u_id']), getMessage('ADMIN_UNLOCKED_SUBJ'), $msg);
+                               SEND_EMAIL(bigintval(REQUEST_GET('uid')), getMessage('ADMIN_UNLOCKED_SUBJ'), $msg);

                                if (EXT_IS_ACTIVE("rallye")) {
                                if (EXT_IS_ACTIVE("rallye")) {

-                                       RALLYE_AUTOADD_USER($_GET['u_id']);
+                                       RALLYE_AUTOADD_USER(REQUEST_GET('uid'));

                                } // END - if
                        } // END - if
 
                        // Prepare message
                                } // END - if
                        } // END - if
 
                        // Prepare message

-                       $MSG = USER_ACCOUNT_UNLOCKED_1.$_GET['u_id'].USER_ACCOUNT_UNLOCKED_2;
+                       $MSG = USER_ACCOUNT_UNLOCKED_1.REQUEST_GET('uid').USER_ACCOUNT_UNLOCKED_2;

                        $ACT = true;
                        $ACT = true;

-               } elseif (isset($_POST['del'])) {
+               } elseif (REQUEST_ISSET_POST(('del'))) {

                        // Delete the account
                        $ACT = true;
                        LOAD_INC_ONCE("inc/modules/admin/what-del_user.php");
                        // Delete the account
                        $ACT = true;
                        LOAD_INC_ONCE("inc/modules/admin/what-del_user.php");

-               } elseif (!empty($_POST['no'])) {
+               } elseif (REQUEST_ISSET_POST(('no'))) {

                        // Do not lock him...
                        // Do not lock him...

-                       $URL = "modules.php?module=admin&what=list_user&u_id=".bigintval($_GET['u_id']);
+                       $URL = "modules.php?module=admin&what=list_user&uid=".bigintval(REQUEST_GET('uid'));

                } else {
                        $result = SQL_QUERY_ESC("SELECT email, surname, family FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
                } else {
                        $result = SQL_QUERY_ESC("SELECT email, surname, family FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",

-                               array(bigintval($_GET['u_id'])), __FILE__, __LINE__);
+                               array(bigintval(REQUEST_GET('uid'))), __FILE__, __LINE__);

 
                        // Entry found?
                        if (SQL_NUMROWS($result) == 1) {
 
                        // Entry found?
                        if (SQL_NUMROWS($result) == 1) {


@@ -128,7 +128,7 @@ if (!empty($_GET['u_id'])) {
                                define('__EMAIL', CREATE_EMAIL_LINK($email, "user_data"));
                                define('__SNAME', $sname);
                                define('__FNAME', $fname);
                                define('__EMAIL', CREATE_EMAIL_LINK($email, "user_data"));
                                define('__SNAME', $sname);
                                define('__FNAME', $fname);

-                               define('__UID'  , bigintval($_GET['u_id']));
+                               define('__UID'  , bigintval(REQUEST_GET('uid')));

 
                                // Realy want to lock?
                                switch ($status)
 
                                // Realy want to lock?
                                switch ($status)


@@ -156,7 +156,7 @@ if (!empty($_GET['u_id'])) {
                                LOAD_TEMPLATE("admin_lock_user");
                        } else {
                                // Account does not exists!
                                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'), $_GET['u_id'])."</div>");
+                               LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"admin_failed\">".sprintf(getMessage('ADMIN_MEMBER_404'), REQUEST_GET('uid'))."</div>");

                        }
                }
 
                        }
                }
 


@@ -174,7 +174,7 @@ if (!empty($_GET['u_id'])) {
                }
        } else {
                // Account does not exists!
                }
        } else {
                // Account does not exists!

-               LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"admin_failed\">".sprintf(getMessage('ADMIN_MEMBER_404'), $_GET['u_id'])."</div>");
+               LOAD_TEMPLATE("admin_settings_saved", false, "<div class=\"admin_failed\">".sprintf(getMessage('ADMIN_MEMBER_404'), REQUEST_GET('uid'))."</div>");

        }
 } else {
        // List all users
        }
 } else {
        // List all users