[pLog-svn] r6070 - plog/trunk/class/action/admin
mark at devel.lifetype.net
mark at devel.lifetype.net
Thu Nov 22 03:41:04 EST 2007
Author: mark
Date: 2007-11-22 03:41:04 -0500 (Thu, 22 Nov 2007)
New Revision: 6070
Modified:
plog/trunk/class/action/admin/adminchangecommentsstatusaction.class.php
plog/trunk/class/action/admin/admindeletecommentaction.class.php
plog/trunk/class/action/admin/admindeletepostaction.class.php
plog/trunk/class/action/admin/admindeleteusersaction.class.php
plog/trunk/class/action/admin/adminnewsendtrackbacksaction.class.php
plog/trunk/class/action/admin/adminversioncheckaction.class.php
Log:
Fixed some syntax errors.
Modified: plog/trunk/class/action/admin/adminchangecommentsstatusaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminchangecommentsstatusaction.class.php 2007-11-22 06:40:49 UTC (rev 6069)
+++ plog/trunk/class/action/admin/adminchangecommentsstatusaction.class.php 2007-11-22 08:41:04 UTC (rev 6070)
@@ -1,5 +1,4 @@
<?php
-
lt_include( PLOG_CLASS_PATH."class/dao/articlecommentstatus.class.php" );
/**
@@ -45,7 +44,7 @@
if( $this->_articleId == 0 )
$this->_view = new AdminArticleCommentsListView( $this->_blogInfo, Array( "article" => null ));
else
- $this->_view = new AdminArticleCommentsListView( $this->_blogInfo, Array( "article" => $article ));
+ $this->_view = new AdminArticleCommentsListView( $this->_blogInfo, Array( "article" => $this->_article ));
if( $results["errorMessage"] != "" ) $this->_view->setErrorMessage( $results["errorMessage"] );
if( $results["successMessage"] != "" ) $this->_view->setSuccessMessage( $results["successMessage"] );
@@ -86,14 +85,14 @@
if( $this->_articleId > 0 ) {
// if we can't even load the article, then forget it...
$articles = new Articles();
- $article = $articles->getBlogArticle( $this->_articleId, $this->_blogInfo->getId());
- if( !$article ) {
+ $this->_article = $articles->getBlogArticle( $this->_articleId, $this->_blogInfo->getId());
+ if( !$this->_article ) {
return( Array( "successMessage" => "", "errorMessage" => $this->_locale->tr("error_fetching_article" )));
}
}
else {
// there was no article, so this probably was the view that shows all comments...
- $article = null;
+ $this->_article = null;
}
// loop through the comments and change them
@@ -110,8 +109,8 @@
$this->notifyEvent( EVENT_PRE_COMMENT_UPDATE, Array( "comment" => &$comment ));
// check if the comment really belongs to this blog...
- $article = $comment->getArticle();
- if( $article->getBlogId() != $this->_blogInfo->getId()) {
+ $this->_article = $comment->getArticle();
+ if( $this->_article->getBlogId() != $this->_blogInfo->getId()) {
// if not, then we shouldn't be allowed to change anything!
$errorMessage .= $this->_locale->pr("error_updating_comment_wrong_blog", $f->filter($comment->getTopic()))."<br/>";
}
Modified: plog/trunk/class/action/admin/admindeletecommentaction.class.php
===================================================================
--- plog/trunk/class/action/admin/admindeletecommentaction.class.php 2007-11-22 06:40:49 UTC (rev 6069)
+++ plog/trunk/class/action/admin/admindeletecommentaction.class.php 2007-11-22 08:41:04 UTC (rev 6070)
@@ -1,13 +1,4 @@
<?php
-
-
-
-
-
-
-
-
-
/**
* \ingroup Action
* @private
@@ -54,7 +45,7 @@
if( $this->_articleId == 0 )
$this->_view = new AdminArticleCommentsListView( $this->_blogInfo, Array( "article" => null ));
else
- $this->_view = new AdminArticleCommentsListView( $this->_blogInfo, Array( "article" => $article ));
+ $this->_view = new AdminArticleCommentsListView( $this->_blogInfo, Array( "article" => $this->_article ));
if( $results["errorMessage"] != "" ) $this->_view->setErrorMessage( $results["errorMessage"] );
if( $results["successMessage"] != "" ) $this->_view->setSuccessMessage( $results["successMessage"] );
@@ -102,14 +93,14 @@
if( $this->_articleId > 0 ) {
// if we can't even load the article, then forget it...
$articles = new Articles();
- $article = $articles->getBlogArticle( $this->_articleId, $this->_blogInfo->getId());
- if( !$article ) {
+ $this->_article = $articles->getBlogArticle( $this->_articleId, $this->_blogInfo->getId());
+ if( !$this->_article ) {
return( Array( "successMessage" => "", "errorMessage" => $this->_locale->tr("error_fetching_article" )));
}
}
else {
// there was no article, so this probably was the view that shows all comments...
- $article = null;
+ $this->_article = null;
}
// loop through the comments and remove them
@@ -126,10 +117,10 @@
$this->notifyEvent( EVENT_PRE_COMMENT_DELETE, Array( "comment" => &$comment ));
// check if the comment really belongs to this blog...
- $article = $comment->getArticle();
+ $this->_article = $comment->getArticle();
if(!($topic = $f->filter( $comment->getTopic())))
$topic = $this->_locale->tr("comment_default_title");
- if( $article->getBlogId() != $this->_blogInfo->getId()) {
+ if( $this->_article->getBlogId() != $this->_blogInfo->getId()) {
// if not, then we shouldn't be allowed to remove anything!
$errorMessage .= $this->_locale->pr("error_deleting_comment", $topic)."<br/>";
}
Modified: plog/trunk/class/action/admin/admindeletepostaction.class.php
===================================================================
--- plog/trunk/class/action/admin/admindeletepostaction.class.php 2007-11-22 06:40:49 UTC (rev 6069)
+++ plog/trunk/class/action/admin/admindeletepostaction.class.php 2007-11-22 08:41:04 UTC (rev 6070)
@@ -1,12 +1,4 @@
<?php
-
-
-
-
-
-
-
-
/**
* \ingroup Action
* @private
@@ -111,9 +103,7 @@
CacheControl::resetBlogCache( $this->_blogInfo->getId(), false );
// return some feedback
- return( Array( "errorMessage" => $errorMessage, "successMessage" => $successMessage ));
-
- return true;
+ return( Array( "errorMessage" => $errorMessage, "successMessage" => $successMessage ));
}
function perform()
Modified: plog/trunk/class/action/admin/admindeleteusersaction.class.php
===================================================================
--- plog/trunk/class/action/admin/admindeleteusersaction.class.php 2007-11-22 06:40:49 UTC (rev 6069)
+++ plog/trunk/class/action/admin/admindeleteusersaction.class.php 2007-11-22 08:41:04 UTC (rev 6070)
@@ -89,8 +89,6 @@
}
return( Array( "errorMessage" => $errorMessage, "successMessage" => $successMessage ));
-
- return false;
}
function performAjax()
Modified: plog/trunk/class/action/admin/adminnewsendtrackbacksaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminnewsendtrackbacksaction.class.php 2007-11-22 06:40:49 UTC (rev 6069)
+++ plog/trunk/class/action/admin/adminnewsendtrackbacksaction.class.php 2007-11-22 08:41:04 UTC (rev 6070)
@@ -58,7 +58,7 @@
$this->_view = new AdminNewSendTrackbacksView( $this->_blogInfo );
$this->_view->setValue( "post", $post);
$this->_view->setValue( "postLinks", $postLinks );
- $this->_view->setValue( "trackbackUrls", $trackbackUrls );
+ $this->_view->setValue( "trackbackUrls", $this->_trackbackUrls );
$this->setCommonData();
return true;
Modified: plog/trunk/class/action/admin/adminversioncheckaction.class.php
===================================================================
--- plog/trunk/class/action/admin/adminversioncheckaction.class.php 2007-11-22 06:40:49 UTC (rev 6069)
+++ plog/trunk/class/action/admin/adminversioncheckaction.class.php 2007-11-22 08:41:04 UTC (rev 6070)
@@ -1,10 +1,4 @@
<?php
-
-
-
-
-
-
/**
* \ingroup Action
* @private
More information about the pLog-svn
mailing list