A lot while() conditions rewritten to SQL_FETCHARRAY(), see bug #107, @TODO tags...

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

diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php
index eceebabec684b88ebb36703456fcca15a09d45a1..37bd1941e3f44958a0e29d0f88b537be124c709a 100644 (file)
--- a/inc/libs/user_functions.php
+++ b/inc/libs/user_functions.php
@@ -44,7 +44,7 @@ function alpha ($sortby, $colspan, $return=false) {
        if (REQUEST_ISSET_GET(('mode'))) $ADD .= "&mode=".REQUEST_GET(('mode'));
 
        /* Creates the list of letters and makes them a link. */
-       $alphabet = array(_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",_OTHERS);
+       $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 = "";
        while (list($counter, $ltr) = each($alphabet)) {
@@ -69,7 +69,7 @@ function alpha ($sortby, $colspan, $return=false) {
 
        // Load template
        $OUT = LOAD_TEMPLATE("admin_list_user_alpha", true);
-       if ($return) {
+       if ($return === true) {
                // Return generated code
                return $OUT;
        } else {
@@ -79,7 +79,7 @@ function alpha ($sortby, $colspan, $return=false) {
 }
 
 // Add links for sorting
-function SortLinks($letter, $sortby, $colspan, $return=false) {
+function SortLinks ($letter, $sortby, $colspan, $return=false) {
        $OUT = "";
        if (!REQUEST_ISSET_GET(('offset'))) REQUEST_SET_GET('offset', 0);
        if (!REQUEST_ISSET_GET(('page')))   REQUEST_SET_GET('page'  , 0);
@@ -92,20 +92,20 @@ function SortLinks($letter, $sortby, $colspan, $return=false) {
         elseif (REQUEST_ISSET_GET(('mode'))) $ADD .= "&mode=".REQUEST_GET(('mode'));
 
        // Makes order by links..
-       if ($letter == "front") $letter = _ALL2;
+       if ($letter == "front") $letter = getMessage('_ALL2');
 
        // Prepare array with all possible sorters
        $list = array(
-               'userid'                => _UID,
-               'family'                => FAMILY_NAME,
-               'email'         => ADDY,
-               'REMOTE_ADDR'   => REMOTE_IP
+               'userid'                => getMessage('_UID'),
+               'family'                => getMessage('FAMILY_NAME'),
+               'email'         => getMessage('ADDY'),
+               'REMOTE_ADDR'   => getMessage('REMOTE_IP')
        );
 
        // Add nickname if extension is installed
        if (EXT_IS_ACTIVE("nickname")) {
-               $list['nickname'] = NICKNAME;
-       }
+               $list['nickname'] = getMessage('NICKNAME');
+       } // END - if
 
        foreach ($list as $sort => $title) {
                if ($sortby == $sort) {
@@ -119,7 +119,7 @@ function SortLinks($letter, $sortby, $colspan, $return=false) {
 
        // Load template
        $OUT = LOAD_TEMPLATE("admin_list_user_sort", true);
-       if ($return) {
+       if ($return === true) {
                // Return code
                return $OUT;
        } else {
@@ -129,7 +129,7 @@ function SortLinks($letter, $sortby, $colspan, $return=false) {
 }
 
 // Add page navigation
-function ADD_PAGENAV($PAGES, $offset, $show_form, $colspan,$return=false) {
+function ADD_PAGENAV ($PAGES, $offset, $show_form, $colspan,$return=false) {
        if (!$show_form) {
                // Empty row
                define('__FORM_HEADER', "<tr><td colspan=\"".$colspan."\" class=\"seperator\">&nbsp;</td></tr>");
@@ -140,10 +140,10 @@ function ADD_PAGENAV($PAGES, $offset, $show_form, $colspan,$return=false) {
 
        if (!$show_form) {
                // Add line with bottom border
-               define('__FORM_FOOTER', "<tr><td colspan=\"".__COLSPAN2."\" class=\"seperator bottom2\">&nbsp;</td></tr>");
+               define('__FORM_FOOTER', "<tr><td colspan=\"{!__COLSPAN2!}\" class=\"seperator bottom2\">&nbsp;</td></tr>");
        } else {
                // Add line without bottom border
-               define('__FORM_FOOTER', "<tr><td colspan=\"".__COLSPAN2."\" class=\"seperator bottom2\">&nbsp;</td></tr>");
+               define('__FORM_FOOTER', "<tr><td colspan=\"{!__COLSPAN2!}\" class=\"seperator bottom2\">&nbsp;</td></tr>");
        }
 
        $OUT = "";
@@ -180,7 +180,7 @@ function ADD_PAGENAV($PAGES, $offset, $show_form, $colspan,$return=false) {
 
        // Load template
        $OUT = LOAD_TEMPLATE("admin_list_user_pagenav", true);
-       if ($return) {
+       if ($return === true) {
                // Return code
                return $OUT;
        } else {