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

[oscar at devel.lifetype.net]

Author: oscar
Date: 2006-10-23 13:43:57 +0000 (Mon, 23 Oct 2006)
New Revision: 4176

Modified:
   plog/trunk/class/action/admin/adminaddblogtemplateaction.class.php
   plog/trunk/class/action/admin/admindeleteblogtemplateaction.class.php
   plog/trunk/class/action/admin/admineditblogtemplatesaction.class.php
   plog/trunk/class/action/admin/adminnewblogtemplateaction.class.php
   plog/trunk/templates/admin/blogtemplates.template
Log:
added permissions for blog template management


Modified: plog/trunk/class/action/admin/adminaddblogtemplateaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminaddblogtemplateaction.class.php	2006-10-23 13:13:46 UTC (rev 4175)
+++ plog/trunk/class/action/admin/adminaddblogtemplateaction.class.php	2006-10-23 13:43:57 UTC (rev 4176)
@@ -29,6 +29,8 @@
             	$this->_op = "addBlogTemplate";
             else
             	$this->_op = "scanBlogTemplates";
+            	
+			$this->requirePermission( "add_blog_template" );            	
         }
 
         function validate()
@@ -67,10 +69,15 @@
 			}
 
             $uploads  = new FileUploads( $files );
+            
+            if( $this->userHasPermission( "view_blog_templates" ))
+                $this->_view = new AdminBlogTemplateSetsListView( $this->_blogInfo );
+            else
+            	$this->_view = new AdminTemplatedView( $this->_blogInfo, "newblogtemplate" );
 
             $result = $uploads->process( $tmpFolder );
             if( $result < 0 ) {
-                $this->_view = new AdminBlogTemplateSetsListView( $this->_blogInfo );
+
                 $this->_view->setErrorMessage( $this->_locale->tr("error_uploads_disabled"));
                 $this->setCommonData();
 
@@ -85,7 +92,6 @@
             $valid = $templateSandbox->checkTemplateSet( $upload->getFileName(), $tmpFolder."/");
 
             if( $valid < 0 ) {
-                $this->_view = new AdminBlogTemplateSetsListView( $this->_blogInfo );
                 $this->_view->setErrorMessage( AdminAddTemplateAction::_checkTemplateSandboxResult( $valid ));
                 $this->setCommonData();
 
@@ -108,7 +114,6 @@
 
             $unpacker = new Unpacker();
             if( !$unpacker->unpack( $tmpFolder."/".$upload->getFileName(), $destFolder )) {
-                $this->_view = new AdminBlogTemplateSetsListView( $this->_blogInfo );
                 $this->_view->setErrorMessage( $this->_locale->tr("error_installing_template"));
                 $this->setCommonData();
 
@@ -126,7 +131,6 @@
             // remove the file
             File::delete( $tmpFolder."/".$upload->getFileName());
 
-			$this->_view = new AdminBlogTemplateSetsListView( $this->_blogInfo );
             $this->_view->setSuccessMessage( $this->_locale->pr("template_installed_ok", $templateName));
             $this->setCommonData();
 
@@ -175,7 +179,10 @@
 			$this->_successMessage = "";		
 		
 			// set up the view
-            $this->_view = new AdminBlogTemplateSetsListView( $this->_blogInfo );		
+			if( $this->userHasPermission( "view_blog_templates" ))
+            	$this->_view = new AdminBlogTemplateSetsListView( $this->_blogInfo );		
+            else
+            	$this->_view = new AdminTemplatedView( $this->_blogInfo, "newblogtemplate" );
 		
 			// and tell the template finder to find any new template file...
 			$tf = new TemplateFinder( TemplateSetStorage::getBlogBaseTemplateFolder( $this->_blogInfo->getId()));

Modified: plog/trunk/class/action/admin/admindeleteblogtemplateaction.class.php
===================================================================
--- plog/trunk/class/action/admin/admindeleteblogtemplateaction.class.php	2006-10-23 13:13:46 UTC (rev 4175)
+++ plog/trunk/class/action/admin/admindeleteblogtemplateaction.class.php	2006-10-23 13:43:57 UTC (rev 4176)
@@ -29,6 +29,8 @@
 			$view = new AdminBlogTemplateSetsListView( $this->_blogInfo );
 			$view->setErrorMessage( $this->_locale->tr("error_no_templates_selected" ));
 			$this->setValidationErrorView( $view );
+			
+			$this->requirePermission( "update_blog_template" );
         }
 		
 		function perform()

Modified: plog/trunk/class/action/admin/admineditblogtemplatesaction.class.php
===================================================================
--- plog/trunk/class/action/admin/admineditblogtemplatesaction.class.php	2006-10-23 13:13:46 UTC (rev 4175)
+++ plog/trunk/class/action/admin/admineditblogtemplatesaction.class.php	2006-10-23 13:43:57 UTC (rev 4176)
@@ -13,6 +13,8 @@
         function AdminEditBlogTemplatesAction( $actionInfo, $request )
         {
         	$this->AdminAction( $actionInfo, $request );
+        	
+        	$this->requirePermission( "view_blog_templates" );
         }
 
         /**

Modified: plog/trunk/class/action/admin/adminnewblogtemplateaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminnewblogtemplateaction.class.php	2006-10-23 13:13:46 UTC (rev 4175)
+++ plog/trunk/class/action/admin/adminnewblogtemplateaction.class.php	2006-10-23 13:43:57 UTC (rev 4176)
@@ -17,6 +17,8 @@
     	function AdminNewBlogTemplateAction( $actionInfo, $request )
         {
         	$this->AdminAction( $actionInfo, $request );
+        	
+        	$this->requirePermission( "add_blog_template" );
         }
 
         function perform()

Modified: plog/trunk/templates/admin/blogtemplates.template
===================================================================
--- plog/trunk/templates/admin/blogtemplates.template	2006-10-23 13:13:46 UTC (rev 4175)
+++ plog/trunk/templates/admin/blogtemplates.template	2006-10-23 13:43:57 UTC (rev 4176)
@@ -31,11 +31,13 @@
     </td>
     <td>
      <div class="list_action_button">
+      {check_perms perm=update_blog_template}
       <a href="?op=deleteBlogTemplate&amp;templateId={$sitetemplate->getName()}">
        {if $blogTemplate->getName() != $sitetemplate->getName()}
 	     <img src="imgs/admin/icon_delete-16.png" alt="{$locale->tr("delete")}" />
-	   {/if}  
+	   {/if}
       </a>
+      {/check_perms}
 	  {if $sitetemplate->hasScreenshot()}
 	    <a href="javascript:openScreenshotWindow('{$sitetemplate->getScreenshotUrl()}');">
 		  <img src="imgs/admin/icon_image-16.png" alt="Screenshot" />
@@ -49,8 +51,10 @@
  </table>
  </div>
  <div id="list_action_bar">
+   {check_perms perm=update_blog_template}
    <input type="hidden" name="op" value="deleteBlogTemplates" class="submit" />
    <input type="submit" name="{$locale->tr("delete")}" value="{$locale->tr("delete")}"/>
+   {/check_perms}
  </div>
  </form>
 {include file="$admintemplatepath/footernavigation.template"}