Index: trunk/kernel/units/general/cat_event_handler.php
===================================================================
diff -u -N -r4446 -r4476
--- trunk/kernel/units/general/cat_event_handler.php (.../cat_event_handler.php) (revision 4446)
+++ trunk/kernel/units/general/cat_event_handler.php (.../cat_event_handler.php) (revision 4476)
@@ -607,11 +607,7 @@
$event->redirect = false;
$search_table = TABLE_PREFIX.'ses_'.$this->Application->GetSID().'_'.TABLE_PREFIX.'Search';
- $keywords = trim($this->Application->GetVar('keywords'));
- if( !$this->Application->GetVar('INPORTAL_ON') )
- {
- $keywords = unhtmlentities($keywords);
- }
+ $keywords = unhtmlentities( trim($this->Application->GetVar('keywords')) );
$query_object =& $this->Application->recallObject('HTTPQuery');
$sql = 'SHOW TABLES LIKE "'.$search_table.'"';
@@ -934,10 +930,7 @@
switch($record['FieldType'])
{
case 'text':
- if( !$this->Application->GetVar('INPORTAL_ON') )
- {
$keywords[$field] = unhtmlentities( $keywords[$field] );
- }
if(strlen($keywords[$field]) >= $this->Application->ConfigValue('Search_MinKeyword_Length'))
{
Index: trunk/core/units/general/cat_event_handler.php
===================================================================
diff -u -N -r4446 -r4476
--- trunk/core/units/general/cat_event_handler.php (.../cat_event_handler.php) (revision 4446)
+++ trunk/core/units/general/cat_event_handler.php (.../cat_event_handler.php) (revision 4476)
@@ -607,11 +607,7 @@
$event->redirect = false;
$search_table = TABLE_PREFIX.'ses_'.$this->Application->GetSID().'_'.TABLE_PREFIX.'Search';
- $keywords = trim($this->Application->GetVar('keywords'));
- if( !$this->Application->GetVar('INPORTAL_ON') )
- {
- $keywords = unhtmlentities($keywords);
- }
+ $keywords = unhtmlentities( trim($this->Application->GetVar('keywords')) );
$query_object =& $this->Application->recallObject('HTTPQuery');
$sql = 'SHOW TABLES LIKE "'.$search_table.'"';
@@ -934,10 +930,7 @@
switch($record['FieldType'])
{
case 'text':
- if( !$this->Application->GetVar('INPORTAL_ON') )
- {
$keywords[$field] = unhtmlentities( $keywords[$field] );
- }
if(strlen($keywords[$field]) >= $this->Application->ConfigValue('Search_MinKeyword_Length'))
{
Index: trunk/admin/install/langpacks/english.lang
===================================================================
diff -u -N -r4446 -r4476
--- trunk/admin/install/langpacks/english.lang (.../english.lang) (revision 4446)
+++ trunk/admin/install/langpacks/english.lang (.../english.lang) (revision 4476)
@@ -255,6 +255,7 @@
VXNlciB1bnN1YnNjcmliZWQ=
VmFsaWRhdGUgVXNlcg==
QW4gZXJyb3IgaGFzIG9jY3VyZWQgZHVyaW5nIGV4cG9ydC4=
+ RmllbGQ=
QWRkcmVzcyBMaW5l
QWR2YW5jZWQgQ1NT
QXV0b21hdGljIEZpbGVuYW1l
@@ -1423,6 +1424,7 @@
VXNlIEVtYWlscyBBcyBMb2dpbg==
VVMvVUs=
UGxlYXNlIGNoZWNrIHRoZSByZXF1aXJlZCBmaWVsZHMgYW5kIHRyeSBhZ2FpbiE=
+ VmFsdWU=
RW50ZXIgbGlzdCBvZiB2YWx1ZXMgYW5kIHRoZWlyIGRlc2NyaXB0aW9ucywgbGlrZSAxPU9uZSwgMj1Ud28=
QWN0aXZl
QWx3YXlz
Index: trunk/kernel/action.php
===================================================================
diff -u -N -r4446 -r4476
--- trunk/kernel/action.php (.../action.php) (revision 4446)
+++ trunk/kernel/action.php (.../action.php) (revision 4476)
@@ -2338,7 +2338,7 @@
$rs->MoveNext();
}
- if($_REQUEST['CategoryId'] > 0) // not root category is updated
+ if(($_REQUEST['CategoryId'] > 0) || ($Action == 'm_add_category')) // not root category is updated
{
$cat_ids = $objCatList->CopyFromEditTable("CategoryId");
if ($cat_ids) {
Index: trunk/admin/users/addgroup_users.php
===================================================================
diff -u -N -r2853 -r4476
--- trunk/admin/users/addgroup_users.php (.../addgroup_users.php) (revision 2853)
+++ trunk/admin/users/addgroup_users.php (.../addgroup_users.php) (revision 4476)
@@ -154,7 +154,7 @@
$GroupUsers = $c->GetUserList(true);
if($GroupUsers)
{
- $list = implode(",",$GroupUsers);
+ $list = implode(",", $GroupUsers);
$where = "u.PortalUserId IN ($list) ";
}
else
@@ -166,16 +166,26 @@
$SearchWords = $objSession->GetVariable("UserGroupSearchWord");
if(strlen($SearchWords))
{
- $where .= $objUsers->AdminSearchWhereClause($SearchWords);
+ $where .= ' AND '.$objUsers->AdminSearchWhereClause($SearchWords);
}
+$orderBy = trim($objConfig->Get($SortFieldVar)." ".$order);
+
+if ($orderBy) {
+ $orderBy = ' ORDER BY '.$orderBy;
+}
+
$sql = "SELECT u.*,g.Name AS GroupName,ELT(u.status+1,'".admin_language("la_Text_Disabled")." ','".admin_language("la_Text_Enabled")." ','".admin_language("la_Text_Pending")."') as UserStatus, ";
$sql .="FROM_UNIXTIME(u.CreatedOn,'%m-%d-%Y') AS DateCreated FROM ".GetTablePrefix()."PortalUser as u ";
$sql .="LEFT JOIN ".GetTablePrefix()."UserGroup AS ug ON (u.PortalUserId=ug.PortalUserId) AND (ug.PrimaryGroup = 1) ";
$sql .="LEFT JOIN ".GetTablePrefix()."PortalGroup as g ON (ug.GroupId=g.GroupId) WHERE 1";
-if(strlen($where))
- $sql .= " AND ".$where;
+if($where) {
+ $sql .= ' AND '.$where;
+}
+
+$sql .= $orderBy;
+
//$sql .=" ".GetLimitSQL($objSession->GetVariable("Page_Userlist"),$objConfig->Get("Perpage_User"));
$objListView = new clsListView($objListToolBar);
$objListView->CurrentPageVar = "Page_Userlist";
@@ -185,7 +195,7 @@
echo htmlentities($sql,ENT_NOQUOTES)."
\n";
$objUsers->Query_Item($sql, $objListView->GetLimitSQL() );
-$itemcount = $list?TableCount(GetTablePrefix()."PortalUser","PortalUserId IN ($list)",0):0;
+$itemcount = $list ? TableCount(GetTablePrefix().'PortalUser', 'PortalUserId IN ('.$list.')', 0) : 0;
$objListView->SetListItems($objUsers);
$objListView->IdField = "ResourceId";