Index: trunk/kernel/include/usersession.php
===================================================================
diff -u -N -r881 -r888
--- trunk/kernel/include/usersession.php	(.../usersession.php)	(revision 881)
+++ trunk/kernel/include/usersession.php	(.../usersession.php)	(revision 888)
@@ -34,7 +34,7 @@
         $this->PermCache = array();        
         $this->PermCacheGroups ="";
         $this->UseTempKeys = $TempKeys;
-        $this->AdminSearchFields = array("p.Login", "g.Name", "us.IpAddress");
+        $this->AdminSearchFields = array("UserName", "GroupName", "us.IpAddress");
        
        	if( GetVar('help_usage') == 'install' ) return;       	
        	
@@ -95,12 +95,12 @@
             		{
               			if( strlen($inner_sql) ) $inner_sql .= " OR ";
               			
-              			if (!stristr($value, "Guest")) {
+              			//if (!stristr($value, "Guest")) {
               				$inner_sql .= $field." LIKE '%".$value."%'";
-              			}
-              			else {
-              				$inner_sql .= $field." IS NULL";
-              			}
+              			//}
+              			//else {
+              			//	$inner_sql .= $field." IS NULL";
+              			//}
             		}
           		}
           		if( strlen($inner_sql) )
Index: trunk/tools/phrase_locator.php
===================================================================
diff -u -N -r882 -r888
--- trunk/tools/phrase_locator.php	(.../phrase_locator.php)	(revision 882)
+++ trunk/tools/phrase_locator.php	(.../phrase_locator.php)	(revision 888)
@@ -2,10 +2,10 @@
 	define('DB_USER','dev');
 	define('DB_PASS','dev-25-sql');
 	define('DB_HOST','localhost');
-	define('DB_BASE','alex_in_portal');
-	define('DB_PREFIX', 'Prefix_');
+	define('DB_BASE','maris_in_portal');
+	define('DB_PREFIX', '');
 	
-	$dir = '/www/alex/in-portal/';
+	$dir = '/www/maris/in-portal/';
 	$phrases = Array();
 	
 	scanDir($dir);
Index: trunk/new_phrases.txt
===================================================================
diff -u -N -r882 -r888
--- trunk/new_phrases.txt	(.../new_phrases.txt)	(revision 882)
+++ trunk/new_phrases.txt	(.../new_phrases.txt)	(revision 888)
@@ -19,6 +19,8 @@
 la_text_custom
 la_text_multipleshow
 la_prompt_multipleshow
+la_text_minkeywordlength
+la_prompt_minkeywordlength
 la_text_prerequisit_not_passed
 la_prevcategory
 la_nextcategory
@@ -34,6 +36,7 @@
 la_prompt_moveup
 la_prompt_delete
 la_prompt_edit
+la_category
 lu_cookies_error
 lu_ferror_reset_denied
 lu_subscribe_banned
Index: trunk/kernel/include/portalgroup.php
===================================================================
diff -u -N -r881 -r888
--- trunk/kernel/include/portalgroup.php	(.../portalgroup.php)	(revision 881)
+++ trunk/kernel/include/portalgroup.php	(.../portalgroup.php)	(revision 888)
@@ -526,6 +526,10 @@
             	$clear_old = false;
             }
             
+            if ($data["PortalUserId"] == 0) {
+            	
+            }
+            
             $sql = "INSERT INTO ".$this->SourceTable." (PortalUserId, GroupId, PrimaryGroup) VALUES (".$data['PortalUserId'].", ".$data['GroupId'].", ".$data['PrimaryGroup'].")";
             @$this->adodbConnection->Execute($sql);
             
Index: trunk/admin/logs/session_list.php
===================================================================
diff -u -N -r822 -r888
--- trunk/admin/logs/session_list.php	(.../session_list.php)	(revision 822)
+++ trunk/admin/logs/session_list.php	(.../session_list.php)	(revision 888)
@@ -190,16 +190,16 @@
 $SearchWords = $objSession->GetVariable("SessionSearchWord");
 if(strlen($SearchWords))
 {
-    $where = $objSession->AdminSearchWhereClause($SearchWords);
+    $where = " HAVING ".$objSession->AdminSearchWhereClause($SearchWords);
 }
 else
   $where = "";
 
 if(strlen($SessionFilter)>0)
 {
-    if(strlen($where))
-        $where.= " AND ";
-    $where.=$SessionFilter;
+    //if(strlen($where))
+      //  $SessionFilter.= " AND ";
+    $where = $SessionFilter.$where;
 }
 
 //echo $where;
Index: trunk/kernel/action.php
===================================================================
diff -u -N -r881 -r888
--- trunk/kernel/action.php	(.../action.php)	(revision 881)
+++ trunk/kernel/action.php	(.../action.php)	(revision 888)
@@ -485,27 +485,27 @@
           $objSession->SetVariable("HasChanges", 1);
           $group = $_POST["GroupId"];
           $g =  $objGroups->GetItem($group);
-          if($group>0)
-          {
+          //if($group>0)
+          //{
               foreach($_POST["itemlist"] as $user_id)
               {
                   $u = $objUsers->GetItemByField("ResourceId",$user_id);
                   $g->DeleteUser($u->Get("PortalUserId"));
               }
-          }
+          //}
       break;    
       case "m_user_removegroup":
            if($ro_perm) break;
            $objSession->SetVariable("HasChanges", 1);
            $user = $_POST["UserId"];
-           if($user>0)
-           {  
+           //if($user>0)
+           //{  
              foreach($_POST["itemlist"] as $groupid)
              {
                 $g = $objGroups->GetItem($groupid);
                 $g->DeleteUser($user);
              }
-           }
+           //}
       break;
       case "m_sendmail":
           if($ro_perm) break;
@@ -2340,9 +2340,9 @@
 	if( GetVar('UserEditStatus') == 1 )
 	{
 		$objUserGroupsList = new clsUserGroupList();
+	    $objUserGroupsList->CopyFromEditTable("PortalUserId");		
 	    $objUsers->CopyFromEditTable("PortalUserId");
 	    $objCustomDataList->CopyFromEditTable("CustomDataId");
-	    $objUserGroupsList->CopyFromEditTable("PortalUserId");
 	    $objGroups->Clear();
 	    $objImages = new clsImageList();
 	    $objImages->CopyFromEditTable("ImageId");    
@@ -2360,9 +2360,9 @@
 	if( GetVar('GroupEditStatus') == 1 )
 	{
 		$objUserGroupsList = new clsUserGroupList();
+	    $objUserGroupsList->CopyFromEditTable("GroupId");		
 	    $objGroups->CopyFromEditTable("GroupId");
 	    $objCustomDataList->CopyFromEditTable("CustomDataId");
-	    $objUserGroupsList->CopyFromEditTable("GroupId");
 	    $objGroups->Clear();
 	}
 	if( GetVar('GroupEditStatus') == 2 )