[Tikiwiki-cvs] tiki tiki-editpage.php, 1.181.2.33, 1.181.2.34 tiki-index.php, 1.198.2.15, 1.198.2.16 tiki-edit_structure.php, 1.46.2.3, 1.46.2.4

[<nk...@us...>]

Update of /cvsroot/tikiwiki/tiki
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv10347

Modified Files:
      Tag: BRANCH-1-10
	tiki-editpage.php tiki-index.php tiki-edit_structure.php 
Log Message:
[FIX] proper checking of category perms

Index: tiki-editpage.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-editpage.php,v
retrieving revision 1.181.2.33
retrieving revision 1.181.2.34
diff -u -d -r1.181.2.33 -r1.181.2.34
--- tiki-editpage.php	31 Jan 2008 22:58:06 -0000	1.181.2.33
+++ tiki-editpage.php	1 Feb 2008 01:07:18 -0000	1.181.2.34
@@ -76,7 +76,7 @@
 		die;
 	}
 	$structure_info = $structlib->s_get_structure_info($_REQUEST['current_page_id']);
-	if ($tiki_p_edit_structures  != 'y' || !$tikilib->user_has_perm_on_object($user,$structure_info["pageName"],'wiki page','tiki_p_edit')) {
+	if ($tiki_p_edit_structures  != 'y' || !$tikilib->user_has_perm_on_object($user,$structure_info["pageName"],'wiki page','tiki_p_edit','tiki_p_edit_categorized')) {
 		$smarty->assign('msg', tra("Permission denied you cannot edit this page"));
 		$smarty->display("error.tpl");
 		die;

Index: tiki-index.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-index.php,v
retrieving revision 1.198.2.15
retrieving revision 1.198.2.16
diff -u -d -r1.198.2.15 -r1.198.2.16
--- tiki-index.php	31 Jan 2008 21:55:56 -0000	1.198.2.15
+++ tiki-index.php	1 Feb 2008 01:07:18 -0000	1.198.2.16
@@ -120,7 +120,7 @@
 			$structs_with_perm[] = $t_structs;
 		}
 	}    	
-    if ($tikilib->user_has_perm_on_object($user,$navigation_info['home']['pageName'],'wiki page','tiki_p_edit'))
+    if ($tikilib->user_has_perm_on_object($user,$navigation_info['home']['pageName'],'wiki page','tiki_p_edit','tiki_p_edit_categorized'))
 		$smarty->assign('struct_editable', 'y');
 	else
 		$smarty->assign('struct_editable', 'n');	
@@ -689,7 +689,7 @@
 		$stagingPageName = $prefs['wikiapproval_prefix'] . $page;
 		$smarty->assign('needsStaging', 'y');
 		$smarty->assign('stagingPageName', $stagingPageName);	
-		if ($tikilib->user_has_perm_on_object($user,$stagingPageName,'wiki page','tiki_p_edit')) {
+		if ($tikilib->user_has_perm_on_object($user,$stagingPageName,'wiki page','tiki_p_edit','tiki_p_edit_categorized')) {
 			$smarty->assign('canEditStaging', 'y');
 		} 	
 	} elseif ($prefs['wikiapproval_staging_category'] > 0 && in_array($prefs['wikiapproval_staging_category'], $cats) && !$tikilib->page_exists($prefs['wikiapproval_prefix'] . $page)) {

Index: tiki-edit_structure.php
===================================================================
RCS file: /cvsroot/tikiwiki/tiki/tiki-edit_structure.php,v
retrieving revision 1.46.2.3
retrieving revision 1.46.2.4
diff -u -d -r1.46.2.3 -r1.46.2.4
--- tiki-edit_structure.php	8 Dec 2007 09:27:38 -0000	1.46.2.3
+++ tiki-edit_structure.php	1 Feb 2008 01:07:18 -0000	1.46.2.4
@@ -39,7 +39,7 @@
 $smarty->assign('structure_id', $structure_info["page_ref_id"]);
 $smarty->assign('structure_name', $structure_info["pageName"]);
 
-if ($tiki_p_edit_structures  == 'y' && $tikilib->user_has_perm_on_object($user,$structure_info["pageName"],'wiki page','tiki_p_edit'))
+if ($tiki_p_edit_structures  == 'y' && $tikilib->user_has_perm_on_object($user,$structure_info["pageName"],'wiki page','tiki_p_edit','tiki_p_edit_categorized'))
 	$editable = 'y';
 else
 	$editable = 'n';
@@ -68,7 +68,7 @@
   	$structs = $structlib->get_page_structures($remove_info['pageName'],$structure);
     //If page is member of more than one structure, do not give option to remove page
     $single_struct = count($structs) == 1; 
-	if ($tiki_p_remove == 'y' && $single_struct && $tikilib->user_has_perm_on_object($user,$remove_info["pageName"],'wiki page','tiki_p_edit'))
+	if ($tiki_p_remove == 'y' && $single_struct && $tikilib->user_has_perm_on_object($user,$remove_info["pageName"],'wiki page','tiki_p_edit','tiki_p_edit_categorized'))
 		$smarty->assign('page_removable', 'y');
 	else
 		$smarty->assign('page_removable', 'n');