[pLog-svn] r2856 - in plugins/trunk: . adminnotifier adrotate
adrotate/class/dao apod/class/action
articlereferers/class/action atom/class/action atom/class/dao
atom/class/logger atom/class/xml/atom authimage/class/action
authimage/class/authimage blogtimes/class/action
contentfilter contentfilter/class/action
contentfilter/class/dao delicious delicious/class/action
dnsantispam/class/action dropcase/class/action
emailencryption/class/action feedreader/class/dao
flickr/class/action gallery/class/action
gallery/class/gallery googleanalytics/class/action
gravatar/class/action gravatar/class/avatars
guestbook/class/action guestbook/class/dao
hiddeninput/class/action hostblock/class/action
hostblock/class/dao hotlinkprevention/class/action
karma/class/action karma/class/karma linktracker/class/dao
lunar/class/action mailcentre/class/dao mobile/class/net
moblog/class/action moblog/class/log moblog/class/moblog
moderate/class/action nofollow nofollow/class/action
plogbirthdays/class/dao plogeshi/class/action
plogeshi/class/plogeshi ploghaiku/class/dao
plogpoll/class/dao plogstaticrotator/class/dao port/class/dao
port/class/database recentcomments/class/action
recenttrackbacks/class/action recommended/class/action
remembercommentdata/class/action rightschooser/class/action
secret/class/action secretblog/class/action
shoutbox/plugins/shoutbox/class/action sitemap/class/action
smileys smileys/class/action smileys/class/smileys
stickyposts/class/action submissions/class/action
technorati/class/action templateeditor/class/action
textparser/class/action topcommentposts/class/action
topcommentvisitors/class/action topreadposts/class/action
toptrackbackposts/class/action validatetrackback
validatetrackback/class/action weather/class/action
oscar at devel.lifetype.net
oscar at devel.lifetype.net
Thu Jan 26 18:57:04 GMT 2006
Author: oscar
Date: 2006-01-26 18:57:03 +0000 (Thu, 26 Jan 2006)
New Revision: 2856
Modified:
plugins/trunk/adminnotifier/pluginadminnotifier.class.php
plugins/trunk/adrotate/class/dao/adrotateadstats.class.php
plugins/trunk/adrotate/pluginadrotate.class.php
plugins/trunk/apod/class/action/pluginapodupdateconfigaction.class.php
plugins/trunk/articlereferers/class/action/pluginarticlereferersupdateconfigaction.class.php
plugins/trunk/atom/class/action/adminatompluginupdatesettingsaction.class.php
plugins/trunk/atom/class/dao/atompasswords.class.php
plugins/trunk/atom/class/logger/atomlogger.class.php
plugins/trunk/atom/class/xml/atom/atomabstractservice.class.php
plugins/trunk/atom/class/xml/atom/atomrequest.class.php
plugins/trunk/atom/class/xml/atom/atomresponse.class.php
plugins/trunk/atom/class/xml/atom/atomserver.class.php
plugins/trunk/atom/class/xml/atom/editservice.class.php
plugins/trunk/atom/class/xml/atom/feedservice.class.php
plugins/trunk/atom/class/xml/atom/wsseauthentication.class.php
plugins/trunk/authimage/class/action/pluginauthimageupdateconfigaction.class.php
plugins/trunk/authimage/class/authimage/authimage.class.php
plugins/trunk/blogtimes/class/action/pluginblogtimesupdateconfigaction.class.php
plugins/trunk/contentfilter/class/action/adminupdatefilteredcontentsettingsaction.class.php
plugins/trunk/contentfilter/class/dao/filteredcontent.class.php
plugins/trunk/contentfilter/plugincontentfilter.class.php
plugins/trunk/delicious/class/action/plugindeliciousupdateconfigaction.class.php
plugins/trunk/delicious/plugindelicious.class.php
plugins/trunk/dnsantispam/class/action/plugindnsantispamupdateconfigaction.class.php
plugins/trunk/dropcase/class/action/plugindropcaseupdateconfigaction.class.php
plugins/trunk/emailencryption/class/action/adminupdateemailencryptionaction.class.php
plugins/trunk/feedreader/class/dao/feeddata.class.php
plugins/trunk/flickr/class/action/pluginflickrupdateconfigaction.class.php
plugins/trunk/gallery/class/action/plugingalleryupdateconfigaction.class.php
plugins/trunk/gallery/class/gallery/galleryhelper.class.php
plugins/trunk/googleanalytics/class/action/plugingoogleanalyticsupdateconfigaction.class.php
plugins/trunk/gravatar/class/action/plugingravatarupdateconfigaction.class.php
plugins/trunk/gravatar/class/avatars/avatars.class.php
plugins/trunk/guestbook/class/action/adminupdateguestbookaction.class.php
plugins/trunk/guestbook/class/dao/guestbookrecord.class.php
plugins/trunk/hiddeninput/class/action/pluginhiddeninputupdateconfigaction.class.php
plugins/trunk/hostblock/class/action/adminupdateblockedhostsettingsaction.class.php
plugins/trunk/hostblock/class/dao/blockedhost.class.php
plugins/trunk/hotlinkprevention/class/action/pluginhotlinkpreventionupdateconfigaction.class.php
plugins/trunk/karma/class/action/adminkarmapluginupdatesettingsaction.class.php
plugins/trunk/karma/class/karma/karmalib.class.php
plugins/trunk/linktracker/class/dao/linktracker.class.php
plugins/trunk/linktracker/class/dao/linktrackerresult.class.php
plugins/trunk/lunar/class/action/pluginlunarupdateconfigaction.class.php
plugins/trunk/mailcentre/class/dao/mailmessage.class.php
plugins/trunk/mobile/class/net/terminalidentifier.class.php
plugins/trunk/mobile/class/net/terminalinfo.class.php
plugins/trunk/moblog.php
plugins/trunk/moblog/class/action/adminmoblogpluginupdatesettingsaction.class.php
plugins/trunk/moblog/class/log/mobloglogger.class.php
plugins/trunk/moblog/class/moblog/moblogconstants.properties.php
plugins/trunk/moblog/class/moblog/moblogrequest.class.php
plugins/trunk/moblog/class/moblog/moblogresponse.class.php
plugins/trunk/moderate/class/action/adminmoderatepluginupdatesettingsaction.class.php
plugins/trunk/nofollow/class/action/pluginnofollowupdateconfigaction.class.php
plugins/trunk/nofollow/pluginnofollow.class.php
plugins/trunk/plogbirthdays/class/dao/plogbirthday.class.php
plugins/trunk/plogeshi/class/action/pluginplogeshiupdateconfigaction.class.php
plugins/trunk/plogeshi/class/plogeshi/plogeshi.class.php
plugins/trunk/ploghaiku/class/dao/ploghaikuobject.class.php
plugins/trunk/plogpoll/class/dao/plogpollpoll.class.php
plugins/trunk/plogstaticrotator/class/dao/plogstaticrotatorcontent.class.php
plugins/trunk/port/class/dao/extmodel.class.php
plugins/trunk/port/class/database/extdb.class.php
plugins/trunk/recentcomments/class/action/pluginrecentcommentsupdateconfigaction.class.php
plugins/trunk/recenttrackbacks/class/action/pluginrecenttrackbacksupdateconfigaction.class.php
plugins/trunk/recommended/class/action/pluginrecommendedupdateconfigaction.class.php
plugins/trunk/remembercommentdata/class/action/pluginremembercommentdataupdateconfigaction.class.php
plugins/trunk/rightschooser/class/action/pluginrightschooserupdateconfigaction.class.php
plugins/trunk/secret/class/action/adminsecretpluginupdatesettingsaction.class.php
plugins/trunk/secretblog/class/action/adminsecretblogpluginupdatesettingsaction.class.php
plugins/trunk/shoutbox/plugins/shoutbox/class/action/pluginshoutboxsetupaction.class.php
plugins/trunk/shoutbox/plugins/shoutbox/class/action/pluginshoutboxupdateconfigaction.class.php
plugins/trunk/sitemap/class/action/adminsitemappluginupdatesettingsaction.class.php
plugins/trunk/smileys/class/action/pluginsmileysupdateconfigaction.class.php
plugins/trunk/smileys/class/smileys/smileys.class.php
plugins/trunk/smileys/pluginsmileys.class.php
plugins/trunk/stickyposts/class/action/pluginstickypostsupdateconfigaction.class.php
plugins/trunk/submissions/class/action/adminsubmissionspluginupdatesettingsaction.class.php
plugins/trunk/technorati/class/action/admintechnoratipluginupdatesettingsaction.class.php
plugins/trunk/templateeditor/class/action/pluginbloguploadtemplatefileaction.class.php
plugins/trunk/textparser/class/action/adminplugintextparserupdatesettingsaction.class.php
plugins/trunk/topcommentposts/class/action/plugintopcommentpostsupdateconfigaction.class.php
plugins/trunk/topcommentvisitors/class/action/plugintopcommentvisitorsupdateconfigaction.class.php
plugins/trunk/topreadposts/class/action/plugintopreadpostsupdateconfigaction.class.php
plugins/trunk/toptrackbackposts/class/action/plugintoptrackbackpostsupdateconfigaction.class.php
plugins/trunk/validatetrackback/class/action/adminvalidatetrackbackpluginupdatesettingsaction.class.php
plugins/trunk/validatetrackback/pluginvalidatetrackback.class.php
plugins/trunk/weather/class/action/pluginweatherupdateconfigaction.class.php
Log:
First batch of changes, affecting all the plugins:
- Blogs::updateBlogSettings() doesn't exist anymore
- The signature of Blogs::updateBlog() has changed
- remove all dependencies from Object and removed all include() statements
- the 'templateeditor', 'atom', 'nofollow', 'validatetrackback','smileys' and 'authimage' have already been verified to work under 1.1.
Modified: plugins/trunk/adminnotifier/pluginadminnotifier.class.php
===================================================================
--- plugins/trunk/adminnotifier/pluginadminnotifier.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/adminnotifier/pluginadminnotifier.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -35,6 +35,9 @@
$config =& Config::getConfig();
$events = $config->getValue( "plugin_adminnotifier_events" );
+ if( !is_array( $events ))
+ $events = Array();
+
foreach( $events as $eventId => $value ) {
// register those that are configured
$this->registerNotification( $eventId );
Modified: plugins/trunk/adrotate/class/dao/adrotateadstats.class.php
===================================================================
--- plugins/trunk/adrotate/class/dao/adrotateadstats.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/adrotate/class/dao/adrotateadstats.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -9,9 +9,9 @@
(at your option) any later version.
*/
-include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
-class AdRotateAdStats extends Object
+
+class AdRotateAdStats
{
var $_id;
var $_impressions;
@@ -26,7 +26,7 @@
function AdRotateAdStats ( $id, $impressions, $clicks, $imageurl, $redirecturl,
$clickmd5, $alttext, $type, $dateadded )
{
- $this->Object();
+
$this->_id = $id;
$this->_impressions = $impressions;
$this->_clicks = $clicks;
Modified: plugins/trunk/adrotate/pluginadrotate.class.php
===================================================================
--- plugins/trunk/adrotate/pluginadrotate.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/adrotate/pluginadrotate.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -46,6 +46,7 @@
*/
function install()
{
+ include_once( PLOG_CLASS_PATH."class/database/db.class.php" );
/**
* create the table that will keep track of current banner campaigns
* and usage statistics for the administrator
Modified: plugins/trunk/apod/class/action/pluginapodupdateconfigaction.class.php
===================================================================
--- plugins/trunk/apod/class/action/pluginapodupdateconfigaction.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/apod/class/action/pluginapodupdateconfigaction.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -59,7 +59,7 @@
// save the blogs settings
$blogs = new Blogs();
- if( !$blogs->updateBlog( $this->_blogInfo->getId(), $this->_blogInfo )) {
+ if( !$blogs->updateBlog( $this->_blogInfo )) {
$this->_view = new PluginapodConfigView( $this->_blogInfo );
$this->_view->setErrorMessage( $this->_locale->tr("error_updating_settings"));
$this->setCommonData();
Modified: plugins/trunk/articlereferers/class/action/pluginarticlereferersupdateconfigaction.class.php
===================================================================
--- plugins/trunk/articlereferers/class/action/pluginarticlereferersupdateconfigaction.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/articlereferers/class/action/pluginarticlereferersupdateconfigaction.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -45,7 +45,7 @@
// save the blogs settings
$blogs = new Blogs();
- if( !$blogs->updateBlog( $this->_blogInfo->getId(), $this->_blogInfo )) {
+ if( !$blogs->updateBlog( $this->_blogInfo )) {
$this->_view = new PluginArticleReferersConfigView( $this->_blogInfo );
$this->_view->setErrorMessage( $this->_locale->tr("error_updating_settings"));
$this->setCommonData();
Modified: plugins/trunk/atom/class/action/adminatompluginupdatesettingsaction.class.php
===================================================================
--- plugins/trunk/atom/class/action/adminatompluginupdatesettingsaction.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/atom/class/action/adminatompluginupdatesettingsaction.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -49,7 +49,7 @@
$blogs = new Blogs();
// update the settings in the database *and* in the session, otherwise we will
// keep using the old settings!!
- $blogs->updateBlogSettings( $this->_blogInfo->getId(), $this->_blogInfo->getSettings());
+ $blogs->updateBlog( $this->_blogInfo );
$this->_session->setValue( "blogInfo", $this->_blogInfo );
$this->saveSession();
Modified: plugins/trunk/atom/class/dao/atompasswords.class.php
===================================================================
--- plugins/trunk/atom/class/dao/atompasswords.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/atom/class/dao/atompasswords.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -6,7 +6,7 @@
* schema of the table, so that we can tell ADOdb to create it
* automatically for us
*/
- define( ATOM_PASSWORDS_DB_SCHEMA,
+ define( "ATOM_PASSWORDS_DB_SCHEMA",
"user_id I(10) NOTNULL,
password C(32) NOTNULL DEFAULT ''" );
@@ -23,6 +23,8 @@
{
$this->Model();
+ // initialize the db and check the tables
+ $this->_initializeDb();
$this->checkTables();
}
Modified: plugins/trunk/atom/class/logger/atomlogger.class.php
===================================================================
--- plugins/trunk/atom/class/logger/atomlogger.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/atom/class/logger/atomlogger.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -1,6 +1,6 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
include_once( PLOG_CLASS_PATH."class/config/config.class.php" );
/**
@@ -8,7 +8,7 @@
*
* @see LoggerManager
*/
- class AtomLogger extends Object
+ class AtomLogger
{
/**
* logs a simple message to the log file, using the "debug" priority"
Modified: plugins/trunk/atom/class/xml/atom/atomabstractservice.class.php
===================================================================
--- plugins/trunk/atom/class/xml/atom/atomabstractservice.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/atom/class/xml/atom/atomabstractservice.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -1,13 +1,12 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
include_once( PLOG_CLASS_PATH."plugins/atom/class/xml/atom/atomrequest.class.php" );
include_once( PLOG_CLASS_PATH."plugins/atom/class/logger/atomlogger.class.php" );
/**
* encapsulates an atom service
*/
- class AtomAbstractService extends Object
+ class AtomAbstractService
{
var $_request;
@@ -22,7 +21,7 @@
$this->_request = $request;
$this->_isInitError = false;
- $this->Object();
+
}
function process()
Modified: plugins/trunk/atom/class/xml/atom/atomrequest.class.php
===================================================================
--- plugins/trunk/atom/class/xml/atom/atomrequest.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/atom/class/xml/atom/atomrequest.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -1,6 +1,6 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
include_once( PLOG_CLASS_PATH."class/net/http/httpvars.class.php" );
include_once( PLOG_CLASS_PATH."plugins/atom/class/xml/lib.xml.inc.php" );
include_once( PLOG_CLASS_PATH."plugins/atom/class/xml/atom/atomFunc.php" );
@@ -11,7 +11,7 @@
/**
* represents an Atom request
*/
- class AtomRequest extends Object
+ class AtomRequest
{
var $_type;
@@ -27,8 +27,8 @@
function AtomRequest()
{
- $this->Object();
+
// assign some inocuous default values to our attributes
$this->_requestPayload = "";
$this->_dom = null;
Modified: plugins/trunk/atom/class/xml/atom/atomresponse.class.php
===================================================================
--- plugins/trunk/atom/class/xml/atom/atomresponse.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/atom/class/xml/atom/atomresponse.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -1,11 +1,11 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
/**
* encapsulates an atom response
*/
- class AtomResponse extends Object
+ class AtomResponse
{
var $_isError;
@@ -15,8 +15,8 @@
function AtomResponse( $output = "" , $headers = Array())
{
- $this->Object();
+
// class attributes
$this->_isError = false;
$this->_output = $output;
Modified: plugins/trunk/atom/class/xml/atom/atomserver.class.php
===================================================================
--- plugins/trunk/atom/class/xml/atom/atomserver.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/atom/class/xml/atom/atomserver.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -1,6 +1,6 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
include_once( PLOG_CLASS_PATH."plugins/atom/class/xml/atom/atomrequest.class.php" );
include_once( PLOG_CLASS_PATH."plugins/atom/class/xml/atom/atomresponse.class.php" );
include_once( PLOG_CLASS_PATH."plugins/atom/class/xml/atom/atomerrorresponse.class.php" );
@@ -24,7 +24,7 @@
/**
* class that handles all the atom requests
*/
- class AtomServer extends Object
+ class AtomServer
{
var $_response;
@@ -32,8 +32,8 @@
function AtomServer()
{
- $this->Object();
+
$this->_response = null;
$this->_request = null;
}
Modified: plugins/trunk/atom/class/xml/atom/editservice.class.php
===================================================================
--- plugins/trunk/atom/class/xml/atom/editservice.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/atom/class/xml/atom/editservice.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -74,6 +74,8 @@
AtomLogger::Log( "Article removed successfully" );
$response = new AtomResponse( "Article deleted OK", Array( HTTP_OK_200 ));
$this->setResponse( $response );
+
+ CacheControl::resetBlogCache( $this->_blogInfo->getId());
return true;
}
@@ -123,6 +125,8 @@
$response = new AtomResponse( "Article updated OK", Array( HTTP_OK_200 ));
$this->setResponse( $response );
+ CacheControl::resetBlogCache( $this->_blogInfo->getId());
+
return true;
}
}
Modified: plugins/trunk/atom/class/xml/atom/feedservice.class.php
===================================================================
--- plugins/trunk/atom/class/xml/atom/feedservice.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/atom/class/xml/atom/feedservice.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -1,11 +1,6 @@
<?php
include_once( PLOG_CLASS_PATH."plugins/atom/class/xml/atom/plogatomabstractservice.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/atom/class/template/atomoutputrenderer.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/atom/class/net/atomrequestgenerator.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/users.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/articles.class.php" );
class FeedService extends PlogAtomAbstractService
{
@@ -20,6 +15,13 @@
*/
function doGet()
{
+ include_once( PLOG_CLASS_PATH."plugins/atom/class/template/atomoutputrenderer.class.php" );
+ include_once( PLOG_CLASS_PATH."plugins/atom/class/net/atomrequestgenerator.class.php" );
+ include_once( PLOG_CLASS_PATH."class/dao/users.class.php" );
+ include_once( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
+ include_once( PLOG_CLASS_PATH."class/dao/articles.class.php" );
+ include_once( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
+
$output = new AtomOutputRenderer( "feed" );
$output->setValue( "blog", $this->_blogInfo );
$output->setValue( "user", $this->_userInfo );
Modified: plugins/trunk/atom/class/xml/atom/wsseauthentication.class.php
===================================================================
--- plugins/trunk/atom/class/xml/atom/wsseauthentication.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/atom/class/xml/atom/wsseauthentication.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -1,6 +1,6 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
include_once( PLOG_CLASS_PATH."plugins/atom/class/data/sha1.class.php" );
/**
@@ -8,7 +8,7 @@
*
* See more information here: http://www.xml.com/pub/a/2003/12/17/dive.html
*/
- class WSSEAuthentication extends Object
+ class WSSEAuthentication
{
var $_userName;
@@ -18,7 +18,7 @@
function WSSEAuthentication()
{
- $this->Object();
+
// initialize with some default values
$this->_userName = "";
Modified: plugins/trunk/authimage/class/action/pluginauthimageupdateconfigaction.class.php
===================================================================
--- plugins/trunk/authimage/class/action/pluginauthimageupdateconfigaction.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/authimage/class/action/pluginauthimageupdateconfigaction.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -66,7 +66,7 @@
// save the blogs settings
$blogs = new Blogs();
- if( !$blogs->updateBlog( $this->_blogInfo->getId(), $this->_blogInfo )) {
+ if( !$blogs->updateBlog( $this->_blogInfo )) {
$this->_view = new PluginAuthImageConfigView( $this->_blogInfo );
$this->_view->setErrorMessage( $this->_locale->tr("error_updating_settings"));
$this->setCommonData();
Modified: plugins/trunk/authimage/class/authimage/authimage.class.php
===================================================================
--- plugins/trunk/authimage/class/authimage/authimage.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/authimage/class/authimage/authimage.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -1,13 +1,13 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
include_once( PLOG_CLASS_PATH."class/misc/glob.class.php" );
include_once( PLOG_CLASS_PATH."class/net/requestgenerator.class.php" );
/**
* deals with backgrounds in disk and so on...
*/
- class AuthImage extends Object
+ class AuthImage
{
/**
* tries to detect and load all the different backgrounds that can be found in the
Modified: plugins/trunk/blogtimes/class/action/pluginblogtimesupdateconfigaction.class.php
===================================================================
--- plugins/trunk/blogtimes/class/action/pluginblogtimesupdateconfigaction.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/blogtimes/class/action/pluginblogtimesupdateconfigaction.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -113,7 +113,7 @@
// save the blogs settings
$blogs = new Blogs();
- if( !$blogs->updateBlog( $this->_blogInfo->getId(), $this->_blogInfo )) {
+ if( !$blogs->updateBlog( $this->_blogInfo )) {
$this->_view = new PluginBlogTimesConfigView( $this->_blogInfo );
$this->_view->setErrorMessage( $this->_locale->tr("error_updating_settings"));
$this->setCommonData();
Modified: plugins/trunk/contentfilter/class/action/adminupdatefilteredcontentsettingsaction.class.php
===================================================================
--- plugins/trunk/contentfilter/class/action/adminupdatefilteredcontentsettingsaction.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/contentfilter/class/action/adminupdatefilteredcontentsettingsaction.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -33,7 +33,7 @@
// save the blogs settings
$blogs = new Blogs();
- if( !$blogs->updateBlog( $this->_blogInfo->getId(), $this->_blogInfo )) {
+ if( !$blogs->updateBlog( $this->_blogInfo )) {
$this->_view = new AdminFilteredContentSettingsView( $this->_blogInfo );
$this->_view->setErrorMessage( $this->_locale->tr("error_updating_settings"));
$this->setCommonData();
Modified: plugins/trunk/contentfilter/class/dao/filteredcontent.class.php
===================================================================
--- plugins/trunk/contentfilter/class/dao/filteredcontent.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/contentfilter/class/dao/filteredcontent.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -1,6 +1,6 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
/**
* Represents a record form the plog_filtered_content table
@@ -8,7 +8,7 @@
* The key of this class is the regexp that will be used to match
* words against it.
*/
- class FilteredContent extends Object
+ class FilteredContent
{
var $_regExp;
@@ -28,7 +28,7 @@
*/
function FilteredContent( $regExp, $blogId, $reason, $date = null, $id = -1 )
{
- $this->Object();
+
$this->_regExp = $regExp;
$this->_blogId = $blogId;
Modified: plugins/trunk/contentfilter/plugincontentfilter.class.php
===================================================================
--- plugins/trunk/contentfilter/plugincontentfilter.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/contentfilter/plugincontentfilter.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -37,6 +37,8 @@
*/
function init()
{
+ include_once( PLOG_CLASS_PATH.'class/template/menu/menu.class.php' );
+
// register the filter
$this->registerFilter( "ContentFilter" );
Modified: plugins/trunk/delicious/class/action/plugindeliciousupdateconfigaction.class.php
===================================================================
--- plugins/trunk/delicious/class/action/plugindeliciousupdateconfigaction.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/delicious/class/action/plugindeliciousupdateconfigaction.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -54,7 +54,7 @@
// save the blogs settings
$blogs = new Blogs();
- if( !$blogs->updateBlog( $this->_blogInfo->getId(), $this->_blogInfo )) {
+ if( !$blogs->updateBlog( $this->_blogInfo )) {
$this->_view = new PluginDeliciousConfigView( $this->_blogInfo );
$this->_view->setErrorMessage( $this->_locale->tr("error_updating_settings"));
$this->setCommonData();
Modified: plugins/trunk/delicious/plugindelicious.class.php
===================================================================
--- plugins/trunk/delicious/plugindelicious.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/delicious/plugindelicious.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -4,6 +4,7 @@
include_once( PLOG_CLASS_PATH."class/plugin/pluginmanager.class.php" );
include_once( PLOG_CLASS_PATH."class/net/rawrequestgenerator.class.php" );
include_once( PLOG_CLASS_PATH."plugins/delicious/class/delicious/delicious.class.php" );
+ include_once( PLOG_CLASS_PATH."class/template/menu/menu.class.php" );
//Used as the root for building the bookmark URLs
define ('DELICIOUS_ROOT', 'http://del.icio.us/');
@@ -122,4 +123,4 @@
}
}
}
-?>
\ No newline at end of file
+?>
Modified: plugins/trunk/dnsantispam/class/action/plugindnsantispamupdateconfigaction.class.php
===================================================================
--- plugins/trunk/dnsantispam/class/action/plugindnsantispamupdateconfigaction.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/dnsantispam/class/action/plugindnsantispamupdateconfigaction.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -32,7 +32,7 @@
// save the blogs settings
$blogs = new Blogs();
- if( !$blogs->updateBlog( $this->_blogInfo->getId(), $this->_blogInfo )) {
+ if( !$blogs->updateBlog( $this->_blogInfo )) {
$this->_view = new PluginDNSAntiSpamConfigView( $this->_blogInfo );
$this->_view->setErrorMessage( $this->_locale->tr("error_updating_settings"));
$this->setCommonData();
Modified: plugins/trunk/dropcase/class/action/plugindropcaseupdateconfigaction.class.php
===================================================================
--- plugins/trunk/dropcase/class/action/plugindropcaseupdateconfigaction.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/dropcase/class/action/plugindropcaseupdateconfigaction.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -32,7 +32,7 @@
// save the blogs settings
$blogs = new Blogs();
- if( !$blogs->updateBlog( $this->_blogInfo->getId(), $this->_blogInfo )) {
+ if( !$blogs->updateBlog( $this->_blogInfo )) {
$this->_view = new PluginDropCaseConfigView( $this->_blogInfo );
$this->_view->setErrorMessage( $this->_locale->tr("error_updating_settings"));
$this->setCommonData();
Modified: plugins/trunk/emailencryption/class/action/adminupdateemailencryptionaction.class.php
===================================================================
--- plugins/trunk/emailencryption/class/action/adminupdateemailencryptionaction.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/emailencryption/class/action/adminupdateemailencryptionaction.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -31,7 +31,7 @@
$blogs = new Blogs();
- if( !$blogs->updateBlog($this->_blogInfo->getId(), $this->_blogInfo))
+ if( !$blogs->updateBlog( $this->_blogInfo ))
{
$this->_view = new AdminEmailEncryptionView( $this->_blogInfo );
$this->_view->setErrorMessage( $this->_locale->tr("error_updating_settings"));
Modified: plugins/trunk/feedreader/class/dao/feeddata.class.php
===================================================================
--- plugins/trunk/feedreader/class/dao/feeddata.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/feedreader/class/dao/feeddata.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -1,9 +1,9 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
include_once( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
- class FeedData extends Object
+ class FeedData
{
var $_myLink;
var $_lastRead;
Modified: plugins/trunk/flickr/class/action/pluginflickrupdateconfigaction.class.php
===================================================================
--- plugins/trunk/flickr/class/action/pluginflickrupdateconfigaction.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/flickr/class/action/pluginflickrupdateconfigaction.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -89,7 +89,7 @@
// save the blogs settings
$blogs = new Blogs();
- if( !$blogs->updateBlog( $this->_blogInfo->getId(), $this->_blogInfo )) {
+ if( !$blogs->updateBlog( $this->_blogInfo )) {
$this->_view = new PluginFlickrConfigView( $this->_blogInfo );
$this->_view->setErrorMessage( $this->_locale->tr("error_updating_settings"));
$this->setCommonData();
Modified: plugins/trunk/gallery/class/action/plugingalleryupdateconfigaction.class.php
===================================================================
--- plugins/trunk/gallery/class/action/plugingalleryupdateconfigaction.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/gallery/class/action/plugingalleryupdateconfigaction.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -132,7 +132,7 @@
$blogs = new Blogs();
// Display an error message if there was a problem with the update
- if( !$blogs->updateBlog( $this->_blogInfo->getId(), $this->_blogInfo ) ) {
+ if( !$blogs->updateBlog( $this->_blogInfo ) ) {
$this->_view = new PluginGalleryConfigView( $this->_blogInfo );
$this->_view->setErrorMessage( $this->_locale->tr( "error_updating_settings" ) );
$this->setCommonData();
Modified: plugins/trunk/gallery/class/gallery/galleryhelper.class.php
===================================================================
--- plugins/trunk/gallery/class/gallery/galleryhelper.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/gallery/class/gallery/galleryhelper.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -1,13 +1,13 @@
<?php
-include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
/**
* This class calls the gallery embedding functions.
*
* @version 0.1
* @author Laurent Vauthrin
*/
-class GalleryHelper extends Object
+class GalleryHelper
{
/**
* @private
Modified: plugins/trunk/googleanalytics/class/action/plugingoogleanalyticsupdateconfigaction.class.php
===================================================================
--- plugins/trunk/googleanalytics/class/action/plugingoogleanalyticsupdateconfigaction.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/googleanalytics/class/action/plugingoogleanalyticsupdateconfigaction.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -52,7 +52,7 @@
// save the blogs settings
$blogs = new Blogs();
- if( !$blogs->updateBlog( $this->_blogInfo->getId(), $this->_blogInfo )) {
+ if( !$blogs->updateBlog( $this->_blogInfo )) {
$this->_view = new PluginStickyPostsConfigView( $this->_blogInfo );
$this->_view->setErrorMessage( $this->_locale->tr("error_updating_settings"));
$this->setCommonData();
Modified: plugins/trunk/gravatar/class/action/plugingravatarupdateconfigaction.class.php
===================================================================
--- plugins/trunk/gravatar/class/action/plugingravatarupdateconfigaction.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/gravatar/class/action/plugingravatarupdateconfigaction.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -42,7 +42,7 @@
// save the blogs settings
$blogs = new Blogs();
- if( !$blogs->updateBlog( $this->_blogInfo->getId(), $this->_blogInfo )) {
+ if( !$blogs->updateBlog( $this->_blogInfo )) {
$this->_view = new PluginGravatarConfigView( $this->_blogInfo );
$this->_view->setErrorMessage( $this->_locale->tr("error_updating_settings"));
$this->setCommonData();
Modified: plugins/trunk/gravatar/class/avatars/avatars.class.php
===================================================================
--- plugins/trunk/gravatar/class/avatars/avatars.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/gravatar/class/avatars/avatars.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -1,13 +1,13 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
include_once( PLOG_CLASS_PATH."class/misc/glob.class.php" );
include_once( PLOG_CLASS_PATH."class/net/requestgenerator.class.php" );
/**
* deals with smileys in disk and so on...
*/
- class Avatars extends Object
+ class Avatars
{
/**
* tries to detect and load all the different avatas that can be found in the
Modified: plugins/trunk/guestbook/class/action/adminupdateguestbookaction.class.php
===================================================================
--- plugins/trunk/guestbook/class/action/adminupdateguestbookaction.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/guestbook/class/action/adminupdateguestbookaction.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -57,7 +57,7 @@
$blogs = new Blogs();
- if( !$blogs->updateBlog($this->_blogInfo->getId(), $this->_blogInfo))
+ if( !$blogs->updateBlog( $this->_blogInfo ))
{
$this->_view = new AdminGuestbookView( $this->_blogInfo );
$this->_view->setErrorMessage( $this->_locale->tr("error_updating_settings"));
Modified: plugins/trunk/guestbook/class/dao/guestbookrecord.class.php
===================================================================
--- plugins/trunk/guestbook/class/dao/guestbookrecord.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/guestbook/class/dao/guestbookrecord.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -1,9 +1,9 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
include_once( PLOG_CLASS_PATH."class/data/Date.class.php" );
- class GuestbookRecord extends Object
+ class GuestbookRecord
{
var $_id;
var $_blogId;
@@ -20,7 +20,7 @@
function GuestbookRecord($blogId, $topic = "", $content = "", $date = null, $userName = "", $userEmail = "", $userUrl = "", $clientIp = "0.0.0.0", $parentId = 0, $private = false, $spamRate = 0)
{
- $this->Object();
+
$this->_blogId = $blogId;
$this->_topic = $topic;
Modified: plugins/trunk/hiddeninput/class/action/pluginhiddeninputupdateconfigaction.class.php
===================================================================
--- plugins/trunk/hiddeninput/class/action/pluginhiddeninputupdateconfigaction.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/hiddeninput/class/action/pluginhiddeninputupdateconfigaction.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -43,7 +43,7 @@
// save the blogs settings
$blogs = new Blogs();
- if( !$blogs->updateBlog( $this->_blogInfo->getId(), $this->_blogInfo )) {
+ if( !$blogs->updateBlog( $this->_blogInfo )) {
$this->_view = new PluginHiddenInputConfigView( $this->_blogInfo );
$this->_view->setErrorMessage( $this->_locale->tr("error_updating_settings"));
$this->setCommonData();
Modified: plugins/trunk/hostblock/class/action/adminupdateblockedhostsettingsaction.class.php
===================================================================
--- plugins/trunk/hostblock/class/action/adminupdateblockedhostsettingsaction.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/hostblock/class/action/adminupdateblockedhostsettingsaction.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -33,7 +33,7 @@
// save the blogs settings
$blogs = new Blogs();
- if( !$blogs->updateBlog( $this->_blogInfo->getId(), $this->_blogInfo )) {
+ if( !$blogs->updateBlog( $this->_blogInfo )) {
$this->_view = new AdminBlockedHostSettingsView( $this->_blogInfo );
$this->_view->setErrorMessage( $this->_locale->tr("error_updating_settings"));
$this->setCommonData();
Modified: plugins/trunk/hostblock/class/dao/blockedhost.class.php
===================================================================
--- plugins/trunk/hostblock/class/dao/blockedhost.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/hostblock/class/dao/blockedhost.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -1,6 +1,6 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
include_once( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
/**
@@ -24,7 +24,7 @@
/**
* Represents a record from the plog_blocked_hosts table.
*/
- class BlockedHost extends Object
+ class BlockedHost
{
var $_id;
@@ -38,7 +38,7 @@
function BlockedHost( $host, $mask, $reason, $date, $blogId, $blockType, $blockList, $id = 1 )
{
- $this->Object();
+
$this->_host = $host;
$this->_mask = $mask;
Modified: plugins/trunk/hotlinkprevention/class/action/pluginhotlinkpreventionupdateconfigaction.class.php
===================================================================
--- plugins/trunk/hotlinkprevention/class/action/pluginhotlinkpreventionupdateconfigaction.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/hotlinkprevention/class/action/pluginhotlinkpreventionupdateconfigaction.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -50,7 +50,7 @@
// save the blogs settings
$blogs = new Blogs();
- if( !$blogs->updateBlog( $this->_blogInfo->getId(), $this->_blogInfo )) {
+ if( !$blogs->updateBlog( $this->_blogInfo )) {
$this->_view = new PluginHotlinkPreventionConfigView( $this->_blogInfo );
$this->_view->setErrorMessage( $this->_locale->tr("error_updating_settings"));
$this->setCommonData();
Modified: plugins/trunk/karma/class/action/adminkarmapluginupdatesettingsaction.class.php
===================================================================
--- plugins/trunk/karma/class/action/adminkarmapluginupdatesettingsaction.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/karma/class/action/adminkarmapluginupdatesettingsaction.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -144,7 +144,7 @@
$blogs = new Blogs();
// update the settings in the db, and make sure that everything went fine
- if( !$blogs->updateBlogSettings( $this->_blogInfo->getId(), $this->_blogInfo->getSettings())) {
+ if( !$blogs->updateBlogs( $this->_blogInfo )) {
$this->_view = new AdminKarmaPluginSettingsView( $this->_blogInfo );
$this->_view->setErrorMessage( $this->_locale->tr("error_updating_settings"));
$this->setCommonData();
Modified: plugins/trunk/karma/class/karma/karmalib.class.php
===================================================================
--- plugins/trunk/karma/class/karma/karmalib.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/karma/class/karma/karmalib.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -2,7 +2,7 @@
include_once( PLOG_CLASS_PATH."class/dao/articles.class.php" );
include_once( PLOG_CLASS_PATH."class/dao/model.class.php" );
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
include_once( PLOG_CLASS_PATH."debug.php" );
define( "PLUGIN_KARMA_DEFAULT_NEGATIVE_THRESHOLD", 3 );
@@ -19,7 +19,7 @@
* "vanish" from the main page. At that point, it will only be found via the "show moderated down"
* posts.
*/
- class KarmaScoreLogic extends Object
+ class KarmaScoreLogic
{
/**
* returns whether the post should be moderated up, down or do nothing.
Modified: plugins/trunk/linktracker/class/dao/linktracker.class.php
===================================================================
--- plugins/trunk/linktracker/class/dao/linktracker.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/linktracker/class/dao/linktracker.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -14,7 +14,7 @@
* searching for all the links in the posts so that they can
* be seen/explored/analyzed together
*/
- class LinkTracker extends Object
+ class LinkTracker
{
/**
@@ -22,7 +22,7 @@
*/
function LinkTracker()
{
- $this->Object();
+
}
/**
Modified: plugins/trunk/linktracker/class/dao/linktrackerresult.class.php
===================================================================
--- plugins/trunk/linktracker/class/dao/linktrackerresult.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/linktracker/class/dao/linktrackerresult.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -4,7 +4,7 @@
* @package dao
*/
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
include_once( PLOG_CLASS_PATH."class/dao/article.class.php" );
/**
@@ -16,7 +16,7 @@
* "href" attribute) and the description, which is the text that was between the opening and closing
* tags of the anchor.
*/
- class LinkTrackerResult extends Object {
+ class LinkTrackerResult {
var $_url;
var $_desc;
@@ -30,7 +30,7 @@
*/
function LinkTrackerResult( $url = "", $desc = "" )
{
- $this->Object();
+
$this->_url = $url;
$this->_desc = $desc;
Modified: plugins/trunk/lunar/class/action/pluginlunarupdateconfigaction.class.php
===================================================================
--- plugins/trunk/lunar/class/action/pluginlunarupdateconfigaction.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/lunar/class/action/pluginlunarupdateconfigaction.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -32,7 +32,7 @@
// save the blogs settings
$blogs = new Blogs();
- if( !$blogs->updateBlog( $this->_blogInfo->getId(), $this->_blogInfo )) {
+ if( !$blogs->updateBlog( $this->_blogInfo )) {
$this->_view = new PluginLunarConfigView( $this->_blogInfo );
$this->_view->setErrorMessage( $this->_locale->tr("error_updating_settings"));
$this->setCommonData();
Modified: plugins/trunk/mailcentre/class/dao/mailmessage.class.php
===================================================================
--- plugins/trunk/mailcentre/class/dao/mailmessage.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/mailcentre/class/dao/mailmessage.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -1,8 +1,8 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
- class MailMessage extends Object
+
+ class MailMessage
{
var $_subject;
@@ -14,20 +14,20 @@
function MailMessage( $subject, $text, $to, $cc, $bcc, $sent = null, $id = -1 )
{
- $this->Object();
+
$this->_subject = $subject;
$this->_text = $text;
- $this->_to = $to;
- $this->_cc = $cc;
- $this->_bcc = $bcc;
- if( $sent == null ) {
- $this->_sentTimestamp = new Timestamp( $sent );
- $this->_sent = $this->_sentTimestamp->getTimestamp();
- }
+ $this->_to = $to;
+ $this->_cc = $cc;
+ $this->_bcc = $bcc;
+ if( $sent == null ) {
+ $this->_sentTimestamp = new Timestamp( $sent );
+ $this->_sent = $this->_sentTimestamp->getTimestamp();
+ }
else {
$this->_sent = $sent;
- $this->_sentTimestamp = new Timestamp( $sent );
+ $this->_sentTimestamp = new Timestamp( $sent );
}
$this->_id = $id;
}
@@ -60,18 +60,18 @@
function getTo()
{
return( $this->_to );
- }
-
- function getCc()
- {
- return( $this->_cc );
- }
-
- function getBcc()
- {
- return( $this->_bcc );
}
+ function getCc()
+ {
+ return( $this->_cc );
+ }
+
+ function getBcc()
+ {
+ return( $this->_bcc );
+ }
+
function setId( $id )
{
$this->_id = $id;
Modified: plugins/trunk/mobile/class/net/terminalidentifier.class.php
===================================================================
--- plugins/trunk/mobile/class/net/terminalidentifier.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/mobile/class/net/terminalidentifier.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -1,10 +1,10 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
include_once( PLOG_CLASS_PATH."plugins/mobile/class/net/terminalinfo.class.php" );
include_once( PLOG_CLASS_PATH."class/config/config.class.php" );
- class TerminalIdentifier extends Object
+ class TerminalIdentifier
{
var $_headers;
@@ -12,8 +12,8 @@
function TerminalIdentifier()
{
- $this->Object();
+
$this->_loadTerminalDefinition();
}
Modified: plugins/trunk/mobile/class/net/terminalinfo.class.php
===================================================================
--- plugins/trunk/mobile/class/net/terminalinfo.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/mobile/class/net/terminalinfo.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -1,16 +1,16 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
- class TerminalInfo extends Object
+
+ class TerminalInfo
{
var $_headers;
var $_def;
function TerminalInfo( $terminalDef, $headers )
{
- $this->Object();
+
$this->_def = $terminalDef;
$this->_headers = $headers;
}
Modified: plugins/trunk/moblog/class/action/adminmoblogpluginupdatesettingsaction.class.php
===================================================================
--- plugins/trunk/moblog/class/action/adminmoblogpluginupdatesettingsaction.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/moblog/class/action/adminmoblogpluginupdatesettingsaction.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -41,7 +41,7 @@
// keep using the old settings!!
$blogs = new Blogs();
$this->_blogInfo->setSettings( $blogSettings );
- $blogs->updateBlogSettings( $this->_blogInfo->getId(), $this->_blogInfo->getSettings());
+ $blogs->updateBlog( $this->_blogInfo );
$this->_session->setValue( "blogInfo", $this->_blogInfo );
$this->saveSession();
Modified: plugins/trunk/moblog/class/log/mobloglogger.class.php
===================================================================
--- plugins/trunk/moblog/class/log/mobloglogger.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/moblog/class/log/mobloglogger.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -1,6 +1,6 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
include_once( PLOG_CLASS_PATH."class/config/config.class.php" );
/**
@@ -8,7 +8,7 @@
*
* @see LoggerManager
*/
- class MoblogLogger extends Object
+ class MoblogLogger
{
/**
* logs a simple message to the log file, using the "debug" priority
Modified: plugins/trunk/moblog/class/moblog/moblogconstants.properties.php
===================================================================
--- plugins/trunk/moblog/class/moblog/moblogconstants.properties.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/moblog/class/moblog/moblogconstants.properties.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -15,5 +15,5 @@
define( 'MOBLOG_IGNORE_SMIL_ATTACHMENTS', true );
// encode all incoming e-mail message to UTF-8
- define( 'MOBLOG_FORCE_ENCODE_TO_UTF8', true );
+ define( 'MOBLOG_FORCE_ENCODE_TO_UTF8', false );
?>
\ No newline at end of file
Modified: plugins/trunk/moblog/class/moblog/moblogrequest.class.php
===================================================================
--- plugins/trunk/moblog/class/moblog/moblogrequest.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/moblog/class/moblog/moblogrequest.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -8,7 +8,7 @@
/**
* contains all the parameters that came in the user's email.
*/
- class MoblogRequest extends Object
+ class MoblogRequest
{
var $_message;
var $_structure;
@@ -28,7 +28,7 @@
function MoblogRequest( $request )
{
- $this->Object();
+
$this->_message = $request["message"];
// it is possible to specify a default user id in the POSTed email message via
@@ -179,15 +179,15 @@
$tmpFolderName = $config->getValue( "temp_folder" );
File::createDir( $tmpFolderName );
MoblogLogger::log( "Creating temp folder = $tmpFolderName" );
- $fileName = stripslashes($part->ctype_parameters["name"]);
-
- // if the filename is not in the 'filename' field, then try with the
- // 'content-location' field, since some MMS-to-email gateways seem to put
- // the file name there for wahtever reason
- if( $fileName == "" )
- $fileName = stripslashes($part->d_parameters["filename"]);
- if ( ($fileName == "") && (isset($part->headers['content-location'])) )
- $fileName = stripslashes($part->headers['content-location']);
+ $fileName = stripslashes($part->ctype_parameters["name"]);
+
+ // if the filename is not in the 'filename' field, then try with the
+ // 'content-location' field, since some MMS-to-email gateways seem to put
+ // the file name there for wahtever reason
+ if( $fileName == "" )
+ $fileName = stripslashes($part->d_parameters["filename"]);
+ if ( ($fileName == "") && (isset($part->headers['content-location'])) )
+ $fileName = stripslashes($part->headers['content-location']);
$fileName = str_replace( "\"", "", $fileName );
$fileName = str_replace( "'", "", $fileName );
Modified: plugins/trunk/moblog/class/moblog/moblogresponse.class.php
===================================================================
--- plugins/trunk/moblog/class/moblog/moblogresponse.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/moblog/class/moblog/moblogresponse.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -1,6 +1,6 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
include_once( PLOG_CLASS_PATH."plugins/moblog/class/log/mobloglogger.class.php" );
include_once( PLOG_CLASS_PATH."class/mail/emailmessage.class.php" );
include_once( PLOG_CLASS_PATH."class/mail/emailservice.class.php" );
@@ -12,15 +12,15 @@
* use the same settings as used by the core itself to send
* messages.
*/
- class MoblogResponse extends Object
+ class MoblogResponse
{
var $_message;
function MoblogResponse( $to = null, $subject = null, $text = null )
{
- $this->Object();
+
$this->_message = new EmailMessage();
$config =& Config::getConfig();
$from = $config->getValue( "post_notification_source_address" );
Modified: plugins/trunk/moblog.php
===================================================================
--- plugins/trunk/moblog.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/moblog.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -204,9 +204,6 @@
foreach( $attachments as $attachment ) {
MoblogLogger::log( "-- Processing attachment ".$attachment->getFileName());
$result = $res->addResource( $blogInfo->getId(), $albumId, $attachment->getFileName(), $attachment );
- //$filePath = $attachment->getFolder()."/".$attachment->getFileName();
- //MoblogLogger::log( "filename = ".$attachment->getFileName()." - patch = ".$filePath );
- //$result = $res->addResourceFromDisk( $blogInfo->getId(), $albumId, $attachment->getFileName(), $filePath );
MoblogLogger::log( " Completed: result = $result" );
if( $result ) {
// keep this for later
@@ -229,14 +226,20 @@
$markup = "<a id=\"res_".$resId."\" href=\"".$rg->resourceLink( $resource )."\">";
if( $resource->isImage()) {
$previewType = $blogSettings->getValue( "plugin_moblog_resource_preview_type" );
- if( $previewType == MOBLOG_EMBED_MEDIUM_PREVIEW )
+ if( $previewType == MOBLOG_EMBED_MEDIUM_PREVIEW ) {
$link = $rg->resourceMediumSizePreviewLink( $resource );
- elseif( $previewType == MOBLOG_EMBED_FULL_SIZE_VIEW )
+ $cssClass = "res_image_medium";
+ }
+ elseif( $previewType == MOBLOG_EMBED_FULL_SIZE_VIEW ) {
$link = $rg->resourceDownloadLink( $resource );
- else
+ $cssClass = "res_image";
+ }
+ else {
$link = $rg->resourcePreviewLink( $resource );
+ $cssClass = "res_image_small";
+ }
- $markup .= "<img src=\"$link\" alt=\"".$resource->getDescription()."\" />";
+ $markup .= "<img class=\"$cssClass\" src=\"$link\" alt=\"".$resource->getDescription()."\" />";
}
else {
$markup .= $resource->getDescription();
Modified: plugins/trunk/moderate/class/action/adminmoderatepluginupdatesettingsaction.class.php
===================================================================
--- plugins/trunk/moderate/class/action/adminmoderatepluginupdatesettingsaction.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/moderate/class/action/adminmoderatepluginupdatesettingsaction.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -37,7 +37,7 @@
// save the blogs settings
$blogs = new Blogs();
- if( !$blogs->updateBlog( $this->_blogInfo->getId(), $this->_blogInfo )) {
+ if( !$blogs->updateBlog( $this->_blogInfo )) {
$this->_view = new AdminModeratePluginSettingsView( $this->_blogInfo );
$this->_view->setErrorMessage( $this->_locale->tr("error_updating_settings"));
$this->setCommonData();
Modified: plugins/trunk/nofollow/class/action/pluginnofollowupdateconfigaction.class.php
===================================================================
--- plugins/trunk/nofollow/class/action/pluginnofollowupdateconfigaction.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/nofollow/class/action/pluginnofollowupdateconfigaction.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -33,7 +33,7 @@
// save the blogs settings
$blogs = new Blogs();
- if( !$blogs->updateBlog( $this->_blogInfo->getId(), $this->_blogInfo )) {
+ if( !$blogs->updateBlog( $this->_blogInfo )) {
$this->_view = new PluginNoFollowConfigView( $this->_blogInfo );
$this->_view->setErrorMessage( $this->_locale->tr("error_updating_settings"));
$this->setCommonData();
Modified: plugins/trunk/nofollow/pluginnofollow.class.php
===================================================================
--- plugins/trunk/nofollow/pluginnofollow.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/nofollow/pluginnofollow.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -1,6 +1,5 @@
<?php
include_once( PLOG_CLASS_PATH."class/plugin/pluginbase.class.php" );
- include_once( PLOG_CLASS_PATH."class/plugin/pluginmanager.class.php" );
class PluginNoFollow extends PluginBase
{
Modified: plugins/trunk/plogbirthdays/class/dao/plogbirthday.class.php
===================================================================
--- plugins/trunk/plogbirthdays/class/dao/plogbirthday.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/plogbirthdays/class/dao/plogbirthday.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -12,7 +12,7 @@
include_once(PLOG_CLASS_PATH."class/object/object.class.php");
-class PlogBirthday extends Object
+class PlogBirthday
{
var $_bdid;
var $_bdperson;
Modified: plugins/trunk/plogeshi/class/action/pluginplogeshiupdateconfigaction.class.php
===================================================================
--- plugins/trunk/plogeshi/class/action/pluginplogeshiupdateconfigaction.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/plogeshi/class/action/pluginplogeshiupdateconfigaction.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -32,7 +32,7 @@
// save the blogs settings
$blogs = new Blogs();
- if( !$blogs->updateBlog( $this->_blogInfo->getId(), $this->_blogInfo )) {
+ if( !$blogs->updateBlog( $this->_blogInfo )) {
$this->_view = new PluginPloGeshiConfigView( $this->_blogInfo );
$this->_view->setErrorMessage( $this->_locale->tr("error_updating_settings"));
$this->setCommonData();
Modified: plugins/trunk/plogeshi/class/plogeshi/plogeshi.class.php
===================================================================
--- plugins/trunk/plogeshi/class/plogeshi/plogeshi.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/plogeshi/class/plogeshi/plogeshi.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -1,8 +1,8 @@
<?
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
- class PloGeshi extends Object
+
+ class PloGeshi
{
function colorText ( $text )
Modified: plugins/trunk/ploghaiku/class/dao/ploghaikuobject.class.php
===================================================================
--- plugins/trunk/ploghaiku/class/dao/ploghaikuobject.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/ploghaiku/class/dao/ploghaikuobject.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -12,7 +12,7 @@
include_once(PLOG_CLASS_PATH."class/object/object.class.php");
-class PlogHaikuObject extends Object
+class PlogHaikuObject
{
var $_id;
var $_syl;
@@ -23,7 +23,7 @@
function PlogHaikuObject($id,$syl,$text,$date,$owner_id,$blog_id)
{
- $this->Object();
+
$this->_id = $id;
$this->_syl = $syl;
$this->_text = $text;
Modified: plugins/trunk/plogpoll/class/dao/plogpollpoll.class.php
===================================================================
--- plugins/trunk/plogpoll/class/dao/plogpollpoll.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/plogpoll/class/dao/plogpollpoll.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -12,7 +12,7 @@
include_once(PLOG_CLASS_PATH."class/object/object.class.php");
-class PlogPollPoll extends Object
+class PlogPollPoll
{
var $_id;
var $_subject;
@@ -25,7 +25,7 @@
function PlogPollPoll(
$id,$subject,$responses,$responsedata,$dateadded,$active,$blogid)
{
- $this->Object();
+
$this->_subject = $subject;
$this->_responses = $responses;
$this->_responsedata = $responsedata;
Modified: plugins/trunk/plogstaticrotator/class/dao/plogstaticrotatorcontent.class.php
===================================================================
--- plugins/trunk/plogstaticrotator/class/dao/plogstaticrotatorcontent.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/plogstaticrotator/class/dao/plogstaticrotatorcontent.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -12,7 +12,7 @@
include_once(PLOG_CLASS_PATH."class/object/object.class.php");
-class PlogStaticRotatorContent extends Object
+class PlogStaticRotatorContent
{
var $_id;
var $_blogid;
Modified: plugins/trunk/port/class/dao/extmodel.class.php
===================================================================
--- plugins/trunk/port/class/dao/extmodel.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/port/class/dao/extmodel.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -1,6 +1,6 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
include_once( PLOG_CLASS_PATH."class/database/adodb/adodb.inc.php" );
include_once( PLOG_CLASS_PATH."plugins/port/class/database/extdb.class.php" );
@@ -13,7 +13,7 @@
* connection so that classes don't have to worry about that. Later on, the Model
* classes will be used by the corresponding action object.
*/
- class ExtModel extends Object {
+ class ExtModel {
var $_db;
var $_prefix;
Modified: plugins/trunk/port/class/database/extdb.class.php
===================================================================
--- plugins/trunk/port/class/database/extdb.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/port/class/database/extdb.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -1,15 +1,15 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
/**
* Provides a singleton for accessing the db.
*/
- class ExtDb extends Object {
+ class ExtDb {
function ExtDb()
{
- $this->Object();
+
}
function &getDb($dbhost, $dbuser, $dbpass, $dbdatabase)
Modified: plugins/trunk/recentcomments/class/action/pluginrecentcommentsupdateconfigaction.class.php
===================================================================
--- plugins/trunk/recentcomments/class/action/pluginrecentcommentsupdateconfigaction.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/recentcomments/class/action/pluginrecentcommentsupdateconfigaction.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -43,7 +43,7 @@
// save the blogs settings
$blogs = new Blogs();
- if( !$blogs->updateBlog( $this->_blogInfo->getId(), $this->_blogInfo )) {
+ if( !$blogs->updateBlog( $this->_blogInfo )) {
$this->_view = new PluginRecentCommentsConfigView( $this->_blogInfo );
$this->_view->setErrorMessage( $this->_locale->tr("error_updating_settings"));
$this->setCommonData();
Modified: plugins/trunk/recenttrackbacks/class/action/pluginrecenttrackbacksupdateconfigaction.class.php
===================================================================
--- plugins/trunk/recenttrackbacks/class/action/pluginrecenttrackbacksupdateconfigaction.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/recenttrackbacks/class/action/pluginrecenttrackbacksupdateconfigaction.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -43,7 +43,7 @@
// save the blogs settings
$blogs = new Blogs();
- if( !$blogs->updateBlog( $this->_blogInfo->getId(), $this->_blogInfo )) {
+ if( !$blogs->updateBlog( $this->_blogInfo )) {
$this->_view = new PluginRecentTrackbacksConfigView( $this->_blogInfo );
$this->_view->setErrorMessage( $this->_locale->tr("error_updating_settings"));
$this->setCommonData();
Modified: plugins/trunk/recommended/class/action/pluginrecommendedupdateconfigaction.class.php
===================================================================
--- plugins/trunk/recommended/class/action/pluginrecommendedupdateconfigaction.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/recommended/class/action/pluginrecommendedupdateconfigaction.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -56,7 +56,7 @@
// save the blogs settings
$blogs = new Blogs();
- if( !$blogs->updateBlog( $this->_blogInfo->getId(), $this->_blogInfo )) {
+ if( !$blogs->updateBlog( $this->_blogInfo )) {
$this->_view = new PluginRecommendedConfigView( $this->_blogInfo );
$this->_view->setErrorMessage( $this->_locale->tr("error_updating_settings"));
$this->setCommonData();
Modified: plugins/trunk/remembercommentdata/class/action/pluginremembercommentdataupdateconfigaction.class.php
===================================================================
--- plugins/trunk/remembercommentdata/class/action/pluginremembercommentdataupdateconfigaction.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/remembercommentdata/class/action/pluginremembercommentdataupdateconfigaction.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -33,7 +33,7 @@
// save the blogs settings
$blogs = new Blogs();
- if( !$blogs->updateBlog( $this->_blogInfo->getId(), $this->_blogInfo )) {
+ if( !$blogs->updateBlog( $this->_blogInfo )) {
$this->_view = new PluginRememberCommentDataConfigView( $this->_blogInfo );
$this->_view->setErrorMessage( $this->_locale->tr("error_updating_settings"));
$this->setCommonData();
Modified: plugins/trunk/rightschooser/class/action/pluginrightschooserupdateconfigaction.class.php
===================================================================
--- plugins/trunk/rightschooser/class/action/pluginrightschooserupdateconfigaction.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/rightschooser/class/action/pluginrightschooserupdateconfigaction.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -51,7 +51,7 @@
// save the blogs settings
$blogs = new Blogs();
- if( !$blogs->updateBlog( $this->_blogInfo->getId(), $this->_blogInfo )) {
+ if( !$blogs->updateBlog( $this->_blogInfo )) {
$this->_view = new PluginRightsChooserConfigView( $this->_blogInfo );
$this->_view->setErrorMessage( $this->_locale->tr("error_updating_settings"));
$this->setCommonData();
Modified: plugins/trunk/secret/class/action/adminsecretpluginupdatesettingsaction.class.php
===================================================================
--- plugins/trunk/secret/class/action/adminsecretpluginupdatesettingsaction.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/secret/class/action/adminsecretpluginupdatesettingsaction.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -112,7 +112,7 @@
// save the blogs settings
$blogs = new Blogs();
- if( !$blogs->updateBlog( $this->_blogInfo->getId(), $this->_blogInfo )) {
+ if( !$blogs->updateBlog( $this->_blogInfo )) {
$this->_view = new AdminSecretPluginSettingsView( $this->_blogInfo );
$this->_view->setErrorMessage( $this->_locale->tr("error_updating_settings"));
$this->setCommonData();
Modified: plugins/trunk/secretblog/class/action/adminsecretblogpluginupdatesettingsaction.class.php
===================================================================
--- plugins/trunk/secretblog/class/action/adminsecretblogpluginupdatesettingsaction.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/secretblog/class/action/adminsecretblogpluginupdatesettingsaction.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -44,7 +44,7 @@
// save the blogs settings
$blogs = new Blogs();
- if( !$blogs->updateBlog( $this->_blogInfo->getId(), $this->_blogInfo )) {
+ if( !$blogs->updateBlog( $this->_blogInfo )) {
$this->_view = new AdminSecretPluginSettingsView( $this->_blogInfo );
$this->_view->setErrorMessage( $this->_locale->tr("error_updating_settings"));
$this->setCommonData();
Modified: plugins/trunk/shoutbox/plugins/shoutbox/class/action/pluginshoutboxsetupaction.class.php
===================================================================
--- plugins/trunk/shoutbox/plugins/shoutbox/class/action/pluginshoutboxsetupaction.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/shoutbox/plugins/shoutbox/class/action/pluginshoutboxsetupaction.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -96,7 +96,7 @@
// save the blogs settings
$blogs = new Blogs();
- if( !$blogs->updateBlog( $this->_blogInfo->getId(), $this->_blogInfo )) {
+ if( !$blogs->updateBlog( $this->_blogInfo )) {
$this->_view = new AdminErrorView( $this->_blogInfo );
$this->_view->setValue( "message", "An error occurred while saving the shoutbox options");
$this->setCommonData();
Modified: plugins/trunk/shoutbox/plugins/shoutbox/class/action/pluginshoutboxupdateconfigaction.class.php
===================================================================
--- plugins/trunk/shoutbox/plugins/shoutbox/class/action/pluginshoutboxupdateconfigaction.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/shoutbox/plugins/shoutbox/class/action/pluginshoutboxupdateconfigaction.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -60,7 +60,7 @@
// save the blogs settings
$blogs = new Blogs();
- if( !$blogs->updateBlog( $this->_blogInfo->getId(), $this->_blogInfo )) {
+ if( !$blogs->updateBlog( $this->_blogInfo )) {
$this->_view = new AdminErrorView( $this->_blogInfo );
$this->_view->setValue( "message", "An error occurred! " . $backLink);
$this->setCommonData();
Modified: plugins/trunk/sitemap/class/action/adminsitemappluginupdatesettingsaction.class.php
===================================================================
--- plugins/trunk/sitemap/class/action/adminsitemappluginupdatesettingsaction.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/sitemap/class/action/adminsitemappluginupdatesettingsaction.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -42,7 +42,7 @@
// save the blogs settings
$blogs = new Blogs();
- if( !$blogs->updateBlog( $this->_blogInfo->getId(), $this->_blogInfo )) {
+ if( !$blogs->updateBlog( $this->_blogInfo )) {
$this->_view = new AdminSiteMapPluginSettingsView( $this->_blogInfo );
$this->_view->setErrorMessage( $this->_locale->tr("error_updating_settings"));
$this->setCommonData();
Modified: plugins/trunk/smileys/class/action/pluginsmileysupdateconfigaction.class.php
===================================================================
--- plugins/trunk/smileys/class/action/pluginsmileysupdateconfigaction.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/smileys/class/action/pluginsmileysupdateconfigaction.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -37,7 +37,7 @@
// save the blogs settings
$blogs = new Blogs();
- if( !$blogs->updateBlog( $this->_blogInfo->getId(), $this->_blogInfo )) {
+ if( !$blogs->updateBlog( $this->_blogInfo )) {
$this->_view = new PluginSmileysConfigView( $this->_blogInfo );
$this->_view->setErrorMessage( $this->_locale->tr("error_updating_settings"));
$this->setCommonData();
Modified: plugins/trunk/smileys/class/smileys/smileys.class.php
===================================================================
--- plugins/trunk/smileys/class/smileys/smileys.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/smileys/class/smileys/smileys.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -1,14 +1,9 @@
<?php
-
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
- include_once( PLOG_CLASS_PATH."class/file/file.class.php" );
- include_once( PLOG_CLASS_PATH."class/net/requestgenerator.class.php" );
- include_once( PLOG_CLASS_PATH."class/misc/glob.class.php" );
/**
* deals with smileys in disk and so on...
*/
- class Smileys extends Object
+ class Smileys
{
/**
* tries to detect and load all the different smiley sets that can be found in the
@@ -18,6 +13,9 @@
*/
function scanSmileysFolder()
{
+ include_once( PLOG_CLASS_PATH."class/file/file.class.php" );
+ include_once( PLOG_CLASS_PATH."class/misc/glob.class.php" );
+
// first of all, find how many folders are available
$smileyFolders = Glob::glob( SMILEY_FILE_PATH );
@@ -50,6 +48,8 @@
*/
function loadSmileySet( $setName )
{
+ include_once( PLOG_CLASS_PATH."class/file/file.class.php" );
+
// define the path to the smiley file
$file = SMILEY_FILE_PATH.$setName."/emoticons.properties.php";
@@ -75,7 +75,7 @@
*/
function smileys( $blogInfo, $text, $setName, $smileySet )
{
- $rg =& RequestGenerator::getRequestGenerator( $blogInfo );
+ $rg = $blogInfo->getBlogRequestGenerator();
foreach( $smileySet as $smiley => $icon ) {
$iconTag = "<img alt=\"$smiley\" src=\"".
$rg->getUrl( "/plugins/smileys/icons/".$setName."/".$icon."\" />" );
Modified: plugins/trunk/smileys/pluginsmileys.class.php
===================================================================
--- plugins/trunk/smileys/pluginsmileys.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/smileys/pluginsmileys.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -1,8 +1,6 @@
<?php
include_once( PLOG_CLASS_PATH."class/plugin/pluginbase.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/smileys/class/smileys/smileys.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
define( "DEFAULT_SMILEY_SET", "default" );
@@ -70,11 +68,13 @@
function _smileizePost( $post, $smileySet, $smileys )
{
+ include_once( PLOG_CLASS_PATH."plugins/smileys/class/smileys/smileys.class.php" );
+
// modify the text...
$postIntroText = $post->getIntroText();
- $postIntroText = Smileys::smileys( $blogInfo, $postIntroText, $smileySet, $smileys );
+ $postIntroText = Smileys::smileys( $this->blogInfo, $postIntroText, $smileySet, $smileys );
$postExtendedText = $post->getExtendedText();
- $postExtendedText = Smileys::smileys( $blogInfo, $postExtendedText, $smileySet, $smileys );
+ $postExtendedText = Smileys::smileys( $this->blogInfo, $postExtendedText, $smileySet, $smileys );
$post->setText( $postIntroText.POST_EXTENDED_TEXT_MODIFIER.$postExtendedText );
// ...modify the comments...
$comments = $post->getComments();
@@ -87,7 +87,7 @@
$output = Array();
foreach( $comments as $comment ) {
$tmpText = $comment->getText();
- $commentText = Smileys::smileys( $blogInfo, $tmpText, $smileySet, $smileys );
+ $commentText = Smileys::smileys( $this->blogInfo, $tmpText, $smileySet, $smileys );
$comment->setText( $commentText );
array_push( $output, $comment );
}
@@ -105,6 +105,8 @@
*/
function process( $eventType, $params )
{
+ include_once( PLOG_CLASS_PATH."plugins/smileys/class/smileys/smileys.class.php" );
+
// get the objects we need from the parameters array
$blogInfo = $params[ "blogInfo" ];
$blogSettings = $blogInfo->getSettings();
@@ -145,12 +147,14 @@
function generateSmileysBar()
{
+ include_once( PLOG_CLASS_PATH."plugins/smileys/class/smileys/smileys.class.php" );
+
if( $this->_pluginEnabled ) {
// load the set
$smileys = Smileys::loadSmileySet( $this->_smileySet );
$text = "";
- $rg =& RequestGenerator::getRequestGenerator( $blogInfo );
+ $rg = $blogInfo->getBlogRequestGenerator();
$prevIcon = "";
$currentIcon = "";
foreach( $smileys as $smiley => $icon ) {
Modified: plugins/trunk/stickyposts/class/action/pluginstickypostsupdateconfigaction.class.php
===================================================================
--- plugins/trunk/stickyposts/class/action/pluginstickypostsupdateconfigaction.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/stickyposts/class/action/pluginstickypostsupdateconfigaction.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -77,7 +77,7 @@
// save the blogs settings
$blogs = new Blogs();
- if( !$blogs->updateBlog( $this->_blogInfo->getId(), $this->_blogInfo )) {
+ if( !$blogs->updateBlog( $this->_blogInfo )) {
$this->_view = new PluginStickyPostsConfigView( $this->_blogInfo );
$this->_view->setErrorMessage( $this->_locale->tr("error_updating_settings"));
$this->setCommonData();
Modified: plugins/trunk/submissions/class/action/adminsubmissionspluginupdatesettingsaction.class.php
===================================================================
--- plugins/trunk/submissions/class/action/adminsubmissionspluginupdatesettingsaction.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/submissions/class/action/adminsubmissionspluginupdatesettingsaction.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -114,7 +114,7 @@
// update the settings in the db, and make sure that everything went fine
$blogs = new Blogs();
- if( !$blogs->updateBlogSettings( $this->_blogInfo->getId(), $this->_blogInfo->getSettings())) {
+ if( !$blogs->updateBlogs( $this->_blogInfo )) {
$this->_view = new AdminSubmissionsPluginSettingsView( $this->_blogInfo );
$this->_view->setErrorMessage( $this->_locale->tr("error_updating_settings"));
$this->setCommonData();
Modified: plugins/trunk/technorati/class/action/admintechnoratipluginupdatesettingsaction.class.php
===================================================================
--- plugins/trunk/technorati/class/action/admintechnoratipluginupdatesettingsaction.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/technorati/class/action/admintechnoratipluginupdatesettingsaction.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -91,7 +91,7 @@
$blogs = new Blogs();
// update the settings in the db, and make sure that everything went fine
- if( !$blogs->updateBlogSettings( $this->_blogInfo->getId(), $this->_blogInfo->getSettings())) {
+ if( !$blogs->updateBlogs( $this->_blogInfo )) {
$this->_view = new AdminTechnoratiPluginSettingsView( $this->_blogInfo );
$this->_view->setErrorMessage( $this->_locale->tr("error_updating_settings"));
$this->setCommonData();
Modified: plugins/trunk/templateeditor/class/action/pluginbloguploadtemplatefileaction.class.php
===================================================================
--- plugins/trunk/templateeditor/class/action/pluginbloguploadtemplatefileaction.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/templateeditor/class/action/pluginbloguploadtemplatefileaction.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -57,6 +57,7 @@
function perform()
{
// uploads the file and moves it to the correct folder
+ include_once( PLOG_CLASS_PATH."class/file/fileuploads.class.php" );
$uploads = new FileUploads( $this->_files );
// make sure were it should go
Modified: plugins/trunk/textparser/class/action/adminplugintextparserupdatesettingsaction.class.php
===================================================================
--- plugins/trunk/textparser/class/action/adminplugintextparserupdatesettingsaction.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/textparser/class/action/adminplugintextparserupdatesettingsaction.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -39,7 +39,7 @@
// save the blogs settings
$blogs = new Blogs();
- if( !$blogs->updateBlog( $this->_blogInfo->getId(), $this->_blogInfo )) {
+ if( !$blogs->updateBlog( $this->_blogInfo )) {
$this->_view = new AdminPluginTextParserSettingsView( $this->_blogInfo );
$this->_view->setErrorMessage( "message", $this->_locale->tr("error_updating_settings"));
$this->setCommonData();
Modified: plugins/trunk/topcommentposts/class/action/plugintopcommentpostsupdateconfigaction.class.php
===================================================================
--- plugins/trunk/topcommentposts/class/action/plugintopcommentpostsupdateconfigaction.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/topcommentposts/class/action/plugintopcommentpostsupdateconfigaction.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -43,7 +43,7 @@
// save the blogs settings
$blogs = new Blogs();
- if( !$blogs->updateBlog( $this->_blogInfo->getId(), $this->_blogInfo )) {
+ if( !$blogs->updateBlog( $this->_blogInfo )) {
$this->_view = new PluginTopCommentPostsConfigView( $this->_blogInfo );
$this->_view->setErrorMessage( $this->_locale->tr("error_updating_settings"));
$this->setCommonData();
Modified: plugins/trunk/topcommentvisitors/class/action/plugintopcommentvisitorsupdateconfigaction.class.php
===================================================================
--- plugins/trunk/topcommentvisitors/class/action/plugintopcommentvisitorsupdateconfigaction.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/topcommentvisitors/class/action/plugintopcommentvisitorsupdateconfigaction.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -43,7 +43,7 @@
// save the blogs settings
$blogs = new Blogs();
- if( !$blogs->updateBlog( $this->_blogInfo->getId(), $this->_blogInfo )) {
+ if( !$blogs->updateBlog( $this->_blogInfo )) {
$this->_view = new PluginTopCommentVisitorsConfigView( $this->_blogInfo );
$this->_view->setErrorMessage( $this->_locale->tr("error_updating_settings"));
$this->setCommonData();
Modified: plugins/trunk/topreadposts/class/action/plugintopreadpostsupdateconfigaction.class.php
===================================================================
--- plugins/trunk/topreadposts/class/action/plugintopreadpostsupdateconfigaction.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/topreadposts/class/action/plugintopreadpostsupdateconfigaction.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -43,7 +43,7 @@
// save the blogs settings
$blogs = new Blogs();
- if( !$blogs->updateBlog( $this->_blogInfo->getId(), $this->_blogInfo )) {
+ if( !$blogs->updateBlog( $this->_blogInfo )) {
$this->_view = new PluginTopReadPostsConfigView( $this->_blogInfo );
$this->_view->setErrorMessage( $this->_locale->tr("error_updating_settings"));
$this->setCommonData();
Modified: plugins/trunk/toptrackbackposts/class/action/plugintoptrackbackpostsupdateconfigaction.class.php
===================================================================
--- plugins/trunk/toptrackbackposts/class/action/plugintoptrackbackpostsupdateconfigaction.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/toptrackbackposts/class/action/plugintoptrackbackpostsupdateconfigaction.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -43,7 +43,7 @@
// save the blogs settings
$blogs = new Blogs();
- if( !$blogs->updateBlog( $this->_blogInfo->getId(), $this->_blogInfo )) {
+ if( !$blogs->updateBlog( $this->_blogInfo )) {
$this->_view = new PluginTopTrackbackPostsConfigView( $this->_blogInfo );
$this->_view->setErrorMessage( $this->_locale->tr("error_updating_settings"));
$this->setCommonData();
Modified: plugins/trunk/validatetrackback/class/action/adminvalidatetrackbackpluginupdatesettingsaction.class.php
===================================================================
--- plugins/trunk/validatetrackback/class/action/adminvalidatetrackbackpluginupdatesettingsaction.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/validatetrackback/class/action/adminvalidatetrackbackpluginupdatesettingsaction.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -56,7 +56,7 @@
// save the blogs settings
$blogs = new Blogs();
- if( !$blogs->updateBlog( $this->_blogInfo->getId(), $this->_blogInfo )) {
+ if( !$blogs->updateBlog( $this->_blogInfo )) {
$this->_view = new AdminValidateTrackbackPluginSettingsView( $this->_blogInfo );
$this->_view->setErrorMessage( $this->_locale->tr("error_updating_settings"));
$this->setCommonData();
Modified: plugins/trunk/validatetrackback/pluginvalidatetrackback.class.php
===================================================================
--- plugins/trunk/validatetrackback/pluginvalidatetrackback.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/validatetrackback/pluginvalidatetrackback.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -1,12 +1,6 @@
<?php
include_once( PLOG_CLASS_PATH."class/plugin/pluginbase.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/trackback.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/trackbackclient.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/trackbacks.class.php" );
- include_once( PLOG_CLASS_PATH."class/net/http/httpclient.class.php" );
- include_once( PLOG_CLASS_PATH."class/security/bayesianfilter.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/validatetrackback/class/security/dnsantispamfilter.class.php" );
/**
* implements moderation of comments
@@ -91,6 +85,7 @@
*/
function fetchPage( $url )
{
+ include_once( PLOG_CLASS_PATH."class/net/http/httpclient.class.php" );
$s = new HttpClient();
// Set the time out to 15 seconds. We don't want this web server
@@ -117,7 +112,7 @@
$blogSettings = $this->blogInfo->getSettings();
if ( $blogSettings->getValue( "plugin_validatetrackback_dns_enabled" ) ) {
-
+ include_once( PLOG_CLASS_PATH."plugins/validatetrackback/class/security/dnsantispamfilter.class.php" );
// First check to see if the ip address is listed in black lists
$clientInfo = new Client();
@@ -127,7 +122,7 @@
ValidateTrackbackDNSAntiSpamFilter::checkClientIP( $clientIpAddress );
if( ! $fTrackBackValid ) {
- trackbackLog( "Validate Trackback: The ip address ".$clientIpAddress.
+ $this->trackbackLog( "Validate Trackback: The ip address ".$clientIpAddress.
" disallowed" );
}
// If the client ip address is OK, check the url
@@ -138,7 +133,7 @@
ValidateTrackbackDNSAntiSpamFilter::checkTrackbackURL( $url );
if( ! $fTrackBackValid ) {
- trackbackLog( "Validate Trackback: The url ".$url.
+ $this->trackbackLog( "Validate Trackback: The url ".$url.
" disallowed" );
}
}
@@ -152,6 +147,7 @@
$page = $this->fetchPage( $url );
// Get the trackback client
+ include_once( PLOG_CLASS_PATH."class/dao/trackbackclient.class.php" );
$tbClient = new TrackbackClient();
// get the trackback url
$tbLinks = $tbClient->getTrackbackLinks( $page, $url );
@@ -160,7 +156,7 @@
$fTrackBackValid = false;
if( ! $fTrackBackValid ) {
- trackbackLog( "Validate Trackback: No trackback urls on resulting page" );
+ $this->trackbackLog( "Validate Trackback: No trackback urls on resulting page" );
}
}
}
@@ -172,6 +168,7 @@
$config =& Config::getConfig();
if ($config->getValue("bayesian_filter_enabled"))
{
+ include_once( PLOG_CLASS_PATH."class/security/bayesianfilter.class.php" );
$tokenizer = new BayesianTokenizer();
$tokensTopic = $tokenizer->addContextMark($tokenizer->tokenize($trackback->getTitle()), TOKEN_TOPIC_MARK);
@@ -190,7 +187,7 @@
$fTrackBackValid = false;
if( ! $fTrackBackValid ) {
- trackbackLog( "Validate Trackback:Spamicity ".$spamicity.
+ $this->trackbackLog( "Validate Trackback:Spamicity ".$spamicity.
" too high" );
}
}
@@ -200,11 +197,18 @@
if ( !$fTrackBackValid ) {
// Trackback is not valid
// Delete this trackback
+ include_once( PLOG_CLASS_PATH."class/dao/trackbacks.class.php" );
$trackbacks = new Trackbacks();
- $trackbacks->deletePostTrackback( $trackback->_id, $trackback->_articleId );
+ $trackbacks->deleteTrackback( $trackback->_id );
//print("Error: trackback unavailable<br/>");
}
}
+
+ function trackbackLog( $message )
+ {
+ $logger =& LoggerManager::getLogger( "trackback" );
+ $logger->debug( $message );
+ }
}
?>
\ No newline at end of file
Modified: plugins/trunk/weather/class/action/pluginweatherupdateconfigaction.class.php
===================================================================
--- plugins/trunk/weather/class/action/pluginweatherupdateconfigaction.class.php 2006-01-26 17:05:43 UTC (rev 2855)
+++ plugins/trunk/weather/class/action/pluginweatherupdateconfigaction.class.php 2006-01-26 18:57:03 UTC (rev 2856)
@@ -61,7 +61,7 @@
// save the blogs settings
$blogs = new Blogs();
- if( !$blogs->updateBlog( $this->_blogInfo->getId(), $this->_blogInfo )) {
+ if( !$blogs->updateBlog( $this->_blogInfo )) {
$this->_view = new PluginWeatherConfigView( $this->_blogInfo );
$this->_view->setErrorMessage( $this->_locale->tr("error_updating_settings"));
$this->setCommonData();
More information about the pLog-svn
mailing list