Index: trunk/kernel/units/users/users_tag_processor.php
===================================================================
diff -u -r4490 -r6093
--- trunk/kernel/units/users/users_tag_processor.php	(.../users_tag_processor.php)	(revision 4490)
+++ trunk/kernel/units/users/users_tag_processor.php	(.../users_tag_processor.php)	(revision 6093)
@@ -1,38 +1,38 @@
 <?php
-	
-	class UsersTagProcessor extends kDBTagProcessor 
+
+	class UsersTagProcessor extends kDBTagProcessor
 	{
-		
+
 		function LogoutLink($params)
 		{
-			$pass = Array('pass' => 'all,m,u', 'u_event' => 'OnLogout');
+			$pass = Array('pass' => 'all,m,u', 'u_event' => 'OnLogout', 'm_cat_id'=>0);
 			$logout_template = $this->SelectParam($params, 'template,t');
 			return $this->Application->HREF($logout_template, '', $pass);
 		}
-		
+
 		function UseUsernames($params)
 		{
 			return $this->Application->ConfigValue('Email_As_Login') != 1;
 		}
-		
+
 		function RegistrationEnabled($params)
 		{
 			return $this->Application->ConfigValue('User_Allow_New') != 2;
 		}
-		
+
 		function SuggestRegister($params)
 		{
 			return !$this->Application->LoggedIn() && !$this->Application->ConfigValue('Comm_RequireLoginBeforeCheckout') && $this->RegistrationEnabled($params);
 		}
-		
+
 		function ConfirmPasswordLink($params)
 		{
 			//global $m_var_list_update, $var_list_update, $objSession, $objConfig;
-			
+
 		    $template = "forgotpw_reset_result";
-		
+
 			$tmp_user_id = $this->Application->RecallVar("tmp_user_id");
-		    
+
 			$saved_denerated_code = $this->Application->GetVar('saved_denerated_code');
 			if ($saved_denerated_code){
 				$code = $saved_denerated_code;
@@ -41,25 +41,25 @@
 				$code = md5($this->GenerateCode());
 				$this->Application->SetVar('saved_denerated_code', $code);
 			}
-			
-			
-		    
+
+
+
 		    $sql = 'UPDATE '.TABLE_PREFIX.'PortalUser SET PwResetConfirm="'.$code.'", PwRequestTime='.adodb_mktime().' WHERE PortalUserId='.$tmp_user_id;
-		
+
 		    $this->Conn->Query($sql);
 
 		    $params = array_merge($params,  array('pass'=>'m', 'user_key'=>$code));
-		    
+
 		    $main_processor =& $this->Application->recallObject('m_TagProcessor');
-			
+
 		    return $main_processor->T($params);
-		    
+
 		}
-		
+
 		function GenerateCode()
 		{
 		        list($usec, $sec) = explode(" ",microtime());
-		
+
 		        $id_part_1 = substr($usec, 4, 4);
 		        $id_part_2 = mt_rand(1,9);
 		        $id_part_3 = substr($sec, 6, 4);
@@ -71,49 +71,49 @@
 		        }
 		        return $id_part_1.$id_part_2.$id_part_3;
 		}
-		
+
 		function ForgottenPassword($params){
 			return $this->Application->GetVar('ForgottenPassword');
 		}
-		
+
 		function TestCodeIsValid($param){
-			
+
 		   	$passed_key = $this->Application->GetVar('user_key');
-		   	
+
 	     	$user_object = &$this->Application->recallObject('u.forgot');
 	     	$user_current_object = &$this->Application->recallObject('u');
-		   	
+
 		    if (strlen(trim($passed_key)) == 0) {
-		    	
+
 		    	$user_current_object->ErrorMsgs['code_is_not_valid'] = $this->Application->Phrase('lu_code_is_not_valid');
-		    	$user_current_object->FieldErrors['PwResetConfirm']['pseudo'] = 'code_is_not_valid';	
+		    	$user_current_object->FieldErrors['PwResetConfirm']['pseudo'] = 'code_is_not_valid';
 				return false;
 		    }
-		    
-	     	
+
+
 		    if($user_object->Load(array('PwResetConfirm'=>$passed_key)))
-		    {		      	
+		    {
 		    	$exp_time = $user_object->GetDBField('PwRequestTime') + 3600;
-		      	if ($exp_time > adodb_mktime()) 
+		      	if ($exp_time > adodb_mktime())
 		      	{
 
-			     	
+
 		      	} else {
 		      		$user_current_object->ErrorMsgs['code_expired'] = $this->Application->Phrase('lu_code_expired');
 		      		$user_current_object->FieldErrors['PwResetConfirm']['pseudo'] = 'code_expired';
 		      		return false;
-		      		
+
 		      	}
 		    } else {
 		    	$user_current_object->ErrorMsgs['code_is_not_valid'] = $this->Application->Phrase('lu_code_is_not_valid');
-		    	$user_current_object->FieldErrors['PwResetConfirm']['pseudo'] = 'code_is_not_valid';	
+		    	$user_current_object->FieldErrors['PwResetConfirm']['pseudo'] = 'code_is_not_valid';
 		    	return false;
-		    	
-		    }   
-		    
+
+		    }
+
 		return true;
-		}		
-		
+		}
+
 		/**
 		 * Returns sitem administrator email
 		 *
@@ -124,35 +124,35 @@
 		{
 			return $this->Application->ConfigValue('Smtp_AdminMailFrom');
 		}
-			
+
 		function AffiliatePaymentTypeChecked($params)
 		{
 			static $checked = false;
-			
+
 			if( $this->Application->GetVar('PaymentTypeId') )
 			{
 				$apt_object =& $this->Application->recallObject('apt.active');
 				if( $this->Application->GetVar('PaymentTypeId') == $apt_object->GetDBField('PaymentTypeId') )
 				{
 					return 1;
 				}
-				else 
+				else
 				{
 					return 0;
 				}
 			}
-			
+
 			if(!$checked)
 			{
 				$checked = true;
 				return 1;
 			}
-			else 
+			else
 			{
 				return 0;
 			}
 		}
-		
+
 		function HasError($params)
 		{
 			$res = parent::HasError($params);
@@ -163,7 +163,7 @@
 			}
 			return $res;
 		}
-		
+
 		/**
 		 * Returns login name of user
 		 *
@@ -174,9 +174,9 @@
 			$object =& $this->getObject($params);
 			return $object->GetID() != -1 ? $object->GetDBField('Login') : 'root';
 		}
-		
+
 	}
-	
-	
-	
+
+
+
 ?>
\ No newline at end of file