[pLog-svn] r669 - plog/trunk/class/action/admin
oscar at devel.plogworld.net
oscar at devel.plogworld.net
Tue Jan 4 17:32:07 GMT 2005
Author: oscar
Date: 2005-01-04 17:32:07 +0000 (Tue, 04 Jan 2005)
New Revision: 669
Modified:
plog/trunk/class/action/admin/admindeletearticlecategoryaction.class.php
plog/trunk/class/action/admin/admindeleteblogtemplateaction.class.php
plog/trunk/class/action/admin/admindeletebloguserpermissionsaction.class.php
plog/trunk/class/action/admin/admindeletecommentaction.class.php
plog/trunk/class/action/admin/admindeletecustomfieldsaction.class.php
plog/trunk/class/action/admin/admindeletelinkaction.class.php
plog/trunk/class/action/admin/admindeletereferreraction.class.php
plog/trunk/class/action/admin/admindeletetrackbackaction.class.php
Log:
some cosmetic changes that needed changes to the core...
Modified: plog/trunk/class/action/admin/admindeletearticlecategoryaction.class.php
===================================================================
--- plog/trunk/class/action/admin/admindeletearticlecategoryaction.class.php 2005-01-04 17:26:04 UTC (rev 668)
+++ plog/trunk/class/action/admin/admindeletearticlecategoryaction.class.php 2005-01-04 17:32:07 UTC (rev 669)
@@ -66,15 +66,15 @@
// if it has at least one we can't delete it because then it would break the
// integrity of our data in the database...
if( $numArticles > 0 ) {
- $errorMessage .= $this->_locale->pr( "error_category_has_articles", $category->getName())."<br/><br/>";
+ $errorMessage .= $this->_locale->pr( "error_category_has_articles", $category->getName())."<br/>";
}
else {
// if everything correct, we can proceed and delete it
if( !$categories->deleteCategory( $categoryId, $this->_blogInfo->getId()))
- $errorMessage .= $this->_locale->pr("error_deleting_category")."<br/><br/>";
+ $errorMessage .= $this->_locale->pr("error_deleting_category")."<br/>";
else {
if( $totalOk < 2 )
- $successMessage .= $this->_locale->pr("category_deleted_ok", $category->getName())."<br/><br/>";
+ $successMessage .= $this->_locale->pr("category_deleted_ok", $category->getName())."<br/>";
else
$successMessage = $this->_locale->pr( "categories_deleted_ok", $totalOk );
Modified: plog/trunk/class/action/admin/admindeleteblogtemplateaction.class.php
===================================================================
--- plog/trunk/class/action/admin/admindeleteblogtemplateaction.class.php 2005-01-04 17:26:04 UTC (rev 668)
+++ plog/trunk/class/action/admin/admindeleteblogtemplateaction.class.php 2005-01-04 17:32:07 UTC (rev 669)
@@ -61,12 +61,12 @@
foreach( $this->_templateIds as $templateId ) {
// we can't remove the current template!
if( $blogTemplate->getName() == $templateId ) {
- $errorMessage .= $this->_locale->pr("error_template_is_current", $templateId )."<br/><br/>";
+ $errorMessage .= $this->_locale->pr("error_template_is_current", $templateId )."<br/>";
}
else {
// otherwise, let's proceed
if( !$ts->removeTemplate( $templateId, $this->_blogInfo->getId() ))
- $errorMessage .= $this->_locale->pr("error_removing_template", $templateId )."<br/><br/>";
+ $errorMessage .= $this->_locale->pr("error_removing_template", $templateId )."<br/>";
else {
if( $totalOk < 2 )
$successMessage = $this->_locale->pr("template_removed_ok", $templateId);
Modified: plog/trunk/class/action/admin/admindeletebloguserpermissionsaction.class.php
===================================================================
--- plog/trunk/class/action/admin/admindeletebloguserpermissionsaction.class.php 2005-01-04 17:26:04 UTC (rev 668)
+++ plog/trunk/class/action/admin/admindeletebloguserpermissionsaction.class.php 2005-01-04 17:32:07 UTC (rev 669)
@@ -70,7 +70,7 @@
$successMessage = $this->_locale->pr("users_removed_from_blog_ok", $totalOk);
}
else
- $errorMessage .= $this->_locale->pr("error_removing_user_from_blog", $userInfo->getUsername())."<br/><br/>";
+ $errorMessage .= $this->_locale->pr("error_removing_user_from_blog", $userInfo->getUsername())."<br/>";
}
$this->_view = new AdminBlogUsersListView( $this->_blogInfo );
Modified: plog/trunk/class/action/admin/admindeletecommentaction.class.php
===================================================================
--- plog/trunk/class/action/admin/admindeletecommentaction.class.php 2005-01-04 17:26:04 UTC (rev 668)
+++ plog/trunk/class/action/admin/admindeletecommentaction.class.php 2005-01-04 17:32:07 UTC (rev 669)
@@ -90,11 +90,11 @@
$this->notifyEvent( EVENT_PRE_COMMENT_DELETE, Array( "comment" => &$comment ));
if( !$comments->deletePostComment( $article->getId(), $commentId ))
- $errorMessage .= $this->_locale->pr("error_deleting_comment")." \"".$comment->getTopic()."\"<br/><br/>";
+ $errorMessage .= $this->_locale->pr("error_deleting_comment")." \"".$comment->getTopic()."\"<br/>";
else {
$totalOk++;
if( $totalOk < 2 )
- $successMessage .= $this->_locale->pr("comment_deleted_ok", $comment->getTopic())."<br/><br/>";
+ $successMessage .= $this->_locale->pr("comment_deleted_ok", $comment->getTopic())."<br/>";
else
$successMessage = $this->_locale->pr("comments_deleted_ok", $totalOk );
Modified: plog/trunk/class/action/admin/admindeletecustomfieldsaction.class.php
===================================================================
--- plog/trunk/class/action/admin/admindeletecustomfieldsaction.class.php 2005-01-04 17:26:04 UTC (rev 668)
+++ plog/trunk/class/action/admin/admindeletecustomfieldsaction.class.php 2005-01-04 17:32:07 UTC (rev 669)
@@ -82,10 +82,10 @@
$this->notifyEvent( EVENT_POST_CUSTOM_FIELD_DELETE, Array( "field" => &$field ));
}
else
- $errorMessage .= $this->_locale->pr( "error_deleting_field", $field->getName())."<br/><br/>";
+ $errorMessage .= $this->_locale->pr( "error_deleting_field", $field->getName())."<br/>";
}
else
- $errorMessage .= $this->_locale->tr( "error_fetching_custom_field" )."<br/><br/>";
+ $errorMessage .= $this->_locale->tr( "error_fetching_custom_field" )."<br/>";
}
if( $errorMessage != "" ) $this->_view->setErrorMessage( $errorMessage );
Modified: plog/trunk/class/action/admin/admindeletelinkaction.class.php
===================================================================
--- plog/trunk/class/action/admin/admindeletelinkaction.class.php 2005-01-04 17:26:04 UTC (rev 668)
+++ plog/trunk/class/action/admin/admindeletelinkaction.class.php 2005-01-04 17:32:07 UTC (rev 669)
@@ -72,12 +72,12 @@
$link = $links->getMyLink( $linkId, $this->_blogInfo->getId());
if( $link ) {
if( !$links->deleteMyLink( $linkId, $this->_blogInfo->getId()))
- $errorMessage .= $this->_locale->pr("error_removing_link", $link->getName())."<br/><br/>";
+ $errorMessage .= $this->_locale->pr("error_removing_link", $link->getName())."<br/>";
else
- $successMessage .= $this->_locale->pr("link_deleted_ok", $link->getName())."<br/><br/>";
+ $successMessage .= $this->_locale->pr("link_deleted_ok", $link->getName())."<br/>";
}
else {
- $errorMessage .= $this->_locale->pr("error_removing_link", $linkId)."<br/><br/>";
+ $errorMessage .= $this->_locale->pr("error_removing_link", $linkId)."<br/>";
}
}
Modified: plog/trunk/class/action/admin/admindeletereferreraction.class.php
===================================================================
--- plog/trunk/class/action/admin/admindeletereferreraction.class.php 2005-01-04 17:26:04 UTC (rev 668)
+++ plog/trunk/class/action/admin/admindeletereferreraction.class.php 2005-01-04 17:32:07 UTC (rev 669)
@@ -76,7 +76,7 @@
$this->notifyEvent( EVEN_PRE_REFERRER_DELETE, Array( "referrer" => &$referrer ));
if( !$referrers->deleteBlogReferer( $referrerId, $this->_blogInfo->getId()))
- $errorMessage .= $this->_locale->tr("error_deleting_referrer")." \"".$referrer->getUrl()."\"<br/><br/>";
+ $errorMessage .= $this->_locale->tr("error_deleting_referrer")." \"".$referrer->getUrl()."\"<br/>";
else {
$totalOk++;
if( $totalOk < 2 )
Modified: plog/trunk/class/action/admin/admindeletetrackbackaction.class.php
===================================================================
--- plog/trunk/class/action/admin/admindeletetrackbackaction.class.php 2005-01-04 17:26:04 UTC (rev 668)
+++ plog/trunk/class/action/admin/admindeletetrackbackaction.class.php 2005-01-04 17:32:07 UTC (rev 669)
@@ -90,14 +90,14 @@
$trackback = $trackbacks->getArticleTrackback( $trackbackId, $this->_articleId );
if( !$trackback ) {
- $errorMessage .= $this->_locale->tr("error_deleting_trackback")."<br/><br/>";
+ $errorMessage .= $this->_locale->tr("error_deleting_trackback")."<br/>";
}
else {
// fire the pre-event
$this->notifyEvent( EVENT_PRE_TRACKBACK_DELETE, Array( "trackback" => &$trackback ));
if( !$trackbacks->deletePostTrackback( $trackbackId, $this->_articleId ))
- $errorMessage .= $this->_locale->tr("error_deleting_trackback")." \"".$trackback->getExcerpt()."\"<br/><br/>";
+ $errorMessage .= $this->_locale->tr("error_deleting_trackback")." \"".$trackback->getExcerpt()."\"<br/>";
else {
$totalOk++;
if( $totalOk < 2 )
More information about the pLog-svn
mailing list