Menu system fixes, list_user simplified:

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

diff --git a/inc/libs/user_functions.php b/inc/libs/user_functions.php
index b7d06247d812cdb9e6b8ac03fc856538934c2753..64a95f39ef6fa149187ddd69909dc547a28ff762 100644 (file)
--- a/inc/libs/user_functions.php
+++ b/inc/libs/user_functions.php
@@ -41,12 +41,9 @@ if (!defined('__SECURITY')) {
 } // END - if
 
 // Add links for selecting some users
-function alpha ($sortby, $colspan, $return=false) {
-       if (!isGetRequestParameterSet('offset')) {
-               setGetRequestParameter('offset', 0);
-       } // END - if
-       $add = '&page=' . getRequestParameter('page').'&offset=' . getRequestParameter('offset');
-       foreach (array('mode','status') as $param) {
+function alpha ($sortby) {
+       $add = '';
+       foreach (array('page','offset','mode','status') as $param) {
                if (isGetRequestParameterSet($param)) {
                        $add .= '&' . $param . '=' . getRequestParameter($param);
                } // END - if
@@ -62,13 +59,7 @@ function alpha ($sortby, $colspan, $return=false) {
                        $OUT .= '<strong>' . $ltr . '</strong>';
                } else {
                        // Output link to letter
-                       $OUT .= '<a href="{%url=modules.php?module=admin&amp;what=' . getWhat();
-                       foreach (array('mode','status') as $param) {
-                               if (isGetRequestParameterSet($param)) {
-                                       $OUT .= '&amp;' . $param . '=' . getRequestParameter($param);
-                               } // END - if
-                       } // END - foreach
-                       $OUT .= '&amp;letter=' . $ltr . '&amp;sortby=' . $sortby . $add . '%}">' . $ltr . '</a>';
+                       $OUT .= '<a href="{%url=modules.php?module=admin&amp;what=' . getWhat() . '&amp;letter=' . $ltr . '&amp;sortby=' . $sortby . $add . '%}">' . $ltr . '</a>';
                }
 
                if ((($counter / getConfig('user_alpha')) == round($counter / getConfig('user_alpha'))) && ($counter > 0)) {
@@ -80,23 +71,18 @@ function alpha ($sortby, $colspan, $return=false) {
 
        // Prepare content
        $content = array (
-               'colspan2'        => $colspan,
                'alpha_selection' => $OUT
        );
 
        // Load template
        $OUT = loadTemplate('admin_list_user_alpha', true, $content);
-       if ($return === true) {
-               // Return generated code
-               return $OUT;
-       } else {
-               // Output generated code
-               outputHtml($OUT);
-       }
+
+       // Return generated code
+       return $OUT;
 }
 
 // Add links for sorting
-function addSortLinks ($letter, $sortby, $colspan, $return=false) {
+function addSortLinks ($letter, $sortby) {
        $OUT = '';
        if (!isGetRequestParameterSet('offset')) setGetRequestParameter('offset', 0);
        if (!isGetRequestParameterSet('page'))   setGetRequestParameter('page'  , 0);
@@ -137,82 +123,67 @@ function addSortLinks ($letter, $sortby, $colspan, $return=false) {
                }
        } // END - foreach
 
-       // Add list and colspan
+       // Add output
        $content['list'] = substr($OUT, 0, -1);
-       $content['colspan2'] = $colspan;
 
        // Load template
        $OUT = loadTemplate('admin_list_user_sort', true, $content);
 
-       // Should we return or output?
-       if ($return === true) {
-               // Return code
-               return $OUT;
-       } else {
-               // Output code
-               outputHtml($OUT);
-       }
+       // Return code
+       return $OUT;
 }
 
 // Add page navigation
-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
-       //      define('__FORM_HEADER', loadTemplate('admin_list_user_sort_form', true));
-       //      define('__FORM_FOOTER', '<tr><td colspan="'.$colspan.'" class="seperator bottom">&nbsp;</td></tr>');
-       //} else {
-       //      // Empty row
-       //      define('__FORM_HEADER', '<tr><td colspan="' . $colspan . '" class="seperator">&nbsp;</td></tr>');
-       //      define('__FORM_FOOTER', '<tr><td colspan="' . $colspan . '" class="seperator bottom">&nbsp;</td></tr>');
-       //}
-
+function addPageNavigation ($numPages) {
+       // Start with empty content
        $OUT = '';
-       for ($page = 1; $page <= $numPages; $page++) {
-               if (($page == getRequestParameter('page')) || ((!isGetRequestParameterSet('page')) && ($page == 1))) {
-                       $OUT .= '<strong>-';
-               } else {
-                       if (!isGetRequestParameterSet('letter')) setGetRequestParameter('letter', '');
-                       if (!isGetRequestParameterSet('sortby')) setGetRequestParameter('sortby', 'userid');
 
-                       // Base link
-                       $OUT .= '<a href="{%url=modules.php?module=admin&amp;what=' . getWhat();
+       // Create only the navigation if page count > 1
+       if ($numPages > 1) {
+               // Create navigation links for every page
+               for ($page = 1; $page <= $numPages; $page++) {
+                       if (($page == getRequestParameter('page')) || ((!isGetRequestParameterSet('page')) && ($page == 1))) {
+                               $OUT .= '<strong>-';
+                       } else {
+                               if (!isGetRequestParameterSet('letter')) setGetRequestParameter('letter', '');
+                               if (!isGetRequestParameterSet('sortby')) setGetRequestParameter('sortby', 'userid');
 
-                       // Add status/mode
-                       foreach (array('mode','status') as $param) {
-                               if (isGetRequestParameterSet($param)) {
-                                       $OUT .= '&amp;' . $param . '=' . getRequestParameter($param);
-                               } // END - if
-                       } // END - foreach
+                               // Base link
+                               $OUT .= '<a href="{%url=modules.php?module=admin&amp;what=' . getWhat();
 
-                       // Letter and so on
-                       $OUT .= '&amp;letter=' . getRequestParameter('letter') . '&amp;sortby=' . getRequestParameter('sortby') . '&amp;page=' . $page . '&amp;offset=' . $offset . '%}">';
-               }
+                               // Add status/mode
+                               foreach (array('mode','status') as $param) {
+                                       if (isGetRequestParameterSet($param)) {
+                                               $OUT .= '&amp;' . $param . '=' . getRequestParameter($param);
+                                       } // END - if
+                               } // END - foreach
+
+                               // Letter and so on
+                               $OUT .= '&amp;letter=' . getRequestParameter('letter') . '&amp;sortby=' . getRequestParameter('sortby') . '&amp;page=' . $page . '&amp;offset=' . getConfig('user_limit') . '%}">';
+                       }
 
-               $OUT .= $page;
+                       $OUT .= $page;
 
-               if (($page == getRequestParameter('page')) || ((!isGetRequestParameterSet('page')) && ($page == 1))) {
-                       $OUT .= '-</strong>';
-               } else  {
-                       $OUT .= '</a>';
-               }
+                       if (($page == getRequestParameter('page')) || ((!isGetRequestParameterSet('page')) && ($page == 1))) {
+                               $OUT .= '-</strong>';
+                       } else  {
+                               $OUT .= '</a>';
+                       }
 
-               if ($page < $numPages) $OUT .= '|';
-       } // END - for
+                       if ($page < $numPages) {
+                               $OUT .= '|';
+                       } // END - if
+               } // END - for
 
-       // Remember the list and colspan
-       $content['list']     = $OUT;
-       $content['colspan2'] = $colspan;
+               // Add list output
+               $content['list'] = $OUT;
 
-       // Load template
-       $OUT = loadTemplate('admin_list_user_pagenav', true, $content);
-       if ($return === true) {
-               // Return code
-               return $OUT;
-       } else {
-               // Output code
-               outputHtml($OUT);
-       }
+               // Load template
+               $OUT = loadTemplate('admin_list_user_pagenav', true, $content);
+       } // END - if
+
+       // Return code
+       return $OUT;
 }
 
 // Create email link to user's account