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

oscar at devel.lifetype.net oscar at devel.lifetype.net
Sat Nov 11 15:27:41 GMT 2006


Author: oscar
Date: 2006-11-11 15:27:41 +0000 (Sat, 11 Nov 2006)
New Revision: 4282

Modified:
   plog/trunk/class/action/admin/adminaddblogaction.class.php
   plog/trunk/class/action/admin/adminadminblogselectaction.class.php
   plog/trunk/class/action/admin/admincreateblogaction.class.php
   plog/trunk/class/action/admin/admindeleteblogaction.class.php
   plog/trunk/class/action/admin/admineditblogaction.class.php
   plog/trunk/class/action/admin/adminsiteblogsaction.class.php
   plog/trunk/class/action/admin/adminupdateeditblogaction.class.php
   plog/trunk/templates/admin/siteblogs.template
Log:
added support for permissions when managing blogs


Modified: plog/trunk/class/action/admin/adminaddblogaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminaddblogaction.class.php	2006-11-11 15:26:53 UTC (rev 4281)
+++ plog/trunk/class/action/admin/adminaddblogaction.class.php	2006-11-11 15:27:41 UTC (rev 4282)
@@ -34,8 +34,12 @@
 				$this->registerFieldValidator( "blogSubDomain", new DomainValidator());
 				$this->registerFieldValidator( "blogMainDomain", new DomainValidator());
 			}
-        	$this->registerField( "userName" );			
-        	$this->setValidationErrorView( new AdminCreateBlogView( $this->_blogInfo ));
+        	$this->registerField( "userName" );	
+			$view = new AdminCreateBlogView( $this->_blogInfo );
+			$view->setErrorMessage( $this->_locale->tr( "error_adding_blog" ));
+        	$this->setValidationErrorView( $view );
+
+			$this->requireAdminPermission( "add_site_blog" );
         }
 
         function perform()
@@ -168,7 +172,11 @@
 
             // and inform everyone that everything went ok
 			$this->notifyEvent( EVENT_POST_BLOG_ADD, Array( "blog" => &$blog ));
-            $this->_view = new AdminSiteBlogsListView( $this->_blogInfo );
+			if( $this->userHasPermission( "view_site_blogs", ADMIN_PERMISSION ))
+            	$this->_view = new AdminSiteBlogsListView( $this->_blogInfo );
+			else
+				$this->_view = new AdminCreateBlogView( $this->_blogInfo );
+				
             $this->_view->setSuccessMessage($this->_locale->pr("blog_added_ok", $blog->getBlog()));
             $this->setCommonData();
 

Modified: plog/trunk/class/action/admin/adminadminblogselectaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminadminblogselectaction.class.php	2006-11-11 15:26:53 UTC (rev 4281)
+++ plog/trunk/class/action/admin/adminadminblogselectaction.class.php	2006-11-11 15:27:41 UTC (rev 4282)
@@ -28,6 +28,8 @@
 			$view = new AdminSiteBlogsListView( $this->_blogInfo );
 			$view->setErrorMessage( $this->_locale->tr( "error_incorrect_blog_id" ));
 			$this->setValidationErrorView( $view );			
+			
+			$this->requireAdminPermission( "edit_blog_admin_mode" );
         }
 
         /**

Modified: plog/trunk/class/action/admin/admincreateblogaction.class.php
===================================================================
--- plog/trunk/class/action/admin/admincreateblogaction.class.php	2006-11-11 15:26:53 UTC (rev 4281)
+++ plog/trunk/class/action/admin/admincreateblogaction.class.php	2006-11-11 15:27:41 UTC (rev 4282)
@@ -13,6 +13,8 @@
     	function AdminCreateBlogAction( $actionInfo, $request )
         {
         	$this->AdminAction( $actionInfo, $request );
+
+			$this->requireAdminPermission( "add_site_blog" );
         }
 
         function perform()

Modified: plog/trunk/class/action/admin/admindeleteblogaction.class.php
===================================================================
--- plog/trunk/class/action/admin/admindeleteblogaction.class.php	2006-11-11 15:26:53 UTC (rev 4281)
+++ plog/trunk/class/action/admin/admindeleteblogaction.class.php	2006-11-11 15:27:41 UTC (rev 4282)
@@ -30,6 +30,8 @@
         	$view = new AdminSiteBlogsListView( $this->_blogInfo );
         	$view->setErrorMessage( $this->_locale->tr("error_no_blogs_selected"));
         	$this->setValidationErrorView( $view );
+
+			$this->requireAdminPermission( "update_site_blog" );
         }
 
         function perform()

Modified: plog/trunk/class/action/admin/admineditblogaction.class.php
===================================================================
--- plog/trunk/class/action/admin/admineditblogaction.class.php	2006-11-11 15:26:53 UTC (rev 4281)
+++ plog/trunk/class/action/admin/admineditblogaction.class.php	2006-11-11 15:27:41 UTC (rev 4282)
@@ -30,6 +30,8 @@
 			$view = new AdminSiteBlogsListView( $this->_blogInfo );
 			$view->setErrorMessage( $this->_locale->tr("error_incorrect_blog_id" ));
 			$this->setValidationErrorView( $view );
+			
+			$this->requireAdminPermission( "update_site_blog" );
         }
 
         /**

Modified: plog/trunk/class/action/admin/adminsiteblogsaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminsiteblogsaction.class.php	2006-11-11 15:26:53 UTC (rev 4281)
+++ plog/trunk/class/action/admin/adminsiteblogsaction.class.php	2006-11-11 15:27:41 UTC (rev 4282)
@@ -16,6 +16,8 @@
     	function AdminSiteBlogsAction( $actionInfo, $request )
         {
         	$this->AdminAction( $actionInfo, $request );
+
+			$this->requireAdminPermission( "view_site_blogs" );
         }
         
         function perform()

Modified: plog/trunk/class/action/admin/adminupdateeditblogaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminupdateeditblogaction.class.php	2006-11-11 15:26:53 UTC (rev 4281)
+++ plog/trunk/class/action/admin/adminupdateeditblogaction.class.php	2006-11-11 15:27:41 UTC (rev 4282)
@@ -57,6 +57,8 @@
 			$view = new AdminEditSiteBlogView( $this->_blogInfo );
 			$view->setErrorMessage( $this->_locale->tr("error_updating_blog_settings2" ));
 			$this->setValidationErrorView( $view );
+			
+			$this->requireAdminPermission( "update_site_blog" );			
         }
 		
         /**

Modified: plog/trunk/templates/admin/siteblogs.template
===================================================================
--- plog/trunk/templates/admin/siteblogs.template	2006-11-11 15:26:53 UTC (rev 4281)
+++ plog/trunk/templates/admin/siteblogs.template	2006-11-11 15:27:41 UTC (rev 4282)
@@ -53,7 +53,7 @@
       <tr>
        <td><input class="checkbox" type="checkbox" name="blogIds[{counter}]" value="{$siteblog->getId()}"/></td>
        <td class="col_highlighted">
-        <a href="?op=editBlog&amp;blogId={$siteblog->getId()}">{$siteblog->getBlog()}</a>
+        {check_perms adminperm=update_site_blog}<a href="?op=editBlog&amp;blogId={$siteblog->getId()}">{/check_perms}{$siteblog->getBlog()}{check_perms adminperm=update_site_blog}</a>{/check_perms}
        </td>
        <td>
 	    {assign var=ownerInfo value=$siteblog->getOwnerInfo()}
@@ -72,14 +72,18 @@
 	   </td>
        <td>
         <div class="list_action_button">
+	     {check_perms adminperm=update_site_blog}
          <a href="?op=deleteBlog&amp;blogId={$siteblog->getId()}"><img src="imgs/admin/icon_delete-16.png" alt="{$locale->tr("delete")}" /></a>
          <a href="?op=editBlog&amp;blogId={$siteblog->getId()}"><img src="imgs/admin/icon_edit-16.png" alt="{$locale->tr("edit_blog")}" /></a>
 		 {if $siteblog->getStatus() == 3}
          <a href="?op=resendConfirmation&amp;blogId={$siteblog->getId()}"><img src="imgs/admin/icon_mail-16.png" alt="{$locale->tr("resend_confirmation_blog")}" /></a>
 		 {/if}
+		 {/check_perms}
+		 {check_perms adminperm=edit_blog_admin_mode}
 		 <a href="?op=adminBlogSelect&amp;blogId={$siteblog->getId()}&amp;action=controlCenter">
 		   <img src="imgs/admin/icon_lock_open-16.png" alt="{$locale->tr("administrate_user_blog")}" />
 		 </a>
+		 {/check_perms}
         </div>
       </tr>
      {/foreach}
@@ -88,8 +92,10 @@
   </div>
   <div id="list_action_bar">
 	{adminpager style="list"}
-   <input type="hidden" name="op" value="deleteBlogs"/>
-   <input type="submit" name="{$locale->tr("delete")}" value="{$locale->tr("delete")}"/>  
+	{check_perms adminperm=update_site_blog}
+    <input type="hidden" name="op" value="deleteBlogs"/>
+    <input type="submit" name="{$locale->tr("delete")}" value="{$locale->tr("delete")}"/>  
+    {/check_perms}
   </div> 
  </form>
 {include file="$admintemplatepath/footernavigation.template"}



More information about the pLog-svn mailing list