[pLog-svn] r4236 - in plugins/trunk: authimage
authimage/class/action contentfilter contentfilter/class/action
oscar at devel.lifetype.net
oscar at devel.lifetype.net
Sat Nov 4 22:54:12 GMT 2006
Author: oscar
Date: 2006-11-04 22:54:12 +0000 (Sat, 04 Nov 2006)
New Revision: 4236
Modified:
plugins/trunk/authimage/class/action/pluginauthimageconfigaction.class.php
plugins/trunk/authimage/class/action/pluginauthimageupdateconfigaction.class.php
plugins/trunk/authimage/pluginauthimage.class.php
plugins/trunk/contentfilter/class/action/adminaddblogfilteredcontentaction.class.php
plugins/trunk/contentfilter/class/action/adminblogfilteredcontentsaction.class.php
plugins/trunk/contentfilter/class/action/admindeleteblogfilteredcontentaction.class.php
plugins/trunk/contentfilter/class/action/admineditblogfilteredcontentaction.class.php
plugins/trunk/contentfilter/class/action/adminfilteredcontentsettingsaction.class.php
plugins/trunk/contentfilter/class/action/adminnewblogfilteredcontentaction.class.php
plugins/trunk/contentfilter/class/action/adminnewfilteredcontentaction.class.php
plugins/trunk/contentfilter/class/action/adminupdateblogfilteredcontentaction.class.php
plugins/trunk/contentfilter/class/action/adminupdatefilteredcontentsettingsaction.class.php
plugins/trunk/contentfilter/plugincontentfilter.class.php
Log:
modified the 'contentfilter' and 'authimage' plugin to use the changes to PluginBase::addMenuEntry() and to require the 'manage_plugins' permission.
Modified: plugins/trunk/authimage/class/action/pluginauthimageconfigaction.class.php
===================================================================
--- plugins/trunk/authimage/class/action/pluginauthimageconfigaction.class.php 2006-11-04 22:48:41 UTC (rev 4235)
+++ plugins/trunk/authimage/class/action/pluginauthimageconfigaction.class.php 2006-11-04 22:54:12 UTC (rev 4236)
@@ -12,6 +12,8 @@
function PluginAuthImageConfigAction( $actionInfo, $request )
{
$this->AdminAction( $actionInfo, $request );
+
+ $this->requirePermission( "manage_plugins" );
}
function perform()
Modified: plugins/trunk/authimage/class/action/pluginauthimageupdateconfigaction.class.php
===================================================================
--- plugins/trunk/authimage/class/action/pluginauthimageupdateconfigaction.class.php 2006-11-04 22:48:41 UTC (rev 4235)
+++ plugins/trunk/authimage/class/action/pluginauthimageupdateconfigaction.class.php 2006-11-04 22:54:12 UTC (rev 4236)
@@ -18,6 +18,8 @@
function PluginAuthImageUpdateConfigAction( $actionInfo, $request )
{
$this->AdminAction( $actionInfo, $request );
+
+ $this->requirePermission( "manage_plugins" );
}
function validate()
Modified: plugins/trunk/authimage/pluginauthimage.class.php
===================================================================
--- plugins/trunk/authimage/pluginauthimage.class.php 2006-11-04 22:48:41 UTC (rev 4235)
+++ plugins/trunk/authimage/pluginauthimage.class.php 2006-11-04 22:54:12 UTC (rev 4236)
@@ -46,8 +46,10 @@
$this->registerBlogAction( "AuthImageShow", "PluginAuthImageShowAction" );
$menu =& Menu::getMenu();
+
if( !$menu->entryExists( "/menu/controlCenter/manageAntiSpamPlugins" ))
- $this->addMenuEntry( "/menu/controlCenter", "manageAntiSpamPlugins", "", "", true, false );
+ $this->addMenuEntry( "/menu/controlCenter", "manageAntiSpamPlugins", "", "" );
+
$this->addMenuEntry( "/menu/controlCenter/manageAntiSpamPlugins", "AuthImage", "?op=authimage", "" );
}
@@ -177,7 +179,9 @@
return( Array(
Array( "name" => "plugin_authimage_enabled", "type" => "boolean" ),
Array( "name" => "plugin_authimage_length", "validator" => new IntegerValidator(), "type" => "integer" ),
- Array( "name" => "plugin_authimage_key", "validator" => new StringValidator(), "type" => "string" )
+ Array( "name" => "plugin_authimage_key", "validator" => new StringValidator(), "type" => "string" ),
+ Array( "name" => "plugin_authimage_test_dropdown", "type" => "list", "options" => Array( "1" => "option 1", "2" => "option 2", "3" => "option 3" )),
+ Array( "name" => "plugin_authimage_test_textarea", "type" => "text", "validator" => new StringValidator())
));
}
}
Modified: plugins/trunk/contentfilter/class/action/adminaddblogfilteredcontentaction.class.php
===================================================================
--- plugins/trunk/contentfilter/class/action/adminaddblogfilteredcontentaction.class.php 2006-11-04 22:48:41 UTC (rev 4235)
+++ plugins/trunk/contentfilter/class/action/adminaddblogfilteredcontentaction.class.php 2006-11-04 22:54:12 UTC (rev 4236)
@@ -1,6 +1,6 @@
<?php
- include_once( PLOG_CLASS_PATH."class/action/admin/blogowneradminaction.class.php" );
+ include_once( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
include_once( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
include_once( PLOG_CLASS_PATH."plugins/contentfilter/class/dao/filteredcontents.class.php" );
include_once( PLOG_CLASS_PATH."plugins/contentfilter/class/view/adminnewblogfilteredcontentview.class.php" );
@@ -9,7 +9,7 @@
/**
* Adds new blocked content to the blog
*/
- class AdminAddBlogFilteredContentAction extends BlogOwnerAdminAction
+ class AdminAddBlogFilteredContentAction extends AdminAction
{
var $_newFilteredContent;
@@ -17,14 +17,16 @@
function AdminAddBlogFilteredContentAction( $actionInfo, $request )
{
- $this->BlogOwnerAdminAction( $actionInfo, $request );
+ $this->AdminAction( $actionInfo, $request );
// data validation
$this->registerFieldValidator( "filteredContent", new StringValidator());
$this->_form->registerField( "reason" );
$view = new AdminNewBlogFilteredContentView( $this->_blogInfo );
$view->setErrorMessage( $this->_locale->tr("error_provide_content_to_block" ));
- $this->setValidationErrorView( $view );
+ $this->setValidationErrorView( $view );
+
+ $this->requirePermission( "manage_plugins" );
}
function perform()
Modified: plugins/trunk/contentfilter/class/action/adminblogfilteredcontentsaction.class.php
===================================================================
--- plugins/trunk/contentfilter/class/action/adminblogfilteredcontentsaction.class.php 2006-11-04 22:48:41 UTC (rev 4235)
+++ plugins/trunk/contentfilter/class/action/adminblogfilteredcontentsaction.class.php 2006-11-04 22:54:12 UTC (rev 4236)
@@ -1,17 +1,19 @@
<?php
- include_once( PLOG_CLASS_PATH."class/action/admin/blogowneradminaction.class.php" );
+ include_once( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
include_once( PLOG_CLASS_PATH."plugins/contentfilter/class/view/adminblogfilteredcontentview.class.php" );
/**
* Shows the list of content that has been blocked by the current blog
*/
- class AdminBlogFilteredContentsAction extends BlogOwnerAdminAction
+ class AdminBlogFilteredContentsAction extends AdminAction
{
function AdminBlogFilteredContentsAction( $actionInfo, $request )
{
- $this->BlogOwnerAdminAction( $actionInfo, $request );
+ $this->AdminAction( $actionInfo, $request );
+
+ $this->requirePermission( "manage_plugins" );
}
/**
Modified: plugins/trunk/contentfilter/class/action/admindeleteblogfilteredcontentaction.class.php
===================================================================
--- plugins/trunk/contentfilter/class/action/admindeleteblogfilteredcontentaction.class.php 2006-11-04 22:48:41 UTC (rev 4235)
+++ plugins/trunk/contentfilter/class/action/admindeleteblogfilteredcontentaction.class.php 2006-11-04 22:54:12 UTC (rev 4236)
@@ -1,6 +1,6 @@
<?php
- include_once( PLOG_CLASS_PATH."class/action/admin/blogowneradminaction.class.php" );
+ include_once( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
include_once( PLOG_CLASS_PATH."class/data/validator/arrayvalidator.class.php" );
include_once( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
include_once( PLOG_CLASS_PATH."plugins/contentfilter/class/dao/filteredcontents.class.php" );
@@ -10,7 +10,7 @@
/**
* removes filtered content from a blog
*/
- class AdminDeleteBlogFilteredContentAction extends BlogOwnerAdminAction
+ class AdminDeleteBlogFilteredContentAction extends AdminAction
{
var $_deleteFilteredContents;
@@ -19,7 +19,7 @@
function AdminDeleteBlogFilteredContentAction( $actionInfo, $request )
{
- $this->BlogOwnerAdminAction( $actionInfo, $request );
+ $this->AdminAction( $actionInfo, $request );
$this->_op = $actionInfo->getActionParamValue();
@@ -32,7 +32,9 @@
$this->registerFieldValidator( "deleteBlogFilteredContent", new ArrayValidator());
$view->setErrorMessage( $this->_locale->tr("error_no_block_content_selected"));
}
- $this->setValidationErrorView( $view );
+ $this->setValidationErrorView( $view );
+
+ $this->requirePermission( "manage_plugins" );
}
/**
Modified: plugins/trunk/contentfilter/class/action/admineditblogfilteredcontentaction.class.php
===================================================================
--- plugins/trunk/contentfilter/class/action/admineditblogfilteredcontentaction.class.php 2006-11-04 22:48:41 UTC (rev 4235)
+++ plugins/trunk/contentfilter/class/action/admineditblogfilteredcontentaction.class.php 2006-11-04 22:54:12 UTC (rev 4236)
@@ -1,6 +1,6 @@
<?php
- include_once( PLOG_CLASS_PATH."class/action/admin/blogowneradminaction.class.php" );
+ include_once( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
include_once( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
include_once( PLOG_CLASS_PATH."plugins/contentfilter/class/dao/filteredcontents.class.php" );
include_once( PLOG_CLASS_PATH."plugins/contentfilter/class/view/admineditblogfilteredcontentview.class.php" );
@@ -9,20 +9,22 @@
/**
* Shows a form to add a new blocked content to the blog
*/
- class AdminEditBlogFilteredContentAction extends BlogOwnerAdminAction
+ class AdminEditBlogFilteredContentAction extends AdminAction
{
var $_contentId;
function AdminEditBlogFilteredContentAction( $actionInfo, $request )
{
- $this->BlogOwnerAdminAction( $actionInfo, $request );
+ $this->AdminAction( $actionInfo, $request );
// data validation stuff
$this->registerFieldValidator( "contentId", new IntegerValidator());
$view = new AdminBlogFilteredContentView( $this->_blogInfo );
$view->setErrorMessage( $this->_locale->tr("error_incorrect_content_id") );
- $this->setValidationErrorView( $view );
+ $this->setValidationErrorView( $view );
+
+ $this->requirePermission( "manage_plugins" );
}
function perform()
Modified: plugins/trunk/contentfilter/class/action/adminfilteredcontentsettingsaction.class.php
===================================================================
--- plugins/trunk/contentfilter/class/action/adminfilteredcontentsettingsaction.class.php 2006-11-04 22:48:41 UTC (rev 4235)
+++ plugins/trunk/contentfilter/class/action/adminfilteredcontentsettingsaction.class.php 2006-11-04 22:54:12 UTC (rev 4236)
@@ -13,6 +13,8 @@
function AdminFilteredContentSettingsAction( $actionInfo, $request )
{
$this->AdminAction( $actionInfo, $request );
+
+ $this->requirePermission( "manage_plugins" );
}
function perform()
Modified: plugins/trunk/contentfilter/class/action/adminnewblogfilteredcontentaction.class.php
===================================================================
--- plugins/trunk/contentfilter/class/action/adminnewblogfilteredcontentaction.class.php 2006-11-04 22:48:41 UTC (rev 4235)
+++ plugins/trunk/contentfilter/class/action/adminnewblogfilteredcontentaction.class.php 2006-11-04 22:54:12 UTC (rev 4236)
@@ -1,16 +1,19 @@
<?php
- include_once( PLOG_CLASS_PATH."class/action/admin/blogowneradminaction.class.php" );
+ include_once( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
include_once( PLOG_CLASS_PATH."plugins/contentfilter/class/view/adminnewblogfilteredcontentview.class.php" );
/**
* Shows a form to add a new blocked content to the blog
*/
- class AdminNewBlogFilteredContentAction extends BlogOwnerAdminAction {
+ class AdminNewBlogFilteredContentAction extends AdminAction
+ {
function AdminNewBlogFilteredContentAction( $actionInfo, $request )
{
- $this->BlogOwnerAdminAction( $actionInfo, $request );
+ $this->AdminAction( $actionInfo, $request );
+
+ $this->requirePermission( "manage_plugins" );
}
function perform()
Modified: plugins/trunk/contentfilter/class/action/adminnewfilteredcontentaction.class.php
===================================================================
--- plugins/trunk/contentfilter/class/action/adminnewfilteredcontentaction.class.php 2006-11-04 22:48:41 UTC (rev 4235)
+++ plugins/trunk/contentfilter/class/action/adminnewfilteredcontentaction.class.php 2006-11-04 22:54:12 UTC (rev 4236)
@@ -6,7 +6,8 @@
/**
* Shows a form to add a new blocked content to the blog
*/
- class AdminNewFilteredContentAction extends SiteAdminAction {
+ class AdminNewFilteredContentAction extends SiteAdminAction
+ {
function AdminNewFilteredContentAction( $actionInfo, $request )
{
Modified: plugins/trunk/contentfilter/class/action/adminupdateblogfilteredcontentaction.class.php
===================================================================
--- plugins/trunk/contentfilter/class/action/adminupdateblogfilteredcontentaction.class.php 2006-11-04 22:48:41 UTC (rev 4235)
+++ plugins/trunk/contentfilter/class/action/adminupdateblogfilteredcontentaction.class.php 2006-11-04 22:54:12 UTC (rev 4236)
@@ -1,6 +1,6 @@
<?php
- include_once( PLOG_CLASS_PATH."class/action/admin/blogowneradminaction.class.php" );
+ include_once( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
include_once( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
include_once( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
include_once( PLOG_CLASS_PATH."plugins/contentfilter/class/dao/filteredcontents.class.php" );
@@ -10,7 +10,7 @@
/**
* updates filtered content from a blog
*/
- class AdminUpdateBlogFilteredContentAction extends BlogOwnerAdminAction
+ class AdminUpdateBlogFilteredContentAction extends AdminAction
{
var $_filteredContentRule;
@@ -19,7 +19,7 @@
function AdminUpdateBlogFilteredContentAction( $actionInfo, $request )
{
- $this->BlogOwnerAdminAction( $actionInfo, $request );
+ $this->AdminAction( $actionInfo, $request );
// fetch the data
$this->_contentId = $this->_request->getValue( "contentId" );
@@ -32,6 +32,8 @@
$view = new AdminEditBlogFilteredContentView( $this->_blogInfo, $this->_contentId );
$view->setErrorMessage( $this->_locale->tr("error_provide_content_to_block" ));
$this->setValidationErrorView( $view );
+
+ $this->requirePermission( "manage_plugins" );
}
function perform()
Modified: plugins/trunk/contentfilter/class/action/adminupdatefilteredcontentsettingsaction.class.php
===================================================================
--- plugins/trunk/contentfilter/class/action/adminupdatefilteredcontentsettingsaction.class.php 2006-11-04 22:48:41 UTC (rev 4235)
+++ plugins/trunk/contentfilter/class/action/adminupdatefilteredcontentsettingsaction.class.php 2006-11-04 22:54:12 UTC (rev 4236)
@@ -14,6 +14,8 @@
function AdminUpdateFilteredContentSettingsAction( $actionInfo, $request )
{
$this->AdminAction( $actionInfo, $request );
+
+ $this->requirePermission( "manage_plugins" );
}
function validate()
Modified: plugins/trunk/contentfilter/plugincontentfilter.class.php
===================================================================
--- plugins/trunk/contentfilter/plugincontentfilter.class.php 2006-11-04 22:48:41 UTC (rev 4235)
+++ plugins/trunk/contentfilter/plugincontentfilter.class.php 2006-11-04 22:54:12 UTC (rev 4236)
@@ -67,18 +67,18 @@
$menu =& Menu::getMenu();
if( !$menu->entryExists( "/menu/Manage/blogSecurity" ))
- $this->addMenuEntry( "/menu/Manage", "blogSecurity", "", "", true, false );
- $this->addMenuEntry( "/menu/Manage/blogSecurity", "blogFilteredContent", "admin.php?op=blogFilteredContent", "blogFilteredContent", true, false );
- $this->addMenuEntry( "/menu/Manage/blogSecurity", "newBlogFilteredContent", "admin.php?op=newBlogFilteredContent", "newBlogFilteredContent", true, false );
+ $this->addMenuEntry( "/menu/Manage", "blogSecurity", "", "", Array(), Array(), false );
+ $this->addMenuEntry( "/menu/Manage/blogSecurity", "blogFilteredContent", "admin.php?op=blogFilteredContent", "blogFilteredContent" );
+ $this->addMenuEntry( "/menu/Manage/blogSecurity", "newBlogFilteredContent", "admin.php?op=newBlogFilteredContent", "newBlogFilteredContent" );
if( !$menu->entryExists( "/menu/adminSettings/siteSecurity" ))
- $this->addMenuEntry( "/menu/adminSettings", "siteSecurity", "", "", true, false );
- $this->addMenuEntry( "/menu/adminSettings/siteSecurity", "filteredContent", "admin.php?op=filteredContent", "filteredContent", false, true );
- $this->addMenuEntry( "/menu/adminSettings/siteSecurity", "newFilteredContent", "admin.php?op=newFilteredContent", "newFilteredContent", false, true );
+ $this->addMenuEntry( "/menu/adminSettings", "siteSecurity", "", "" );
+ $this->addMenuEntry( "/menu/adminSettings/siteSecurity", "filteredContent", "admin.php?op=filteredContent", "filteredContent", Array( "manage_plugins" ), Array( "manage_plugins"), true );
+ $this->addMenuEntry( "/menu/adminSettings/siteSecurity", "newFilteredContent", "admin.php?op=newFilteredContent", "newFilteredContent", Array( "manage_plugins" ), Array( "manage_plugins" ), true );
- if( !$menu->entryExists( "/menu/controlCenter/manageSecurityPlugins" ))
- $this->addMenuEntry( "/menu/controlCenter", "manageSecurityPlugins", "", "", true, false );
- $this->addMenuEntry( "/menu/controlCenter/manageSecurityPlugins", "filteredContentSettings", "admin.php?op=filteredContentSettings", "", true, false );
+ if( !$menu->entryExists( "/menu/controlCenter/manageSecurityPlugins" ))
+ $this->addMenuEntry( "/menu/controlCenter", "manageSecurityPlugins", "", "" );
+ $this->addMenuEntry( "/menu/controlCenter/manageSecurityPlugins", "filteredContentSettings", "admin.php?op=filteredContentSettings", "" );
}
function register()
More information about the pLog-svn
mailing list