X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_cats.php;h=fd157aa3d1f0b2a036593e94a95a330905f1848b;hb=c5173c4d66be7ec72fbf8051a2097cbb377e87a0;hp=308ed2f32b3deb8ef81b65c493c0a75ac41b8398;hpb=4cf9e7903e3d0528650b2c8871b9b9f68e473807;p=mailer.git
diff --git a/inc/modules/admin/what-list_cats.php b/inc/modules/admin/what-list_cats.php
index 308ed2f32b..fd157aa3d1 100644
--- a/inc/modules/admin/what-list_cats.php
+++ b/inc/modules/admin/what-list_cats.php
@@ -15,10 +15,9 @@
* $Date:: $ *
* $Tag:: 0.2.1-FINAL $ *
* $Author:: $ *
- * Needs to be in all Files and every File needs "svn propset *
- * svn:keywords Date Revision" (autoprobset!) at least!!!!!! *
* -------------------------------------------------------------------- *
* Copyright (c) 2003 - 2009 by Roland Haeder *
+ * Copyright (c) 2009, 2010 by Mailer Developer Team *
* For more information visit: http://www.mxchange.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -43,47 +42,49 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
} // END - if
// Add description as navigation point
-addMenuDescription('admin', __FILE__);
+addYouAreHereLink('admin', __FILE__);
-if (isGetRequestElementSet('userid')) {
+if (isGetRequestParameterSet('userid')) {
// Check if the user already exists
- if (fetchUserData(getRequestElement('userid'))) {
+ if (fetchUserData(getRequestParameter('userid'))) {
// Loads surname, family's name and the email address
$content = getUserDataArray();
// Prepare constants
- // @TODO No longer needed? define('__CATS_BASE' , "".$content['surname']." ".$content['family']."";
+ // @TODO No longer needed? define('__CATEGORIES_BASE' , '' . $content['surname'] . ' ' . $content['family'] . '';
// Ok, list categories of this user
$result_cats = SQL_QUERY("SELECT `id`, `cat` FROM `{?_MYSQL_PREFIX?}_cats` ORDER BY `sort` ASC", __FILE__, __LINE__);
- if (SQL_NUMROWS($result_cats) > 0) {
+ if (!SQL_HASZERONUMS($result_cats)) {
// List categories
- $cnt = 1; $OUT = ''; $SW = 2;
- while ($content = merge_array($content, SQL_FETCHARRAY($result_cats))) {
+ $count = 1; $OUT = '';
+ while ($row = SQL_FETCHARRAY($result_cats)) {
+ // Merge both arrays
+ $content = merge_array($content, $row);
+
// 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(getRequestElement('userid')), bigintval($content['id'])), __FILE__, __LINE__);
+ array(bigintval(getRequestParameter('userid')), bigintval($content['id'])), __FILE__, __LINE__);
// Set selection
- $selection = "{--NO--}";
- if (SQL_NUMROWS($result_user) == 1) $selection = "{--YES--}";
+ $selection = '{--NO--}';
+ if (SQL_NUMROWS($result_user) == 1) $selection = '{--YES--}';
// Add more elements
- $content['sw'] = $SW;
- $content['cnt'] = $cnt;
+ $content['cnt'] = $count;
$content['sel'] = $selection;
- // Load row template and switch colors + count up
+ // Load row template and count up
$OUT .= loadTemplate('admin_list_cats_row', true, $content);
- $SW = 3 - $SW; $cnt++;
+ $count++;
} // END - while
// Free memory
- SQL_FREERESULT($result);
+ SQL_FREERESULT($result_cats);
// Remember all rows in the array
$content['rows'] = $OUT;
@@ -96,7 +97,7 @@ if (isGetRequestElementSet('userid')) {
}
} else {
// User not found
- loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_MEMBER_404'), $content['userid']));
+ loadTemplate('admin_settings_saved', false, getMaskedMessage('ADMIN_MEMBER_404', $content['userid']));
}
} else {
// Output selection form with all confirmed user accounts listed