Index: trunk/kernel/include/usersession.php
===================================================================
diff -u -r41 -r168
--- trunk/kernel/include/usersession.php (.../usersession.php) (revision 41)
+++ trunk/kernel/include/usersession.php (.../usersession.php) (revision 168)
@@ -718,7 +718,8 @@
{
$GroupList = substr($GroupList,0,-1);
$this->Set("GroupList",$GroupList);
- }
+ }
+ //print_pre( $GroupList);
if($this->Get("GroupList")!=$this->PermCacheGroups)
$this->ResetSysPermCache();
if(!$this->SysPermCacheLoaded())
@@ -727,7 +728,7 @@
$this->GetSysPermCache();
$this->PermCacheGroups = $this->Get("GroupList");
}
- //echo "SysPerm $PermissionName: ". $this->SysPermCache[$PermissionName]."
\n";
+ //echo "SysPerm $PermissionName: [". $this->SysPermCache[$PermissionName]."]
\n";
return isset($this->SysPermCache[$PermissionName]) ? $this->SysPermCache[$PermissionName] == 1 : false;
}
Index: trunk/admin/logs/session_list.php
===================================================================
diff -u -r13 -r168
--- trunk/admin/logs/session_list.php (.../session_list.php) (revision 13)
+++ trunk/admin/logs/session_list.php (.../session_list.php) (revision 168)
@@ -222,15 +222,18 @@
if(strlen($orderBy))
$sql .=" ORDER BY ".$orderBy;
-$sql .=" ".GetLimitSQL($objSession->GetVariable("Page_Sessionlist"),$objConfig->Get("Perpage_Sessionlist"));
+//$sql .=" ".GetLimitSQL($objSession->GetVariable("Page_Sessionlist"),$objConfig->Get("Perpage_Sessionlist"));
if($objSession->HasSystemPermission("DEBUG.LIST"))
echo htmlentities($sql,ENT_NOQUOTES)."
\n";
+$objListView = new clsListView($objListToolBar);
+$objListView->CurrentPageVar = "Page_Sessionlist";
+$objListView->PerPageVar = "Perpage_Sessionlist";
-$objUsers->Query_Item($sql);
+$objUsers->Query_Item( $sql, $objListView->GetLimitSQL() );
$itemcount = TableCount(GetTablePrefix()."UserSession", $where,0);
-$objListView = new clsListView($objListToolBar,$objUsers);
+$objListView->SetListItems($objUsers);
$objListView->IdField = "SessionKey";
$objListView->PageLinkTemplate = $pathtoroot.$admin."/templates/user_page_link.tpl";
@@ -245,8 +248,6 @@
$objListView->SearchBar = TRUE;
$objListView->SearchKeywords = $SearchWords;
$objListView->SearchAction="m_session_search";
-$objListView->CurrentPageVar = "Page_Sessionlist";
-$objListView->PerPageVar = "Perpage_Sessionlist";
$objListView->CheckboxName = "itemlist[]";
$objListView->TotalItemCount = $itemcount;
Index: trunk/kernel/action.php
===================================================================
diff -u -r104 -r168
--- trunk/kernel/action.php (.../action.php) (revision 104)
+++ trunk/kernel/action.php (.../action.php) (revision 168)
@@ -1,5 +1,7 @@
HasSystemPermission("SYSTEM_ACCESS.READONLY");
+
if( defined('DEBUG_ACTIONS') && (DEBUG_ACTIONS & KERNEL_ACTIONS) == KERNEL_ACTIONS )
{
echo "Kernel Action $Action
\n";
@@ -268,6 +270,8 @@
break;
case "m_edit_permissions":
+ if($ro_perm) break;
+
if($_POST["CatEditStatus"] != -1)
{
$GroupId = $_POST["GroupId"];
@@ -357,6 +361,7 @@
break;
case "m_user_addto_group":
+ if($ro_perm) break;
$user = $_POST["UserId"];
if(is_numeric($user))
{
@@ -380,6 +385,7 @@
}
break;
case "m_group_add_user":
+ if($ro_perm) break;
$group = $_POST["GroupId"];
$EditGroups = new clsGroupList();
$EditGroups->SourceTable = $objSession->GetEditTable($objGroups->SourceTable);
@@ -397,6 +403,7 @@
break;
case "m_group_removeuser":
+ if($ro_perm) break;
$group = $_POST["GroupId"];
$g = $objGroups->GetItem($group);
if($group>0)
@@ -409,6 +416,7 @@
}
break;
case "m_user_removegroup":
+ if($ro_perm) break;
$user = $_POST["UserId"];
if($user>0)
{
@@ -1998,9 +2006,12 @@
// ALL Saving Stuff From Temp Tables Heppens Here
+//echo "==== BEGIN ====
";
+$has_perm = $objSession->HasSystemPermission("SYSTEM_ACCESS.READONLY");
+//echo "PortalUserID: [".$objSession->Get("PortalUserId")."]
";
+//echo "PermSet: [".$has_perm."]
";
-
-if( ! $objSession->HasSystemPermission("SYSTEM_ACCESS.READONLY") )
+if( !$has_perm )
{
/* category Edit */
@@ -2161,4 +2172,6 @@
echo "USER HAS RO-ACCESS on action [".$_REQUEST['Action']."]
";
}
+//echo "==== END ====
";
+
?>
Index: trunk/admin/users/addgroup_users.php
===================================================================
diff -u -r13 -r168
--- trunk/admin/users/addgroup_users.php (.../addgroup_users.php) (revision 13)
+++ trunk/admin/users/addgroup_users.php (.../addgroup_users.php) (revision 168)
@@ -234,15 +234,18 @@
$sql .="LEFT JOIN ".GetTablePrefix()."PortalGroup as g ON (ug.GroupId=g.GroupId) WHERE ug.PrimaryGroup!=0";
if(strlen($where))
$sql .= " AND ".$where;
-$sql .=" ".GetLimitSQL($objSession->GetVariable("Page_Userlist"),$objConfig->Get("Perpage_User"));
+//$sql .=" ".GetLimitSQL($objSession->GetVariable("Page_Userlist"),$objConfig->Get("Perpage_User"));
+$objListView = new clsListView($objListToolBar);
+$objListView->CurrentPageVar = "Page_Userlist";
+$objListView->PerPageVar = "Perpage_User";
if($objSession->HasSystemPermission("DEBUG.LIST"))
echo htmlentities($sql,ENT_NOQUOTES)."
\n";
-$objUsers->Query_Item($sql);
+$objUsers->Query_Item($sql, $objListView->GetLimitSQL() );
$itemcount = TableCount(GetTablePrefix()."PortalUser","PortalUserId IN ($list)",0);
-$objListView = new clsListView($objListToolBar,$objUsers);
+$objListView->SetListItems($objUsers);
$objListView->IdField = "ResourceId";
$objListView->PageLinkTemplate = $pathtoroot. $admin."/templates/user_page_link.tpl";
@@ -258,8 +261,6 @@
$objListView->SearchBar = TRUE;
$objListView->SearchKeywords = $SearchWords;
$objListView->SearchAction="m_usergroup_search";
-$objListView->CurrentPageVar = "Page_Userlist";
-$objListView->PerPageVar = "Perpage_User";
$objListView->CheckboxName = "itemlist[]";
$objListView->TotalItemCount = $itemcount;
Index: trunk/admin/users/user_select.php
===================================================================
diff -u -r85 -r168
--- trunk/admin/users/user_select.php (.../user_select.php) (revision 85)
+++ trunk/admin/users/user_select.php (.../user_select.php) (revision 168)
@@ -149,6 +149,10 @@
$SelectorType = $_REQUEST["Selector"] ? $_REQUEST["Selector"] : 'checkbox';
+$objListView = new clsListView($objListToolBar);
+$objListView->CurrentPageVar = "Page_UserSelect";
+$objListView->PerPageVar = "Perpage_User";
+
if(strlen($_GET["source"])>0)
{
switch($_GET["source"])
@@ -177,8 +181,8 @@
$sql .="LEFT JOIN ".GetTablePrefix()."PortalGroup as g ON (ug.GroupId=g.GroupId) WHERE ";
$sql .= "u.PortalUserId NOT IN (".$catlist.")";
- $sql .=" ".GetLimitSQL($objSession->GetVariable("Page_UserSelect"),$objConfig->Get("Perpage_User"));
- $objUsers->Query_Item($sql);
+ //$sql .=" ".GetLimitSQL($objSession->GetVariable("Page_UserSelect"),$objConfig->Get("Perpage_User"));
+ $objUsers->Query_Item($sql, $objListView->GetLimitSQL() );
$itemcount = TableCount(GetTablePrefix()."PortalUser","PortalUserId NOT IN ($catlist)",0);
}
@@ -188,8 +192,8 @@
$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) ";
$sql .="LEFT JOIN ".GetTablePrefix()."PortalGroup as g ON (ug.GroupId=g.GroupId) WHERE ug.PrimaryGroup!=0";
- $sql .=" ".GetLimitSQL($objSession->GetVariable("Page_UserSelect"),$objConfig->Get("Perpage_User"));
- $objUsers->Query_Item($sql);
+ //$sql .=" ".GetLimitSQL($objSession->GetVariable("Page_UserSelect"),$objConfig->Get("Perpage_User"));
+ $objUsers->Query_Item($sql, $objListView->GetLimitSQL() );
$itemcount = TableCount(GetTablePrefix()."PortalUser","PortalUserId NOT IN ($catlist)",0);
}
@@ -202,16 +206,16 @@
$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) ";
$sql .="LEFT JOIN ".GetTablePrefix()."PortalGroup as g ON (ug.GroupId=g.GroupId) WHERE ug.PrimaryGroup!=0 $where";
- $sql .=" ".GetLimitSQL($objSession->GetVariable("Page_UserSelect"),$objConfig->Get("Perpage_User"));
+ //$sql .=" ".GetLimitSQL($objSession->GetVariable("Page_UserSelect"),$objConfig->Get("Perpage_User"));
- $objUsers->Query_Item($sql);
+ $objUsers->Query_Item($sql, $objListView->GetLimitSQL() );
$itemcount = TableCount(GetTablePrefix()."PortalUser","PortalUserId NOT IN ($catlist)",0);
}
if($objSession->HasSystemPermission("DEBUG.LIST"))
echo htmlentities($sql,ENT_NOQUOTES)."
\n";
-$objListView = new clsListView($objListToolBar,$objUsers);
+$objListView->SetListItems($objUsers);
if(strlen($_GET["IdField"])>0)
{
$objListView->IdField = $_GET["IdField"];
@@ -240,8 +244,6 @@
$objListView->SearchBar = TRUE;
$objListView->SearchKeywords = $SearchWords;
$objListView->SearchAction="m_userselect_search";
-$objListView->CurrentPageVar = "Page_UserSelect";
-$objListView->PerPageVar = "Perpage_User";
$objListView->CheckboxName = "itemlist[]";
$objListView->SelectorType=$SelectorType;
$objListView->TotalItemCount = $itemcount;