A lot rewrites from double-quote to single-quote, some fixes for extension handling...

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

diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php
index f5103384843691161a1fae922459644670daabbe..adeb3001ff0265ee3b8d11a634f5aa7f0ae5eaff 100644 (file)
--- a/inc/libs/user_functions.php
+++ b/inc/libs/user_functions.php
@@ -51,7 +51,7 @@ function alpha ($sortby, $colspan, $return=false) {
        /* Creates the list of letters and makes them a link. */
        $alphabet = array(getMessage('_ALL2'),"A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z",getMessage('_OTHERS'));
        $num = count($alphabet) - 1;
-       $OUT = "";
+       $OUT = '';
        while (list($counter, $ltr) = each($alphabet)) {
                if (REQUEST_GET('letter') == $ltr) {
                        // Current letter is letter from URL
@@ -85,7 +85,7 @@ function alpha ($sortby, $colspan, $return=false) {
 
 // Add links for sorting
 function SortLinks ($letter, $sortby, $colspan, $return=false) {
-       $OUT = "";
+       $OUT = '';
        if (!REQUEST_ISSET_GET(('offset'))) REQUEST_SET_GET('offset', 0);
        if (!REQUEST_ISSET_GET(('page')))   REQUEST_SET_GET('page'  , 0);
 
@@ -108,7 +108,7 @@ function SortLinks ($letter, $sortby, $colspan, $return=false) {
        );
 
        // Add nickname if extension is installed
-       if (EXT_IS_ACTIVE("nickname")) {
+       if (EXT_IS_ACTIVE('nickname')) {
                $list['nickname'] = getMessage('NICKNAME');
        } // END - if
 
@@ -151,13 +151,13 @@ function ADD_PAGENAV ($PAGES, $offset, $show_form, $colspan,$return=false) {
                define('__FORM_FOOTER', "<tr><td colspan=\"{!__COLSPAN2!}\" class=\"seperator bottom2\">&nbsp;</td></tr>");
        }
 
-       $OUT = "";
+       $OUT = '';
        for ($page = 1; $page <= $PAGES; $page++) {
                if (($page == REQUEST_GET('page')) || ((!REQUEST_ISSET_GET(('page'))) && ($page == "1"))) {
                        $OUT .= "<strong>-";
                } else {
                        if (!REQUEST_ISSET_GET(('letter'))) REQUEST_SET_GET('letter', getMessage('_ALL2'));
-                       if (!REQUEST_ISSET_GET(('sortby'))) REQUEST_SET_GET('sortby', "userid");
+                       if (!REQUEST_ISSET_GET(('sortby'))) REQUEST_SET_GET('sortby', 'userid');
 
                        // Base link
                        $OUT .= "<a href=\"{!URL!}/modules.php?module=admin&amp;what=".$GLOBALS['what'];
@@ -195,12 +195,12 @@ function ADD_PAGENAV ($PAGES, $offset, $show_form, $colspan,$return=false) {
 }
 
 // Create email link to user's account
-function USER_CREATE_EMAIL_LINK($email, $mod="admin") {
+function USER_CREATE_EMAIL_LINK($email, $mod='admin') {
        // Show contact link only if user is confirmed by default
        $locked = " AND `status`='CONFIRMED'";
 
        // But admins shall always see it
-       if (IS_ADMIN()) $locked = "";
+       if (IS_ADMIN()) $locked = '';
 
        $result = SQL_QUERY_ESC("SELECT userid
 FROM `{!_MYSQL_PREFIX!}_user_data`
@@ -227,9 +227,9 @@ function SELECT_RANDOM_REFID () {
        $refid = 0;
 
        // Is the extension version fine?
-       if (GET_EXT_VERSION("user") >= "0.3.4") {
+       if (GET_EXT_VERSION('user') >= "0.3.4") {
                // Get all user ids
-               $totalUsers = GET_TOTAL_DATA("CONFIRMED", "user_data", "userid", "status", true, " AND `rand_confirmed` >= ".getConfig('user_min_confirmed')."");
+               $totalUsers = GET_TOTAL_DATA("CONFIRMED", "user_data", 'userid', "status", true, " AND `rand_confirmed` >= ".getConfig('user_min_confirmed')."");
 
                // Do we have at least one?
                if ($totalUsers > 0) {
@@ -262,11 +262,11 @@ function SELECT_RANDOM_REFID () {
 // Do the user login
 function USER_DO_LOGIN ($uid, $passwd) {
        // Init variables
-       $dmy = "";
+       $dmy = '';
 
        // Add last_login if available
-       $lastOnline = ""; 
-       if (GET_EXT_VERSION("sql_patches") >= "0.2.8") {
+       $lastOnline = ''; 
+       if (GET_EXT_VERSION('sql_patches') >= '0.2.8') {
                $lastOnline = ", last_login";
        } // END - if
 
@@ -280,7 +280,7 @@ function USER_DO_LOGIN ($uid, $passwd) {
        );
 
        // Check login data
-       if ((EXT_IS_ACTIVE("nickname")) && (NICKNAME_PROBE_ON_USERID($uid))) {
+       if ((EXT_IS_ACTIVE('nickname')) && (NICKNAME_PROBE_ON_USERID($uid))) {
                // Nickname entered
                $result = SQL_QUERY_ESC("SELECT userid, password, last_online".$lastOnline." FROM `{!_MYSQL_PREFIX!}_user_data` WHERE nickname='%s' AND `status`='CONFIRMED' LIMIT 1",
                        array($uid), __FUNCTION__, __LINE__);
@@ -324,7 +324,7 @@ function USER_DO_LOGIN ($uid, $passwd) {
                        // Probe for last online timemark
                        $probe = time() -  $content['last_online'];
                        if (!empty($content['last_login'])) $probe = time() - $content['last_login'];
-                       if ((GET_EXT_VERSION("bonus") >= "0.2.2") && ($probe >= getConfig('login_timeout'))) {
+                       if ((GET_EXT_VERSION('bonus') >= '0.2.2') && ($probe >= getConfig('login_timeout'))) {
                                // Add login bonus to user's account
                                $add = sprintf(", login_bonus=login_bonus+%s",
                                        (float)getConfig('login_bonus')
@@ -332,7 +332,7 @@ function USER_DO_LOGIN ($uid, $passwd) {
                                $GLOBALS['bonus_payed'] = true;
 
                                // Subtract login bonus from userid's account or jackpot
-                               if ((GET_EXT_VERSION("bonus") >= "0.3.5") && (getConfig('bonus_mode') != "ADD")) BONUS_POINTS_HANDLER('login_bonus');
+                               if ((GET_EXT_VERSION('bonus') >= '0.3.5') && (getConfig('bonus_mode') != "ADD")) BONUS_POINTS_HANDLER('login_bonus');
                        } // END - if
 
                        // Calculate new hash with the secret key and master salt together
@@ -349,7 +349,7 @@ function USER_DO_LOGIN ($uid, $passwd) {
                                        array($uid), __FUNCTION__, __LINE__);
                                if (SQL_AFFECTEDROWS() == 1) {
                                        // Procedure to checking for login data
-                                       if (($GLOBALS['bonus_payed']) && (EXT_IS_ACTIVE("bonus"))) {
+                                       if (($GLOBALS['bonus_payed']) && (EXT_IS_ACTIVE('bonus'))) {
                                                // Bonus added (just displaying!)
                                                $URL = "modules.php?module=chk_login&amp;mode=bonus";
                                        } else {
@@ -364,7 +364,7 @@ function USER_DO_LOGIN ($uid, $passwd) {
                                // Cookies not setable!
                                $URL = "modules.php?module=index&amp;what=login&amp;login=".getCode('NO_COOKIES');
                        }
-               } elseif (GET_EXT_VERSION("sql_patches") >= "0.6.1") {
+               } elseif (GET_EXT_VERSION('sql_patches') >= '0.6.1') {
                        // Update failture counter
                        SQL_QUERY_ESC("UPDATE `{!_MYSQL_PREFIX!}_user_data` SET login_failures=login_failures+1,last_failure=NOW() WHERE userid=%s LIMIT 1",
                                array($uid), __FUNCTION__, __LINE__);
@@ -407,11 +407,11 @@ function USER_DO_NEW_PASSWORD ($email, $uid) {
        if (!empty($email)) $email = str_replace("{DOT}", '.', $email);
 
        // Init result and error
-       $errorCode = "";
+       $errorCode = '';
        $result = false;
 
        // Probe userid/nickname
-       if ((EXT_IS_ACTIVE("nickname")) && (NICKNAME_PROBE_ON_USERID($uid))) {
+       if ((EXT_IS_ACTIVE('nickname')) && (NICKNAME_PROBE_ON_USERID($uid))) {
                // Nickname entered
                $result = SQL_QUERY_ESC("SELECT userid, status FROM `{!_MYSQL_PREFIX!}_user_data` WHERE nickname='%s' OR email='%s' LIMIT 1",
                        array($uid, $email), __FUNCTION__, __LINE__);
@@ -447,7 +447,7 @@ function USER_DO_NEW_PASSWORD ($email, $uid) {
                        SEND_EMAIL($uid, getMessage('GUEST_NEW_PASSWORD'), $msg);
 
                        // Output note to user
-                       LOAD_TEMPLATE("admin_settings_saved", false, getMessage('GUEST_NEW_PASSWORD_SEND'));
+                       LOAD_TEMPLATE('admin_settings_saved', false, getMessage('GUEST_NEW_PASSWORD_SEND'));
                } else {
                        // Account is locked or unconfirmed
                        $errorCode = GEN_ERROR_CODE_FROM_ACCOUNT_STATUS($status);
@@ -457,7 +457,7 @@ function USER_DO_NEW_PASSWORD ($email, $uid) {
                }
        } else {
                // ID or email is wrong
-               LOAD_TEMPLATE("admin_settings_saved", false, "<span class=\"guest_failed\">{--GUEST_WRONG_ID_EMAIL--}</span>");
+               LOAD_TEMPLATE('admin_settings_saved', false, "<span class=\"guest_failed\">{--GUEST_WRONG_ID_EMAIL--}</span>");
        }
 
        // Return the error code