[pLog-svn] r7254 - in plugins/branches/lifetype-1.2: clean clean/class/view editcomments editcomments/class/action editcomments/class/view mailcentre mailcentre/class/view
jondaley at devel.lifetype.net
jondaley at devel.lifetype.net
Thu Oct 15 00:20:08 EDT 2020
Author: jondaley
Date: 2020-10-15 00:20:08 -0400 (Thu, 15 Oct 2020)
New Revision: 7254
Modified:
plugins/branches/lifetype-1.2/clean/class/view/admincleanview.class.php
plugins/branches/lifetype-1.2/clean/pluginclean.class.php
plugins/branches/lifetype-1.2/editcomments/class/action/adminupdatecommentaction.class.php
plugins/branches/lifetype-1.2/editcomments/class/action/adminupdatetrackbackaction.class.php
plugins/branches/lifetype-1.2/editcomments/class/view/admineditcommentview.class.php
plugins/branches/lifetype-1.2/editcomments/class/view/adminedittrackbackview.class.php
plugins/branches/lifetype-1.2/editcomments/plugineditcomments.class.php
plugins/branches/lifetype-1.2/mailcentre/class/view/mailcentreuserselectorview.class.php
plugins/branches/lifetype-1.2/mailcentre/pluginmailcentre.class.php
Log:
updated plugins to non-static methods. These changes are violating our major/minor API changes, but LifeType isn't going to run well on PHP 7.4 without a lot of changes, so I'm thinking this might be the end of the project
Modified: plugins/branches/lifetype-1.2/clean/class/view/admincleanview.class.php
===================================================================
--- plugins/branches/lifetype-1.2/clean/class/view/admincleanview.class.php 2020-10-15 04:17:09 UTC (rev 7253)
+++ plugins/branches/lifetype-1.2/clean/class/view/admincleanview.class.php 2020-10-15 04:20:08 UTC (rev 7254)
@@ -63,11 +63,12 @@
$this->_page,
$numBlogs,
DEFAULT_ITEMS_PER_PAGE );
-
+ $blogStatus = new BlogStatus();
+
$this->setValue( "siteblogs", $siteBlogs );
$this->setValue( "pager", $pager );
$this->setValue( "currentstatus", $this->_last_update );
- $this->setValue( "blogstatus", BlogStatus::getStatusList( true ));
+ $this->setValue( "blogstatus", $blogStatus->getStatusList( true ));
$this->setValue( "searchTerms", $this->_search_terms );
$this->setValue( "total_posts_less_than", $this->_total_posts_less_than );
Modified: plugins/branches/lifetype-1.2/clean/pluginclean.class.php
===================================================================
--- plugins/branches/lifetype-1.2/clean/pluginclean.class.php 2020-10-15 04:17:09 UTC (rev 7253)
+++ plugins/branches/lifetype-1.2/clean/pluginclean.class.php 2020-10-15 04:20:08 UTC (rev 7254)
@@ -10,7 +10,7 @@
$this->id = "clean";
$this->author = "Mai Minh";
$this->desc = "This plugin cleans unused blogs.";
- $this->version = "20090221";
+ $this->version = "20201015";
$this->locales = Array( "en_UK" , "zh_TW" );
Modified: plugins/branches/lifetype-1.2/editcomments/class/action/adminupdatecommentaction.class.php
===================================================================
--- plugins/branches/lifetype-1.2/editcomments/class/action/adminupdatecommentaction.class.php 2020-10-15 04:17:09 UTC (rev 7253)
+++ plugins/branches/lifetype-1.2/editcomments/class/action/adminupdatecommentaction.class.php 2020-10-15 04:20:08 UTC (rev 7254)
@@ -107,6 +107,7 @@
if($this->_op == "updateComment"){
$comments = new ArticleComments();
$comment = $comments->getComment($this->_commentId);
+ $articleCommentStatus = new ArticleCommentStatus();
if(!$comment){
$this->_view = new AdminEditCommentView($this->_blogInfo, $this->_commentId);
$this->_view->setErrorMessage( $this->_locale->tr("pluginEditCommentsFailed") );
@@ -119,7 +120,7 @@
$this->_view = new AdminEditCommentView($this->_blogInfo, $this->_commentId);
$this->_view->setErrorMessage( $this->_locale->tr("pluginEditCommentsFailed") );
}
- else if(!ArticleCommentStatus::isValidStatus($this->_commentStatus)){
+ else if(!$articleCommentStatus->isValidStatus($this->_commentStatus)){
$this->_view = new AdminEditCommentView($this->_blogInfo, $this->_commentId);
$this->_view->setErrorMessage( $this->_locale->tr("pluginEditCommentsFailed") );
}
Modified: plugins/branches/lifetype-1.2/editcomments/class/action/adminupdatetrackbackaction.class.php
===================================================================
--- plugins/branches/lifetype-1.2/editcomments/class/action/adminupdatetrackbackaction.class.php 2020-10-15 04:17:09 UTC (rev 7253)
+++ plugins/branches/lifetype-1.2/editcomments/class/action/adminupdatetrackbackaction.class.php 2020-10-15 04:20:08 UTC (rev 7254)
@@ -109,6 +109,7 @@
}
else{
$tbBlogInfo = $trackback->getBlogInfo();
+ $articleCommentStatus = new ArticleCommentStatus();
if(!$tbBlogInfo ||
($tbBlogInfo->getId() != $this->_blogInfo->getId()))
{
@@ -115,7 +116,7 @@
$this->_view = new AdminEditTrackbackView($this->_blogInfo, $this->_trackbackId);
$this->_view->setErrorMessage( $this->_locale->tr("pluginEditTrackbacksFailed") );
}
- else if(!ArticleCommentStatus::isValidStatus($this->_commentStatus)){
+ else if(!$articleCommentStatus->isValidStatus($this->_commentStatus)){
$this->_view = new AdminEditTrackbackView($this->_blogInfo, $this->_trackbackId);
$this->_view->setErrorMessage( $this->_locale->tr("pluginEditTrackbacksFailed") );
}
Modified: plugins/branches/lifetype-1.2/editcomments/class/view/admineditcommentview.class.php
===================================================================
--- plugins/branches/lifetype-1.2/editcomments/class/view/admineditcommentview.class.php 2020-10-15 04:17:09 UTC (rev 7253)
+++ plugins/branches/lifetype-1.2/editcomments/class/view/admineditcommentview.class.php 2020-10-15 04:20:08 UTC (rev 7254)
@@ -32,8 +32,8 @@
$t->getMonth()."/".$t->getYear()." ".
$t->getHour().":".$t->getMinutes());
}
-
- $statusList = ArticleCommentStatus::getStatusList();
+ $articleCommentStatus = new ArticleCommentStatus();
+ $statusList = $articleCommentStatus->getStatusList();
$this->setValue( "commentstatus", $statusList );
$this->setValue( "editcomment", $comment );
Modified: plugins/branches/lifetype-1.2/editcomments/class/view/adminedittrackbackview.class.php
===================================================================
--- plugins/branches/lifetype-1.2/editcomments/class/view/adminedittrackbackview.class.php 2020-10-15 04:17:09 UTC (rev 7253)
+++ plugins/branches/lifetype-1.2/editcomments/class/view/adminedittrackbackview.class.php 2020-10-15 04:20:08 UTC (rev 7254)
@@ -32,8 +32,9 @@
$t->getMonth()."/".$t->getYear()." ".
$t->getHour().":".$t->getMinutes());
}
-
- $statusList = ArticleCommentStatus::getStatusList();
+ $articleCommentStatus = new ArticleCommentStatus();
+
+ $statusList = $articleCommentStatus->getStatusList();
$this->setValue( "tbstatus", $statusList );
$this->setValue( "edittrackback", $tb );
Modified: plugins/branches/lifetype-1.2/editcomments/plugineditcomments.class.php
===================================================================
--- plugins/branches/lifetype-1.2/editcomments/plugineditcomments.class.php 2020-10-15 04:17:09 UTC (rev 7253)
+++ plugins/branches/lifetype-1.2/editcomments/plugineditcomments.class.php 2020-10-15 04:20:08 UTC (rev 7254)
@@ -10,7 +10,7 @@
$this->desc = "Allows editing of comments for users with the 'update existing comments' permission.";
$this->author = "Jon Daley";
$this->locales = Array( "en_UK" );
- $this->version = "20201014";
+ $this->version = "20201015";
if($source == "admin")
$this->initAdmin();
Modified: plugins/branches/lifetype-1.2/mailcentre/class/view/mailcentreuserselectorview.class.php
===================================================================
--- plugins/branches/lifetype-1.2/mailcentre/class/view/mailcentreuserselectorview.class.php 2020-10-15 04:17:09 UTC (rev 7253)
+++ plugins/branches/lifetype-1.2/mailcentre/class/view/mailcentreuserselectorview.class.php 2020-10-15 04:20:08 UTC (rev 7254)
@@ -35,9 +35,10 @@
$val = new IntegerValidator();
if( !$val->validate( $status ))
$status = UserStatus::getDefaultStatus();
-
+
+ $userStatus = new UserStatus();
// if the value validated, check if it is a valid status
- if( !UserStatus::isValidStatus( $status ))
+ if( !$userStatus->isValidStatus( $status ))
$status = UserStatus::getDefaultStatus();
return $status;
@@ -80,10 +81,12 @@
$this->_page,
$numUsers,
DEFAULT_ITEMS_PER_PAGE );
-
+
+ $userStatus = new UserStatus();
+
// and generate the view
$this->setValue( "siteusers", $siteUsers );
- $this->setValue( "userstatus", UserStatus::getStatusList( true ));
+ $this->setValue( "userstatus", $userStatus->getStatusList( true ));
$this->setValue( "pager", $pager );
$this->setValue( "currentstatus", $this->_status );
$this->setValue( "dest", $this->_dest );
Modified: plugins/branches/lifetype-1.2/mailcentre/pluginmailcentre.class.php
===================================================================
--- plugins/branches/lifetype-1.2/mailcentre/pluginmailcentre.class.php 2020-10-15 04:17:09 UTC (rev 7253)
+++ plugins/branches/lifetype-1.2/mailcentre/pluginmailcentre.class.php 2020-10-15 04:20:08 UTC (rev 7254)
@@ -12,7 +12,7 @@
$this->id = "mailcentre";
$this->desc = "Allows site administrators to send emails to users";
$this->author = "The LifeType Project";
- $this->version = "20030723";
+ $this->version = "20201015";
if( $this->getSource() == "admin" ) {
// register our menu entries
More information about the pLog-svn
mailing list