[pLog-svn] r4153 - in plog/trunk: class/action/admin
class/controller templates/admin
oscar at devel.lifetype.net
oscar at devel.lifetype.net
Sun Oct 22 14:54:51 GMT 2006
Author: oscar
Date: 2006-10-22 14:54:50 +0000 (Sun, 22 Oct 2006)
New Revision: 4153
Modified:
plog/trunk/class/action/admin/adminaddlinkaction.class.php
plog/trunk/class/action/admin/adminaddlinkcategoryaction.class.php
plog/trunk/class/controller/admincontrollermap.properties.php
plog/trunk/templates/admin/addbloguser.template
plog/trunk/templates/admin/createblog.template
plog/trunk/templates/admin/createuser.template
plog/trunk/templates/admin/editarticlecategory.template
plog/trunk/templates/admin/editblog.template
plog/trunk/templates/admin/editblogcategory.template
plog/trunk/templates/admin/editbloguser.template
plog/trunk/templates/admin/editcustomfield.template
plog/trunk/templates/admin/editglobalarticlecategory.template
plog/trunk/templates/admin/editlink.template
plog/trunk/templates/admin/editlinkcategory.template
plog/trunk/templates/admin/editpost.template
plog/trunk/templates/admin/editresourcealbum.template
plog/trunk/templates/admin/formvalidate.template
plog/trunk/templates/admin/newblogcategory.template
plog/trunk/templates/admin/newcustomfield.template
plog/trunk/templates/admin/newglobalarticlecategory.template
plog/trunk/templates/admin/newlink.template
plog/trunk/templates/admin/newlinkcategory.template
plog/trunk/templates/admin/newpermission.template
plog/trunk/templates/admin/newpost.template
plog/trunk/templates/admin/newpostcategory.template
plog/trunk/templates/admin/newresource.template
plog/trunk/templates/admin/newresourcealbum.template
plog/trunk/templates/admin/userprofile.template
Log:
some more changes
Modified: plog/trunk/class/action/admin/adminaddlinkaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminaddlinkaction.class.php 2006-10-22 14:27:02 UTC (rev 4152)
+++ plog/trunk/class/action/admin/adminaddlinkaction.class.php 2006-10-22 14:54:50 UTC (rev 4153)
@@ -75,7 +75,12 @@
}
$this->notifyEvent( EVENT_POST_LINK_ADD, Array( "link" => &$link ));
- $this->_view = new AdminLinksListView( $this->_blogInfo );
+ // if the user has no permission to view the links, the we have to find another view
+ if( $this->userHasPermission( "view_links" ))
+ $this->_view = new AdminLinksListView( $this->_blogInfo );
+ else
+ $this->_view = new AdminNewLinkView( $this->_blogInfo );
+
$this->_view->setSuccessMessage( $this->_locale->pr("link_added_ok", $myLink->getName()));
$this->setCommonData();
@@ -86,4 +91,4 @@
return true;
}
}
-?>
+?>
\ No newline at end of file
Modified: plog/trunk/class/action/admin/adminaddlinkcategoryaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminaddlinkcategoryaction.class.php 2006-10-22 14:27:02 UTC (rev 4152)
+++ plog/trunk/class/action/admin/adminaddlinkcategoryaction.class.php 2006-10-22 14:54:50 UTC (rev 4153)
@@ -45,8 +45,11 @@
$this->_blogInfo->getId(),
0,
$this->_properties );
- // the view is the same for both conditions
- $this->_view = new AdminLinkCategoriesListView( $this->_blogInfo );
+ // the view is the same for both conditions
+ if( $this->userHasPermission( "view_link_categories" ))
+ $this->_view = new AdminLinkCategoriesListView( $this->_blogInfo );
+ else
+ $this->_view = new AdminTemplatedView( $this->_blogInfo, "newlinkcategory" );
if( !$mylinksCategories->addMyLinksCategory( $mylinksCategory, $this->_blogInfo->getId())) {
// set an error message
Modified: plog/trunk/class/controller/admincontrollermap.properties.php
===================================================================
--- plog/trunk/class/controller/admincontrollermap.properties.php 2006-10-22 14:27:02 UTC (rev 4152)
+++ plog/trunk/class/controller/admincontrollermap.properties.php 2006-10-22 14:54:50 UTC (rev 4153)
@@ -310,4 +310,6 @@
$actions["editBlogUser"] = "AdminEditBlogUserAction";
// update blog user
$actions["updateBlogUser"] = "AdminUpdateBlogUserAction";
+ // permission required
+ $actions["permissionRequired"] = "AdminPermissionRequiredAction";
?>
\ No newline at end of file
Modified: plog/trunk/templates/admin/addbloguser.template
===================================================================
--- plog/trunk/templates/admin/addbloguser.template 2006-10-22 14:27:02 UTC (rev 4152)
+++ plog/trunk/templates/admin/addbloguser.template 2006-10-22 14:54:50 UTC (rev 4153)
@@ -5,7 +5,7 @@
<fieldset class="inputField">
<legend>{$locale->tr("newBlogUser")}</legend>
- {include file="$admintemplatepath/formvalidate.template" message=$locale->tr("error_adding_user")}
+ {include file="$admintemplatepath/formvalidate.template"}
<div class="field">
<label for="newBlogUserName">{$locale->tr("username")}</label>
Modified: plog/trunk/templates/admin/createblog.template
===================================================================
--- plog/trunk/templates/admin/createblog.template 2006-10-22 14:27:02 UTC (rev 4152)
+++ plog/trunk/templates/admin/createblog.template 2006-10-22 14:54:50 UTC (rev 4153)
@@ -3,7 +3,7 @@
<form name="addBlog" action="admin.php" method="post">
<fieldset class="inputField">
<legend>{$locale->tr("createBlog")}</legend>
- {include file="$admintemplatepath/formvalidate.template" message=$locale->tr("error_adding_blog")}
+ {include file="$admintemplatepath/formvalidate.template"}
<div class="field">
<label for="blogName">{$locale->tr("name")}</label>
<span class="required">*</span>
Modified: plog/trunk/templates/admin/createuser.template
===================================================================
--- plog/trunk/templates/admin/createuser.template 2006-10-22 14:27:02 UTC (rev 4152)
+++ plog/trunk/templates/admin/createuser.template 2006-10-22 14:54:50 UTC (rev 4153)
@@ -4,7 +4,7 @@
<form name="addUser" action="admin.php" method="post">
<fieldset class="inputField">
<legend>{$locale->tr("createUser")}</legend>
- {include file="$admintemplatepath/formvalidate.template" message=$locale->tr("error_adding_user")}
+ {include file="$admintemplatepath/formvalidate.template"}
<div class="field">
<label for="userName">{$locale->tr("username")}</label>
<span class="required">*</span>
Modified: plog/trunk/templates/admin/editarticlecategory.template
===================================================================
--- plog/trunk/templates/admin/editarticlecategory.template 2006-10-22 14:27:02 UTC (rev 4152)
+++ plog/trunk/templates/admin/editarticlecategory.template 2006-10-22 14:54:50 UTC (rev 4153)
@@ -5,7 +5,7 @@
<fieldset class="inputField">
<legend>{$locale->tr("editArticleCategories")}</legend>
- {include file="$admintemplatepath/formvalidate.template" message=$locale->tr("error_updating_article_category")}
+ {include file="$admintemplatepath/formvalidate.template"}
<div class="field">
<label for="categoryName">{$locale->tr("name")}</label>
Modified: plog/trunk/templates/admin/editblog.template
===================================================================
--- plog/trunk/templates/admin/editblog.template 2006-10-22 14:27:02 UTC (rev 4152)
+++ plog/trunk/templates/admin/editblog.template 2006-10-22 14:54:50 UTC (rev 4153)
@@ -4,7 +4,7 @@
<form name="blogSettings" action="admin.php" method="post" onsubmit="listSelectAll('userList');">
<fieldset class="inputField">
<legend>{$locale->tr("editBlog")}</legend>
- {include file="$admintemplatepath/formvalidate.template" message=$locale->tr("error_updating_settings")}
+ {include file="$admintemplatepath/formvalidate.template"}
<div class="field">
<label for="ro_blogLink">{$locale->tr("blog_link")}</label>
<span class="required"></span>
Modified: plog/trunk/templates/admin/editblogcategory.template
===================================================================
--- plog/trunk/templates/admin/editblogcategory.template 2006-10-22 14:27:02 UTC (rev 4152)
+++ plog/trunk/templates/admin/editblogcategory.template 2006-10-22 14:54:50 UTC (rev 4153)
@@ -5,7 +5,7 @@
<fieldset class="inputField">
<legend>{$locale->tr("editBlogCategories")}</legend>
- {include file="$admintemplatepath/formvalidate.template" message=$locale->tr("error_updating_article_category")}
+ {include file="$admintemplatepath/formvalidate.template"}
<div class="field">
<label for="categoryName">{$locale->tr("name")}</label>
Modified: plog/trunk/templates/admin/editbloguser.template
===================================================================
--- plog/trunk/templates/admin/editbloguser.template 2006-10-22 14:27:02 UTC (rev 4152)
+++ plog/trunk/templates/admin/editbloguser.template 2006-10-22 14:54:50 UTC (rev 4153)
@@ -5,7 +5,7 @@
<fieldset class="inputField">
<legend>{$locale->tr("newBlogUser")}</legend>
- {include file="$admintemplatepath/formvalidate.template" message=$locale->tr("error_updating_user")}
+ {include file="$admintemplatepath/formvalidate.template"}
<div class="field">
<label for="newBlogUserName">{$locale->tr("username")}</label>
Modified: plog/trunk/templates/admin/editcustomfield.template
===================================================================
--- plog/trunk/templates/admin/editcustomfield.template 2006-10-22 14:27:02 UTC (rev 4152)
+++ plog/trunk/templates/admin/editcustomfield.template 2006-10-22 14:54:50 UTC (rev 4153)
@@ -4,7 +4,7 @@
<form name="editCustomField" method="post" action="admin.php" onSubmit="listSelectAll('fieldValues');return true">
<fieldset class="inputField">
<legend>{$locale->tr("editCustomField")}</legend>
- {include file="$admintemplatepath/formvalidate.template" message=$locale->tr("error_updating_custom_field")}
+ {include file="$admintemplatepath/formvalidate.template"}
<div class="field">
<label for="fieldName">{$locale->tr("name")}</label>
Modified: plog/trunk/templates/admin/editglobalarticlecategory.template
===================================================================
--- plog/trunk/templates/admin/editglobalarticlecategory.template 2006-10-22 14:27:02 UTC (rev 4152)
+++ plog/trunk/templates/admin/editglobalarticlecategory.template 2006-10-22 14:54:50 UTC (rev 4153)
@@ -5,7 +5,7 @@
<fieldset class="inputField">
<legend>{$locale->tr("editGlobalArticleCategories")}</legend>
- {include file="$admintemplatepath/formvalidate.template" message=$locale->tr("error_updating_article_category")}
+ {include file="$admintemplatepath/formvalidate.template"}
<div class="field">
<label for="categoryName">{$locale->tr("name")}</label>
Modified: plog/trunk/templates/admin/editlink.template
===================================================================
--- plog/trunk/templates/admin/editlink.template 2006-10-22 14:27:02 UTC (rev 4152)
+++ plog/trunk/templates/admin/editlink.template 2006-10-22 14:54:50 UTC (rev 4153)
@@ -5,7 +5,7 @@
<fieldset class="inputField">
<legend>{$locale->tr("editLink")}</legend>
- {include file="$admintemplatepath/formvalidate.template" message=$locale->tr("error_updating_link")}
+ {include file="$admintemplatepath/formvalidate.template"}
<div class="field">
<label for="linkName">{$locale->tr("name")}</label>
Modified: plog/trunk/templates/admin/editlinkcategory.template
===================================================================
--- plog/trunk/templates/admin/editlinkcategory.template 2006-10-22 14:27:02 UTC (rev 4152)
+++ plog/trunk/templates/admin/editlinkcategory.template 2006-10-22 14:54:50 UTC (rev 4153)
@@ -2,7 +2,7 @@
{include file="$admintemplatepath/navigation.template" showOpt=editLinkCategories title=$locale->tr("editLinkCategory")}
<form name="editLinkCategory" method="post" action="admin.php">
<fieldset class="inputField">
- {include file="$admintemplatepath/formvalidate.template" message=$locale->tr("error_updating_link_category")}
+ {include file="$admintemplatepath/formvalidate.template"}
<legend>{$locale->tr("editLinkCategory")}</legend>
<div class="field">
<label for="linkCategoryName">{$locale->tr("name")}</label>
Modified: plog/trunk/templates/admin/editpost.template
===================================================================
--- plog/trunk/templates/admin/editpost.template 2006-10-22 14:27:02 UTC (rev 4152)
+++ plog/trunk/templates/admin/editpost.template 2006-10-22 14:54:50 UTC (rev 4153)
@@ -34,7 +34,7 @@
</div>
<div id="mainPanel" style="float:left; width: 73%; border-right: 1px solid #DEDEDE;">
- {include file="$admintemplatepath/formvalidate.template" message=$locale->tr("error_updating_post")}
+ {include file="$admintemplatepath/formvalidate.template"}
<div class="field">
<label for="postTopic">{$locale->tr("topic")}</label>
Modified: plog/trunk/templates/admin/editresourcealbum.template
===================================================================
--- plog/trunk/templates/admin/editresourcealbum.template 2006-10-22 14:27:02 UTC (rev 4152)
+++ plog/trunk/templates/admin/editresourcealbum.template 2006-10-22 14:54:50 UTC (rev 4153)
@@ -3,7 +3,7 @@
<form name="updateResourceAlbum" method="post" action="admin.php">
<fieldset class="inputField">
<legend>{$locale->tr("editResourceAlbum")}</legend>
- {include file="$admintemplatepath/formvalidate.template" message=$locale->tr("error_updating_album")}
+ {include file="$admintemplatepath/formvalidate.template"}
<div class="field">
<label for="albumName">{$locale->tr("name")}</label>
<span class="required">*</span>
Modified: plog/trunk/templates/admin/formvalidate.template
===================================================================
--- plog/trunk/templates/admin/formvalidate.template 2006-10-22 14:27:02 UTC (rev 4152)
+++ plog/trunk/templates/admin/formvalidate.template 2006-10-22 14:54:50 UTC (rev 4153)
@@ -6,3 +6,4 @@
{include file="$admintemplatepath/errormessage.template" message=$message}
{/if}
{/if}
+ {include file="$admintemplatepath/successmessage.template" message=$message}
Modified: plog/trunk/templates/admin/newblogcategory.template
===================================================================
--- plog/trunk/templates/admin/newblogcategory.template 2006-10-22 14:27:02 UTC (rev 4152)
+++ plog/trunk/templates/admin/newblogcategory.template 2006-10-22 14:54:50 UTC (rev 4153)
@@ -4,7 +4,7 @@
<form name="addBlogCategory" method="post" action="admin.php">
<fieldset class="inputField">
<legend>{$locale->tr("newBlogCategory")}</legend>
- {include file="$admintemplatepath/formvalidate.template" message=$locale->tr("error_adding_blog_category")}
+ {include file="$admintemplatepath/formvalidate.template"}
<div class="field">
<label for="categoryName">{$locale->tr("name")}</label>
Modified: plog/trunk/templates/admin/newcustomfield.template
===================================================================
--- plog/trunk/templates/admin/newcustomfield.template 2006-10-22 14:27:02 UTC (rev 4152)
+++ plog/trunk/templates/admin/newcustomfield.template 2006-10-22 14:54:50 UTC (rev 4153)
@@ -4,7 +4,7 @@
<form name="newCustomField" method="post" action="admin.php" onSubmit="listSelectAll('fieldValues');return true">
<fieldset class="inputField">
<legend>{$locale->tr("newCustomField")}</legend>
- {include file="$admintemplatepath/formvalidate.template" message=$locale->tr("error_adding_custom_field")}
+ {include file="$admintemplatepath/formvalidate.template"}
<div class="field">
<label for="fieldName">{$locale->tr("name")}</label>
Modified: plog/trunk/templates/admin/newglobalarticlecategory.template
===================================================================
--- plog/trunk/templates/admin/newglobalarticlecategory.template 2006-10-22 14:27:02 UTC (rev 4152)
+++ plog/trunk/templates/admin/newglobalarticlecategory.template 2006-10-22 14:54:50 UTC (rev 4153)
@@ -4,7 +4,7 @@
<form name="addGlobalCategory" method="post" action="admin.php">
<fieldset class="inputField">
<legend>{$locale->tr("newGlobalArticleCategory")}</legend>
- {include file="$admintemplatepath/formvalidate.template" message=$locale->tr("error_adding_article_category")}
+ {include file="$admintemplatepath/formvalidate.template"}
<div class="field">
<label for="categoryName">{$locale->tr("name")}</label>
Modified: plog/trunk/templates/admin/newlink.template
===================================================================
--- plog/trunk/templates/admin/newlink.template 2006-10-22 14:27:02 UTC (rev 4152)
+++ plog/trunk/templates/admin/newlink.template 2006-10-22 14:54:50 UTC (rev 4153)
@@ -10,7 +10,7 @@
<fieldset class="inputField">
<legend>{$locale->tr("newLink")}</legend>
- {include file="$admintemplatepath/formvalidate.template" message=$locale->tr("error_adding_link")}
+ {include file="$admintemplatepath/formvalidate.template"}
<div class="field">
<label for="linkName">{$locale->tr("name")}</label>
Modified: plog/trunk/templates/admin/newlinkcategory.template
===================================================================
--- plog/trunk/templates/admin/newlinkcategory.template 2006-10-22 14:27:02 UTC (rev 4152)
+++ plog/trunk/templates/admin/newlinkcategory.template 2006-10-22 14:54:50 UTC (rev 4153)
@@ -3,7 +3,7 @@
<form name="newLinkCategory" action="admin.php" method="post">
<fieldset class="inputField">
<legend>{$locale->tr("newLinkCategory")}</legend>
- {include file="$admintemplatepath/formvalidate.template" message=$locale->tr("error_adding_link_category")}
+ {include file="$admintemplatepath/formvalidate.template"}
<div class="field">
<label for="linkCategoryName">{$locale->tr("name")}</label>
<span class="required">*</span>
Modified: plog/trunk/templates/admin/newpermission.template
===================================================================
--- plog/trunk/templates/admin/newpermission.template 2006-10-22 14:27:02 UTC (rev 4152)
+++ plog/trunk/templates/admin/newpermission.template 2006-10-22 14:54:50 UTC (rev 4153)
@@ -4,7 +4,7 @@
<form name="addBlogCategory" method="post" action="admin.php">
<fieldset class="inputField">
<legend>{$locale->tr("newPermission")}</legend>
- {include file="$admintemplatepath/formvalidate.template" message=$locale->tr("error_adding_new_permission")}
+ {include file="$admintemplatepath/formvalidate.template"}
<div class="field">
<label for="permissionName">{$locale->tr("name")}</label>
Modified: plog/trunk/templates/admin/newpost.template
===================================================================
--- plog/trunk/templates/admin/newpost.template 2006-10-22 14:27:02 UTC (rev 4152)
+++ plog/trunk/templates/admin/newpost.template 2006-10-22 14:54:50 UTC (rev 4153)
@@ -50,7 +50,7 @@
<div id="mainPanel" style="float:left; width: 73%; border-right: 1px solid #DEDEDE;">
<div id="autoSaveMessage" style="display: none;"></div>
- {include file="$admintemplatepath/formvalidate.template" message=$locale->tr("error_adding_post")}
+ {include file="$admintemplatepath/formvalidate.template"}
<div class="field">
<label for="postTopic">{$locale->tr("topic")}</label>
<span class="required">*</span>
Modified: plog/trunk/templates/admin/newpostcategory.template
===================================================================
--- plog/trunk/templates/admin/newpostcategory.template 2006-10-22 14:27:02 UTC (rev 4152)
+++ plog/trunk/templates/admin/newpostcategory.template 2006-10-22 14:54:50 UTC (rev 4153)
@@ -4,7 +4,7 @@
<form name="addArticleCategory" method="post" action="admin.php">
<fieldset class="inputField">
<legend>{$locale->tr("newArticleCategory")}</legend>
- {include file="$admintemplatepath/formvalidate.template" message=$locale->tr("error_adding_article_category")}
+ {include file="$admintemplatepath/formvalidate.template"}
<div class="field">
<label for="categoryName">{$locale->tr("name")}</label>
Modified: plog/trunk/templates/admin/newresource.template
===================================================================
--- plog/trunk/templates/admin/newresource.template 2006-10-22 14:27:02 UTC (rev 4152)
+++ plog/trunk/templates/admin/newresource.template 2006-10-22 14:54:50 UTC (rev 4153)
@@ -5,7 +5,7 @@
<form name="addResource" action="admin.php" method="post" enctype="multipart/form-data">
<fieldset class="inputField">
<legend>{$locale->tr("newResource")}</legend>
- {include file="$admintemplatepath/formvalidate.template" message=$locale->tr("error_adding_resource")}
+ {include file="$admintemplatepath/formvalidate.template"}
<div class="field" id="fileFields">
<label for="resourceFile_1">{$locale->tr("file")}</label>
<span class="required">*</span>
Modified: plog/trunk/templates/admin/newresourcealbum.template
===================================================================
--- plog/trunk/templates/admin/newresourcealbum.template 2006-10-22 14:27:02 UTC (rev 4152)
+++ plog/trunk/templates/admin/newresourcealbum.template 2006-10-22 14:54:50 UTC (rev 4153)
@@ -3,7 +3,7 @@
<form name="addResourceAlbum" action="admin.php" method="post">
<fieldset class="inputField">
- {include file="$admintemplatepath/formvalidate.template" message=$locale->tr("error_adding_album")}
+ {include file="$admintemplatepath/formvalidate.template"}
{if $viewIsError}
{if $viewErrorMessage != ""}
{include file="$admintemplatepath/successmessage.template" message=$viewErrorMessage}
Modified: plog/trunk/templates/admin/userprofile.template
===================================================================
--- plog/trunk/templates/admin/userprofile.template 2006-10-22 14:27:02 UTC (rev 4152)
+++ plog/trunk/templates/admin/userprofile.template 2006-10-22 14:54:50 UTC (rev 4153)
@@ -4,7 +4,7 @@
<form name="editUserProfile" action="admin.php" method="post">
<fieldset class="inputField">
<legend>{$locale->tr("editUser")}</legend>
- {include file="$admintemplatepath/formvalidate.template" message=$locale->tr("error_updating_user")}
+ {include file="$admintemplatepath/formvalidate.template"}
<div class="field">
<label for="userName">{$locale->tr("username")}</label>
More information about the pLog-svn
mailing list