Index: trunk/admin/category/addcategory_permissions.php
===================================================================
diff -u -r4446 -r5180
--- trunk/admin/category/addcategory_permissions.php (.../addcategory_permissions.php) (revision 4446)
+++ trunk/admin/category/addcategory_permissions.php (.../addcategory_permissions.php) (revision 5180)
@@ -156,8 +156,11 @@
$order = $objConfig->Get("Group_SortOrder");
$objGroupList->Clear();
-$sql = "SELECT ResourceId, g.name as Name, ELT(g.Personal+1,'Group ','User ') as UserGroup FROM ".GetTablePrefix()."Permissions as p ";
-$sql .="LEFT JOIN ".GetTablePrefix()."PortalGroup as g ON p.GroupId=g.GroupId WHERE (p.CatId=".(int)$c->Get("CategoryId").") AND (g.Personal = 0) GROUP BY Name";
+$sql = 'SELECT ResourceId, g.name AS Name, ELT(g.Personal + 1,"Group ","User ") AS UserGroup
+ FROM '.TABLE_PREFIX.'Permissions p
+ LEFT JOIN '.TABLE_PREFIX.'PortalGroup g ON p.GroupId = g.GroupId
+ WHERE (p.CatId = '.(int)$c->Get('CategoryId').') AND (g.Personal = 0) AND (p.Type = 0)
+ GROUP BY Name';
//$sql = "SELECT GroupId, count(*) as PermCount FROM ".GetTablePrefix()."Permissions WHERE CatId=".$c->Get("CategoryId")." GROUP BY GroupId";
$objGroupList->Query_Item($sql);
Index: trunk/core/admin_templates/categories/categories_edit.tpl
===================================================================
diff -u -r5102 -r5180
--- trunk/core/admin_templates/categories/categories_edit.tpl (.../categories_edit.tpl) (revision 5102)
+++ trunk/core/admin_templates/categories/categories_edit.tpl (.../categories_edit.tpl) (revision 5180)
@@ -60,8 +60,8 @@
-
-
+
+
Index: trunk/admin/install/upgrades/inportal_upgrade_v1.2.1.php
===================================================================
diff -u
--- trunk/admin/install/upgrades/inportal_upgrade_v1.2.1.php (revision 0)
+++ trunk/admin/install/upgrades/inportal_upgrade_v1.2.1.php (revision 5180)
@@ -0,0 +1,20 @@
+ConfigValue('User_LoggedInGroup');
+ $sql = str_replace('#GROUP_ID#', $everyone_group, $sql);
+
+
+ $i = 0; $count = count($sql);
+ while ($i < $count) {
+ foreach ($replacements as $replace_from => $replace_to) {
+ $sql[$i] = str_replace($replace_from, $replace_to, $sql[$i]);
+ }
+ $i++;
+ }
+
+ RunSQLText($application->Conn, Array($sql), 'dbconnection');
+
+?>
\ No newline at end of file
Index: trunk/admin/install/inportal_data.sql
===================================================================
diff -u -r5130 -r5180
--- trunk/admin/install/inportal_data.sql (.../inportal_data.sql) (revision 5130)
+++ trunk/admin/install/inportal_data.sql (.../inportal_data.sql) (revision 5180)
@@ -264,7 +264,7 @@
INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('LOGIN', 11, 1, 1, 0);
INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('LOGIN', 12, 1, 1, 0);
INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('ADMIN', 11, 1, 1, 0);
-INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('CATEGORY.VIEW', 15, 0, 0, 0);
+INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('CATEGORY.VIEW', 15, 1, 0, 0);
INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('CATEGORY.ADD', 15, 0, 0, 0);
INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('CATEGORY.DELETE', 15, 0, 0, 0);
INSERT INTO Permissions (Permission, GroupId, PermissionValue, Type, CatId) VALUES ('CATEGORY.ADD.PENDING', 15, 0, 0, 0);
Index: trunk/kernel/admin_templates/categories/categories_edit.tpl
===================================================================
diff -u -r5102 -r5180
--- trunk/kernel/admin_templates/categories/categories_edit.tpl (.../categories_edit.tpl) (revision 5102)
+++ trunk/kernel/admin_templates/categories/categories_edit.tpl (.../categories_edit.tpl) (revision 5180)
@@ -60,8 +60,8 @@