X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_cats.php;h=fdf5a00c888249d41743b6ec912ee4129a242d97;hb=09fd6484d1eaf735476270c33692f799bc0c9590;hp=4b41510cc5bff98ae301b0b2e45dae5f5e286631;hpb=57227d33e870ec5cd271209c4a978a52b45c2dd6;p=mailer.git
diff --git a/inc/modules/admin/what-list_cats.php b/inc/modules/admin/what-list_cats.php
index 4b41510cc5..fdf5a00c88 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 - 2011 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,7 +42,7 @@ if ((!defined('__SECURITY')) || (!isAdmin())) {
} // END - if
// Add description as navigation point
-addMenuDescription('admin', __FILE__);
+addYouAreHereLink('admin', __FILE__);
if (isGetRequestParameterSet('userid')) {
// Check if the user already exists
@@ -52,51 +51,54 @@ if (isGetRequestParameterSet('userid')) {
$content = getUserDataArray();
// Prepare constants
- // @TODO No longer needed? define('__CATS_BASE' , '' . $content['surname'] . ' ' . $content['family'] . '';
+ // @TODO No longer needed? define('__CATEGORIES_BASE' , '{%pipe,translateGender=' . $content['gender'] . '%} ' . $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(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--}';
+ } // END - if
// Add more elements
- $content['sw'] = $SW;
- $content['cnt'] = $cnt;
- $content['sel'] = $selection;
+ $content['count'] = $count;
+ $content['sel'] = $selection;
- // Load row template and switch colors + count up
- $OUT .= loadTemplate('admin_list_cats_row', true, $content);
- $SW = 3 - $SW; $cnt++;
+ // Load row template and count up
+ $OUT .= loadTemplate('admin_list_user_cats_row', true, $content);
+ $count++;
} // END - while
// Free memory
- SQL_FREERESULT($result);
+ SQL_FREERESULT($result_cats);
// Remember all rows in the array
$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