Fixes loading of network type config

[mailer.git] / inc / modules / admin / what-list_cats.php

diff --git a/inc/modules/admin/what-list_cats.php b/inc/modules/admin/what-list_cats.php
index 049e32fe1626da766f1b2222163f8ef673805c41..fecc5764b043c7ba5e33acb0f963c206f6a34038 100644 (file)
--- a/inc/modules/admin/what-list_cats.php
+++ b/inc/modules/admin/what-list_cats.php
@@ -18,7 +18,7 @@
  * -------------------------------------------------------------------- *
  * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * Copyright (c) 2009 - 2011 by Mailer Developer Team                   *
- * For more information visit: http://www.mxchange.org                  *
+ * For more information visit: http://mxchange.org                      *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
  * it under the terms of the GNU General Public License as published by *
@@ -44,19 +44,18 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
 // Add description as navigation point
 addYouAreHereLink('admin', __FILE__);
 
-if (isGetRequestParameterSet('userid')) {
+if (isGetRequestElementSet('userid')) {
        // Check if the user already exists
-       if (fetchUserData(getRequestParameter('userid'))) {
+       if (fetchUserData(getRequestElement('userid'))) {
                // Loads surname, family's name and the email address
                $content = getUserDataArray();
 
                // Prepare constants
                // @TODO No longer needed? define('__CATEGORIES_BASE'   , '<a href="{%url=modules.php?module=admin&amp;userid=');
-               $content['userid']       = bigintval(getRequestParameter('userid'));
-               $content['email']        = '<a href="' . generateEmailLink($content['email'], 'user_data') . '">' . $content['surname'] . ' ' . $content['family'] . '</a>';
+               $content['email']  = '<a href="' . generateEmailLink($content['email'], 'user_data') . '">{%pipe,translateGender=' . $content['gender'] . '%} ' . $content['surname'] . ' ' . $content['family'] . '</a>';
 
                // Ok, list categories of this user
-               $result_cats = SQL_QUERY("SELECT `id`, `cat` FROM `{?_MYSQL_PREFIX?}_cats` ORDER BY `sort` ASC", __FILE__, __LINE__);
+               $result_cats = SQL_QUERY("SELECT `id`,`cat` FROM `{?_MYSQL_PREFIX?}_cats` ORDER BY `sort` ASC", __FILE__, __LINE__);
 
                if (!SQL_HASZERONUMS($result_cats)) {
                        // List categories
@@ -68,18 +67,20 @@ if (isGetRequestParameterSet('userid')) {
                                // Check user's selection
                                // @TODO Rewrite this to countSum.....() function
                                $result_user = SQL_QUERY_ESC("SELECT `id` FROM `{?_MYSQL_PREFIX?}_user_cats` WHERE `userid`=%s AND `cat_id`=%s LIMIT 1",
-                                       array(bigintval(getRequestParameter('userid')), bigintval($content['id'])), __FILE__, __LINE__);
+                                       array(bigintval(getRequestElement('userid')), bigintval($content['id'])), __FILE__, __LINE__);
 
                                // Set selection
                                $selection = '<font color="#ee0000">{--NO--}</div>';
-                               if (SQL_NUMROWS($result_user) == 1) $selection = '<font color="#00ee00">{--YES--}</div>';
+                               if (SQL_NUMROWS($result_user) == 1) {
+                                       $selection = '<font color="#00ee00">{--YES--}</div>';
+                               } // END - if
 
                                // Add more elements
-                               $content['cnt'] = $count;
-                               $content['sel'] = $selection;
+                               $content['count'] = $count;
+                               $content['sel']   = $selection;
 
                                // Load row template and count up
-                               $OUT .= loadTemplate('admin_list_cats_row', true, $content);
+                               $OUT .= loadTemplate('admin_list_user_cats_row', true, $content);
                                $count++;
                        } // END - while
 
@@ -90,14 +91,14 @@ if (isGetRequestParameterSet('userid')) {
                        $content['rows'] = $OUT;
 
                        // Load main template
-                       loadTemplate('admin_list_cats', false, $content);
+                       loadTemplate('admin_list_user_cats', false, $content);
                } else {
                        // No categories selected! :-(
-                       loadTemplate('admin_list_cats_404', false, $content);
+                       loadTemplate('admin_list_user_cats_404', false, $content);
                }
        } else {
                // User not found
-               loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_MEMBER_404', $content['userid']));
+               displayMessage('{%message,ADMIN_MEMBER_404=' . $content['userid'] . '%}');
        }
 } else {
        // Output selection form with all confirmed user accounts listed