[pLog-svn] r4355 - in plog/trunk: class/action/admin templates/admin

[oscar at devel.lifetype.net]

Author: oscar
Date: 2006-11-27 21:48:36 +0000 (Mon, 27 Nov 2006)
New Revision: 4355

Modified:
   plog/trunk/class/action/admin/adminaction.class.php
   plog/trunk/templates/admin/menus.xml
Log:
some fixes related to the 'admin mode' (which now is driven by a permission called 'edit_blog_admin_mode') and menus.xml not having the right permissions.


Modified: plog/trunk/class/action/admin/adminaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminaction.class.php	2006-11-27 20:55:26 UTC (rev 4354)
+++ plog/trunk/class/action/admin/adminaction.class.php	2006-11-27 21:48:36 UTC (rev 4355)
@@ -243,15 +243,15 @@
 		 * we're checking the user's permissions in this blog or an admin permission
 		 */
 		function userHasPermission( $permName, $mode = BLOG_PERMISSION )
-		{
-			
+		{			
 			// check for the permission, whether the user is the blog owner or
 			// whether the user is a site administrator
 			$hasPermission = false;
 			if( $mode == BLOG_PERMISSION ) {
 		    	$hasPermission = ( 
 		    		$this->_userInfo->hasPermissionByName( $permName, $this->_blogInfo->getId()) ||
-		    		$this->_blogInfo->getOwnerId() == $this->_userInfo->getId()
+		    		$this->_blogInfo->getOwnerId() == $this->_userInfo->getId() ||
+					$this->_userInfo->hasPermissionByName( "edit_blog_admin_mode", 0 )
 		    	);
 			}
 			else {				

Modified: plog/trunk/templates/admin/menus.xml
===================================================================
--- plog/trunk/templates/admin/menus.xml	2006-11-27 20:55:26 UTC (rev 4354)
+++ plog/trunk/templates/admin/menus.xml	2006-11-27 21:48:36 UTC (rev 4355)
@@ -41,16 +41,16 @@
 		  <blogTemplates url="?op=blogTemplates" andPerms="view_blog_template" />
 		 </manageBlogTemplates> 
 	</controlCenter>
-	<adminSettings url="?op=adminSettings" admin="1" orPerms="add_user,view_users,add_permission,view_permissions,add_blog,view_blogs,add_blog_category,view_blog_categories,add_locale,view_locales,add_template,view_templates,add_global_category,view_global_categories,view_global_settings,view_plugins,update_plugin_settings,purge_data">
+	<adminSettings url="?op=adminSettings" admin="1" orPerms="add_user,view_users,add_permission,view_permissions,add_site_blog,view_site_blogs,add_blog_category,view_blog_categories,add_locale,view_locales,add_template,view_templates,add_global_category,view_global_categories,view_global_settings,view_plugins,update_plugin_settings,purge_data">
 		<Users ignoreBreadCrumbs="1" orPerms="add_user,view_users,add_permission,view_permissions" admin="1">
 			<createUser url="?op=createUser" andPerms="add_user" admin="1"/>
 			<editSiteUsers url="?op=editSiteUsers" andPerms="view_users" admin="1"/>
 			<newPermission url="?op=newPermission" andPerms="add_permission" admin="1"/>			
 			<permissionsList url="?op=permissionsList" andPerms="view_permissions" admin="1" />
 		</Users>
-		<Blogs ignoreBreadCrumbs="1" admin="1" orPerms="add_blog,view_blogs,add_blog_category,view_blog_categories">
-			<createBlog url="?op=createBlog" admin="1" andPerms="add_blog" />
-			<editSiteBlogs url="?op=editSiteBlogs" admin="1" andPerms="view_blogs"/>
+		<Blogs ignoreBreadCrumbs="1" admin="1" orPerms="add_site_blog,view_site_blogs,add_blog_category,view_blog_categories">
+			<createBlog url="?op=createBlog" admin="1" andPerms="add_site_blog" />
+			<editSiteBlogs url="?op=editSiteBlogs" admin="1" andPerms="view_site_blogs"/>
 			<newBlogCategory url="?op=newBlogCategory" admin="1" andPerms="add_blog_category"/>
 			<editBlogCategories url="?op=editBlogCategories"  admin="1" andPerms="view_blog_categories"/>
 		</Blogs>