X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=inc%2Fmodules%2Fmember%2Fwhat-categories.php;h=c74bf25aa40a1c2044bec35b0733a6dee19cd252;hb=885637e9f61f315ba051500061ec193ebc937f7b;hp=ab5fc444b6288c50b8b73178bc40d2493adc789b;hpb=5bdeaf8b452206598b6c6cd4f941145b11a0eccc;p=mailer.git

diff --git a/inc/modules/member/what-categories.php b/inc/modules/member/what-categories.php
index ab5fc444b6..c74bf25aa4 100644
--- a/inc/modules/member/what-categories.php
+++ b/inc/modules/member/what-categories.php
@@ -10,7 +10,12 @@
  * -------------------------------------------------------------------- *
  * Kurzbeschreibung  : Kategorien ab- bzw. anwaehlen                    *
  * -------------------------------------------------------------------- *
- *                                                                      *
+ * $Revision::                                                        $ *
+ * $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 - 2008 by Roland Haeder                           *
  * For more information visit: http://www.mxchange.org                  *
@@ -33,79 +38,69 @@
 
 // Some security stuff...
 if (!defined('__SECURITY')) {
-	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), "/inc") + 4) . "/security.php";
+	$INC = substr(dirname(__FILE__), 0, strpos(dirname(__FILE__), '/inc') + 4) . '/security.php';
 	require($INC);
 } elseif (!IS_MEMBER()) {
-	LOAD_URL("modules.php[13~?module=index");
+	redirectToUrl('modules.php?module=index');
 }
 
 // Add description as navigation point
-ADD_DESCR("member", __FILE__);
+ADD_DESCR('member', __FILE__);
 
-$UID = $GLOBALS['userid'];
+$UID = getUserId();
 $whereStatement = " WHERE `visible`='Y'";
-if (IS_ADMIN()) $whereStatement = "";
+if (IS_ADMIN()) $whereStatement = '';
 
 $result = SQL_QUERY("SELECT id, cat FROM `{!_MYSQL_PREFIX!}_cats`".$whereStatement." ORDER BY `sort`", __FILE__, __LINE__);
 $cats = SQL_NUMROWS($result);
 
-if ($cats > 0)
-{
+if ($cats > 0) {
 	$LEAST = false;
-	if (isset($_POST['ok']))
-	{
+	if (isFormSent()) {
 		$cnt = 0;
-		foreach ($_POST['cat'] as $cat => $joined)
-		{
-			if ($joined == "N") $cnt++;
+		foreach (REQUEST_POST('cat') as $cat => $joined) {
+			if ($joined == 'N') $cnt++;
 		}
-		if (($cats - $cnt) < getConfig('least_cats'))
-		{
-			unset($_POST['ok']);
+
+		if (($cats - $cnt) < getConfig('least_cats')) {
+			REQUEST_UNSET_POST('ok');
 			$LEAST = true;
 		}
 	}
-	if (isset($_POST['ok']))
-	{
-		foreach ($_POST['cat'] as $cat => $joined)
-		{
-			switch ($joined)
-			{
-				case "Y":
-					$sql = "";
-					$result_user = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_user_cats` WHERE userid=%s AND cat_id=%s LIMIT 1",
-					 array($UID, bigintval($cat)), __FILE__, __LINE__);
-
-					if (SQL_NUMROWS($result_user) == 0)
-					{
+
+	if (isFormSent()) {
+		foreach (REQUEST_POST('cat') as $cat => $joined) {
+			switch ($joined) {
+				case 'Y':
+					$sql = '';
+					$result_user = SQL_QUERY_ESC("SELECT `id` FROM `{!_MYSQL_PREFIX!}_user_cats` WHERE userid=%s AND cat_id=%s LIMIT 1",
+					array($UID, bigintval($cat)), __FILE__, __LINE__);
+
+					if (SQL_NUMROWS($result_user) == 0) {
 						$sql = "INSERT INTO `{!_MYSQL_PREFIX!}_user_cats` (userid, cat_id) VALUES ('%s','%s')";
-					}
-					 else
-					{
+					} else {
 						// Free memory
 						SQL_FREERESULT($result_user);
 					}
 					break;
 
-				case "N":
+				case 'N':
 					$sql = "DELETE LOW_PRIORITY FROM `{!_MYSQL_PREFIX!}_user_cats` WHERE userid=%s AND cat_id=%s LIMIT 1";
 					break;
 			}
-			if (!empty($sql))
-			{
+
+			if (!empty($sql)) {
 				// Run SQL command
 				$result = SQL_QUERY_ESC(trim($sql), array($UID, bigintval($cat)), __FILE__, __LINE__);
 			}
 		}
+
 		// Categories saved...
-		LOAD_TEMPLATE("admin_settings_saved", true, getMessage('MEMBER_CATS_SAVED'));
-	}
-	 else
-	{
-		if ($LEAST)
-		{
+		LOAD_TEMPLATE('admin_settings_saved', true, getMessage('MEMBER_CATS_SAVED'));
+	} else {
+		if ($LEAST) {
 			// Also here we have to secure it... :(
-			LOAD_TEMPLATE("admin_settings_saved", true, CATS_LEAST.": ".getConfig('least_cats'));
+			LOAD_TEMPLATE('admin_settings_saved', false, sprintf(getMessage('CATS_LEAST'), getConfig('least_cats')));
 		}
 		// Put some data into constants for the template
 		define('__ROWS', ($cats*2+4));
@@ -114,40 +109,30 @@ if ($cats > 0)
 		LOAD_TEMPLATE("member_cats_header");
 
 		// Start switching colors and load all visible categories
-		$SW = 2;
-		while (list($id, $cat) = SQL_FETCHROW($result))
-		{
+		// @TODO Rewrite this to use $OUT .= ...
+		$OUT = ''; $SW = 2;
+		while ($content = SQL_FETCHARRAY($result)) {
 			// Default he has not joined
-			$JOINED_N = " checked=\"checked\""; $JOINED_Y = "";
-
-			// Check category selection
-			$result_user = SQL_QUERY_ESC("SELECT id FROM `{!_MYSQL_PREFIX!}_user_cats` WHERE userid=%s AND cat_id=%s LIMIT 1",
-			 array($UID, bigintval($id)), __FILE__, __LINE__);
-
-			// When we found an entry don't read it, just change the JOINED_x variables
-			if (isset($_POST['cat']))
-			{
-				if ($_POST['cat'][$id] =='Y') { $JOINED_Y = " checked=\"checked\""; $JOINED_N = ""; }
-			}
-			 else
-			{
-				if (SQL_NUMROWS($result_user) == 1)
-				{
-					$JOINED_Y = " checked=\"checked\""; $JOINED_N = "";
+			$content['jn'] = ' checked="checked"';
+			$content['jy'] = '';
+
+			// When we found an entry don't read it, just change the jx elements
+			if (REQUEST_ISSET_POST(('cat'))) {
+				// Form sent?
+				if (REQUEST_POST('cat', $content['id']) =='Y') {
+					$content['jy'] = ' checked="checked"';
+					$content['jn'] = '';
+				}
+			} else {
+				// Check if he has an entry
+				if (GET_TOTAL_DATA($UID, "user_cats", 'id', 'userid', true, sprintf(" AND cat_id=%s", bigintval($content['id']))) == 1) {
+					$content['jn'] = '';
+					$content['jy'] = ' checked="checked"';
 				}
-
-				// Free memory
-				SQL_FREERESULT($result_user);
 			}
 
-			// Prepare data for the template
-			$content = array(
-				'sw'  => $SW,
-				'id'  => $id,
-				'cat' => $cat,
-				'jy'  => $JOINED_Y,
-				'jn'  => $JOINED_N,
-			);
+			// Add some more
+			$content['sw'] = $SW;
 
 			// Load row template and switch colors
 			LOAD_TEMPLATE("member_cat_row", false, $content);
@@ -157,13 +142,12 @@ if ($cats > 0)
 		// Load footer template
 		LOAD_TEMPLATE("member_cats_footer");
 	}
-}
- else
-{
+} else {
 	// No cateogries are defined yet
-	LOAD_TEMPLATE("admin_settings_saved", true, getMessage('MEMBER_NO_CATS'));
+	LOAD_TEMPLATE('admin_settings_saved', true, getMessage('MEMBER_NO_CATS'));
 }
 
+// Free result
 SQL_FREERESULT($result);
 
 //