[pLog-svn] r2468 - in plog/trunk/class: action bayesian cache
cache/Cache_Lite config controller dao dao/customfields
dao/status data data/forms data/pager data/validator database
database/pdb database/pdb/datadict database/pdb/drivers file
file/finder file/unpacker gallery/dao gallery/data
gallery/resizers gallery/template locale logger/layout
logger/logger mail misc net net/http net/http/session object
plugin security summary/data template template/menu
template/templatesets view view/admin xml xml/rssparser
oscar at devel.plogworld.net
oscar at devel.plogworld.net
Wed Sep 14 20:52:43 GMT 2005
Author: oscar
Date: 2005-09-14 20:52:42 +0000 (Wed, 14 Sep 2005)
New Revision: 2468
Added:
plog/trunk/class/object/loggable.class.php
Modified:
plog/trunk/class/action/action.class.php
plog/trunk/class/action/actioninfo.class.php
plog/trunk/class/bayesian/bayesianfiltercore.class.php
plog/trunk/class/bayesian/tokenizer.class.php
plog/trunk/class/cache/Cache_Lite/Lite.php
plog/trunk/class/cache/bloginfomanager.class.php
plog/trunk/class/cache/cache.class.php
plog/trunk/class/cache/cachemanager.class.php
plog/trunk/class/config/config.class.php
plog/trunk/class/config/configabstractstorage.class.php
plog/trunk/class/config/configdbstorage.class.php
plog/trunk/class/config/properties.class.php
plog/trunk/class/controller/controller.class.php
plog/trunk/class/controller/resourceclassloader.class.php
plog/trunk/class/dao/blogarticles.class.php
plog/trunk/class/dao/bloglinks.class.php
plog/trunk/class/dao/customfields/customfields.class.php
plog/trunk/class/dao/customfields/customfieldvaluefactory.class.php
plog/trunk/class/dao/model.class.php
plog/trunk/class/dao/searchresult.class.php
plog/trunk/class/dao/status/genericstatuslist.class.php
plog/trunk/class/dao/trackbackclient.class.php
plog/trunk/class/dao/usercomment.class.php
plog/trunk/class/dao/users.class.php
plog/trunk/class/data/forms/formvalidator.class.php
plog/trunk/class/data/htmlcalendar.class.php
plog/trunk/class/data/mimetype.class.php
plog/trunk/class/data/pager/pager.class.php
plog/trunk/class/data/stringutils.class.php
plog/trunk/class/data/textfilter.class.php
plog/trunk/class/data/timestamp.class.php
plog/trunk/class/data/validator/validation.class.php
plog/trunk/class/data/validator/validationlist.class.php
plog/trunk/class/database/db.class.php
plog/trunk/class/database/dbobject.class.php
plog/trunk/class/database/pdb/datadict/pdbbasedatadict.class.php
plog/trunk/class/database/pdb/datadict/pdbfielddescobject.class.php
plog/trunk/class/database/pdb/drivers/pdbdriverbase.class.php
plog/trunk/class/database/pdb/drivers/pdbrecordset.class.php
plog/trunk/class/database/pdb/pdb.class.php
plog/trunk/class/file/file.class.php
plog/trunk/class/file/fileupload.class.php
plog/trunk/class/file/fileuploads.class.php
plog/trunk/class/file/finder/filefinder.class.php
plog/trunk/class/file/unpacker/baseunpacker.class.php
plog/trunk/class/file/unpacker/rarunpacker.class.php
plog/trunk/class/file/unpacker/tarbz2unpacker.class.php
plog/trunk/class/file/unpacker/targzunpacker.class.php
plog/trunk/class/file/unpacker/unpacker.class.php
plog/trunk/class/file/unpacker/zipunpacker.class.php
plog/trunk/class/gallery/dao/galleryitemslist.class.php
plog/trunk/class/gallery/dao/galleryresourcequotas.class.php
plog/trunk/class/gallery/dao/galleryresourcestorage.class.php
plog/trunk/class/gallery/data/galleryresourcebasemetadatareader.class.php
plog/trunk/class/gallery/resizers/galleryabstractresizer.class.php
plog/trunk/class/gallery/resizers/galleryresizer.class.php
plog/trunk/class/gallery/resizers/gallerythumbnailgenerator.class.php
plog/trunk/class/gallery/resizers/gddetector.class.php
plog/trunk/class/gallery/template/gallerytemplatetools.class.php
plog/trunk/class/locale/locale.class.php
plog/trunk/class/locale/locales.class.php
plog/trunk/class/logger/layout/layout.class.php
plog/trunk/class/logger/logger/logger.class.php
plog/trunk/class/mail/emailmessage.class.php
plog/trunk/class/mail/emailservice.class.php
plog/trunk/class/misc/glob.class.php
plog/trunk/class/misc/osdetect.class.php
plog/trunk/class/misc/version.class.php
plog/trunk/class/net/baserequestgenerator.class.php
plog/trunk/class/net/client.class.php
plog/trunk/class/net/customurlhandler.class.php
plog/trunk/class/net/dns.class.php
plog/trunk/class/net/http/httpvars.class.php
plog/trunk/class/net/http/session/sessionmanager.class.php
plog/trunk/class/net/http/subdomains.class.php
plog/trunk/class/net/linkformatmatcher.class.php
plog/trunk/class/net/linkparser.class.php
plog/trunk/class/net/prettyrequestparser.class.php
plog/trunk/class/net/request.class.php
plog/trunk/class/net/requestgenerator.class.php
plog/trunk/class/net/url.class.php
plog/trunk/class/net/xmlrpcclient.class.php
plog/trunk/class/object/exception.class.php
plog/trunk/class/object/object.class.php
plog/trunk/class/object/observable.class.php
plog/trunk/class/object/observer.class.php
plog/trunk/class/object/reflection.class.php
plog/trunk/class/plugin/pluginbase.class.php
plog/trunk/class/plugin/pluginmanager.class.php
plog/trunk/class/security/pipeline.class.php
plog/trunk/class/security/pipelinefilter.class.php
plog/trunk/class/security/pipelinerequest.class.php
plog/trunk/class/security/pipelineresult.class.php
plog/trunk/class/summary/data/summarytools.class.php
plog/trunk/class/template/cachecontrol.class.php
plog/trunk/class/template/menu/menurenderer.class.php
plog/trunk/class/template/templatesandbox.class.php
plog/trunk/class/template/templateservice.class.php
plog/trunk/class/template/templatesets/templateset.class.php
plog/trunk/class/template/templatesets/templatesets.class.php
plog/trunk/class/template/templatesets/templatesetstorage.class.php
plog/trunk/class/template/templateutils.class.php
plog/trunk/class/view/admin/adminview.class.php
plog/trunk/class/view/blogview.class.php
plog/trunk/class/view/view.class.php
plog/trunk/class/xml/pathparser.class.php
plog/trunk/class/xml/rssparser/rsschannel.class.php
plog/trunk/class/xml/rssparser/rssenclosure.class.php
plog/trunk/class/xml/rssparser/rssitem.class.php
plog/trunk/class/xml/rssparser/rssparser.class.php
Log:
Not sure if you'll all agree with this, but I have decided to remove the base Object class. For those
objects that need logging for debugging purposes, please make your object extend the Loggable class
that comes with a Loggable::log attribute which works as Object::log used to work. The class itself
is still available in the class/object/ folder, for compatibility reasons (mostly for plugins) but all
other core classes do not extend it anymore.
The reason for this is clear: if the figures reported by memory_get_usage are anything to get by, the total
memory usage at the moment is between 4.0-5.1mb, in similar situations as 1.0.x. which I think is
a fantastic improvement :) Now plog 1.1 can run with the default memory_limit settings... again!
Modified: plog/trunk/class/action/action.class.php
===================================================================
--- plog/trunk/class/action/action.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/action/action.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -21,7 +21,7 @@
* @see BlogOwnerAdminAction
*/
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
/**
* \ingroup Action
@@ -48,7 +48,7 @@
* of the Action::perform() method in our custom classes because it needs to perform some extra
* operations right before the view is sent back to the controller.
*/
- class Action extends Object
+ class Action
{
// this is the pointer to the view associated with this action
@@ -69,10 +69,8 @@
function Action( $actionInfo, $httpRequest )
{
include_once( PLOG_CLASS_PATH."class/net/request.class.php" );
- include_once( PLOG_CLASS_PATH."class/data/forms/formvalidator.class.php" );
+ include_once( PLOG_CLASS_PATH."class/data/forms/formvalidator.class.php" );
- $this->Object();
-
$this->_request = new Request( $httpRequest );
$this->_actionInfo = $actionInfo;
Modified: plog/trunk/class/action/actioninfo.class.php
===================================================================
--- plog/trunk/class/action/actioninfo.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/action/actioninfo.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -1,6 +1,6 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
/**
* \ingroup Action
@@ -9,7 +9,7 @@
* with which parameter they were called or which was the name of the parameter
* in the request.
*/
- class ActionInfo extends Object
+ class ActionInfo
{
/**
@@ -29,7 +29,7 @@
*/
function ActionInfo( $actionParamName, $actionParamValue )
{
- $this->Object();
+
$this->_actionParamName = $actionParamName;
$this->_actionParamValue = $actionParamValue;
Modified: plog/trunk/class/bayesian/bayesianfiltercore.class.php
===================================================================
--- plog/trunk/class/bayesian/bayesianfiltercore.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/bayesian/bayesianfiltercore.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -10,7 +10,7 @@
*/
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
include_once( PLOG_CLASS_PATH."class/bayesian/bayesiantokenizer.class.php" );
include_once( PLOG_CLASS_PATH."class/dao/bayesianfilterinfos.class.php" );
include_once( PLOG_CLASS_PATH."class/dao/bayesiantokens.class.php" );
@@ -32,12 +32,12 @@
*
* @see BayesianFilter
*/
- class BayesianFilterCore extends Object
+ class BayesianFilterCore
{
function BayesianFilterCore()
{
- $this->Object();
+
}
/**
Modified: plog/trunk/class/bayesian/tokenizer.class.php
===================================================================
--- plog/trunk/class/bayesian/tokenizer.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/bayesian/tokenizer.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -1,13 +1,13 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
/**
* \ingroup Bayesian
*
* Class that defines the interface for classes wishing to implement a tokenizer
*/
- class Tokenizer extends Object
+ class Tokenizer
{
/**
@@ -15,7 +15,7 @@
*/
function Tokenizer()
{
- $this->Object();
+
}
/**
Modified: plog/trunk/class/cache/Cache_Lite/Lite.php
===================================================================
--- plog/trunk/class/cache/Cache_Lite/Lite.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/cache/Cache_Lite/Lite.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -31,7 +31,7 @@
define('CACHE_LITE_ERROR_RETURN', 1);
define('CACHE_LITE_ERROR_DIE', 8);
-class Cache_Lite extends Object
+class Cache_Lite
{
// --- Private properties ---
Modified: plog/trunk/class/cache/bloginfomanager.class.php
===================================================================
--- plog/trunk/class/cache/bloginfomanager.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/cache/bloginfomanager.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -2,7 +2,7 @@
require_once( PLOG_CLASS_PATH . "class/object/object.class.php" );
- class BlogInfoManager extends Object
+ class BlogInfoManager
{
var $_knownBlogs = array();
Modified: plog/trunk/class/cache/cache.class.php
===================================================================
--- plog/trunk/class/cache/cache.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/cache/cache.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -2,13 +2,14 @@
require_once( PLOG_CLASS_PATH . "class/object/object.class.php" );
require_once( PLOG_CLASS_PATH . "class/template/templatesets/templateset.class.php" );
+ include_once( PLOG_CLASS_PATH . "class/object/loggable.class.php" );
/**
* Provides a singleton for storing and retrieving data from a global cache.
*/
- class Cache extends Object
+ class Cache extends Loggable
{
var $cache;
@@ -17,8 +18,8 @@
function Cache( $cacheProperties )
{
require_once( PLOG_CLASS_PATH . "class/cache/Cache_Lite/Lite.php" );
-
- $this->Object();
+ $this->Loggable();
+
$this->cache = new Cache_Lite( $cacheProperties );
}
Modified: plog/trunk/class/cache/cachemanager.class.php
===================================================================
--- plog/trunk/class/cache/cachemanager.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/cache/cachemanager.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -25,13 +25,13 @@
* Provides a singleton for storing and retrieving data from a global cache.
*/
- class CacheManager extends Object
+ class CacheManager
{
var $cache;
function CacheManager()
{
- $this->Object();
+
}
function clearCache()
Modified: plog/trunk/class/config/config.class.php
===================================================================
--- plog/trunk/class/config/config.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/config/config.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -23,7 +23,7 @@
* Please also see this wiki page: http://wiki.plogworld.net/index.php/PLog_1.0/Global_Configuration_API
*/
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
/**
* Set it to either "file" or "db"
@@ -55,7 +55,7 @@
* @see ConfigFileStorage
* @see getConfig
*/
- class Config extends Object
+ class Config
{
/**
Modified: plog/trunk/class/config/configabstractstorage.class.php
===================================================================
--- plog/trunk/class/config/configabstractstorage.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/config/configabstractstorage.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -1,6 +1,6 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
define( "TYPE_INTEGER", 1 );
define( "TYPE_BOOLEAN", 2 );
@@ -18,12 +18,12 @@
* This class cannot be instantiated directly, and an attempt to call any of its methods
* will end our script.
*/
- class ConfigAbstractStorage extends Object
+ class ConfigAbstractStorage
{
function ConfigAbstractStorage( $params = null )
{
- $this->Object();
+
}
/**
Modified: plog/trunk/class/config/configdbstorage.class.php
===================================================================
--- plog/trunk/class/config/configdbstorage.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/config/configdbstorage.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -1,6 +1,6 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
include_once( PLOG_CLASS_PATH."class/config/configfilestorage.class.php" );
include_once( PLOG_CLASS_PATH."class/cache/cachemanager.class.php" );
Modified: plog/trunk/class/config/properties.class.php
===================================================================
--- plog/trunk/class/config/properties.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/config/properties.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -1,13 +1,13 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
/**
* \ingroup Config
*
* Class inspired by the java class Properties.
*/
- class Properties extends Object
+ class Properties
{
var $_props;
@@ -20,7 +20,7 @@
*/
function Properties( $values = null )
{
- $this->Object();
+
if( $values == null )
$this->_props = Array();
Modified: plog/trunk/class/controller/controller.class.php
===================================================================
--- plog/trunk/class/controller/controller.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/controller/controller.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -15,7 +15,7 @@
*/
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
include_once( PLOG_CLASS_PATH."class/action/action.class.php" );
include_once( PLOG_CLASS_PATH."class/controller/resourceclassloader.class.php" );
@@ -120,7 +120,7 @@
* @see FormValidator
* @see Validator
*/
- class Controller extends Object
+ class Controller
{
var $_actionParam;
@@ -149,7 +149,7 @@
*/
function Controller( $actionMap, $actionParam = DEFAULT_ACTION_PARAM )
{
- $this->Object();
+
global $_plogController_actionMap;
if( !is_array($_plogController_actionMap))
Modified: plog/trunk/class/controller/resourceclassloader.class.php
===================================================================
--- plog/trunk/class/controller/resourceclassloader.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/controller/resourceclassloader.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -17,7 +17,7 @@
* This object should never be instantiated directly but instead, please use the
* ResourceClassLoader::getLoader() method which will return a reference to an already existing instance.
*/
- class ResourceClassLoader extends Object
+ class ResourceClassLoader
{
var $_paths;
@@ -33,7 +33,7 @@
*/
function ResourceClassLoader( $path = "./", $classFileSuffix = '.class.php' )
{
- $this->Object();
+
$this->_paths = Array( $path );
$this->_classFileSuffix = $classFileSuffix;
Modified: plog/trunk/class/dao/blogarticles.class.php
===================================================================
--- plog/trunk/class/dao/blogarticles.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/dao/blogarticles.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -7,7 +7,7 @@
* Cache Object to cache all article ids of a blog, this information will not be stored
* in the db but only in the disk-cache.
*/
- class BlogArticles extends Object {
+ class BlogArticles {
var $_blogId;
var $_articles = array();
Modified: plog/trunk/class/dao/bloglinks.class.php
===================================================================
--- plog/trunk/class/dao/bloglinks.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/dao/bloglinks.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -7,7 +7,7 @@
* Cache Object to cache all links of a blog, this information will not be stored in the db
* but only in the disk-cache.
*/
- class BlogLinks extends Object {
+ class BlogLinks {
var $_blogId;
var $_links = array();
Modified: plog/trunk/class/dao/customfields/customfields.class.php
===================================================================
--- plog/trunk/class/dao/customfields/customfields.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/dao/customfields/customfields.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -55,7 +55,8 @@
$blogFields = $this->getMany( "blog_id",
$blogId,
CACHE_CUSTOMFIELDS_BLOG,
- Array( CACHE_CUSTOMFIELDS => "getId" ));
+ Array( CACHE_CUSTOMFIELDS => "getId" ),
+ Array( "name" => "ASC" ));
if( !$blogFields )
return false;
foreach( $blogFields as $field ) {
@@ -83,6 +84,7 @@
$blogId,
CACHE_CUSTOMFIELDS_BLOG,
Array( CACHE_CUSTOMFIELDS => "getId" ),
+ Array( "name" => "ASC" ),
$page,
$itemsPerPage );
Modified: plog/trunk/class/dao/customfields/customfieldvaluefactory.class.php
===================================================================
--- plog/trunk/class/dao/customfields/customfieldvaluefactory.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/dao/customfields/customfieldvaluefactory.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -1,6 +1,6 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
include_once( PLOG_CLASS_PATH."class/dao/customfields/customfieldvalue.class.php" );
include_once( PLOG_CLASS_PATH."class/dao/customfields/customfielddatevalue.class.php" );
include_once( PLOG_CLASS_PATH."class/dao/customfields/customfieldcheckboxvalue.class.php" );
@@ -10,7 +10,7 @@
*
* \ingroup DAO
*/
- class CustomFieldValueFactory extends Object
+ class CustomFieldValueFactory
{
/**
Modified: plog/trunk/class/dao/model.class.php
===================================================================
--- plog/trunk/class/dao/model.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/dao/model.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -42,7 +42,7 @@
*
*/
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+ include_once( PLOG_CLASS_PATH."class/object/loggable.class.php" );
/**
* default database prefix, if none other specified
@@ -83,7 +83,7 @@
* worry about that. Later on, the Model classes will be used by
* the corresponding action object.
*/
- class Model extends Object
+ class Model extends Loggable
{
var $_db;
@@ -98,7 +98,7 @@
*/
function Model( $useCache = true )
{
- $this->Object();
+ $this->Loggable();
if ( $useCache ) {
// allow a cache for all dao objects
Modified: plog/trunk/class/dao/searchresult.class.php
===================================================================
--- plog/trunk/class/dao/searchresult.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/dao/searchresult.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -1,6 +1,6 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
define( "SEARCH_RESULT_ARTICLE", 1 );
define( "SEARCH_RESULT_CUSTOM_FIELD", 2 );
@@ -14,7 +14,7 @@
*
* \ingroup DAO
*/
- class SearchResult extends Object
+ class SearchResult
{
var $_relevance;
@@ -31,8 +31,8 @@
*/
function SearchResult( $relevance, $article, $type )
{
- $this->Object();
+
$this->_relevance = $relevance;
$this->_article = $article;
$this->_type = $type;
Modified: plog/trunk/class/dao/status/genericstatuslist.class.php
===================================================================
--- plog/trunk/class/dao/status/genericstatuslist.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/dao/status/genericstatuslist.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -1,6 +1,6 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
/**
* Generic class for handling custom statuses that are defined via global constants
@@ -12,7 +12,7 @@
*
* \ingroup DAO
*/
- class GenericStatusList extends Object
+ class GenericStatusList
{
/**
Modified: plog/trunk/class/dao/trackbackclient.class.php
===================================================================
--- plog/trunk/class/dao/trackbackclient.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/dao/trackbackclient.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -17,7 +17,7 @@
*
* \ingroup DAO
*/
- class TrackbackClient extends Object
+ class TrackbackClient
{
/**
@@ -25,7 +25,7 @@
*/
function TrackbackClient()
{
- $this->Object();
+
}
/**
Modified: plog/trunk/class/dao/usercomment.class.php
===================================================================
--- plog/trunk/class/dao/usercomment.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/dao/usercomment.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -36,7 +36,7 @@
*/
function UserComment( $artid, $blogId, $parentid, $topic, $text, $date = null, $userName = "", $userEmail = "", $userUrl = "", $clientIp = "0.0.0.0", $spamRate = 0, $status = COMMENT_STATUS_NONSPAM, $id = -1 )
{
- $this->Object();
+
$this->_topic = $topic;
$this->_text = $text;
Modified: plog/trunk/class/dao/users.class.php
===================================================================
--- plog/trunk/class/dao/users.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/dao/users.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -1,6 +1,6 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
/**
* Model representing the users in our application. Provides the methods such as
@@ -8,7 +8,7 @@
*
* \ingroup DAO
*/
- class Users extends Object
+ class Users
{
var $_provider;
@@ -17,8 +17,8 @@
*/
function Users()
{
- $this->Object();
+
$this->_loadUserDataProvider();
}
Modified: plog/trunk/class/data/forms/formvalidator.class.php
===================================================================
--- plog/trunk/class/data/forms/formvalidator.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/data/forms/formvalidator.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -6,7 +6,7 @@
* The Form class helps in data validation.
*/
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
include_once( PLOG_CLASS_PATH."class/data/validator/emptyvalidator.class.php" );
/**
@@ -16,7 +16,7 @@
* as well as in conjunction with the Action and View classes. It is fact internally used by the Action class and it is
* capable of reporting to the view class which fields of a given form generated an error.
*/
- class FormValidator extends Object
+ class FormValidator
{
var $_fieldValidators;
var $_validationResults;
@@ -30,8 +30,8 @@
*/
function FormValidator()
{
- $this->Object();
+
// internal arrays used by the class
$this->_fieldValidators = Array();
$this->_validationResults = Array();
Modified: plog/trunk/class/data/htmlcalendar.class.php
===================================================================
--- plog/trunk/class/data/htmlcalendar.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/data/htmlcalendar.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -1,16 +1,16 @@
<?php
-include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
-
-/**
- * \ingroup Data
- *
- * Generates an html calendar
+
+
+/**
+ * \ingroup Data
*
+ * Generates an html calendar
+ *
* PHP Calendar Class Version 1.4 (5th March 2001)
*
* Copyright David Wilkinson 2000 - 2001. All Rights reserved.
- *
+ *
* This software may be used, modified and distributed freely
* providing this copyright notice remains intact at the head
* of the file.
@@ -23,22 +23,22 @@
* it meets your requirements.
*
* URL: http://www.cascade.org.uk/software/php/calendar/
- * Email: davidw at cascade.org.uk
+ * Email: davidw at cascade.org.uk
*
* Modified by fuze (http://www.fuze.org) on 2004/07/11
*
* Just changed the html table output for better (CSS) accessibility
* and variable names.
*/
-
-class Calendar extends Object
+
+class Calendar
{
/*
Constructor for the Calendar class
*/
function Calendar()
{
- $this->Object();
+
}
Modified: plog/trunk/class/data/mimetype.class.php
===================================================================
--- plog/trunk/class/data/mimetype.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/data/mimetype.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -1,6 +1,6 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
/**
* \ingroup Data
@@ -75,7 +75,7 @@
* types as an static variable inside the class, so that it does not have to be rebuilt
* everytime when calling getType.
*/
-class MimeType extends Object
+class MimeType
{
var $mimetypes = Array(
@@ -221,7 +221,7 @@
function MimeType()
{
- $this->Object();
+
}
/**
Modified: plog/trunk/class/data/pager/pager.class.php
===================================================================
--- plog/trunk/class/data/pager/pager.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/data/pager/pager.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -48,7 +48,7 @@
*
* The display logic might look a bit complex but it is unavoidable...
*/
- class Pager extends Object
+ class Pager
{
var $_baseUrl;
var $_totalRegs;
Modified: plog/trunk/class/data/stringutils.class.php
===================================================================
--- plog/trunk/class/data/stringutils.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/data/stringutils.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -1,31 +1,31 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
-
- /**
- * \ingroup Data
- *
- * Basic methods for formatting or doing nasty things to strings :-)
+
+
+ /**
+ * \ingroup Data
+ *
+ * Basic methods for formatting or doing nasty things to strings :-)
*/
- class StringUtils extends Object
+ class StringUtils
{
-
- /**
- * Alias for htmlspecialchars
- * @static
+
+ /**
+ * Alias for htmlspecialchars
+ * @static
*/
function htmlTranslate( $string )
{
return htmlspecialchars( $string );
}
-
- /**
- * cuts a string at a given character
- *
- * @param string
- * @param n
- * @return The reduced string
- * @static
+
+ /**
+ * cuts a string at a given character
+ *
+ * @param string
+ * @param n
+ * @return The reduced string
+ * @static
*/
function cutString( $string, $n )
{
@@ -36,7 +36,7 @@
* Returns an array with all the links in a string.
*
* @param string The string
- * @return An array with the links in the string.
+ * @return An array with the links in the string.
* @static
*/
function getLinks( $string )
@@ -57,7 +57,7 @@
* Returns a size formatted and with its unit: "bytes", "KB", "MB" or "GB"
*
* @param size The amount
- * @return A string with the formatted size.
+ * @return A string with the formatted size.
* @static
*/
function formatSize( $size )
@@ -72,8 +72,8 @@
* Returns a string in a readable and url-compliant format.
*
* @param string The string
- * @return A string ready to use in urls.
- * @static
+ * @return A string ready to use in urls.
+ * @static
* @see TextFilter::urlize()
*/
function text2url( $string )
@@ -100,11 +100,11 @@
}
/**
- * extremely lame function.
+ * extremely lame function.
*
* @param count how many times we'd like to repeat the character
* @param char The character (or string) we'd like to repeat
- * @return The resulting string
+ * @return The resulting string
* @static
*/
function pad( $count, $char = " ")
Modified: plog/trunk/class/data/textfilter.class.php
===================================================================
--- plog/trunk/class/data/textfilter.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/data/textfilter.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -7,7 +7,7 @@
* classes, text formatters or pagers
*/
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
include_once( PLOG_CLASS_PATH."class/config/config.class.php" );
include_once( PLOG_CLASS_PATH."class/data/kses.class.php" );
include_once( PLOG_CLASS_PATH."class/data/stringutils.class.php" );
@@ -18,7 +18,7 @@
* Implements some text filters that can be used to remove Javascript code, or convert
* non-XHTML code into valid XHTML code, etc.
*/
- class TextFilter extends Object
+ class TextFilter
{
var $htmlAllowedTags;
@@ -33,7 +33,7 @@
*/
function TextFilter( $removeJavaScript = true )
{
- $this->Object();
+
$this->removeJavaScript = $removeJavaScript;
Modified: plog/trunk/class/data/timestamp.class.php
===================================================================
--- plog/trunk/class/data/timestamp.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/data/timestamp.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -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" );
include_once( PLOG_CLASS_PATH."class/locale/locales.class.php" );
include_once( PLOG_CLASS_PATH."class/data/Date.class.php" );
Modified: plog/trunk/class/data/validator/validation.class.php
===================================================================
--- plog/trunk/class/data/validator/validation.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/data/validator/validation.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -12,7 +12,7 @@
* Client classes can use the public method getError() to retrieve this error codes
* and perhaps show a more meaningful message based on its value (if any)
*/
- class Validation extends Object
+ class Validation
{
var $_error;
@@ -21,7 +21,7 @@
*/
function Validation()
{
- $this->Object();
+
$this->_error = false;
}
Modified: plog/trunk/class/data/validator/validationlist.class.php
===================================================================
--- plog/trunk/class/data/validator/validationlist.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/data/validator/validationlist.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -7,7 +7,7 @@
/**
* @private
*/
- class ValidationList extends Object
+ class ValidationList
{
var $_validations;
var $_required;
@@ -18,7 +18,7 @@
*/
function ValidationList()
{
- $this->Object();
+
$this->_validations = array();
$this->_required = array();
Modified: plog/trunk/class/database/db.class.php
===================================================================
--- plog/trunk/class/database/db.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/database/db.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -6,7 +6,7 @@
* Database-related objects
*/
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
include_once( PLOG_CLASS_PATH."class/config/configfilestorage.class.php" );
include_once( PLOG_CLASS_PATH."class/database/pdb/pdb.class.php" );
@@ -15,13 +15,13 @@
*
* Provides a singleton for accessing the db and interfaces with ADOdb
*/
- class Db extends Object
+ class Db
{
var $_prefix;
function Db()
{
- $this->Object();
+
}
function &getDb()
Modified: plog/trunk/class/database/dbobject.class.php
===================================================================
--- plog/trunk/class/database/dbobject.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/database/dbobject.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -1,7 +1,7 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
/**
* \ingroup Database
*
@@ -9,7 +9,7 @@
* extend. It doesn't provide too many features yet but it is planned to provide them in the
* future.
*/
- class DbObject extends Object
+ class DbObject
{
var $_table;
var $_pk;
@@ -18,9 +18,7 @@
var $_properties;
function DbObject()
- {
- $this->Object();
-
+ {
$this->_table = null;
$this->_pk = null;
$this->_class = "DbObject";
Modified: plog/trunk/class/database/pdb/datadict/pdbbasedatadict.class.php
===================================================================
--- plog/trunk/class/database/pdb/datadict/pdbbasedatadict.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/database/pdb/datadict/pdbbasedatadict.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -7,8 +7,8 @@
the BSD license will take precedence.
*/
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
-
+
+
// compatibility stuff
if (!function_exists('ctype_alnum')) {
function ctype_alnum($text) {
@@ -17,12 +17,12 @@
}
- /**
- * Base class for data dictionaries. Implements most of the functionality.
- *
- * \ingroup PDb
+ /**
+ * Base class for data dictionaries. Implements most of the functionality.
+ *
+ * \ingroup PDb
*/
- class PDbBaseDataDict extends Object
+ class PDbBaseDataDict
{
var $connection;
var $debug = false;
@@ -40,8 +40,8 @@
var $dataProvider;
var $invalidResizeTypes4 = array('CLOB','BLOB','TEXT','DATE','TIME'); // for changetablesql
var $blobSize = 100; /// any varchar/char field this size or greater is treated as a blob
- /// in other words, we use a text area for editting.
-
+ /// in other words, we use a text area for editting.
+
/**
Parse arguments, treat "text" (text) and 'text' as quotation marks.
@@ -410,8 +410,8 @@
foreach($tsql as $s) $sql[] = $s;
return $sql;
- }
-
+ }
+
function _array_change_key_case($an_array)
{
if (is_array($an_array)) {
Modified: plog/trunk/class/database/pdb/datadict/pdbfielddescobject.class.php
===================================================================
--- plog/trunk/class/database/pdb/datadict/pdbfielddescobject.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/database/pdb/datadict/pdbfielddescobject.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -1,18 +1,18 @@
-<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
-
+<?php
+
+
/**
- * Helper class for FetchFields -- holds info on a column
- *
+ * Helper class for FetchFields -- holds info on a column
+ *
* \ingroup PDb
*/
- class PDbFieldDescObject extends Object
+ class PDbFieldDescObject
{
var $name = '';
var $max_length=0;
var $type="";
var $not_null = false;
- var $has_default = false;
- var $default_value;
- }
+ var $has_default = false;
+ var $default_value;
+ }
?>
\ No newline at end of file
Modified: plog/trunk/class/database/pdb/drivers/pdbdriverbase.class.php
===================================================================
--- plog/trunk/class/database/pdb/drivers/pdbdriverbase.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/database/pdb/drivers/pdbdriverbase.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -1,7 +1,7 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
/**
* how many items per page by default, when paging is enabled
*/
@@ -18,7 +18,7 @@
* provide some common functionality that should be called even when the method is overwritten, so please make sure
* to call the method of the parent class for those that need it.
*/
- class PDbDriverBase extends Object
+ class PDbDriverBase
{
var $_dbname;
@@ -37,7 +37,7 @@
*/
function PDbDriverBase()
{
- $this->Object();
+
}
/**
Modified: plog/trunk/class/database/pdb/drivers/pdbrecordset.class.php
===================================================================
--- plog/trunk/class/database/pdb/drivers/pdbrecordset.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/database/pdb/drivers/pdbrecordset.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -1,14 +1,14 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
-
- /**
- * \ingroup PDb
- *
- * Abstract representation of a record set. Child classes are expected to extend this class
- * to provide database-specific handling of record sets
+
+
+ /**
+ * \ingroup PDb
+ *
+ * Abstract representation of a record set. Child classes are expected to extend this class
+ * to provide database-specific handling of record sets
*/
- class PdbRecordSet extends Object
+ class PdbRecordSet
{
var $_dbRes;
@@ -36,16 +36,16 @@
function RecordCount()
{
- }
-
- /**
- * Alias for RecordCount()
- *
- * @see RecordCount
- */
- function RowCount()
- {
- return( $this->RecordCount());
+ }
+
+ /**
+ * Alias for RecordCount()
+ *
+ * @see RecordCount
+ */
+ function RowCount()
+ {
+ return( $this->RecordCount());
}
}
?>
\ No newline at end of file
Modified: plog/trunk/class/database/pdb/pdb.class.php
===================================================================
--- plog/trunk/class/database/pdb/pdb.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/database/pdb/pdb.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -3,8 +3,8 @@
* \defgroup PDb
*/
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
define( "PDB_DRIVER_FOLDER", PLOG_CLASS_PATH."class/database/pdb/drivers/" );
/**
@@ -24,11 +24,11 @@
*
* \ingroup PDb
*/
- class PDb extends Object
+ class PDb
{
function PDb()
{
- $this->Object();
+
}
/**
Modified: plog/trunk/class/file/file.class.php
===================================================================
--- plog/trunk/class/file/file.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/file/file.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -9,7 +9,7 @@
*/
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
include_once( PLOG_CLASS_PATH."class/misc/glob.class.php" );
define( "FILE_DEFAULT_DIRECTORY_CREATION_MODE", 0700 );
@@ -21,7 +21,7 @@
* to some of the php functions.
* http://www.php.net/manual/en/ref.filesystem.php
*/
- class File extends Object
+ class File
{
var $_fileName;
@@ -36,8 +36,8 @@
*/
function File( $fileName )
{
- $this->Object();
+
$this->_fileName = $fileName;
}
@@ -374,7 +374,7 @@
// partitions, this will be a copy and delete of the original file
// copy the file to the new location
- if (!copy($inFile, $outFile)) {
+ if (!copy($inFile, $outFile)) {
// The copy failed, return false
return FALSE;
}
Modified: plog/trunk/class/file/fileupload.class.php
===================================================================
--- plog/trunk/class/file/fileupload.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/file/fileupload.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -6,7 +6,7 @@
* Object representation of a file upload.
* Wraps around the values in the $_FILES or $HTTP_POST_FILES array.
*/
- class FileUpload extends Object
+ class FileUpload
{
var $_name;
Modified: plog/trunk/class/file/fileuploads.class.php
===================================================================
--- plog/trunk/class/file/fileuploads.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/file/fileuploads.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -1,6 +1,6 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
include_once( PLOG_CLASS_PATH."class/file/fileupload.class.php" );
define( "FILE_UPLOADS_NOT_ENABLED", -200 );
@@ -11,7 +11,7 @@
* Handles file uploads in pLog.
* @see FileUpload
*/
- class FileUploads extends Object
+ class FileUploads
{
var $_files;
@@ -27,7 +27,7 @@
*/
function FileUploads( $files )
{
- $this->Object();
+
$this->_files = $files;
}
@@ -53,7 +53,7 @@
//use basename of tmp_name istead of filename
//because there is locale problem with filename
//$fileName = $upload->getFileName();
- if( $this->my_move_uploaded_file( $upload->getTmpName(),
+ if( $this->my_move_uploaded_file( $upload->getTmpName(),
$destinationFolder.basename($upload->getTmpName()))){//$fileName)) {
$upload->setFolder( $destinationFolder );
$error = 0;
@@ -102,25 +102,25 @@
array_push( $uploads, $upload );
}
- return $uploads;
- }
-
- /**
- * Implements the a move_uploaded_file that handles multiple partitions.
- *
- * @return a boolean that indicates if the file was successfully moved. This will
- * return false if the file is not an uploaded file.
- */
- function my_move_uploaded_file( $filename, $destination )
- {
- // first check to make sure that this file is an uploaded file
- if ( !is_uploaded_file($filename) )
- {
- // This file was not an uploaded file, return false
- return FALSE;
- }
-
- return File::rename( $filename, $destination );
- }
+ return $uploads;
+ }
+
+ /**
+ * Implements the a move_uploaded_file that handles multiple partitions.
+ *
+ * @return a boolean that indicates if the file was successfully moved. This will
+ * return false if the file is not an uploaded file.
+ */
+ function my_move_uploaded_file( $filename, $destination )
+ {
+ // first check to make sure that this file is an uploaded file
+ if ( !is_uploaded_file($filename) )
+ {
+ // This file was not an uploaded file, return false
+ return FALSE;
+ }
+
+ return File::rename( $filename, $destination );
+ }
}
?>
Modified: plog/trunk/class/file/finder/filefinder.class.php
===================================================================
--- plog/trunk/class/file/finder/filefinder.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/file/finder/filefinder.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -13,7 +13,7 @@
* use FileFinder::getNew()
* @see getNew
*/
- class FileFinder extends Object
+ class FileFinder
{
var $_folder;
var $_removed;
@@ -22,7 +22,7 @@
function FileFinder( $folder = '.' )
{
- $this->Object();
+
$this->_folder = $folder;
$this->_removed = Array();
Modified: plog/trunk/class/file/unpacker/baseunpacker.class.php
===================================================================
--- plog/trunk/class/file/unpacker/baseunpacker.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/file/unpacker/baseunpacker.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -1,6 +1,6 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
/**
* \ingroup File_Unpacker
@@ -10,12 +10,12 @@
* interface and so we have to resort to this kind of tricks but probably you
* already know the drill :)
*/
- class BaseUnpacker extends Object
+ class BaseUnpacker
{
function BaseUnpacker()
{
- $this->Object();
+
}
/**
Modified: plog/trunk/class/file/unpacker/rarunpacker.class.php
===================================================================
--- plog/trunk/class/file/unpacker/rarunpacker.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/file/unpacker/rarunpacker.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -1,6 +1,6 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
include_once( PLOG_CLASS_PATH."class/file/unpacker/baseunpacker.class.php" );
define( "DEFAULT_UNRAR_PATH", "/usr/bin/unrar" );
Modified: plog/trunk/class/file/unpacker/tarbz2unpacker.class.php
===================================================================
--- plog/trunk/class/file/unpacker/tarbz2unpacker.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/file/unpacker/tarbz2unpacker.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -1,6 +1,6 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
include_once( PLOG_CLASS_PATH."class/file/unpacker/baseunpacker.class.php" );
include_once( PLOG_CLASS_PATH."class/config/config.class.php" );
Modified: plog/trunk/class/file/unpacker/targzunpacker.class.php
===================================================================
--- plog/trunk/class/file/unpacker/targzunpacker.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/file/unpacker/targzunpacker.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -1,6 +1,6 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
include_once( PLOG_CLASS_PATH."class/file/unpacker/baseunpacker.class.php" );
include_once( PLOG_CLASS_PATH."class/config/config.class.php" );
Modified: plog/trunk/class/file/unpacker/unpacker.class.php
===================================================================
--- plog/trunk/class/file/unpacker/unpacker.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/file/unpacker/unpacker.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -10,7 +10,7 @@
* subclass according to the package type.
*/
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
include_once( PLOG_CLASS_PATH."class/file/unpacker/baseunpacker.class.php" );
include_once( PLOG_CLASS_PATH."class/file/unpacker/targzunpacker.class.php" );
include_once( PLOG_CLASS_PATH."class/file/unpacker/zipunpacker.class.php" );
@@ -47,7 +47,7 @@
* @see TarBz2Unpacker
* @see RarUnpacker
*/
- class Unpacker extends Object
+ class Unpacker
{
var $_methods = Array( "tar.gz" => "TarGzUnpacker",
@@ -78,7 +78,7 @@
*/
function Unpacker( $method = UNPACKER_AUTODETECT )
{
- $this->Object();
+
$this->_method = $method;
}
Modified: plog/trunk/class/file/unpacker/zipunpacker.class.php
===================================================================
--- plog/trunk/class/file/unpacker/zipunpacker.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/file/unpacker/zipunpacker.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -1,6 +1,6 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
include_once( PLOG_CLASS_PATH."class/file/unpacker/baseunpacker.class.php" );
include_once( PLOG_CLASS_PATH."class/file/unpacker/pclzip.lib.php" );
Modified: plog/trunk/class/gallery/dao/galleryitemslist.class.php
===================================================================
--- plog/trunk/class/gallery/dao/galleryitemslist.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/gallery/dao/galleryitemslist.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -7,12 +7,12 @@
* obtains combined lists of albums and resources, so that it can be properly
* shown in the view
*/
- class GalleryItemsList extends Object
+ class GalleryItemsList
{
function GalleryItemsList()
{
- $this->Object();
+
}
function getGalleryItems( $ownerId, $albumId = GALLERY_NO_ALBUM, $resourceType = GALLEY_RESOURCE_ANY, $page = DEFAULT_PAGING_ENABLED, $itemsPerPage = DEFAULT_ITEMS_PER_PAGE )
Modified: plog/trunk/class/gallery/dao/galleryresourcequotas.class.php
===================================================================
--- plog/trunk/class/gallery/dao/galleryresourcequotas.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/gallery/dao/galleryresourcequotas.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -1,7 +1,7 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
define( "GLOBAL_QUOTA_DEFAULT", 5000000 );
/**
@@ -9,7 +9,7 @@
*
* returns information about quotas, both global-wise and per-blog quotas
*/
- class GalleryResourceQuotas extends Object
+ class GalleryResourceQuotas
{
/**
Modified: plog/trunk/class/gallery/dao/galleryresourcestorage.class.php
===================================================================
--- plog/trunk/class/gallery/dao/galleryresourcestorage.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/gallery/dao/galleryresourcestorage.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -1,6 +1,6 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
include_once( PLOG_CLASS_PATH."class/file/fileupload.class.php" );
include_once( PLOG_CLASS_PATH."class/file/file.class.php" );
include_once( PLOG_CLASS_PATH."class/file/fileuploads.class.php" );
@@ -16,12 +16,12 @@
* Takes care of dealing with resource files on disk. This class hides all the intricacies of storing
* files in disk, and how they are found and handled later on.
*/
- class GalleryResourceStorage extends Object
+ class GalleryResourceStorage
{
function GalleryResourceStorage()
{
- $this->Object();
+
}
/**
Modified: plog/trunk/class/gallery/data/galleryresourcebasemetadatareader.class.php
===================================================================
--- plog/trunk/class/gallery/data/galleryresourcebasemetadatareader.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/gallery/data/galleryresourcebasemetadatareader.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -1,5 +1,5 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
include_once( PLOG_CLASS_PATH."class/gallery/dao/galleryresource.class.php" );
include_once( PLOG_CLASS_PATH."class/data/stringutils.class.php" );
@@ -28,13 +28,13 @@
* the methods GalleryResource::isImage(), GalleryResource::isVideo(), etc to know which properties
* we can check, or use PHP's function for checking of which type a class is.
*/
- class GalleryResourceBaseMetadataReader extends Object
+ class GalleryResourceBaseMetadataReader
{
var $_metadata;
function GalleryResourceBaseMetadataReader( $resource )
{
- $this->Object();
+
$this->_metadata = $resource->getMetadata();
}
Modified: plog/trunk/class/gallery/resizers/galleryabstractresizer.class.php
===================================================================
--- plog/trunk/class/gallery/resizers/galleryabstractresizer.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/gallery/resizers/galleryabstractresizer.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -1,6 +1,6 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
/**
* \ingroup Gallery_resizer
@@ -9,7 +9,7 @@
* the skeleton of the functions that should be implemented by the generators
* themselves.
*/
- class GalleryAbstractResizer extends Object
+ class GalleryAbstractResizer
{
var $_image;
@@ -21,7 +21,7 @@
*/
function GalleryAbstractResizer( $image, $outputMethod )
{
- $this->Object();
+
$this->_image = $image;
$this->_outputMethod = $outputMethod;
Modified: plog/trunk/class/gallery/resizers/galleryresizer.class.php
===================================================================
--- plog/trunk/class/gallery/resizers/galleryresizer.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/gallery/resizers/galleryresizer.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -41,7 +41,7 @@
* many as needed. It also supports caching of thumbnails so that they don't have
* to be generated after each request.
*/
- class GalleryResizer extends Object
+ class GalleryResizer
{
/**
@@ -80,7 +80,7 @@
*/
function GalleryResizer( $image )
{
- $this->Object();
+
// keep these things for later
$this->_image = $image;
Modified: plog/trunk/class/gallery/resizers/gallerythumbnailgenerator.class.php
===================================================================
--- plog/trunk/class/gallery/resizers/gallerythumbnailgenerator.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/gallery/resizers/gallerythumbnailgenerator.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -1,8 +1,8 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
- class GalleryThumbnailGenerator extends Object
+
+ class GalleryThumbnailGenerator
{
/**
Modified: plog/trunk/class/gallery/resizers/gddetector.class.php
===================================================================
--- plog/trunk/class/gallery/resizers/gddetector.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/gallery/resizers/gddetector.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -1,7 +1,7 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
/**
* \ingroup Gallery_resizer
*
@@ -9,11 +9,11 @@
* is available in this host
*
*/
- class GdDetector extends Object
+ class GdDetector
{
function GdDectector()
{
- $this->Object();
+
}
/**
Modified: plog/trunk/class/gallery/template/gallerytemplatetools.class.php
===================================================================
--- plog/trunk/class/gallery/template/gallerytemplatetools.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/gallery/template/gallerytemplatetools.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -1,6 +1,6 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
include_once( PLOG_CLASS_PATH."class/data/stringutils.class.php" );
include_once( PLOG_CLASS_PATH."class/gallery/dao/galleryalbums.class.php" );
@@ -9,7 +9,7 @@
*
* some extra useful functions, which shouldn't be used by developers anyway...
*/
- class GalleryTemplateTools extends Object
+ class GalleryTemplateTools
{
/**
Modified: plog/trunk/class/locale/locale.class.php
===================================================================
--- plog/trunk/class/locale/locale.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/locale/locale.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -19,7 +19,7 @@
* @see Locales
*/
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
include_once( PLOG_CLASS_PATH."class/config/config.class.php" );
define( "DEFAULT_LOCALE_FOLDER", PLOG_CLASS_PATH . "locale" );
@@ -67,7 +67,7 @@
* every time from disk.
* @see Locales::getLocale()
*/
- class Locale extends Object
+ class Locale
{
var $_defaultFolder;
@@ -90,7 +90,7 @@
*/
function Locale( $code )
{
- $this->Object();
+
$this->_code = $code;
Modified: plog/trunk/class/locale/locales.class.php
===================================================================
--- plog/trunk/class/locale/locales.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/locale/locales.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -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" );
include_once( PLOG_CLASS_PATH."class/locale/locale.class.php" );
include_once( PLOG_CLASS_PATH."class/plugin/pluginmanager.class.php" );
@@ -23,12 +23,12 @@
* @see Locales::getLocale
* @see Locale
*/
- class Locales extends Object
+ class Locales
{
function Locales()
{
- $this->Object();
+
}
/**
Modified: plog/trunk/class/logger/layout/layout.class.php
===================================================================
--- plog/trunk/class/logger/layout/layout.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/logger/layout/layout.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -1,7 +1,7 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
/**
* Layout provides a customizable way to format data for an appender. A Layout specifies
* the format of the messages that are going to be written to a target via an appender.
Modified: plog/trunk/class/logger/logger/logger.class.php
===================================================================
--- plog/trunk/class/logger/logger/logger.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/logger/logger/logger.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -1,6 +1,6 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
include_once( PLOG_CLASS_PATH."class/logger/logger/loggedmessage.class.php" );
/**
Modified: plog/trunk/class/mail/emailmessage.class.php
===================================================================
--- plog/trunk/class/mail/emailmessage.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/mail/emailmessage.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -1,6 +1,6 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
define( "MAX_LINE_LENGTH", 998 );
@@ -10,7 +10,7 @@
* Represents an email message and has basic setter and getter methods for all the most
* basic attributes of an email message (To:, From:, Bcc:, etc)
*/
- class EmailMessage extends Object
+ class EmailMessage
{
var $_toAddrs;
@@ -29,7 +29,7 @@
*/
function EmailMessage()
{
- $this->Object();
+
$this->_toAddrs = Array();
$this->_ccAddrs = Array();
Modified: plog/trunk/class/mail/emailservice.class.php
===================================================================
--- plog/trunk/class/mail/emailservice.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/mail/emailservice.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -11,7 +11,7 @@
* class takes care of sending out the messages.
*/
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
include_once( PLOG_CLASS_PATH."class/config/config.class.php" );
include_once( PLOG_CLASS_PATH."class/mail/emailmessage.class.php" );
include_once( PLOG_CLASS_PATH."class/mail/phpmailer/class.phpmailer.php" );
@@ -62,7 +62,7 @@
* - smtp_username
* - smtp_password
*/
- class EmailService extends Object
+ class EmailService
{
var $_config;
@@ -72,7 +72,7 @@
*/
function EmailService()
{
- $this->Object();
+
$this->_config =& Config::getConfig();
}
Modified: plog/trunk/class/misc/glob.class.php
===================================================================
--- plog/trunk/class/misc/glob.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/misc/glob.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -7,7 +7,7 @@
*/
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
/**
* \ingroup Misc
@@ -21,7 +21,7 @@
* The class is capable of detecting the version of php and using the native (and probably
* faster) version instead of the custom one.
*/
- class Glob extends Object
+ class Glob
{
/**
Modified: plog/trunk/class/misc/osdetect.class.php
===================================================================
--- plog/trunk/class/misc/osdetect.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/misc/osdetect.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -1,6 +1,6 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
/**
* \ingroup Misc
@@ -9,7 +9,7 @@
* on which operating system our php parser is running. Please bear in mind that this has not been
* thoroughly tested and that at the moment it only provides detection for windows and linux.
*/
- class OsDetect extends Object
+ class OsDetect
{
/**
Modified: plog/trunk/class/misc/version.class.php
===================================================================
--- plog/trunk/class/misc/version.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/misc/version.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -1,6 +1,6 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
include_once( PLOG_CLASS_PATH."class/file/file.class.php" );
define( "PLOG_PROJECT_PAGE", "http://www.plogworld.net" );
@@ -13,7 +13,7 @@
*
* Returns the current version of plog as well as a link to the project page
*/
- class Version extends Object
+ class Version
{
/**
Modified: plog/trunk/class/net/baserequestgenerator.class.php
===================================================================
--- plog/trunk/class/net/baserequestgenerator.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/net/baserequestgenerator.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -10,7 +10,7 @@
*/
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
include_once( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
define( "DEFAULT_SCRIPT_NAME", "index.php" );
@@ -34,7 +34,7 @@
*
* @see RequestGenerator
*/
- class BaseRequestGenerator extends Object
+ class BaseRequestGenerator
{
var $_params;
@@ -60,7 +60,7 @@
*/
function BaseRequestGenerator( $blogInfo = null )
{
- $this->Object();
+
$this->_params = Array();
Modified: plog/trunk/class/net/client.class.php
===================================================================
--- plog/trunk/class/net/client.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/net/client.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -1,7 +1,7 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
/**
* \ingroup Net
@@ -9,7 +9,7 @@
* Basic class that will return the real IP address of a request. In the future this class
* will be improved to return other things such as the user agent, content type, etc.
*/
- class Client extends Object
+ class Client
{
/**
Modified: plog/trunk/class/net/customurlhandler.class.php
===================================================================
--- plog/trunk/class/net/customurlhandler.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/net/customurlhandler.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -1,7 +1,7 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
include_once( PLOG_CLASS_PATH."class/config/config.class.php" );
include_once( PLOG_CLASS_PATH."class/net/linkformatmatcher.class.php" );
include_once( PLOG_CLASS_PATH."class/net/url.class.php" );
@@ -18,7 +18,7 @@
*
* @see LinkFormatMatcher
*/
- class CustomUrlHandler extends Object
+ class CustomUrlHandler
{
var $_formats;
@@ -30,8 +30,8 @@
function CustomUrlHandler()
{
- $this->Object();
+
// we need to figure out the full server path so that we can generate proper
// regexps for the url parsing. This should get rid of issues like
// http://bugs.plogworld.net/view.php?id=369
Modified: plog/trunk/class/net/dns.class.php
===================================================================
--- plog/trunk/class/net/dns.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/net/dns.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -1,6 +1,6 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
include_once( PLOG_CLASS_PATH."class/misc/osdetect.class.php" );
/**
@@ -11,7 +11,7 @@
* running windows or linux and then depending on the result, we will use the faster and native
* version or the alternative one.
*/
- class Dns extends Object
+ class Dns
{
/**
Modified: plog/trunk/class/net/http/httpvars.class.php
===================================================================
--- plog/trunk/class/net/http/httpvars.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/net/http/httpvars.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -1,7 +1,7 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
/**
* \defgroup Net_HTTP
*
@@ -21,7 +21,7 @@
* incompatibility with the version of php we are running while having access to the
* variables we most need.
*/
- class HttpVars extends Object
+ class HttpVars
{
/**
Modified: plog/trunk/class/net/http/session/sessionmanager.class.php
===================================================================
--- plog/trunk/class/net/http/session/sessionmanager.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/net/http/session/sessionmanager.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -1,6 +1,6 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
include_once( PLOG_CLASS_PATH."class/net/url.class.php" );
include_once( PLOG_CLASS_PATH."class/net/http/httpvars.class.php" );
include_once( PLOG_CLASS_PATH."class/net/http/session/sessioninfo.class.php" );
@@ -15,7 +15,7 @@
* Class that deals with session, initializing, session cookies, etc. It also takes care of setting
* the session folder paths, by calling the method SessionManager::setSessionSavePath().
*/
- class SessionManager extends Object
+ class SessionManager
{
/**
Modified: plog/trunk/class/net/http/subdomains.class.php
===================================================================
--- plog/trunk/class/net/http/subdomains.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/net/http/subdomains.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -1,6 +1,6 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
include_once( PLOG_CLASS_PATH."class/net/linkparser.class.php" );
include_once( PLOG_CLASS_PATH."class/config/config.class.php" );
include_once( PLOG_CLASS_PATH."class/net/url.class.php" );
@@ -11,7 +11,7 @@
* encapsulates most of the logic needed to extract info about
* the subdomain, given a subdomain url
*/
- class Subdomains extends Object
+ class Subdomains
{
/**
* returns an array with two positions: $array["username"] and $array["blogname"] as
Modified: plog/trunk/class/net/linkformatmatcher.class.php
===================================================================
--- plog/trunk/class/net/linkformatmatcher.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/net/linkformatmatcher.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -1,8 +1,8 @@
<?php
include_once( PLOG_CLASS_PATH."class/net/linkparser.class.php" );
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
/**
* \ingroup Net
*
@@ -20,7 +20,7 @@
*
* @see LinkParser
*/
- class LinkFormatMatcher extends Object
+ class LinkFormatMatcher
{
var $_request;
Modified: plog/trunk/class/net/linkparser.class.php
===================================================================
--- plog/trunk/class/net/linkparser.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/net/linkparser.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -14,7 +14,7 @@
*
* @see LinkFormatMatcher
*/
- class LinkParser extends Object
+ class LinkParser
{
// list of tags that can be used to generate valid urls, and its
@@ -46,7 +46,7 @@
function LinkParser( $linkFormat )
{
- $this->Object();
+
$this->_linkFormat = $linkFormat;
}
Modified: plog/trunk/class/net/prettyrequestparser.class.php
===================================================================
--- plog/trunk/class/net/prettyrequestparser.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/net/prettyrequestparser.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -5,9 +5,9 @@
*/
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
- class PrettyRequestParser extends Object {
+ class PrettyRequestParser {
function PrettyRequestParser( $function, $path_info )
{
Modified: plog/trunk/class/net/request.class.php
===================================================================
--- plog/trunk/class/net/request.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/net/request.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -1,6 +1,6 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
include_once( PLOG_CLASS_PATH."class/config/properties.class.php" );
include_once( PLOG_CLASS_PATH."class/config/config.class.php" );
Modified: plog/trunk/class/net/requestgenerator.class.php
===================================================================
--- plog/trunk/class/net/requestgenerator.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/net/requestgenerator.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -58,7 +58,7 @@
* In order to check which methods are available to request generators, please see the documentation of the
* RequestGenerator proxy class.
*/
- class RequestGenerator extends Object
+ class RequestGenerator
{
function getRequestGenerator( $blogInfo = null, $mode = CHECK_CONFIG_REQUEST_MODE )
Modified: plog/trunk/class/net/url.class.php
===================================================================
--- plog/trunk/class/net/url.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/net/url.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -1,6 +1,6 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
/**
* \ingroup Net
@@ -22,7 +22,7 @@
* url string is recalculated so that any call to getUrl
* will return the right one.
*/
- class Url extends Object
+ class Url
{
var $_url;
@@ -44,7 +44,7 @@
*/
function Url( $url )
{
- $this->Object();
+
$this->_url = $url;
Modified: plog/trunk/class/net/xmlrpcclient.class.php
===================================================================
--- plog/trunk/class/net/xmlrpcclient.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/net/xmlrpcclient.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -1,6 +1,6 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
include_once( PLOG_CLASS_PATH."class/net/xmlrpc/IXR_Library.lib.php" );
/**
Modified: plog/trunk/class/object/exception.class.php
===================================================================
--- plog/trunk/class/object/exception.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/object/exception.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -1,13 +1,13 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
/**
* \ingroup Core
*
* PHP Java-style definition of an Exception object-
*/
- class Exception extends Object
+ class Exception
{
var $_exceptionString;
@@ -21,7 +21,7 @@
*/
function Exception( $exceptionString, $exceptionCode = 0 )
{
- $this->Object();
+
$this->_exceptionString = $exceptionString;
$this->_exceptionCode = $exceptionCode;
Added: plog/trunk/class/object/loggable.class.php
===================================================================
--- plog/trunk/class/object/loggable.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/object/loggable.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -0,0 +1,19 @@
+<?php
+
+ class Loggable {
+
+ var $log;
+
+ /**
+ * Constructor
+ */
+ function Loggable()
+ {
+ // initialize logging -- enable this only for debugging purposes
+ $this->log =& LoggerManager::getLogger( "default" );
+
+ if( DEBUG_ENABLED )
+ $this->debug =& LoggerManager::getLogger( "debug" );
+ }
+ }
+?>
Modified: plog/trunk/class/object/object.class.php
===================================================================
--- plog/trunk/class/object/object.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/object/object.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -11,11 +11,6 @@
strong object-oriented languages such as Java and C# so do not be surprised if some of the design decisions
look strangely familiar.
</p>
-<p>Every object in pLog extends the Object class, or at least all those objects created internally
-inherit from this class (while you are free not to follow this pattern when creating your own custom
-classes) The Object class provides some very basic methods related to dealing with classes such as getting
-the name of a class, getting access to its attributes or methods. It is closely modelled after the same
-Java class.</p>
<p>This documentation should only be used as a reference, and for checking which methods each class has and to
get some basic information about them. This documentation does not try to be an in-depth introduction to the
pLog API and the best place for developers to get acquainted with pLog is the wiki: http://wiki.plogworld.net/index.php/Developers_Documentation
@@ -45,6 +40,12 @@
* toString, which will dump the names and the values of the attributes of the object.
* All the objects should inherit from this one and call this constructor manually, due
* to PHP not automatically calling the parent's class constructor when inheriting.
+ *
+ * <b>NOTE:</b> As of pLog 1.1, this object is deprecated and all objects in pLog do not depend
+ * on the base class Object. This object has been left here for backwards compatibility (plugins, etc)
+ * but you are not advised to depend on it for new plugins or development.
+ *
+ * @deprecated
*/
class Object {
Modified: plog/trunk/class/object/observable.class.php
===================================================================
--- plog/trunk/class/object/observable.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/object/observable.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -1,6 +1,6 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
/**
* \ingroup Core
@@ -8,7 +8,7 @@
* Implementation of the Observer pattern. Copied/Inspired ;) from
* http://www.phppatterns.com/index.php/article/articleview/27/1/1/.
*/
- class Observable extends Object {
+ class Observable {
/**
* @private
Modified: plog/trunk/class/object/observer.class.php
===================================================================
--- plog/trunk/class/object/observer.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/object/observer.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -1,6 +1,6 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
/**
* \ingroup Core
Modified: plog/trunk/class/object/reflection.class.php
===================================================================
--- plog/trunk/class/object/reflection.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/object/reflection.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -1,6 +1,6 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
/**
* \ingroup Core
@@ -8,7 +8,7 @@
* <b>Very</b> modest attempt to recreate some kind of Reflection API
* "a la" Java.
*/
- class Reflection extends Object
+ class Reflection
{
/**
@@ -16,7 +16,7 @@
*/
function Reflection()
{
- $this->Object();
+
}
/**
Modified: plog/trunk/class/plugin/pluginbase.class.php
===================================================================
--- plog/trunk/class/plugin/pluginbase.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/plugin/pluginbase.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -11,14 +11,14 @@
* available in this class.
*/
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
/**
* \ingroup Plugin
*
* This is the base class from which every plugin object should inherit.
*/
- class PluginBase extends Object
+ class PluginBase
{
/** ADOConnection object to connect to the database
@@ -88,7 +88,7 @@
*/
function PluginBase()
{
- $this->Object();
+
}
/**
Modified: plog/trunk/class/plugin/pluginmanager.class.php
===================================================================
--- plog/trunk/class/plugin/pluginmanager.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/plugin/pluginmanager.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -1,6 +1,6 @@
<?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/config/config.class.php" );
include_once( PLOG_CLASS_PATH."class/misc/glob.class.php" );
@@ -33,7 +33,7 @@
* $pm->notifyEvent( ... );
* </pre>
*/
- class PluginManager extends Object
+ class PluginManager
{
var $_pluginDir;
@@ -61,7 +61,7 @@
*/
function PluginManager( $pluginDir = PLUGIN_MANAGER_DEFAULT_PLUGIN_FOLDER, $filePattern = PLUGIN_MANAGER_DEFAULT_PLUGIN_FILE_PATTERN )
{
- $this->Object();
+
$config =& Config::getConfig();
Modified: plog/trunk/class/security/pipeline.class.php
===================================================================
--- plog/trunk/class/security/pipeline.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/security/pipeline.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -9,7 +9,7 @@
*/
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
include_once( PLOG_CLASS_PATH."class/config/config.class.php" );
/**
@@ -35,7 +35,7 @@
* The out of the box implementation of the Pipeline comes with a null filter (a filter that does nothing -- go figure :))
* and a filter that implements a Bayesian filter for advanced spam protection. See the BayesianFilter class for more information.
*/
- class Pipeline extends Object
+ class Pipeline
{
/**
@@ -64,7 +64,7 @@
*/
function Pipeline( $httpRequest, $blogInfo = null )
{
- $this->Object();
+
$this->_httpRequest = $httpRequest;
$this->_blogInfo = $blogInfo;
Modified: plog/trunk/class/security/pipelinefilter.class.php
===================================================================
--- plog/trunk/class/security/pipelinefilter.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/security/pipelinefilter.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -1,6 +1,6 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
/**
* \ingroup Security
@@ -19,7 +19,7 @@
*
* Please implement at least the filter() method when creating custom filters.
*/
- class PipelineFilter extends Object
+ class PipelineFilter
{
var $_pipelineRequest;
@@ -32,7 +32,7 @@
*/
function PipelineFilter( $pipelineRequest )
{
- $this->Object();
+
$this->_pipelineRequest = $pipelineRequest;
}
Modified: plog/trunk/class/security/pipelinerequest.class.php
===================================================================
--- plog/trunk/class/security/pipelinerequest.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/security/pipelinerequest.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -1,6 +1,6 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
include_once( PLOG_CLASS_PATH."class/dao/bloginfo.class.php" );
/**
@@ -11,7 +11,7 @@
* such as the incoming HTTP request and a reference to the BlogInfo object
* of the blog that is executing the Pipeline.
*/
- class PipelineRequest extends Object
+ class PipelineRequest
{
var $_httpRequest;
@@ -27,7 +27,7 @@
*/
function PipelineRequest( $httpRequest, $blogInfo, $rejected = false )
{
- $this->Object();
+
if( is_array($httpRequest))
$this->_httpRequest = new Properties( $httpRequest );
Modified: plog/trunk/class/security/pipelineresult.class.php
===================================================================
--- plog/trunk/class/security/pipelineresult.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/security/pipelineresult.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -1,6 +1,6 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
/**
* \ingroup Security
@@ -13,7 +13,7 @@
*
* @see Pipeline
*/
- class PipelineResult extends Object
+ class PipelineResult
{
/**
Modified: plog/trunk/class/summary/data/summarytools.class.php
===================================================================
--- plog/trunk/class/summary/data/summarytools.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/summary/data/summarytools.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -1,11 +1,11 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
include_once( PLOG_CLASS_PATH."class/mail/emailmessage.class.php" );
include_once( PLOG_CLASS_PATH."class/mail/emailservice.class.php" );
include_once( PLOG_CLASS_PATH."class/dao/users.class.php" );
- class SummaryTools extends Object
+ class SummaryTools
{
/**
Modified: plog/trunk/class/template/cachecontrol.class.php
===================================================================
--- plog/trunk/class/template/cachecontrol.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/template/cachecontrol.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -1,6 +1,6 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
include_once( PLOG_CLASS_PATH."class/template/cachedtemplate.class.php" );
include_once( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
@@ -11,7 +11,7 @@
* whenever you need to clear the contents of the whole site, the summary or just a single
* blog.
*/
- class CacheControl extends Object
+ class CacheControl
{
/**
Modified: plog/trunk/class/template/menu/menurenderer.class.php
===================================================================
--- plog/trunk/class/template/menu/menurenderer.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/template/menu/menurenderer.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -1,6 +1,6 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
include_once( PLOG_CLASS_PATH."class/locale/locales.class.php" );
include_once( PLOG_CLASS_PATH."class/template/templateservice.class.php" );
include_once( PLOG_CLASS_PATH."class/template/menu/menu.class.php" );
@@ -19,7 +19,7 @@
* See the "Menu API reference" document in the wiki for more information:
* http://wiki.plogworld.net/index.php/PLog_1.0/The_Menu_API
*/
- class MenuRenderer extends Object
+ class MenuRenderer
{
var $_menu;
var $_blogInfo;
@@ -37,7 +37,7 @@
*/
function MenuRenderer( $menu, $blogInfo, $userInfo )
{
- $this->Object();
+
$this->_menu = $menu;
$this->_blogInfo = $blogInfo;
$this->_userInfo = $userInfo;
Modified: plog/trunk/class/template/templatesandbox.class.php
===================================================================
--- plog/trunk/class/template/templatesandbox.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/template/templatesandbox.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -22,12 +22,12 @@
*
* @see TemplateValidator
*/
- class TemplateSandbox extends Object
+ class TemplateSandbox
{
function TemplateSandbox()
{
- $this->Object();
+
}
/**
Modified: plog/trunk/class/template/templateservice.class.php
===================================================================
--- plog/trunk/class/template/templateservice.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/template/templateservice.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -41,7 +41,7 @@
* print($template->display());
* </pre>
*/
- class TemplateService extends Object
+ class TemplateService
{
/**
@@ -49,7 +49,7 @@
*/
function TemplateService()
{
- $this->Object();
+
}
/**
Modified: plog/trunk/class/template/templatesets/templateset.class.php
===================================================================
--- plog/trunk/class/template/templatesets/templateset.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/template/templatesets/templateset.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -1,6 +1,6 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
include_once( PLOG_CLASS_PATH."class/file/file.class.php" );
define( "TEMPLATE_SET_GLOBAL", 1 );
@@ -11,7 +11,7 @@
*
* abstraction for a template set
*/
- class TemplateSet extends Object
+ class TemplateSet
{
var $_name;
var $_type;
@@ -27,8 +27,8 @@
*/
function TemplateSet( $name, $type, $blogId = 0)
{
- $this->Object();
+
$this->_name = $name;
$this->_type = $type;
$this->_blogId = $blogId;
Modified: plog/trunk/class/template/templatesets/templatesets.class.php
===================================================================
--- plog/trunk/class/template/templatesets/templatesets.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/template/templatesets/templatesets.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -1,6 +1,6 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
include_once( PLOG_CLASS_PATH."class/template/templatesets/templateset.class.php" );
include_once( PLOG_CLASS_PATH."class/template/templatesets/templatesetstorage.class.php" );
include_once( PLOG_CLASS_PATH."class/template/templateservice.class.php" );
@@ -19,12 +19,12 @@
* screenshot? Is it a local template?) and TemplateStorage deals with adding
* templates, removing them from disk, etc.
*/
- class TemplateSets extends Object
+ class TemplateSets
{
function TemplateSets()
{
- $this->Object();
+
}
/**
Modified: plog/trunk/class/template/templatesets/templatesetstorage.class.php
===================================================================
--- plog/trunk/class/template/templatesets/templatesetstorage.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/template/templatesets/templatesetstorage.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -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" );
include_once( PLOG_CLASS_PATH."class/misc/glob.class.php" );
include_once( PLOG_CLASS_PATH."class/file/file.class.php" );
@@ -20,7 +20,7 @@
*
* Class and API users should not need to use this class directly.
*/
- class TemplateSetStorage extends Object
+ class TemplateSetStorage
{
/**
@@ -28,7 +28,7 @@
*/
function TemplateSetStorage()
{
- $this->Object();
+
}
/**
Modified: plog/trunk/class/template/templateutils.class.php
===================================================================
--- plog/trunk/class/template/templateutils.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/template/templateutils.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -1,6 +1,6 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
include_once( PLOG_CLASS_PATH."class/dao/article.class.php" );
include_once( PLOG_CLASS_PATH."class/net/requestgenerator.class.php" );
include_once( PLOG_CLASS_PATH."class/dao/bloginfo.class.php" );
@@ -14,7 +14,7 @@
*
* \ingroup Template
*/
- class TemplateUtils extends Object
+ class TemplateUtils
{
var $_blogInfo;
@@ -27,7 +27,7 @@
*/
function TemplateUtils( $blogInfo )
{
- $this->Object();
+
$this->_blogInfo = $blogInfo;
}
Modified: plog/trunk/class/view/admin/adminview.class.php
===================================================================
--- plog/trunk/class/view/admin/adminview.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/view/admin/adminview.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -74,8 +74,8 @@
*/
function notifyEvent( $eventType, $params = Array())
{
- $params[ 'from' ] = $this->className();
-
+ $params[ 'from' ] = get_class( $this );
+
return $this->_pm->notifyEvent( $eventType, $params );
}
Modified: plog/trunk/class/view/blogview.class.php
===================================================================
--- plog/trunk/class/view/blogview.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/view/blogview.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -67,7 +67,7 @@
*/
function notifyEvent( $eventType, $params = Array())
{
- $params[ 'from' ] = $this->className();
+ $params[ 'from' ] = get_class( $this );
return $this->_pm->notifyEvent( $eventType, $params );
}
Modified: plog/trunk/class/view/view.class.php
===================================================================
--- plog/trunk/class/view/view.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/view/view.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -15,7 +15,7 @@
* @see AdminPluginTemplatedView
*/
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
include_once( PLOG_CLASS_PATH."class/config/properties.class.php" );
/**
@@ -53,7 +53,7 @@
* In case it is necessary to create a class extending directly from View, please implement your own rendering
* logic in the View::render() method but do not forget to call it at some point in your render() method.
*/
- class View extends Object
+ class View
{
var $_params;
@@ -67,7 +67,7 @@
*/
function View()
{
- $this->Object();
+
$this->_params = new Properties();
@@ -241,7 +241,7 @@
function setSessionValue( $param, $value )
{
$session = HttpVars::getSession();
- $viewName = $this->className();
+ $viewName = get_class( $this );
$keyName = "{$viewName}_{$param}";
$session["$keyName"] = $value;
HttpVars::setSession( $session );
@@ -260,7 +260,7 @@
function getSessionValue( $param, $defaultValue = "" )
{
$session = HttpVars::getSession();
- $viewName = $this->className();
+ $viewName = get_class( $this );
$keyName = "{$viewName}_{$param}";
$value = $session["$keyName"];
Modified: plog/trunk/class/xml/pathparser.class.php
===================================================================
--- plog/trunk/class/xml/pathparser.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/xml/pathparser.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -39,14 +39,14 @@
-include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
/**
* \ingroup XML
*
* Allows to create XPath queries for XML documents, if needed.
*/
-class Path_parser extends Object {
+class Path_parser {
var $paths;
var $context=Array();
var $parser;
@@ -59,7 +59,7 @@
}
function Path_parser() {
- $this->Object();
+
$this->init();
}
Modified: plog/trunk/class/xml/rssparser/rsschannel.class.php
===================================================================
--- plog/trunk/class/xml/rssparser/rsschannel.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/xml/rssparser/rsschannel.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -1,6 +1,6 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
/**
* \ingroup XML
@@ -13,7 +13,7 @@
* The array is an associative array where the keys are the name of the attribute/tag and the values are
* the value of the attribute/tag.</p>
*/
- class RSSChannel extends Object {
+ class RSSChannel {
var $_title;
var $_description;
Modified: plog/trunk/class/xml/rssparser/rssenclosure.class.php
===================================================================
--- plog/trunk/class/xml/rssparser/rssenclosure.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/xml/rssparser/rssenclosure.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -1,7 +1,7 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
/**
* \ingroup XML
*
@@ -11,7 +11,7 @@
* Objects of this class are returned via the RssItem::getEnclosures() method, as an
* array of enclosures in case the RSS item has any.
*/
- class RssEnclosure extends Object
+ class RssEnclosure
{
var $_url;
var $_mimeType;
Modified: plog/trunk/class/xml/rssparser/rssitem.class.php
===================================================================
--- plog/trunk/class/xml/rssparser/rssitem.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/xml/rssparser/rssitem.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -1,6 +1,6 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
include_once( PLOG_CLASS_PATH."class/xml/rssparser/rssenclosure.class.php" );
/**
@@ -14,7 +14,7 @@
* The array is an associative array where the keys are the name of the attribute/tag and the values are
* the value of the attribute/tag.</p>
*/
- class RSSItem extends Object
+ class RSSItem
{
var $_link;
Modified: plog/trunk/class/xml/rssparser/rssparser.class.php
===================================================================
--- plog/trunk/class/xml/rssparser/rssparser.class.php 2005-09-14 16:43:15 UTC (rev 2467)
+++ plog/trunk/class/xml/rssparser/rssparser.class.php 2005-09-14 20:52:42 UTC (rev 2468)
@@ -1,6 +1,6 @@
<?php
- include_once( PLOG_CLASS_PATH."class/object/object.class.php" );
+
// include_once( PLOG_CLASS_PATH."class/xml/rssparser/magpierss/rss_fetch.inc" );
// include_once( PLOG_CLASS_PATH."class/xml/rssparser/magpierss/rss_cache.inc" );
// include_once( PLOG_CLASS_PATH."class/xml/rssparser/magpierss/rss_parse.inc" );
@@ -37,7 +37,7 @@
* <p>If the RSS parser has been disabled via the configuration file, then the constructor will not do
* anything and the parse method will return false.</p>
*/
- class RSSParser extends Object
+ class RSSParser
{
var $_items;
More information about the pLog-svn
mailing list