Even more rewrites to make use of the EL

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

diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php
index af1e552320412fe79659b800254069069e156db7..cc9c5fcc660c78acea43ab93ac2221561b3d8c44 100644 (file)
--- a/inc/libs/user_functions.php
+++ b/inc/libs/user_functions.php
@@ -64,9 +64,9 @@ 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
 
@@ -112,9 +112,9 @@ function addSortLinks ($letter, $sortby, $colspan, $return=false) {
 
        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
 
@@ -173,7 +173,7 @@ function addPageNavigation ($pages, $offset, $showForm, $colspan, $return=false)
                        $OUT .= '</a>';
                }
 
-               if ($page < $pages) $OUT .= '&nbsp;|&nbsp;';
+               if ($page < $pages) $OUT .= '|';
        } // END - for
 
        // Remember the list
@@ -334,7 +334,7 @@ function doUserLogin ($userid, $passwd, $successUrl = '', $errorUrl = 'modules.p
                                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 +351,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!
@@ -393,14 +393,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