X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fadmin%2Fwhat-list_cats.php;h=f5eeb03c7b0e8da874d112166f753fd65ed23921;hb=0e269568bd666186509e98594e83bac199ac26da;hp=804b2c92e4a64b0c5cb5a02501b7172dce5ec456;hpb=7b0f17cd637e388049d2167811e4332cec1e979b;p=mailer.git

diff --git a/inc/modules/admin/what-list_cats.php b/inc/modules/admin/what-list_cats.php
index 804b2c92e4..f5eeb03c7b 100644
--- a/inc/modules/admin/what-list_cats.php
+++ b/inc/modules/admin/what-list_cats.php
@@ -18,7 +18,7 @@
  * Needs to be in all Files and every File needs "svn propset           *
  * svn:keywords Date Revision" (autoprobset!) at least!!!!!!            *
  * -------------------------------------------------------------------- *
- * Copyright (c) 2003 - 2008 by Roland Haeder                           *
+ * Copyright (c) 2003 - 2009 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
  *                                                                      *
  * This program is free software; you can redistribute it and/or modify *
@@ -38,39 +38,35 @@
  ************************************************************************/
 
 // Some security stuff...
-if ((!defined('__SECURITY')) || (!IS_ADMIN())) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
-	require($INC);
-}
+if ((!defined('__SECURITY')) || (!isAdmin())) {
+	die();
+} // END - if
 
 // Add description as navigation point
-ADD_DESCR('admin', __FILE__);
+addMenuDescription('admin', __FILE__);
 
-if (REQUEST_ISSET_GET('uid')) {
+if (isGetRequestElementSet('userid')) {
 	// Check if the user already exists
-	$result = SQL_QUERY_ESC("SELECT surname, family, email FROM `{!_MYSQL_PREFIX!}_user_data` WHERE userid=%s LIMIT 1",
-		array(bigintval(REQUEST_GET('uid'))), __FILE__, __LINE__);
-	if (SQL_NUMROWS($result) == 1) {
+	if (fetchUserData(getRequestElement('userid'))) {
 		// Loads surname, family's name and the email address
-		list($sname, $fname, $email) = SQL_FETCHROW($result);
-		SQL_FREERESULT($result);
+		$content = getUserDataArray();
 
 		// Prepare constants
-		define('__CATS_BASE'   , "<a href=\"{!URL!}/modules.php?module=admin&amp;uid=");
-		define('__UID'         , bigintval(REQUEST_GET('uid')));
-		define('__MEMBER_LINKS', generateMemberAdminActionLinks(constant('__UID')));
-		define('__EMAIL'       , "<a href=\"".generateMemberEmailLink($email, "user_data")."\">".$sname." ".$fname."</a>");
+		// @TODO No longer needed? define('__CATS_BASE'   , "<a href=\"{?URL?}/modules.php?module=admin&amp;userid=");
+		$content['userid']       = bigintval(getRequestElement('userid'));
+		$content['member_links'] = generateMemberAdminActionLinks($content['userid']);
+		$content['email']        = "<a href=\"".generateEmailLink($content['email'], 'user_data')."\">".$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`", __FILE__, __LINE__);
+		$result_cats = SQL_QUERY("SELECT `id`, `cat` FROM `{?_MYSQL_PREFIX?}_cats` ORDER BY `sort` ASC", __FILE__, __LINE__);
 
 		if (SQL_NUMROWS($result_cats) > 0) {
 			// List categories
 			$cnt = 1; $OUT = ''; $SW = 2;
-			while ($content = SQL_FETCHARRAY($result_cats)) {
+			while ($content = merge_array($content, SQL_FETCHARRAY($result_cats))) {
 				// Check user's selection
-				$result_user = SQL_QUERY_ESC("SELECT `id` FROM `{!_MYSQL_PREFIX!}_user_cats` WHERE userid=%s AND cat_id=%s LIMIT 1",
-					array(bigintval(REQUEST_GET('uid')), bigintval($content['id'])), __FILE__, __LINE__);
+				$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__);
 
 				// Set selection
 				$selection = "<font color=\"#ee0000\">{--NO--}</div>";
@@ -82,30 +78,30 @@ if (REQUEST_ISSET_GET('uid')) {
 				$content['sel'] = $selection;
 
 				// Load row template and switch colors + count up
-				$OUT .= LOAD_TEMPLATE("admin_list_cats_row", true, $content);
+				$OUT .= loadTemplate('admin_list_cats_row', true, $content);
 				$SW = 3 - $SW; $cnt++;
 			} // END - while
 
 			// Free memory
 			SQL_FREERESULT($result);
 
-			// @TODO Rewrite this constant
-			define('__CATS_ROWS', $OUT);
+			// Remember all rows in the array
+			$content['rows'] = $OUT;
 
 			// Load main template
-			LOAD_TEMPLATE("admin_list_cats");
+			loadTemplate('admin_list_cats', false, $content);
 		} else {
 			// No categories selected! :-(
-			LOAD_TEMPLATE("admin_list_cats_404");
+			loadTemplate('admin_list_cats_404', false, $content);
 		}
 	} else {
 		// User not found
-		LOAD_TEMPLATE('admin_settings_saved', false, sprintf(getMessage('ADMIN_MEMBER_404'), constant('__UID')));
+		loadTemplate('admin_settings_saved', false, sprintf(getMessage('ADMIN_MEMBER_404'), $content['userid']));
 	}
 } else {
 	// Output selection form with all confirmed user accounts listed
-	ADD_MEMBER_SELECTION_BOX();
+	addMemberSelectionBox();
 }
 
-//
+// [EOF]
 ?>