Next wave of lesser getMessage() usage and more EL

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

diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php
index 547148947cb461456ef3a10108040a33e2befbef..517f0ebdd3bac261128c507becdce894c5515509 100644 (file)
--- a/inc/libs/user_functions.php
+++ b/inc/libs/user_functions.php
@@ -64,14 +64,20 @@ function alpha ($sortby, $colspan, $return=false) {
                }
 
                if ((($counter / getConfig('user_alpha')) == round($counter / getConfig('user_alpha'))) && ($counter > 0)) {
-                       $OUT .= '&nbsp;]<br />[&nbsp;';
+                       $OUT .= ']<br />[';
                } elseif ( $counter != $num ) {
-                       $OUT .= '&nbsp;|&nbsp;';
+                       $OUT .= '|';
                }
        } // END - while
 
+       // Prepare content
+       $content = array (
+               'colspan2'        => $colspan,
+               'alpha_selection' => $OUT
+       );
+
        // Load template
-       $OUT = loadTemplate('admin_list_user_alpha', true, $OUT);
+       $OUT = loadTemplate('admin_list_user_alpha', true, $content);
        if ($return === true) {
                // Return generated code
                return $OUT;
@@ -95,7 +101,7 @@ function addSortLinks ($letter, $sortby, $colspan, $return=false) {
        elseif (isGetRequestParameterSet('mode')) $add .= '&amp;mode=' . getRequestParameter('mode');
 
        // Makes order by links..
-       if ($letter == 'front') $letter = getMessage('_ALL2');
+       if ($letter == 'front') $letter = '{--_ALL2--}';
 
        // Prepare array with all possible sorters
        $list = array(
@@ -107,18 +113,20 @@ function addSortLinks ($letter, $sortby, $colspan, $return=false) {
 
        // Add nickname if extension is installed
        if (isExtensionActive('nickname')) {
-               $list['nickname'] = getMessage('NICKNAME');
+               $list['nickname'] = '{--NICKNAME--}';
        } // END - if
 
        foreach ($list as $sort => $title) {
                if ($sortby == $sort) {
-                       $OUT .= '<strong>' . $title . '</strong>&nbsp;|&nbsp;';
+                       $OUT .= '<strong>' . $title . '</strong>|';
                } else {
-                       $OUT .= '<a href="{%url=modules.php?module=admin&amp;what=list_user&amp;letter=' . $letter . '&amp;sortby=' . $sort.$add . '%}">' . $title . '</a>&nbsp;|&nbsp;';
+                       $OUT .= '<a href="{%url=modules.php?module=admin&amp;what=list_user&amp;letter=' . $letter . '&amp;sortby=' . $sort . $add . '%}">' . $title . '</a>|';
                }
        } // END - foreach
 
+       // Add list and colspan
        $content['list'] = substr($OUT, 0, -13);
+       $content['colspan2'] = $colspan;
 
        // Load template
        $OUT = loadTemplate('admin_list_user_sort', true, $content);
@@ -134,7 +142,7 @@ function addSortLinks ($letter, $sortby, $colspan, $return=false) {
 }
 
 // Add page navigation
-function addPageNavigation ($pages, $offset, $showForm, $colspan, $return=false) {
+function addPageNavigation ($numPages, $offset, $showForm, $colspan, $return=false) {
        // @TODO These two constants are no longer used, maybe we reactivate this code?
        //if ($showForm === true) {
        //      // Load form for changing number of lines
@@ -147,7 +155,7 @@ function addPageNavigation ($pages, $offset, $showForm, $colspan, $return=false)
        //}
 
        $OUT = '';
-       for ($page = 1; $page <= $pages; $page++) {
+       for ($page = 1; $page <= $numPages; $page++) {
                if (($page == getRequestParameter('page')) || ((!isGetRequestParameterSet('page')) && ($page == 1))) {
                        $OUT .= '<strong>-';
                } else {
@@ -173,11 +181,12 @@ function addPageNavigation ($pages, $offset, $showForm, $colspan, $return=false)
                        $OUT .= '</a>';
                }
 
-               if ($page < $pages) $OUT .= '&nbsp;|&nbsp;';
+               if ($page < $numPages) $OUT .= '|';
        } // END - for
 
-       // Remember the list
-       $content['list'] = $OUT;
+       // Remember the list and colspan
+       $content['list']     = $OUT;
+       $content['colspan2'] = $colspan;
 
        // Load template
        $OUT = loadTemplate('admin_list_user_pagenav', true, $content);
@@ -228,9 +237,9 @@ function determineRandomReferalId () {
        $refid = '0';
 
        // Is the extension version fine?
-       if (getExtensionVersion('user') >= '0.3.4') {
+       if (isExtensionInstalledAndNewer('user', '0.3.4')) {
                // Get all user ids
-               $totalUsers = countSumTotalData('CONFIRMED', 'user_data', 'userid', 'status', true, " AND `rand_confirmed` >= ".getConfig('user_min_confirmed')."");
+               $totalUsers = countSumTotalData('CONFIRMED', 'user_data', 'userid', 'status', true, " AND `rand_confirmed` >= {?user_min_confirmed?}");
 
                // Do we have at least one?
                if ($totalUsers > 0) {
@@ -331,10 +340,10 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
                                $GLOBALS['bonus_payed'] = true;
 
                                // Subtract login bonus from userid's account or jackpot
-                               if ((getExtensionVersion('bonus') >= '0.3.5') && (getConfig('bonus_mode') != 'ADD')) handleBonusPoints('login_bonus');
+                               if ((isExtensionInstalledAndNewer('bonus', '0.3.5')) && (getConfig('bonus_mode') != 'ADD')) handleBonusPoints('login_bonus');
                        } // END - if
 
-                       // @TODO Make this filter working: $URL = runFilterChain('do_login', array('content' => $content, 'addon' => $ADDON));
+                       // @TODO Make this filter working: $url = runFilterChain('do_login', array('content' => $content, 'addon' => $ADDON));
 
                        // Set member id
                        setMemberId($userid);
@@ -351,14 +360,14 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
                                                // Procedure to checking for login data
                                                if (($GLOBALS['bonus_payed'] === true) && (isExtensionActive('bonus'))) {
                                                        // Bonus added (just displaying!)
-                                                       $URL = 'modules.php?module=chk_login&amp;mode=bonus';
+                                                       $url = 'modules.php?module=chk_login&amp;mode=bonus';
                                                } else {
                                                        // Bonus not added
-                                                       $URL = 'modules.php?module=chk_login&amp;mode=login';
+                                                       $url = 'modules.php?module=chk_login&amp;mode=login';
                                                }
                                        } else {
                                                // Use this URL
-                                               $URL = $successUrl;
+                                               $url = $successUrl;
                                        }
                                } else {
                                        // Cannot update counter!
@@ -368,7 +377,7 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
                                // Cookies not setable!
                                $errorCode = getCode('COOKIES_DISABLED');
                        }
-               } elseif (getExtensionVersion('sql_patches') >= '0.6.1') {
+               } elseif (isExtensionInstalledAndNewer('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($userid), __FUNCTION__, __LINE__);
@@ -393,14 +402,14 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
        // Error code provided?
        if ($errorCode > 0) {
                // Then reconstruct the URL
-               $URL = $errorUrl . $errorCode;
+               $url = $errorUrl . $errorCode;
 
                // Extension set? Then add it as well.
-               if (!empty($ext)) $URL .= '&amp;ext=' . $ext;
+               if (!empty($ext)) $url .= '&amp;ext=' . $ext;
        } // END - if
 
        // Return URL
-       return $URL;
+       return $url;
 }
 
 // Try to send a new password for the given user account
@@ -447,7 +456,7 @@ function doNewUserPassword ($email, $userid) {
                        sendEmail($userid, getMessage('GUEST_NEW_PASSWORD'), $message);
 
                        // Output note to user
-                       loadTemplate('admin_settings_saved', false, getMessage('GUEST_NEW_PASSWORD_SEND'));
+                       loadTemplate('admin_settings_saved', false, '{--GUEST_NEW_PASSWORD_SEND--}');
                } else {
                        // Account is locked or unconfirmed
                        $errorCode = generateErrorCodeFromUserStatus($status);
@@ -530,4 +539,3 @@ function insertUserStatsRecord ($userid, $statsType, $statsData) {
 
 // [EOF]
 ?>
-