Our convention says if(-else) blocks should not be put in one line

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

diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php
index 549340dd24c98f67d265ce918a9abbd731bdad4a..6e8ebaf67d4dde3256c31e7b761960139faf401d 100644 (file)
--- a/inc/libs/user_functions.php
+++ b/inc/libs/user_functions.php
@@ -49,7 +49,7 @@ function alpha ($sortby, $colspan, $return=false) {
        if (isGetRequestParameterSet('mode')) $add .= '&mode='.getRequestParameter('mode');
 
        /* Creates the list of letters and makes them a link. */
-       $alphabet = explode(',', 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'));
+       $alphabet = explode(',', '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,');
        $num = count($alphabet) - 1;
        $OUT = '';
        while (list($counter, $ltr) = each($alphabet)) {
@@ -70,8 +70,14 @@ function alpha ($sortby, $colspan, $return=false) {
                }
        } // 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,19 +101,19 @@ function addSortLinks ($letter, $sortby, $colspan, $return=false) {
        elseif (isGetRequestParameterSet('mode')) $add .= '&mode=' . getRequestParameter('mode');
 
        // Makes order by links..
-       if ($letter == 'front') $letter = getMessage('_ALL2');
+       if ($letter == 'front') $letter = '';
 
        // Prepare array with all possible sorters
        $list = array(
-               'userid'      => getMessage('_UID'),
-               'family'      => getMessage('FAMILY'),
-               'email'       => getMessage('EMAIL'),
-               'REMOTE_ADDR' => getMessage('REMOTE_IP')
+               'userid'      => '{--_UID--}',
+               'family'      => '{--FAMILY--}',
+               'email'       => '{--EMAIL--}',
+               'REMOTE_ADDR' => '{--REMOTE_IP--}'
        );
 
        // Add nickname if extension is installed
        if (isExtensionActive('nickname')) {
-               $list['nickname'] = getMessage('NICKNAME');
+               $list['nickname'] = '{--NICKNAME--}';
        } // END - if
 
        foreach ($list as $sort => $title) {
@@ -118,7 +124,9 @@ function addSortLinks ($letter, $sortby, $colspan, $return=false) {
                }
        } // 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,11 +155,11 @@ 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 {
-                       if (!isGetRequestParameterSet('letter')) setGetRequestParameter('letter', getMessage('_ALL2'));
+                       if (!isGetRequestParameterSet('letter')) setGetRequestParameter('letter', '');
                        if (!isGetRequestParameterSet('sortby')) setGetRequestParameter('sortby', 'userid');
 
                        // Base link
@@ -173,11 +181,12 @@ function addPageNavigation ($pages, $offset, $showForm, $colspan, $return=false)
                        $OUT .= '</a>';
                }
 
-               if ($page < $pages) $OUT .= '|';
+               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);
@@ -376,7 +385,7 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
                        // Wrong password!
                        $errorCode = getCode('WRONG_PASS');
                }
-       } elseif (getUserData('status') != 'CONFIRMED') {
+       } elseif ((isUserDataValid()) && (getUserData('status') != 'CONFIRMED')) {
                // Create an error code from given status
                $errorCode = generateErrorCodeFromUserStatus(getUserData('status'));
 
@@ -444,10 +453,10 @@ function doNewUserPassword ($email, $userid) {
                        $message = loadEmailTemplate('new-pass', array('new_pass' => $NEW_PASS, 'nickname' => $userid), $userid);
 
                        // ... and send it away
-                       sendEmail($userid, getMessage('GUEST_NEW_PASSWORD'), $message);
+                       sendEmail($userid, '{--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);