[pLog-svn] r4154 - in plog/trunk/class/action/admin: . chooser

oscar at devel.lifetype.net oscar at devel.lifetype.net
Sun Oct 22 15:00:21 GMT 2006


Author: oscar
Date: 2006-10-22 15:00:20 +0000 (Sun, 22 Oct 2006)
New Revision: 4154

Removed:
   plog/trunk/class/action/admin/blogowneradminaction.class.php
Modified:
   plog/trunk/class/action/admin/adminaddblogtemplateaction.class.php
   plog/trunk/class/action/admin/adminaddbloguseraction.class.php
   plog/trunk/class/action/admin/adminaddcustomfieldaction.class.php
   plog/trunk/class/action/admin/adminblogcustomfieldsaction.class.php
   plog/trunk/class/action/admin/adminblogsecurityaction.class.php
   plog/trunk/class/action/admin/adminblogsettingsaction.class.php
   plog/trunk/class/action/admin/admindeleteblogtemplateaction.class.php
   plog/trunk/class/action/admin/admindeletebloguserpermissionsaction.class.php
   plog/trunk/class/action/admin/admineditblogtemplatesaction.class.php
   plog/trunk/class/action/admin/admineditcustomfieldaction.class.php
   plog/trunk/class/action/admin/adminnewblogtemplateaction.class.php
   plog/trunk/class/action/admin/adminnewbloguseraction.class.php
   plog/trunk/class/action/admin/adminnewcustomfieldaction.class.php
   plog/trunk/class/action/admin/adminshowblogusersaction.class.php
   plog/trunk/class/action/admin/adminstatisticsaction.class.php
   plog/trunk/class/action/admin/adminupdateblogsettingsaction.class.php
   plog/trunk/class/action/admin/adminupdatecustomfieldaction.class.php
   plog/trunk/class/action/admin/chooser/adminblogtemplatechooseraction.class.php
Log:
the BlogOwnerAdminAction class is no longer necessary, as now every action can freely define the permissions required to execute it


Modified: plog/trunk/class/action/admin/adminaddblogtemplateaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminaddblogtemplateaction.class.php	2006-10-22 14:54:50 UTC (rev 4153)
+++ plog/trunk/class/action/admin/adminaddblogtemplateaction.class.php	2006-10-22 15:00:20 UTC (rev 4154)
@@ -1,6 +1,6 @@
 <?php
 
-    lt_include( PLOG_CLASS_PATH."class/action/admin/blogowneradminaction.class.php" );
+    lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
     lt_include( PLOG_CLASS_PATH."class/action/admin/adminaddtemplateaction.class.php" );
     lt_include( PLOG_CLASS_PATH."class/file/unpacker/unpacker.class.php" );
 	lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
@@ -15,14 +15,14 @@
      *
      * Shows a form to add a new locale file
      */
-    class AdminAddBlogTemplateAction extends BlogOwnerAdminAction
+    class AdminAddBlogTemplateAction extends AdminAction
 	{
 
 		var $_op;
 
         function AdminAddBlogTemplateAction( $actionInfo, $request )
         {
-            $this->BlogOwnerAdminAction( $actionInfo, $request );
+            $this->AdminAction( $actionInfo, $request );
 
             // decide what to do based on which submit button was pressed
             if( $this->_request->getValue( "addBlogTemplate" ) != "" )

Modified: plog/trunk/class/action/admin/adminaddbloguseraction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminaddbloguseraction.class.php	2006-10-22 14:54:50 UTC (rev 4153)
+++ plog/trunk/class/action/admin/adminaddbloguseraction.class.php	2006-10-22 15:00:20 UTC (rev 4154)
@@ -1,6 +1,6 @@
 <?php
 
-	lt_include( PLOG_CLASS_PATH."class/action/admin/blogowneradminaction.class.php" );
+	lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
     lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
     lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
     lt_include( PLOG_CLASS_PATH."class/dao/users.class.php" );
@@ -14,7 +14,7 @@
      *
      * Adds a user to the blog
      */
-    class AdminAddBlogUserAction extends BlogOwnerAdminAction 
+    class AdminAddBlogUserAction extends AdminAction 
 	{
 
     	var $_sendNotification;
@@ -24,7 +24,7 @@
 
     	function AdminAddBlogUserAction( $actionInfo, $request )
         {
-        	$this->BlogOwnerAdminAction( $actionInfo, $request );
+        	$this->AdminAction( $actionInfo, $request );
 			
 			// data validation
 			$this->registerFieldValidator( "newBlogUserName", new StringValidator());

Modified: plog/trunk/class/action/admin/adminaddcustomfieldaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminaddcustomfieldaction.class.php	2006-10-22 14:54:50 UTC (rev 4153)
+++ plog/trunk/class/action/admin/adminaddcustomfieldaction.class.php	2006-10-22 15:00:20 UTC (rev 4154)
@@ -1,6 +1,6 @@
 <?php
 
-	lt_include( PLOG_CLASS_PATH."class/action/admin/blogowneradminaction.class.php" );
+	lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
 	lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
 	lt_include( PLOG_CLASS_PATH."class/dao/customfields/customfields.class.php" );
 	lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
@@ -14,7 +14,7 @@
      *
      * adds a custom field to the blog
      */
-    class AdminAddCustomFieldAction extends BlogOwnerAdminAction 
+    class AdminAddCustomFieldAction extends AdminAction 
 	{
 	
 		var $_fieldName;
@@ -25,7 +25,7 @@
 
         function AdminAddCustomFieldAction( $actionInfo, $request )
         {
-        	$this->BlogOwnerAdminAction( $actionInfo, $request );
+        	$this->AdminAction( $actionInfo, $request );
 			
 			// data validation
 			$this->registerFieldValidator( "fieldName", new StringValidator());

Modified: plog/trunk/class/action/admin/adminblogcustomfieldsaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminblogcustomfieldsaction.class.php	2006-10-22 14:54:50 UTC (rev 4153)
+++ plog/trunk/class/action/admin/adminblogcustomfieldsaction.class.php	2006-10-22 15:00:20 UTC (rev 4154)
@@ -1,6 +1,6 @@
 <?php
 
-	lt_include( PLOG_CLASS_PATH."class/action/admin/blogowneradminaction.class.php" );
+	lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
     lt_include( PLOG_CLASS_PATH."class/view/admin/admincustomfieldslistview.class.php" );
 	lt_include( PLOG_CLASS_PATH."class/dao/customfields/customfields.class.php" );
 
@@ -10,12 +10,12 @@
      *
      * Custom fields that have been defined so far 
      */
-    class AdminBlogCustomFieldsAction extends BlogOwnerAdminAction 
+    class AdminBlogCustomFieldsAction extends AdminAction 
 	{
 
         function AdminBlogCustomFieldsAction( $actionInfo, $request )
         {
-        	$this->BlogOwnerAdminAction( $actionInfo, $request );
+        	$this->AdminAction( $actionInfo, $request );
         }
 
         /**

Modified: plog/trunk/class/action/admin/adminblogsecurityaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminblogsecurityaction.class.php	2006-10-22 14:54:50 UTC (rev 4153)
+++ plog/trunk/class/action/admin/adminblogsecurityaction.class.php	2006-10-22 15:00:20 UTC (rev 4154)
@@ -1,6 +1,6 @@
 <?php
 
-	lt_include( PLOG_CLASS_PATH."class/action/admin/blogowneradminaction.class.php" );
+	lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
     lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
 
     /**
@@ -9,11 +9,11 @@
      *
      * Does nothing yet :)
      */
-    class AdminBlogSecurityAction extends BlogOwnerAdminAction {
+    class AdminBlogSecurityAction extends AdminAction {
 
         function AdminBlogSecurityAction( $actionInfo, $request )
         {
-        	$this->BlogOwnerAdminAction( $actionInfo, $request );
+        	$this->AdminAction( $actionInfo, $request );
         }
 
         /**

Modified: plog/trunk/class/action/admin/adminblogsettingsaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminblogsettingsaction.class.php	2006-10-22 14:54:50 UTC (rev 4153)
+++ plog/trunk/class/action/admin/adminblogsettingsaction.class.php	2006-10-22 15:00:20 UTC (rev 4154)
@@ -1,6 +1,6 @@
 <?php
 
-	lt_include( PLOG_CLASS_PATH."class/action/admin/blogowneradminaction.class.php" );
+	lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
     lt_include( PLOG_CLASS_PATH."class/view/admin/adminblogsettingsview.class.php" );
 
     /**
@@ -9,7 +9,7 @@
      *
      * Action that shows a form to change the settings of the current blog.
      */
-    class AdminBlogSettingsAction extends BlogOwnerAdminAction 
+    class AdminBlogSettingsAction extends AdminAction 
 	{
 
     	/**
@@ -18,7 +18,7 @@
          */
         function AdminBlogSettingsAction( $actionInfo, $request )
         {
-        	$this->BlogOwnerAdminAction( $actionInfo, $request );
+        	$this->AdminAction( $actionInfo, $request );
 
 			$this->requirePermission( "update_blog" );
         }

Modified: plog/trunk/class/action/admin/admindeleteblogtemplateaction.class.php
===================================================================
--- plog/trunk/class/action/admin/admindeleteblogtemplateaction.class.php	2006-10-22 14:54:50 UTC (rev 4153)
+++ plog/trunk/class/action/admin/admindeleteblogtemplateaction.class.php	2006-10-22 15:00:20 UTC (rev 4154)
@@ -1,6 +1,6 @@
 <?php
 
-	lt_include( PLOG_CLASS_PATH."class/action/admin/blogowneradminaction.class.php" );
+	lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
 	lt_include( PLOG_CLASS_PATH."class/view/admin/adminblogtemplatesetslistview.class.php" );
 	lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
 	lt_include( PLOG_CLASS_PATH."class/data/validator/arrayvalidator.class.php" );
@@ -12,14 +12,14 @@
      *
      * Removes a global template from disk.
      */
-    class AdminDeleteBlogTemplateAction extends BlogOwnerAdminAction 
+    class AdminDeleteBlogTemplateAction extends AdminAction 
 	{
 
     	var $_templateIds;
 
         function AdminDeleteBlogTemplateAction( $actionInfo, $request )
         {
-        	$this->BlogOwnerAdminAction( $actionInfo, $request );
+        	$this->AdminAction( $actionInfo, $request );
 			
 			$this->_op = $actionInfo->getActionParamValue();
 			if( $this->_op == "deleteBlogTemplate" )

Modified: plog/trunk/class/action/admin/admindeletebloguserpermissionsaction.class.php
===================================================================
--- plog/trunk/class/action/admin/admindeletebloguserpermissionsaction.class.php	2006-10-22 14:54:50 UTC (rev 4153)
+++ plog/trunk/class/action/admin/admindeletebloguserpermissionsaction.class.php	2006-10-22 15:00:20 UTC (rev 4154)
@@ -1,6 +1,6 @@
 <?php
 
-	lt_include( PLOG_CLASS_PATH."class/action/admin/blogowneradminaction.class.php" );
+	lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
 	lt_include( PLOG_CLASS_PATH."class/view/admin/adminbloguserslistview.class.php" );
     lt_include( PLOG_CLASS_PATH."class/dao/users.class.php" );
     lt_include( PLOG_CLASS_PATH."class/dao/userpermissions.class.php" );
@@ -14,7 +14,7 @@
      *
      * Revokes the permissions some users might have in a given blog
      */
-    class AdminDeleteBlogUserPermissionsAction extends BlogOwnerAdminAction 
+    class AdminDeleteBlogUserPermissionsAction extends AdminAction 
 	{
 
     	var $_userIds;
@@ -22,7 +22,7 @@
 
     	function AdminDeleteBlogUserPermissionsAction( $actionInfo, $request )
         {
-        	$this->BlogOwnerAdminAction( $actionInfo, $request );
+        	$this->AdminAction( $actionInfo, $request );
 			
 			$this->_op = $actionInfo->getActionParamValue();
 			if( $this->_op == "deleteBlogUserPermissions" )

Modified: plog/trunk/class/action/admin/admineditblogtemplatesaction.class.php
===================================================================
--- plog/trunk/class/action/admin/admineditblogtemplatesaction.class.php	2006-10-22 14:54:50 UTC (rev 4153)
+++ plog/trunk/class/action/admin/admineditblogtemplatesaction.class.php	2006-10-22 15:00:20 UTC (rev 4154)
@@ -1,18 +1,18 @@
 <?php
 
-	lt_include( PLOG_CLASS_PATH."class/action/admin/blogowneradminaction.class.php" );
+	lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
 	lt_include( PLOG_CLASS_PATH."class/view/admin/adminblogtemplatesetslistview.class.php" );
 
     /**
      * \ingroup Action
      * @private
      */
-    class AdminEditBlogTemplatesAction extends BlogOwnerAdminAction 
+    class AdminEditBlogTemplatesAction extends AdminAction 
 	{
 
         function AdminEditBlogTemplatesAction( $actionInfo, $request )
         {
-        	$this->BlogOwnerAdminAction( $actionInfo, $request );
+        	$this->AdminAction( $actionInfo, $request );
         }
 
         /**

Modified: plog/trunk/class/action/admin/admineditcustomfieldaction.class.php
===================================================================
--- plog/trunk/class/action/admin/admineditcustomfieldaction.class.php	2006-10-22 14:54:50 UTC (rev 4153)
+++ plog/trunk/class/action/admin/admineditcustomfieldaction.class.php	2006-10-22 15:00:20 UTC (rev 4154)
@@ -1,7 +1,7 @@
 <?php
 
 	lt_include( PLOG_CLASS_PATH."class/dao/customfields/customfields.class.php" );
-	lt_include( PLOG_CLASS_PATH."class/action/admin/blogowneradminaction.class.php" );
+	lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
 	lt_include( PLOG_CLASS_PATH."class/view/admin/admincustomfieldslistview.class.php" );
 	lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
 	lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
@@ -12,14 +12,14 @@
      *
      * Allows users to edit custom fields
      */
-    class AdminEditCustomFieldAction extends BlogOwnerAdminAction
+    class AdminEditCustomFieldAction extends AdminAction
 	{
 
     	var $_fieldId;
 
         function AdminEditCustomFieldAction( $actionInfo, $request )
         {
-        	$this->BlogOwnerAdminAction( $actionInfo, $request );
+        	$this->AdminAction( $actionInfo, $request );
 			
 			// validate data
 			$this->registerFieldValidator( "fieldId", new IntegerValidator());

Modified: plog/trunk/class/action/admin/adminnewblogtemplateaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminnewblogtemplateaction.class.php	2006-10-22 14:54:50 UTC (rev 4153)
+++ plog/trunk/class/action/admin/adminnewblogtemplateaction.class.php	2006-10-22 15:00:20 UTC (rev 4154)
@@ -1,6 +1,6 @@
 <?php
 
-	lt_include( PLOG_CLASS_PATH."class/action/admin/blogowneradminaction.class.php" );
+	lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
     lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
     lt_include( PLOG_CLASS_PATH."class/view/admin/adminerrorview.class.php" );
     lt_include( PLOG_CLASS_PATH."class/template/templatesets/templatesetstorage.class.php" );
@@ -11,12 +11,12 @@
      *
      * Shows a form to add a new locale file
      */
-    class AdminNewBlogTemplateAction extends BlogOwnerAdminAction 
+    class AdminNewBlogTemplateAction extends AdminAction 
     {
 
     	function AdminNewBlogTemplateAction( $actionInfo, $request )
         {
-        	$this->BlogOwnerAdminAction( $actionInfo, $request );
+        	$this->AdminAction( $actionInfo, $request );
         }
 
         function perform()

Modified: plog/trunk/class/action/admin/adminnewbloguseraction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminnewbloguseraction.class.php	2006-10-22 14:54:50 UTC (rev 4153)
+++ plog/trunk/class/action/admin/adminnewbloguseraction.class.php	2006-10-22 15:00:20 UTC (rev 4154)
@@ -1,6 +1,6 @@
 <?php
 
-	lt_include( PLOG_CLASS_PATH."class/action/admin/blogowneradminaction.class.php" );
+	lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
     lt_include( PLOG_CLASS_PATH."class/view/admin/adminnewbloguserview.class.php" );
 
     /**
@@ -9,12 +9,12 @@
      *
      * Shows a form to add a user to the blog
      */
-    class AdminNewBlogUserAction extends BlogOwnerAdminAction 
+    class AdminNewBlogUserAction extends AdminAction 
     {
 
     	function AdminNewBlogUserAction( $actionInfo, $request )
         {
-        	$this->BlogOwnerAdminAction( $actionInfo, $request );
+        	$this->AdminAction( $actionInfo, $request );
         }
 
         function perform()

Modified: plog/trunk/class/action/admin/adminnewcustomfieldaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminnewcustomfieldaction.class.php	2006-10-22 14:54:50 UTC (rev 4153)
+++ plog/trunk/class/action/admin/adminnewcustomfieldaction.class.php	2006-10-22 15:00:20 UTC (rev 4154)
@@ -1,6 +1,6 @@
 <?php
 
-	lt_include( PLOG_CLASS_PATH."class/action/admin/blogowneradminaction.class.php" );
+	lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
     lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
 
     /**
@@ -9,12 +9,12 @@
      *
      * Defines blog-wide custom fields
      */
-    class AdminNewCustomFieldAction extends BlogOwnerAdminAction 
+    class AdminNewCustomFieldAction extends AdminAction 
 	{
 
         function AdminBlogCustomFieldsAction( $actionInfo, $request )
         {
-        	$this->BlogOwnerAdminAction( $actionInfo, $request );
+        	$this->AdminAction( $actionInfo, $request );
 
 			$this->requirePermission( "add_custom_field" );
         }

Modified: plog/trunk/class/action/admin/adminshowblogusersaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminshowblogusersaction.class.php	2006-10-22 14:54:50 UTC (rev 4153)
+++ plog/trunk/class/action/admin/adminshowblogusersaction.class.php	2006-10-22 15:00:20 UTC (rev 4154)
@@ -1,6 +1,6 @@
 <?php
 
-	lt_include( PLOG_CLASS_PATH."class/action/admin/blogowneradminaction.class.php" );
+	lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
 	lt_include( PLOG_CLASS_PATH."class/view/admin/adminbloguserslistview.class.php" );
 
     /**
@@ -9,12 +9,12 @@
      *
      * Shows the list of users that belong to this blog
      */
-    class AdminShowBlogUsersAction extends BlogOwnerAdminAction 
+    class AdminShowBlogUsersAction extends AdminAction 
 	{
 
     	function AdminShowBlogUsersAction( $actionInfo, $request )
         {
-        	$this->BlogOwnerAdminAction( $actionInfo, $request );
+        	$this->AdminAction( $actionInfo, $request );
         }
 
         function perform()

Modified: plog/trunk/class/action/admin/adminstatisticsaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminstatisticsaction.class.php	2006-10-22 14:54:50 UTC (rev 4153)
+++ plog/trunk/class/action/admin/adminstatisticsaction.class.php	2006-10-22 15:00:20 UTC (rev 4154)
@@ -1,6 +1,6 @@
 <?php
 
-	lt_include( PLOG_CLASS_PATH."class/action/admin/blogowneradminaction.class.php" );
+	lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
 	lt_include( PLOG_CLASS_PATH."class/view/admin/adminreferrersview.class.php" );
 	lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
 
@@ -10,7 +10,7 @@
      *
      * Action that shows statistics
      */
-    class AdminStatisticsAction extends BlogOwnerAdminAction 
+    class AdminStatisticsAction extends AdminAction 
 	{
 	
 		var $_page;
@@ -21,7 +21,7 @@
          */
         function AdminStatisticsAction( $actionInfo, $request )
         {
-        	$this->BlogOwnerAdminAction( $actionInfo, $request );
+        	$this->AdminAction( $actionInfo, $request );
 
 			$this->requirePermission( "blog_statistics" );
         }

Modified: plog/trunk/class/action/admin/adminupdateblogsettingsaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminupdateblogsettingsaction.class.php	2006-10-22 14:54:50 UTC (rev 4153)
+++ plog/trunk/class/action/admin/adminupdateblogsettingsaction.class.php	2006-10-22 15:00:20 UTC (rev 4154)
@@ -1,6 +1,6 @@
 <?php
 
-	lt_include( PLOG_CLASS_PATH."class/action/admin/blogowneradminaction.class.php" );
+	lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
     lt_include( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
     lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
     lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
@@ -17,7 +17,7 @@
      *
      * Action that shows a form to change the settings of the current blog.
      */
-    class AdminUpdateBlogSettingsAction extends BlogOwnerAdminAction
+    class AdminUpdateBlogSettingsAction extends AdminAction
 	{
     	/**
          * Constructor. If nothing else, it also has to call the constructor of the parent
@@ -25,7 +25,7 @@
          */
         function AdminUpdateBlogSettingsAction( $actionInfo, $request )
         {
-        	$this->BlogOwnerAdminAction( $actionInfo, $request );
+        	$this->AdminAction( $actionInfo, $request );
 			
         	// specific validator that does not allow an integer below 1
 			$val = new IntegerValidator();

Modified: plog/trunk/class/action/admin/adminupdatecustomfieldaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminupdatecustomfieldaction.class.php	2006-10-22 14:54:50 UTC (rev 4153)
+++ plog/trunk/class/action/admin/adminupdatecustomfieldaction.class.php	2006-10-22 15:00:20 UTC (rev 4154)
@@ -1,6 +1,6 @@
 <?php
 
-	lt_include( PLOG_CLASS_PATH."class/action/admin/blogowneradminaction.class.php" );
+	lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
     lt_include( PLOG_CLASS_PATH."class/view/admin/admincustomfieldslistview.class.php" );
 	lt_include( PLOG_CLASS_PATH."class/dao/customfields/customfields.class.php" );
 	lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
@@ -12,7 +12,7 @@
      *
      * updates a custom field
 	 */
-    class AdminUpdateCustomFieldAction extends BlogOwnerAdminAction 
+    class AdminUpdateCustomFieldAction extends AdminAction 
 	{
 	
 		var $_fieldName;
@@ -25,7 +25,7 @@
 
         function AdminUpdateCustomFieldAction( $actionInfo, $request )
         {
-        	$this->BlogOwnerAdminAction( $actionInfo, $request );
+        	$this->AdminAction( $actionInfo, $request );
 			
 			// data validation
 			$this->registerFieldValidator( "fieldName", new StringValidator());

Deleted: plog/trunk/class/action/admin/blogowneradminaction.class.php
===================================================================
--- plog/trunk/class/action/admin/blogowneradminaction.class.php	2006-10-22 14:54:50 UTC (rev 4153)
+++ plog/trunk/class/action/admin/blogowneradminaction.class.php	2006-10-22 15:00:20 UTC (rev 4154)
@@ -1,37 +0,0 @@
-<?php
-
-	lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
-
-    /**
-     * \ingroup Action
-     *
-     * Extends the AdminAction class in a way that any class subclassing this one,
-     * will check if the user has BLOG_OWNER privileges to be here. The implementation is
-     * quite simple in the sense that if the UserInfo object that was trying to access
-     * this action doesn't have enough privileges, the action will show a really
-     * ugly message and all processing will stop. 
-     *
-     * Hopefully future versions will improve this area and show a friendlier message.
-     */
-    class BlogOwnerAdminAction extends AdminAction 
-    {
-
-    	/**
-         * The constructor calls AdminAction so that we can fetch the information we need
-         * from the session (blogInfo and userInfo) and then check if the owner of the blog
-         * is the same as the user who is currently trying to access. If so, we continue. If not,
-         * then we show an error message and quit.
-         */   
-    	function BlogOwnerAdminAction( $actionInfo, $request )
-        {
-        	$this->AdminAction( $actionInfo, $request );
-
-            // we should check if the user has permissions to be here...
-            if( ($this->_blogInfo->getOwner() != $this->_userInfo->getId()) &&
-			    ($this->_userInfo->isSiteAdmin() == false )) {
-            	print("Sorry, only the owner of the blog or site administrators can access this area." );
-                die();
-            }
-        }
-    }
-?>

Modified: plog/trunk/class/action/admin/chooser/adminblogtemplatechooseraction.class.php
===================================================================
--- plog/trunk/class/action/admin/chooser/adminblogtemplatechooseraction.class.php	2006-10-22 14:54:50 UTC (rev 4153)
+++ plog/trunk/class/action/admin/chooser/adminblogtemplatechooseraction.class.php	2006-10-22 15:00:20 UTC (rev 4154)
@@ -1,6 +1,6 @@
 <?php
 
-	lt_include( PLOG_CLASS_PATH."class/action/admin/blogowneradminaction.class.php" );
+	lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
 	lt_include( PLOG_CLASS_PATH."class/view/admin/adminblogtemplatechooserview.class.php" );
 
     /**
@@ -9,12 +9,12 @@
      *
 	 * shows a list of templates where to choose
 	 */
-	class AdminBlogTemplateChooserAction extends BlogOwnerAdminAction
+	class AdminBlogTemplateChooserAction extends AdminAction
 	{
 	
 		function AdminBlogTemplateChooserAction( $actionInfo, $request )
 		{
-			$this->BlogOwnerAdminAction( $actionInfo, $request );
+			$this->AdminAction( $actionInfo, $request );
 		}
 		
 		function perform()



More information about the pLog-svn mailing list