[pLog-svn] r5348 - in plog/branches/lifetype-1.2: . class class/action class/action/admin class/cache class/config class/controller class/dao class/dao/userdata class/data class/data/Date class/locale class/logger/config class/mail/phpmailer class/misc class/net/http class/net/http/phpsniff class/net/xmlrpc class/object class/plugin class/security class/summary/action class/summary/net class/template class/template/smarty/plugins class/test/helpers class/test/tests/dao class/test/tests/ui class/view class/view/admin class/xml/tree plugins/badbehavior
jondaley at devel.lifetype.net
jondaley at devel.lifetype.net
Thu Apr 26 18:31:00 EDT 2007
Author: jondaley
Date: 2007-04-26 18:30:59 -0400 (Thu, 26 Apr 2007)
New Revision: 5348
Modified:
plog/branches/lifetype-1.2/blog
plog/branches/lifetype-1.2/class/action/admin/adminaddpostaction.class.php
plog/branches/lifetype-1.2/class/action/admin/admincleanupaction.class.php
plog/branches/lifetype-1.2/class/action/admin/adminmainaction.class.php
plog/branches/lifetype-1.2/class/action/blogaction.class.php
plog/branches/lifetype-1.2/class/action/resourceserveraction.class.php
plog/branches/lifetype-1.2/class/bootstrap.php
plog/branches/lifetype-1.2/class/cache/cache.class.php
plog/branches/lifetype-1.2/class/cache/cachemanager.class.php
plog/branches/lifetype-1.2/class/cache/memcache.class.php
plog/branches/lifetype-1.2/class/config/configfilestorage.class.php
plog/branches/lifetype-1.2/class/controller/admincontroller.class.php
plog/branches/lifetype-1.2/class/controller/blogcontroller.class.php
plog/branches/lifetype-1.2/class/dao/articlenotifications.class.php
plog/branches/lifetype-1.2/class/dao/articles.class.php
plog/branches/lifetype-1.2/class/dao/blogs.class.php
plog/branches/lifetype-1.2/class/dao/blogsettings.class.php
plog/branches/lifetype-1.2/class/dao/commentscommon.class.php
plog/branches/lifetype-1.2/class/dao/referers.class.php
plog/branches/lifetype-1.2/class/dao/searchengine.class.php
plog/branches/lifetype-1.2/class/dao/usercomment.class.php
plog/branches/lifetype-1.2/class/dao/userdata/joomlauserdataprovider.class.php
plog/branches/lifetype-1.2/class/dao/userdata/vbb3userdataprovider.class.php
plog/branches/lifetype-1.2/class/dao/userdata/wbbuserdataprovider.class.php
plog/branches/lifetype-1.2/class/data/Date.class.php
plog/branches/lifetype-1.2/class/data/Date/Span.class.php
plog/branches/lifetype-1.2/class/data/textfilter.class.php
plog/branches/lifetype-1.2/class/locale/bloglocale.class.php
plog/branches/lifetype-1.2/class/locale/locale.class.php
plog/branches/lifetype-1.2/class/locale/locales.class.php
plog/branches/lifetype-1.2/class/locale/pluginlocale.class.php
plog/branches/lifetype-1.2/class/logger/config/loggerconfigloader.class.php
plog/branches/lifetype-1.2/class/mail/phpmailer/class.phpmailer.php
plog/branches/lifetype-1.2/class/misc/version.class.php
plog/branches/lifetype-1.2/class/net/http/phpsniff/phpSniff.class.php
plog/branches/lifetype-1.2/class/net/http/subdomains.class.php
plog/branches/lifetype-1.2/class/net/xmlrpc/xmlrpcserver.class.php
plog/branches/lifetype-1.2/class/object/loader.class.php
plog/branches/lifetype-1.2/class/plugin/globalpluginconfig.class.php
plog/branches/lifetype-1.2/class/plugin/pluginmanager.class.php
plog/branches/lifetype-1.2/class/security/bayesianfilter.class.php
plog/branches/lifetype-1.2/class/security/nullpipelinefilter.class.php
plog/branches/lifetype-1.2/class/security/pipeline.class.php
plog/branches/lifetype-1.2/class/summary/action/registeraction.class.php
plog/branches/lifetype-1.2/class/summary/action/summarydefaultaction.class.php
plog/branches/lifetype-1.2/class/summary/net/summaryrequestgenerator.class.php
plog/branches/lifetype-1.2/class/template/smarty/plugins/function.adminpager.php
plog/branches/lifetype-1.2/class/template/smarty/plugins/function.pager.php
plog/branches/lifetype-1.2/class/template/smarty/plugins/modifier.utf8_truncate.php
plog/branches/lifetype-1.2/class/template/templateservice.class.php
plog/branches/lifetype-1.2/class/test/helpers/consolereporter.class.php
plog/branches/lifetype-1.2/class/test/helpers/uiscriptrunner.class.php
plog/branches/lifetype-1.2/class/test/tests/dao/articlecategories_test.class.php
plog/branches/lifetype-1.2/class/test/tests/dao/commentscommon_test.class.php
plog/branches/lifetype-1.2/class/test/tests/dao/userinfo_test.class.php
plog/branches/lifetype-1.2/class/test/tests/ui/articlecategoriesui_test.class.php
plog/branches/lifetype-1.2/class/test/tests/ui/login_test.class.php
plog/branches/lifetype-1.2/class/test/tests/ui/permissionsui_test.class.php
plog/branches/lifetype-1.2/class/view/admin/adminnewpostview.class.php
plog/branches/lifetype-1.2/class/view/blogview.class.php
plog/branches/lifetype-1.2/class/view/redirectview.class.php
plog/branches/lifetype-1.2/class/view/smartyview.class.php
plog/branches/lifetype-1.2/class/xml/tree/Tree.php
plog/branches/lifetype-1.2/plugins/badbehavior/index.inc.php
plog/branches/lifetype-1.2/plugins/badbehavior/pluginbadbehavior.class.php
plog/branches/lifetype-1.2/resserver.php
plog/branches/lifetype-1.2/runtests.php
plog/branches/lifetype-1.2/xmlrpc.php
Log:
we should use lt_include everywhere
Modified: plog/branches/lifetype-1.2/blog
===================================================================
--- plog/branches/lifetype-1.2/blog 2007-04-26 21:19:34 UTC (rev 5347)
+++ plog/branches/lifetype-1.2/blog 2007-04-26 22:30:59 UTC (rev 5348)
@@ -5,5 +5,5 @@
}
// and transfer execution to the main script
- include_once( PLOG_CLASS_PATH."blog.php" );
-?>
\ No newline at end of file
+ include( PLOG_CLASS_PATH."blog.php" );
+?>
Modified: plog/branches/lifetype-1.2/class/action/admin/adminaddpostaction.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/action/admin/adminaddpostaction.class.php 2007-04-26 21:19:34 UTC (rev 5347)
+++ plog/branches/lifetype-1.2/class/action/admin/adminaddpostaction.class.php 2007-04-26 22:30:59 UTC (rev 5348)
@@ -154,13 +154,13 @@
// train the filter, but only if enabled
if( $this->_config->getValue( "bayesian_filter_enabled" ) == true ) {
- include_once( PLOG_CLASS_PATH."class/bayesian/bayesianfiltercore.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/bayesian/bayesianfiltercore.class.php" );
BayesianFilterCore::trainWithArticle( $article );
}
// add the article notification if requested to do so
if( $this->_sendNotification ) {
- require_once( PLOG_CLASS_PATH."class/dao/articlenotifications.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/articlenotifications.class.php" );
$artNotifications = new ArticleNotifications();
$artNotifications->addNotification( $artId, $this->_blogInfo->getId(), $this->_userInfo->getId());
Modified: plog/branches/lifetype-1.2/class/action/admin/admincleanupaction.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/action/admin/admincleanupaction.class.php 2007-04-26 21:19:34 UTC (rev 5347)
+++ plog/branches/lifetype-1.2/class/action/admin/admincleanupaction.class.php 2007-04-26 22:30:59 UTC (rev 5348)
@@ -49,7 +49,7 @@
*/
function cleanupPosts()
{
- include_once( PLOG_CLASS_PATH."class/dao/purgedata.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/purgedata.class.php" );
$purge = new PurgeData();
$result = $purge->purgePosts();
@@ -77,7 +77,7 @@
*/
function cleanupUsers()
{
- include_once( PLOG_CLASS_PATH."class/dao/purgedata.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/purgedata.class.php" );
$purge = new PurgeData();
$result = $purge->purgeUsers();
@@ -105,7 +105,7 @@
*/
function cleanupBlogs()
{
- include_once( PLOG_CLASS_PATH."class/dao/purgedata.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/purgedata.class.php" );
$purge = new PurgeData();
$result = $purge->purgeBlogs();
@@ -134,7 +134,7 @@
*/
function cleanupComments()
{
- include_once( PLOG_CLASS_PATH."class/dao/purgedata.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/purgedata.class.php" );
$purge = new PurgeData();
$result = $purge->purgeSpamComments();
Modified: plog/branches/lifetype-1.2/class/action/admin/adminmainaction.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/action/admin/adminmainaction.class.php 2007-04-26 21:19:34 UTC (rev 5347)
+++ plog/branches/lifetype-1.2/class/action/admin/adminmainaction.class.php 2007-04-26 22:30:59 UTC (rev 5348)
@@ -52,7 +52,7 @@
}
// load the blog
- require_once( PLOG_CLASS_PATH . "class/dao/blogs.class.php" );
+ lt_include( PLOG_CLASS_PATH . "class/dao/blogs.class.php" );
$blogs = new Blogs();
$this->_blogInfo = $blogs->getBlogInfo( $this->_blogId );
Modified: plog/branches/lifetype-1.2/class/action/blogaction.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/action/blogaction.class.php 2007-04-26 21:19:34 UTC (rev 5347)
+++ plog/branches/lifetype-1.2/class/action/blogaction.class.php 2007-04-26 22:30:59 UTC (rev 5348)
@@ -229,7 +229,7 @@
}
// fetch the BlogInfo object
- include_once( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
$blogs = new Blogs();
if( $blogId ) {
lt_include( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
Modified: plog/branches/lifetype-1.2/class/action/resourceserveraction.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/action/resourceserveraction.class.php 2007-04-26 21:19:34 UTC (rev 5347)
+++ plog/branches/lifetype-1.2/class/action/resourceserveraction.class.php 2007-04-26 22:30:59 UTC (rev 5348)
@@ -90,7 +90,7 @@
// check if there was a user parameter
if( !empty($userName) ) {
// if so, check to which blogs the user belongs
- include_once( PLOG_CLASS_PATH."class/dao/users.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/users.class.php" );
$users = new Users();
$userInfo = $users->getUserInfoFromUsername( $userName );
// if the user exists and is valid...
@@ -120,7 +120,7 @@
}
// fetch the BlogInfo object
- include_once( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
$blogs = new Blogs();
if( $blogId ) {
$this->_blogInfo = $blogs->getBlogInfo( $blogId );
Modified: plog/branches/lifetype-1.2/class/bootstrap.php
===================================================================
--- plog/branches/lifetype-1.2/class/bootstrap.php 2007-04-26 21:19:34 UTC (rev 5347)
+++ plog/branches/lifetype-1.2/class/bootstrap.php 2007-04-26 22:30:59 UTC (rev 5348)
@@ -20,7 +20,7 @@
*/
// load our custom lt_include method to speed up the inclusion of files
- include_once( PLOG_CLASS_PATH."class/object/loader.class.php" );
+ include( PLOG_CLASS_PATH."class/object/loader.class.php" );
// load the Exception class and set the needed error handlers for PHP 4.x
if(PHP_VERSION < 5)
Modified: plog/branches/lifetype-1.2/class/cache/cache.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/cache/cache.class.php 2007-04-26 21:19:34 UTC (rev 5347)
+++ plog/branches/lifetype-1.2/class/cache/cache.class.php 2007-04-26 22:30:59 UTC (rev 5348)
@@ -37,7 +37,7 @@
*/
function Cache( $cacheProperties )
{
- require_once( PLOG_CLASS_PATH . "class/cache/Cache_Lite/Lite.php" );
+ lt_include( PLOG_CLASS_PATH . "class/cache/Cache_Lite/Lite.php" );
$this->cache = new Cache_Lite( $cacheProperties );
$this->lifeTime = $cacheProperties['lifeTime'];
Modified: plog/branches/lifetype-1.2/class/cache/cachemanager.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/cache/cachemanager.class.php 2007-04-26 21:19:34 UTC (rev 5347)
+++ plog/branches/lifetype-1.2/class/cache/cachemanager.class.php 2007-04-26 22:30:59 UTC (rev 5348)
@@ -24,12 +24,12 @@
if( $cache == null ) {
// source the neccessary files
- require_once( PLOG_CLASS_PATH . "class/config/configfilestorage.class.php" );
+ lt_include( PLOG_CLASS_PATH . "class/config/configfilestorage.class.php" );
$config = new ConfigFileStorage( Array( "file" => PLOG_CLASS_PATH."config/cache.properties.php" ));
if( $config->getValue( 'cache_method' ) == 'memcached' ) {
- require_once( PLOG_CLASS_PATH . "class/cache/memcache.class.php" );
+ lt_include( PLOG_CLASS_PATH . "class/cache/memcache.class.php" );
// define defaults
$cacheParameter = array(
'servers' => $config->getValue( 'memcached_servers' ),
@@ -43,7 +43,7 @@
$cache = new MemCache( $cacheParameter);
}
else {
- require_once( PLOG_CLASS_PATH . "class/cache/cache.class.php" );
+ lt_include( PLOG_CLASS_PATH . "class/cache/cache.class.php" );
// configure the Cache_Lite parameters, but providing some defaults in case the config file isn't there
$cacheParameter = array(
'cacheDir' => $config->getValue( 'cache_lite_cache_dir', "./tmp/" ),
Modified: plog/branches/lifetype-1.2/class/cache/memcache.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/cache/memcache.class.php 2007-04-26 21:19:34 UTC (rev 5347)
+++ plog/branches/lifetype-1.2/class/cache/memcache.class.php 2007-04-26 22:30:59 UTC (rev 5348)
@@ -18,7 +18,7 @@
function MemCache( $cacheProperties )
{
- require_once( PLOG_CLASS_PATH . "class/cache/Memcached_Client/memcached-client.php" );
+ lt_include( PLOG_CLASS_PATH . "class/cache/Memcached_Client/memcached-client.php" );
$this->cache = new memcached( $cacheProperties );
$this->lifeTime = $cacheProperties['life_time'];
Modified: plog/branches/lifetype-1.2/class/config/configfilestorage.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/config/configfilestorage.class.php 2007-04-26 21:19:34 UTC (rev 5347)
+++ plog/branches/lifetype-1.2/class/config/configfilestorage.class.php 2007-04-26 22:30:59 UTC (rev 5348)
@@ -55,9 +55,10 @@
lt_include( PLOG_CLASS_PATH."class/file/file.class.php" );
lt_include( PLOG_CLASS_PATH."class/config/properties.class.php" );
if( File::isReadable( $this->_configFile )) {
- include( $this->_configFile );
- $this->_props = new Properties( $config );
- $result = true;
+ // Note: It is correct to not use lt_include() here
+ include( $this->_configFile );
+ $this->_props = new Properties( $config );
+ $result = true;
}
else {
$this->_props = new Properties();
Modified: plog/branches/lifetype-1.2/class/controller/admincontroller.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/controller/admincontroller.class.php 2007-04-26 21:19:34 UTC (rev 5347)
+++ plog/branches/lifetype-1.2/class/controller/admincontroller.class.php 2007-04-26 22:30:59 UTC (rev 5348)
@@ -76,6 +76,7 @@
*/
function _loadActionMaps()
{
+ // NOTE: this is an acceptable use of include()
include( PLOG_CLASS_PATH."class/controller/admincontrollermap.properties.php" );
return $actions;
Modified: plog/branches/lifetype-1.2/class/controller/blogcontroller.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/controller/blogcontroller.class.php 2007-04-26 21:19:34 UTC (rev 5347)
+++ plog/branches/lifetype-1.2/class/controller/blogcontroller.class.php 2007-04-26 22:30:59 UTC (rev 5348)
@@ -68,6 +68,7 @@
*/
function _loadActionMaps()
{
+ // Note: this is an acceptable use of include()
include( PLOG_CLASS_PATH."class/controller/controllermap.properties.php" );
return $actions;
Modified: plog/branches/lifetype-1.2/class/dao/articlenotifications.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/dao/articlenotifications.class.php 2007-04-26 21:19:34 UTC (rev 5347)
+++ plog/branches/lifetype-1.2/class/dao/articlenotifications.class.php 2007-04-26 22:30:59 UTC (rev 5348)
@@ -189,7 +189,7 @@
{
// source classes
lt_include( PLOG_CLASS_PATH."class/net/xmlrpcclient.class.php" );
- require_once( PLOG_CLASS_PATH . 'class/config/config.class.php' );
+ lt_include( PLOG_CLASS_PATH . 'class/config/config.class.php' );
// if this feature is not enabled, we quit
$config =& Config::getConfig();
Modified: plog/branches/lifetype-1.2/class/dao/articles.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/dao/articles.class.php 2007-04-26 21:19:34 UTC (rev 5347)
+++ plog/branches/lifetype-1.2/class/dao/articles.class.php 2007-04-26 22:30:59 UTC (rev 5348)
@@ -514,7 +514,7 @@
$arcnives = false;
if( !$archives ) {
- require_once( PLOG_CLASS_PATH . 'class/dao/blogs.class.php' );
+ lt_include( PLOG_CLASS_PATH . 'class/dao/blogs.class.php' );
$blogs = new Blogs();
$blogInfo = $blogs->getBlogInfo( $blogId );
$blogSettings = $blogInfo->getSettings();
@@ -651,8 +651,8 @@
*/
function addPostCategoriesLink( $article )
{
- require_once( PLOG_CLASS_PATH.'class/database/db.class.php' );
- require_once( PLOG_CLASS_PATH."class/dao/articlecategories.class.php" );
+ lt_include( PLOG_CLASS_PATH.'class/database/db.class.php' );
+ lt_include( PLOG_CLASS_PATH."class/dao/articlecategories.class.php" );
$articleId = $article->getId();
$categories = $article->getCategoryIds();
@@ -688,8 +688,8 @@
*/
function deletePostCategoriesLink( $article )
{
- require_once( PLOG_CLASS_PATH.'class/database/db.class.php' );
- require_once( PLOG_CLASS_PATH."class/dao/articlecategories.class.php" );
+ lt_include( PLOG_CLASS_PATH.'class/database/db.class.php' );
+ lt_include( PLOG_CLASS_PATH."class/dao/articlecategories.class.php" );
$articleId = $article->getId();
$query = "DELETE FROM ".$this->getPrefix()."article_categories_link WHERE article_id = '".Db::qstr( $article->getId())."'";
@@ -814,7 +814,7 @@
// update the blog counters
if( $newArticle->getStatus() == POST_STATUS_PUBLISHED ) {
- include_once( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
$blogs = new Blogs();
$blogInfo = $newArticle->getBlogInfo();
$blogInfo->setTotalPosts( $blogInfo->getTotalPosts() + 1 );
@@ -839,7 +839,7 @@
*/
function addArticleText( $newArticle )
{
- require_once( PLOG_CLASS_PATH . 'class/data/textfilter.class.php' );
+ lt_include( PLOG_CLASS_PATH . 'class/data/textfilter.class.php' );
$filter = new Textfilter();
$query = "INSERT INTO ".$this->getPrefix()."articles_text (article_id, topic, text, normalized_text, normalized_topic, mangled_topic) ".
@@ -962,14 +962,14 @@
// update the blog counter
if( $oldArticle->getStatus() == POST_STATUS_PUBLISHED && $article->getStatus() != POST_STATUS_PUBLISHED ) {
- include_once( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
$blogs = new Blogs();
$blogInfo = $article->getBlogInfo();
$blogInfo->setTotalPosts( $blogInfo->getTotalPosts() - 1 );
$blogInfo->setUpdateDate( Timestamp::getNowTimestamp());
$blogs->updateBlog( $blogInfo );
} elseif ( $oldArticle->getStatus() != POST_STATUS_PUBLISHED && $article->getStatus() == POST_STATUS_PUBLISHED ) {
- include_once( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
$blogs = new Blogs();
$blogInfo = $article->getBlogInfo();
$blogInfo->setTotalPosts( $blogInfo->getTotalPosts() + 1 );
@@ -1027,7 +1027,7 @@
*/
function updateArticleNumReads( $articleId )
{
- require_once( PLOG_CLASS_PATH . 'class/database/db.class.php' );
+ lt_include( PLOG_CLASS_PATH . 'class/database/db.class.php' );
$query = "UPDATE ".$this->getPrefix()."articles SET ".
" num_reads = num_reads+1, date = date".
Modified: plog/branches/lifetype-1.2/class/dao/blogs.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/dao/blogs.class.php 2007-04-26 21:19:34 UTC (rev 5347)
+++ plog/branches/lifetype-1.2/class/dao/blogs.class.php 2007-04-26 22:30:59 UTC (rev 5348)
@@ -27,7 +27,7 @@
*/
function getBlogInfo( $blogId )
{
- require_once( PLOG_CLASS_PATH . 'class/dao/bloginfo.class.php' );
+ lt_include( PLOG_CLASS_PATH . 'class/dao/bloginfo.class.php' );
return( $this->get( "id", $blogId,
CACHE_BLOGINFOS,
Array( CACHE_BLOGIDBYNAME => "getMangledBlogName",
@@ -42,14 +42,14 @@
*/
function getBlogInfoByName( $blogName, $extendedInfo = false )
{
- require_once( PLOG_CLASS_PATH . 'class/dao/bloginfo.class.php' );
+ lt_include( PLOG_CLASS_PATH . 'class/dao/bloginfo.class.php' );
return( $this->get( "mangled_blog", $blogName,
CACHE_BLOGIDBYNAME,
Array( CACHE_BLOGINFOS => "getId" )));
}
function getBlogInfoByDomain($blogDomain, $extendedInfo = false){
- require_once(PLOG_CLASS_PATH . 'class/dao/bloginfo.class.php');
+ lt_include(PLOG_CLASS_PATH . 'class/dao/bloginfo.class.php');
return( $this->get( "custom_domain", $blogDomain,
CACHE_BLOGIDBYDOMAIN,
Array( CACHE_BLOGINFOS => "getId" )));
Modified: plog/branches/lifetype-1.2/class/dao/blogsettings.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/dao/blogsettings.class.php 2007-04-26 21:19:34 UTC (rev 5347)
+++ plog/branches/lifetype-1.2/class/dao/blogsettings.class.php 2007-04-26 22:30:59 UTC (rev 5348)
@@ -51,7 +51,7 @@
{
// is it a plugin key?
if( substr( $key, 0, strlen( "plugin_" )) == "plugin_" ) {
- include_once( PLOG_CLASS_PATH."class/plugin/globalpluginconfig.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/plugin/globalpluginconfig.class.php" );
// check if users can override the plugin setting. If so, return the blog plugin settings
// and if not return the global setting
if( GlobalPluginConfig::canOverride( $key ) == PLUGIN_SETTINGS_USER_CAN_OVERRIDE ) {
Modified: plog/branches/lifetype-1.2/class/dao/commentscommon.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/dao/commentscommon.class.php 2007-04-26 21:19:34 UTC (rev 5347)
+++ plog/branches/lifetype-1.2/class/dao/commentscommon.class.php 2007-04-26 22:30:59 UTC (rev 5348)
@@ -441,8 +441,8 @@
*/
function mapRow( $row )
{
- require_once( PLOG_CLASS_PATH."class/dao/usercomment.class.php" );
- require_once( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/usercomment.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
$prefix = $this->getPrefix();
$date = $row["date"];
Modified: plog/branches/lifetype-1.2/class/dao/referers.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/dao/referers.class.php 2007-04-26 21:19:34 UTC (rev 5347)
+++ plog/branches/lifetype-1.2/class/dao/referers.class.php 2007-04-26 22:30:59 UTC (rev 5348)
@@ -1,7 +1,7 @@
<?php
- require_once( PLOG_CLASS_PATH."class/dao/model.class.php" );
- require_once( PLOG_CLASS_PATH."class/config/config.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/model.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
define( "REFERRERS_LIST_ITEMS_PER_PAGE", 15 );
@@ -34,7 +34,7 @@
*/
function addReferer( $refererHeader, $articleId, $blogId )
{
- require_once( PLOG_CLASS_PATH."class/net/url.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/net/url.class.php" );
// we only add a new referer if we come from somewhere else than our own server
$ourHost = $_SERVER["HTTP_HOST"];
@@ -148,7 +148,7 @@
*/
function mapRow( $row )
{
- require_once( PLOG_CLASS_PATH."class/dao/referer.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/referer.class.php" );
$referer = new Referer( $row["url"],
$row["article_id"],
Modified: plog/branches/lifetype-1.2/class/dao/searchengine.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/dao/searchengine.class.php 2007-04-26 21:19:34 UTC (rev 5347)
+++ plog/branches/lifetype-1.2/class/dao/searchengine.class.php 2007-04-26 22:30:59 UTC (rev 5348)
@@ -112,7 +112,7 @@
$result = $this->Execute( $query, $page, $itemsPerPage );
- include_once( PLOG_CLASS_PATH."class/dao/articles.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/articles.class.php" );
$articles = new Articles();
if( !$result )
Modified: plog/branches/lifetype-1.2/class/dao/usercomment.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/dao/usercomment.class.php 2007-04-26 21:19:34 UTC (rev 5347)
+++ plog/branches/lifetype-1.2/class/dao/usercomment.class.php 2007-04-26 22:30:59 UTC (rev 5348)
@@ -501,7 +501,7 @@
function getBlogInfo()
{
if( $this->_blogInfo === null ) {
- include_once( PLOG_CLASS_PATH."class/dao/bloginfo.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/bloginfo.class.php" );
$blogs = new Blogs();
$this->_blogInfo = $blogs->getBlogInfo( $this->getBlogId());
}
Modified: plog/branches/lifetype-1.2/class/dao/userdata/joomlauserdataprovider.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/dao/userdata/joomlauserdataprovider.class.php 2007-04-26 21:19:34 UTC (rev 5347)
+++ plog/branches/lifetype-1.2/class/dao/userdata/joomlauserdataprovider.class.php 2007-04-26 22:30:59 UTC (rev 5348)
@@ -1,7 +1,7 @@
<?php
- include_once( PLOG_CLASS_PATH."class/dao/userdata/baseuserdataprovider.class.php" );
- include_once( PLOG_CLASS_PATH."class/database/db.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/userdata/baseuserdataprovider.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/database/db.class.php" );
define( "JOOMLA_USER_IS_BLOCKED", 1);
define( "JOOMLA_USER_IS_ACTIVE", 0);
@@ -155,7 +155,7 @@
*/
function getUserInfoFromId( $userid, $extendedInfo = false )
{
- include_once( PLOG_CLASS_PATH."class/dao/userpermissions.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/userpermissions.class.php" );
$query = "SELECT * FROM ".$this->_joomladbprefix."users WHERE id = '".Db::qstr( $userid )."'";
@@ -175,9 +175,9 @@
function JoomlaAddBlog( $row )
{
// create a new blog
- 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/dao/articlecategories.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/articles.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/articlecategories.class.php" );
$blogs = new Blogs();
$blog = new BlogInfo( $row["user"].$this->_blogtitle_postfix, // name of the new blog
@@ -218,7 +218,7 @@
*/
function _mapUserInfoObject( $row, $extraInfo=false)
{
- include_once( PLOG_CLASS_PATH."class/dao/userpermissions.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/userpermissions.class.php" );
$plogJoomlaData = $this->getpLogJoomlaUserData( $row["id"] );
Modified: plog/branches/lifetype-1.2/class/dao/userdata/vbb3userdataprovider.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/dao/userdata/vbb3userdataprovider.class.php 2007-04-26 21:19:34 UTC (rev 5347)
+++ plog/branches/lifetype-1.2/class/dao/userdata/vbb3userdataprovider.class.php 2007-04-26 22:30:59 UTC (rev 5348)
@@ -19,8 +19,8 @@
*/
- include_once( PLOG_CLASS_PATH."class/dao/userdata/baseuserdataprovider.class.php" );
- include_once( PLOG_CLASS_PATH."class/database/db.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/userdata/baseuserdataprovider.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/database/db.class.php" );
/**
* Model representing the users in our application. Provides the methods such as
@@ -199,7 +199,7 @@
*/
function getUserInfoFromId( $userid, $extendedInfo = false )
{
- include_once( PLOG_CLASS_PATH."class/dao/userpermissions.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/userpermissions.class.php" );
$query = "SELECT * FROM ".$this->_vbb3prefix."user WHERE userid = '".Db::qstr( $userid )."'";
@@ -224,9 +224,9 @@
function vbb3AddBlog( $row )
{
// create a new blog
- 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/dao/articlecategories.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/articles.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/articlecategories.class.php" );
$blogs = new Blogs();
$blog = new BlogInfo( $row["user"], // name of the new blog
@@ -260,7 +260,7 @@
function _mapUserInfoObject( $row, $extraInfo = false )
{
- include_once( PLOG_CLASS_PATH."class/dao/userpermissions.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/userpermissions.class.php" );
$plogPhpBB2Data = $this->getpLogPHPBBUserData( $row["userid"] );
@@ -573,7 +573,7 @@
*/
function getSearchConditions( $searchTerms )
{
- include_once( PLOG_CLASS_PATH."class/dao/searchengine.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/searchengine.class.php" );
// prepare the query string
$searchTerms = SearchEngine::adaptSearchString( $searchTerms );
Modified: plog/branches/lifetype-1.2/class/dao/userdata/wbbuserdataprovider.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/dao/userdata/wbbuserdataprovider.class.php 2007-04-26 21:19:34 UTC (rev 5347)
+++ plog/branches/lifetype-1.2/class/dao/userdata/wbbuserdataprovider.class.php 2007-04-26 22:30:59 UTC (rev 5348)
@@ -1,7 +1,7 @@
<?php
- include_once( PLOG_CLASS_PATH."class/dao/userdata/baseuserdataprovider.class.php" );
- include_once( PLOG_CLASS_PATH."class/database/db.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/userdata/baseuserdataprovider.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/database/db.class.php" );
/**
* Model representing the users in our application. Provides the methods such as
@@ -119,7 +119,7 @@
*/
function getUserInfoFromId( $userid, $extendedInfo = false )
{
- include_once( PLOG_CLASS_PATH."class/dao/userpermissions.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/userpermissions.class.php" );
$query = "SELECT * FROM ".$this->_wbbprefix."users WHERE userid = '".Db::qstr( $userid )."'";
@@ -143,9 +143,9 @@
function WBB2AddBlog( $row )
{
// create a new blog
- 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/dao/articlecategories.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/articles.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/articlecategories.class.php" );
$config =& Config::getConfig();
$locale =& Locales::getLocale( $config->getValue( "default_locale" ));
@@ -180,7 +180,7 @@
function _mapUserInfoObject( $row, $extraInfo = false )
{
- include_once( PLOG_CLASS_PATH."class/dao/userpermissions.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/userpermissions.class.php" );
$plogWBB2Data = $this->getpLogWBBUserData( $row["userid"] );
Modified: plog/branches/lifetype-1.2/class/data/Date/Span.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/data/Date/Span.class.php 2007-04-26 21:19:34 UTC (rev 5347)
+++ plog/branches/lifetype-1.2/class/data/Date/Span.class.php 2007-04-26 22:30:59 UTC (rev 5348)
@@ -19,8 +19,8 @@
// $Id: Span.php,v 1.4 2003/04/30 03:56:26 llucax Exp $
//
-require_once PLOG_CLASS_PATH.'class/data/Date.class.php';
-require_once PLOG_CLASS_PATH.'class/data/Date/Calc.class.php';
+lt_include(PLOG_CLASS_PATH.'class/data/Date.class.php');
+lt_include(PLOG_CLASS_PATH.'class/data/Date/Calc.class.php');
/**
*
Modified: plog/branches/lifetype-1.2/class/data/Date.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/data/Date.class.php 2007-04-26 21:19:34 UTC (rev 5347)
+++ plog/branches/lifetype-1.2/class/data/Date.class.php 2007-04-26 22:30:59 UTC (rev 5348)
@@ -24,9 +24,9 @@
* Include supporting classes
*/
// require_once PLOG_CLASS_PATH.'class/data/Date/TimeZone.class.php';
-require_once PLOG_CLASS_PATH.'class/data/Date/Calc.class.php';
-require_once PLOG_CLASS_PATH.'class/data/Date/Span.class.php';
-require_once PLOG_CLASS_PATH.'class/data/Date/TimeZone.class.php';
+lt_include(PLOG_CLASS_PATH.'class/data/Date/Calc.class.php');
+lt_include(PLOG_CLASS_PATH.'class/data/Date/Span.class.php');
+lt_include(PLOG_CLASS_PATH.'class/data/Date/TimeZone.class.php');
/**@#-*/
/**@#+
Modified: plog/branches/lifetype-1.2/class/data/textfilter.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/data/textfilter.class.php 2007-04-26 21:19:34 UTC (rev 5347)
+++ plog/branches/lifetype-1.2/class/data/textfilter.class.php 2007-04-26 22:30:59 UTC (rev 5348)
@@ -250,7 +250,7 @@
// This should fixed the CJK/UTF-8 characters break by Jon's original modification.
//
// If possible, I really hope we can accept UTF-8 encoding only, it will make our life easier.
- require_once( PLOG_CLASS_PATH . "class/config/configfilestorage.class.php" );
+ lt_include( PLOG_CLASS_PATH . "class/config/configfilestorage.class.php" );
$config = new ConfigFileStorage();
if( $config->getValue( 'db_character_set' ) == 'utf8' ) {
// Convert the ISO-8859-1 translation table to UTF-8
Modified: plog/branches/lifetype-1.2/class/locale/bloglocale.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/locale/bloglocale.class.php 2007-04-26 21:19:34 UTC (rev 5347)
+++ plog/branches/lifetype-1.2/class/locale/bloglocale.class.php 2007-04-26 22:30:59 UTC (rev 5348)
@@ -46,8 +46,10 @@
$fileName = $this->_defaultFolder."/locale_".$this->_code.".php";
- if( File::isReadable( $fileName ))
+ if( File::isReadable( $fileName )){
+ // TODO: check to see that this is only called once??
include( $fileName );
+ }
// The following is just to handle the case where there isn't
// a valid local file.
Modified: plog/branches/lifetype-1.2/class/locale/locale.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/locale/locale.class.php 2007-04-26 21:19:34 UTC (rev 5347)
+++ plog/branches/lifetype-1.2/class/locale/locale.class.php 2007-04-26 22:30:59 UTC (rev 5348)
@@ -119,8 +119,10 @@
// load the blog locale
$fileName = $this->_defaultFolder."/locale_".$this->_code.".php";
- if( File::isReadable( $fileName ))
+ if( File::isReadable( $fileName )){
+ // TODO: this function is only called once, right?
include( $fileName );
+ }
if ( !isset($messages) || !is_array( $messages ) ) {
$messages = array();
}
@@ -128,8 +130,10 @@
// load the admin locale
$fileName = $this->_defaultFolder."/admin/locale_".$this->_code.".php";
- if( File::isReadable( $fileName ))
+ if( File::isReadable( $fileName )){
+ // TODO: this function is only called once, right?
include( $fileName );
+ }
if ( !isset($messages) || !is_array( $messages ) ) {
$messages = array();
}
Modified: plog/branches/lifetype-1.2/class/locale/locales.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/locale/locales.class.php 2007-04-26 21:19:34 UTC (rev 5347)
+++ plog/branches/lifetype-1.2/class/locale/locales.class.php 2007-04-26 22:30:59 UTC (rev 5348)
@@ -51,7 +51,7 @@
*/
function &getBlogLocale( $localeCode = null )
{
- include_once( PLOG_CLASS_PATH."class/locale/bloglocale.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/locale/bloglocale.class.php" );
// array to keep track of the locales that we have already loaded, so that
// we don't have to fetch them from disk
@@ -69,7 +69,7 @@
$locale = $loadedLocales[$localeCode];
}
else {
- require_once( PLOG_CLASS_PATH . "class/cache/cachemanager.class.php" );
+ lt_include( PLOG_CLASS_PATH . "class/cache/cachemanager.class.php" );
$cache =& CacheManager::getCache();
$locale = $cache->getData( $localeCode, CACHE_BLOG_LOCALES );
if ( !$locale ) {
@@ -148,7 +148,7 @@
$locale = $loadedLocales[$localeCode];
}
else {
- require_once( PLOG_CLASS_PATH . "class/cache/cachemanager.class.php" );
+ lt_include( PLOG_CLASS_PATH . "class/cache/cachemanager.class.php" );
$cache =& CacheManager::getCache();
$locale = $cache->getData( $localeCode, CACHE_LOCALES );
if ( !$locale ) {
Modified: plog/branches/lifetype-1.2/class/locale/pluginlocale.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/locale/pluginlocale.class.php 2007-04-26 21:19:34 UTC (rev 5347)
+++ plog/branches/lifetype-1.2/class/locale/pluginlocale.class.php 2007-04-26 22:30:59 UTC (rev 5348)
@@ -48,6 +48,7 @@
if( File::isReadable( $fileName ))
{
+ // TODO: this function is only called once, right?
include( $fileName );
}
Modified: plog/branches/lifetype-1.2/class/logger/config/loggerconfigloader.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/logger/config/loggerconfigloader.class.php 2007-04-26 21:19:34 UTC (rev 5347)
+++ plog/branches/lifetype-1.2/class/logger/config/loggerconfigloader.class.php 2007-04-26 22:30:59 UTC (rev 5348)
@@ -23,7 +23,7 @@
{
// load the config file if it is readable
if( File::isReadable( $defaultFilePath )) {
- include_once( $defaultFilePath );
+ lt_include( $defaultFilePath );
$this->_keys = $config;
}
else {
Modified: plog/branches/lifetype-1.2/class/mail/phpmailer/class.phpmailer.php
===================================================================
--- plog/branches/lifetype-1.2/class/mail/phpmailer/class.phpmailer.php 2007-04-26 21:19:34 UTC (rev 5347)
+++ plog/branches/lifetype-1.2/class/mail/phpmailer/class.phpmailer.php 2007-04-26 22:30:59 UTC (rev 5348)
@@ -457,7 +457,7 @@
* @return bool
*/
function SmtpSend($header, $body) {
- include_once($this->PluginDir . "class.smtp.php");
+ lt_include($this->PluginDir . "class.smtp.php");
$error = "";
$bad_rcpt = array();
Modified: plog/branches/lifetype-1.2/class/misc/version.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/misc/version.class.php 2007-04-26 21:19:34 UTC (rev 5347)
+++ plog/branches/lifetype-1.2/class/misc/version.class.php 2007-04-26 22:30:59 UTC (rev 5348)
@@ -27,6 +27,7 @@
$version = "undefined";
if( File::isReadable( $versionFile )) {
+ // NOTE: this is a valid use of include()
include( $versionFile );
} else {
$version = "UNKNOWN";
Modified: plog/branches/lifetype-1.2/class/net/http/phpsniff/phpSniff.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/net/http/phpsniff/phpSniff.class.php 2007-04-26 21:19:34 UTC (rev 5347)
+++ plog/branches/lifetype-1.2/class/net/http/phpsniff/phpSniff.class.php 2007-04-26 22:30:59 UTC (rev 5348)
@@ -19,7 +19,7 @@
License along with this library; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*******************************************************************************/
-require_once( PLOG_CLASS_PATH.'class/net/http/phpsniff/phpSniff.core.php');
+lt_include( PLOG_CLASS_PATH.'class/net/http/phpsniff/phpSniff.core.php');
//===============================================================
// the following defines are used to create the short
Modified: plog/branches/lifetype-1.2/class/net/http/subdomains.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/net/http/subdomains.class.php 2007-04-26 21:19:34 UTC (rev 5347)
+++ plog/branches/lifetype-1.2/class/net/http/subdomains.class.php 2007-04-26 22:30:59 UTC (rev 5348)
@@ -139,7 +139,7 @@
*/
function domainNameExists( $domain, $ignoreBlogId=0 )
{
- include_once( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
$blogs = new Blogs();
$blog = $blogs->getBlogInfoByDomain( $domain );
$valid = is_object($blog);
Modified: plog/branches/lifetype-1.2/class/net/xmlrpc/xmlrpcserver.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/net/xmlrpc/xmlrpcserver.class.php 2007-04-26 21:19:34 UTC (rev 5347)
+++ plog/branches/lifetype-1.2/class/net/xmlrpc/xmlrpcserver.class.php 2007-04-26 22:30:59 UTC (rev 5348)
@@ -160,7 +160,7 @@
// Add article notifcations if this is specified by the default setting.
if ($blogSettings->getValue( "default_send_notification" ))
{
- require_once( PLOG_CLASS_PATH."class/dao/articlenotifications.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/articlenotifications.class.php" );
$artNotifications = new ArticleNotifications();
$artNotifications->addNotification( $postid, $blogid, $userInfo->getId());
@@ -336,7 +336,7 @@
// Add article notifcations if this is specified by the default setting.
if ($blogSettings->getValue( "default_send_notification" ))
{
- require_once( PLOG_CLASS_PATH."class/dao/articlenotifications.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/articlenotifications.class.php" );
$artNotifications = new ArticleNotifications();
$artNotifications->addNotification( $postid, $blogid, $userInfo->getId());
@@ -461,7 +461,7 @@
function getPost($args)
{
- include_once( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
$users = new Users();
$articles = new Articles();
@@ -1187,7 +1187,7 @@
if( $userInfo )
{
- include_once( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
$item = $articles->getBlogArticle($postid,
-1, // blogId
@@ -1239,7 +1239,7 @@
$userInfo = $users->getUserInfo( $username, $password );
if( $userInfo ) {
- include_once( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
$article = $articles->getBlogArticle($postid,
-1, // blogId
Modified: plog/branches/lifetype-1.2/class/object/loader.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/object/loader.class.php 2007-04-26 21:19:34 UTC (rev 5347)
+++ plog/branches/lifetype-1.2/class/object/loader.class.php 2007-04-26 22:30:59 UTC (rev 5348)
@@ -3,8 +3,8 @@
function lt_include( $filename )
{
if(!isset($GLOBALS['included_files'][$filename] )) {
- include_once($filename);
$GLOBALS['included_files'][$filename] = TRUE;
+ include($filename);
}
}
Modified: plog/branches/lifetype-1.2/class/plugin/globalpluginconfig.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/plugin/globalpluginconfig.class.php 2007-04-26 21:19:34 UTC (rev 5347)
+++ plog/branches/lifetype-1.2/class/plugin/globalpluginconfig.class.php 2007-04-26 22:30:59 UTC (rev 5348)
@@ -1,6 +1,6 @@
<?php
- include_once( PLOG_CLASS_PATH."class/config/config.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
define( "PLUGIN_SETTINGS_USER_CAN_OVERRIDE", 1 );
define( "PLUGIN_SETTINGS_USER_CANNOT_OVERRIDE", 2 );
Modified: plog/branches/lifetype-1.2/class/plugin/pluginmanager.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/plugin/pluginmanager.class.php 2007-04-26 21:19:34 UTC (rev 5347)
+++ plog/branches/lifetype-1.2/class/plugin/pluginmanager.class.php 2007-04-26 22:30:59 UTC (rev 5348)
@@ -287,7 +287,7 @@
*/
function _loadPluginLocale( $pluginId, $locale )
{
- require_once( PLOG_CLASS_PATH . "class/locale/locales.class.php" );
+ lt_include( PLOG_CLASS_PATH . "class/locale/locales.class.php" );
return( Locales::getPluginLocale( $pluginId, $locale ));
}
Modified: plog/branches/lifetype-1.2/class/security/bayesianfilter.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/security/bayesianfilter.class.php 2007-04-26 21:19:34 UTC (rev 5347)
+++ plog/branches/lifetype-1.2/class/security/bayesianfilter.class.php 2007-04-26 22:30:59 UTC (rev 5348)
@@ -1,8 +1,8 @@
<?php
lt_include( PLOG_CLASS_PATH."class/security/pipelinefilter.class.php" );
- include_once( PLOG_CLASS_PATH."class/net/client.class.php" );
- include_once( PLOG_CLASS_PATH."class/net/client.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/net/client.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/net/client.class.php" );
define("HIGH_SPAM_PROBABILITY", 1000);
Modified: plog/branches/lifetype-1.2/class/security/nullpipelinefilter.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/security/nullpipelinefilter.class.php 2007-04-26 21:19:34 UTC (rev 5347)
+++ plog/branches/lifetype-1.2/class/security/nullpipelinefilter.class.php 2007-04-26 22:30:59 UTC (rev 5348)
@@ -1,6 +1,6 @@
<?php
- require_once( PLOG_CLASS_PATH."class/security/pipelinefilter.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/security/pipelinefilter.class.php" );
/**
* \ingroup Security
@@ -23,7 +23,7 @@
*/
function filter()
{
- require_once( PLOG_CLASS_PATH . 'class/security/pipelineresult.class.php' );
+ lt_include( PLOG_CLASS_PATH . 'class/security/pipelineresult.class.php' );
$result = new PipelineResult();
Modified: plog/branches/lifetype-1.2/class/security/pipeline.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/security/pipeline.class.php 2007-04-26 21:19:34 UTC (rev 5347)
+++ plog/branches/lifetype-1.2/class/security/pipeline.class.php 2007-04-26 22:30:59 UTC (rev 5348)
@@ -115,8 +115,8 @@
*/
function process()
{
- require_once( PLOG_CLASS_PATH . 'class/security/pipelinerequest.class.php' );
- require_once( PLOG_CLASS_PATH . 'class/security/pipelineresult.class.php' );
+ lt_include( PLOG_CLASS_PATH . 'class/security/pipelinerequest.class.php' );
+ lt_include( PLOG_CLASS_PATH . 'class/security/pipelineresult.class.php' );
global $_pLogPipelineRegisteredFilters;
// check if the pipeline is enabled
Modified: plog/branches/lifetype-1.2/class/summary/action/registeraction.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/summary/action/registeraction.class.php 2007-04-26 21:19:34 UTC (rev 5347)
+++ plog/branches/lifetype-1.2/class/summary/action/registeraction.class.php 2007-04-26 22:30:59 UTC (rev 5348)
@@ -4,11 +4,11 @@
lt_include( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
lt_include( PLOG_CLASS_PATH."class/summary/view/summarycachedview.class.php" );
lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
-include_once( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
-include_once( PLOG_CLASS_PATH."class/data/validator/usernamevalidator.class.php" );
-include_once( PLOG_CLASS_PATH."class/data/validator/passwordvalidator.class.php" );
-include_once( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
-include_once( PLOG_CLASS_PATH."class/data/validator/emailvalidator.class.php" );
+lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
+lt_include( PLOG_CLASS_PATH."class/data/validator/usernamevalidator.class.php" );
+lt_include( PLOG_CLASS_PATH."class/data/validator/passwordvalidator.class.php" );
+lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
+lt_include( PLOG_CLASS_PATH."class/data/validator/emailvalidator.class.php" );
/**
* Base action that all register actions should extend
Modified: plog/branches/lifetype-1.2/class/summary/action/summarydefaultaction.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/summary/action/summarydefaultaction.class.php 2007-04-26 21:19:34 UTC (rev 5347)
+++ plog/branches/lifetype-1.2/class/summary/action/summarydefaultaction.class.php 2007-04-26 22:30:59 UTC (rev 5348)
@@ -3,8 +3,7 @@
lt_include( PLOG_CLASS_PATH."class/summary/action/summaryaction.class.php" );
lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
lt_include( PLOG_CLASS_PATH."class/summary/dao/summarystatsconstants.class.php" );
- include_once( PLOG_CLASS_PATH."class/summary/net/summaryrequestgenerator.class.php" );
- include_once( PLOG_CLASS_PATH."class/summary/net/summaryrequestgenerator.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/summary/net/summaryrequestgenerator.class.php" );
/**
* This is the one and only default action. It simply fetches all the most recent
Modified: plog/branches/lifetype-1.2/class/summary/net/summaryrequestgenerator.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/summary/net/summaryrequestgenerator.class.php 2007-04-26 21:19:34 UTC (rev 5347)
+++ plog/branches/lifetype-1.2/class/summary/net/summaryrequestgenerator.class.php 2007-04-26 22:30:59 UTC (rev 5348)
@@ -1,6 +1,6 @@
<?php
- include_once( PLOG_CLASS_PATH."class/net/baserequestgenerator.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/net/baserequestgenerator.class.php" );
/**
* Very basic request generator for the summary. It is not meant to be used as a
Modified: plog/branches/lifetype-1.2/class/template/smarty/plugins/function.adminpager.php
===================================================================
--- plog/branches/lifetype-1.2/class/template/smarty/plugins/function.adminpager.php 2007-04-26 21:19:34 UTC (rev 5347)
+++ plog/branches/lifetype-1.2/class/template/smarty/plugins/function.adminpager.php 2007-04-26 22:30:59 UTC (rev 5348)
@@ -5,7 +5,7 @@
*/
function smarty_function_adminpager($params, &$smarty)
{
- include_once( PLOG_CLASS_PATH."class/template/smarty/plugins/function.pager.php" );
+ lt_include( PLOG_CLASS_PATH."class/template/smarty/plugins/function.pager.php" );
// fetch the parameters
if( isset( $params["data"]))
$pager = $params["data"];
Modified: plog/branches/lifetype-1.2/class/template/smarty/plugins/function.pager.php
===================================================================
--- plog/branches/lifetype-1.2/class/template/smarty/plugins/function.pager.php 2007-04-26 21:19:34 UTC (rev 5347)
+++ plog/branches/lifetype-1.2/class/template/smarty/plugins/function.pager.php 2007-04-26 22:30:59 UTC (rev 5348)
@@ -48,7 +48,7 @@
$locale = $smarty->_tpl_vars["locale"];
}
else {
- include_once( PLOG_CLASS_PATH."class/locale/locales.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/locale/locales.class.php" );
$locale =& Locales::getLocale();
}
$nextText = $locale->tr( "next_post" )."»";
@@ -64,7 +64,7 @@
$locale = $smarty->_tpl_vars["locale"];
}
else {
- include_once( PLOG_CLASS_PATH."class/locale/locales.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/locale/locales.class.php" );
$locale =& Locales::getLocale();
}
$prevText = "«".$locale->tr( "previous_post" );
Modified: plog/branches/lifetype-1.2/class/template/smarty/plugins/modifier.utf8_truncate.php
===================================================================
--- plog/branches/lifetype-1.2/class/template/smarty/plugins/modifier.utf8_truncate.php 2007-04-26 21:19:34 UTC (rev 5347)
+++ plog/branches/lifetype-1.2/class/template/smarty/plugins/modifier.utf8_truncate.php 2007-04-26 22:30:59 UTC (rev 5348)
@@ -1,5 +1,5 @@
<?php
-include_once(PLOG_CLASS_PATH.'class/data/utf8/utf8_funcs.php');
+lt_include(PLOG_CLASS_PATH.'class/data/utf8/utf8_funcs.php');
/**
* Smarty truncate modifier plugin
Modified: plog/branches/lifetype-1.2/class/template/templateservice.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/template/templateservice.class.php 2007-04-26 21:19:34 UTC (rev 5347)
+++ plog/branches/lifetype-1.2/class/template/templateservice.class.php 2007-04-26 22:30:59 UTC (rev 5348)
@@ -241,7 +241,7 @@
*/
function PluginTemplate( $pluginId, $templateName, $blogInfo = null )
{
- require_once( PLOG_CLASS_PATH . 'class/template/templatesets/templatesetstorage.class.php' );
+ lt_include( PLOG_CLASS_PATH . 'class/template/templatesets/templatesetstorage.class.php' );
lt_include( PLOG_CLASS_PATH . 'class/template/template.class.php' );
// define the template file name
Modified: plog/branches/lifetype-1.2/class/test/helpers/consolereporter.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/test/helpers/consolereporter.class.php 2007-04-26 21:19:34 UTC (rev 5347)
+++ plog/branches/lifetype-1.2/class/test/helpers/consolereporter.class.php 2007-04-26 22:30:59 UTC (rev 5348)
@@ -1,7 +1,7 @@
<?php
- include_once( PLOG_CLASS_PATH."class/test/PHPUnit/TestResult.php" );
- include_once( PLOG_CLASS_PATH."class/test/PHPUnit/TestListener.php" );
+ lt_include( PLOG_CLASS_PATH."class/test/PHPUnit/TestResult.php" );
+ lt_include( PLOG_CLASS_PATH."class/test/PHPUnit/TestListener.php" );
/**
* \ingroup Test
Modified: plog/branches/lifetype-1.2/class/test/helpers/uiscriptrunner.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/test/helpers/uiscriptrunner.class.php 2007-04-26 21:19:34 UTC (rev 5347)
+++ plog/branches/lifetype-1.2/class/test/helpers/uiscriptrunner.class.php 2007-04-26 22:30:59 UTC (rev 5348)
@@ -1,6 +1,6 @@
<?php
- include_once( PLOG_CLASS_PATH."class/net/http/httpclient.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/net/http/httpclient.class.php" );
/**
* \ingroup Test
Modified: plog/branches/lifetype-1.2/class/test/tests/dao/articlecategories_test.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/test/tests/dao/articlecategories_test.class.php 2007-04-26 21:19:34 UTC (rev 5347)
+++ plog/branches/lifetype-1.2/class/test/tests/dao/articlecategories_test.class.php 2007-04-26 22:30:59 UTC (rev 5348)
@@ -1,9 +1,9 @@
<?php
- include_once( PLOG_CLASS_PATH."class/test/helpers/lifetypetestcase.class.php" );
- include_once( PLOG_CLASS_PATH."class/test/helpers/testtools.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/articlecategory.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/articlecategories.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/test/helpers/lifetypetestcase.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/test/helpers/testtools.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/articlecategory.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/articlecategories.class.php" );
/**
* \ingroup Test
Modified: plog/branches/lifetype-1.2/class/test/tests/dao/commentscommon_test.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/test/tests/dao/commentscommon_test.class.php 2007-04-26 21:19:34 UTC (rev 5347)
+++ plog/branches/lifetype-1.2/class/test/tests/dao/commentscommon_test.class.php 2007-04-26 22:30:59 UTC (rev 5348)
@@ -1,19 +1,19 @@
<?php
- include_once( PLOG_CLASS_PATH."class/test/helpers/lifetypetestcase.class.php" );
- include_once( PLOG_CLASS_PATH."class/test/helpers/testtools.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/bloginfo.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/article.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/commentscommon.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/usercomment.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/trackbacks.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/users.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/userinfo.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/articles.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/articlecomments.class.php" );
- include_once( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
- include_once( PLOG_CLASS_PATH."class/template/cachecontrol.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/test/helpers/lifetypetestcase.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/test/helpers/testtools.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/bloginfo.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/article.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/commentscommon.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/usercomment.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/trackbacks.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/users.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/userinfo.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/articles.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/articlecomments.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/template/cachecontrol.class.php" );
/**
* \ingroup Test
Modified: plog/branches/lifetype-1.2/class/test/tests/dao/userinfo_test.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/test/tests/dao/userinfo_test.class.php 2007-04-26 21:19:34 UTC (rev 5347)
+++ plog/branches/lifetype-1.2/class/test/tests/dao/userinfo_test.class.php 2007-04-26 22:30:59 UTC (rev 5348)
@@ -1,9 +1,9 @@
<?php
- include_once( PLOG_CLASS_PATH."class/test/helpers/lifetypetestcase.class.php" );
- include_once( PLOG_CLASS_PATH."class/test/helpers/testtools.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/userinfo.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/users.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/test/helpers/lifetypetestcase.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/test/helpers/testtools.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/userinfo.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/users.class.php" );
class UserInfo_Test extends LifeTypeTestCase
{
Modified: plog/branches/lifetype-1.2/class/test/tests/ui/articlecategoriesui_test.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/test/tests/ui/articlecategoriesui_test.class.php 2007-04-26 21:19:34 UTC (rev 5347)
+++ plog/branches/lifetype-1.2/class/test/tests/ui/articlecategoriesui_test.class.php 2007-04-26 22:30:59 UTC (rev 5348)
@@ -1,8 +1,8 @@
<?php
-include_once( PLOG_CLASS_PATH."class/test/helpers/lifetypetestcase.class.php" );
-include_once( PLOG_CLASS_PATH."class/test/helpers/testtools.class.php" );
-include_once( PLOG_CLASS_PATH."class/config/config.class.php" );
+lt_include( PLOG_CLASS_PATH."class/test/helpers/lifetypetestcase.class.php" );
+lt_include( PLOG_CLASS_PATH."class/test/helpers/testtools.class.php" );
+lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
/**
* \ingroup Test
Modified: plog/branches/lifetype-1.2/class/test/tests/ui/login_test.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/test/tests/ui/login_test.class.php 2007-04-26 21:19:34 UTC (rev 5347)
+++ plog/branches/lifetype-1.2/class/test/tests/ui/login_test.class.php 2007-04-26 22:30:59 UTC (rev 5348)
@@ -1,7 +1,7 @@
<?php
- include_once( PLOG_CLASS_PATH."class/test/helpers/lifetypetestcase.class.php" );
- include_once( PLOG_CLASS_PATH."class/test/helpers/testtools.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/test/helpers/lifetypetestcase.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/test/helpers/testtools.class.php" );
/**
* \ingroup Test
Modified: plog/branches/lifetype-1.2/class/test/tests/ui/permissionsui_test.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/test/tests/ui/permissionsui_test.class.php 2007-04-26 21:19:34 UTC (rev 5347)
+++ plog/branches/lifetype-1.2/class/test/tests/ui/permissionsui_test.class.php 2007-04-26 22:30:59 UTC (rev 5348)
@@ -1,8 +1,8 @@
<?php
- include_once( PLOG_CLASS_PATH."class/test/helpers/lifetypetestcase.class.php" );
- include_once( PLOG_CLASS_PATH."class/test/helpers/testtools.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/permissions.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/test/helpers/lifetypetestcase.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/test/helpers/testtools.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/permissions.class.php" );
/**
* \ingroup Test
Modified: plog/branches/lifetype-1.2/class/view/admin/adminnewpostview.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/view/admin/adminnewpostview.class.php 2007-04-26 21:19:34 UTC (rev 5347)
+++ plog/branches/lifetype-1.2/class/view/admin/adminnewpostview.class.php 2007-04-26 22:30:59 UTC (rev 5348)
@@ -22,7 +22,7 @@
function render()
{
- require_once( PLOG_CLASS_PATH."class/dao/articlestatus.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/articlestatus.class.php" );
// fetch the categories
$categories = new ArticleCategories();
Modified: plog/branches/lifetype-1.2/class/view/blogview.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/view/blogview.class.php 2007-04-26 21:19:34 UTC (rev 5347)
+++ plog/branches/lifetype-1.2/class/view/blogview.class.php 2007-04-26 22:30:59 UTC (rev 5348)
@@ -182,7 +182,7 @@
*/
function _getArticleCategories()
{
- require_once( PLOG_CLASS_PATH.'class/dao/articlecategories.class.php' );
+ lt_include( PLOG_CLASS_PATH.'class/dao/articlecategories.class.php' );
$blogSettings = $this->_blogInfo->getSettings();
$categoryOrder = $blogSettings->getValue( 'categories_order' );
Modified: plog/branches/lifetype-1.2/class/view/redirectview.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/view/redirectview.class.php 2007-04-26 21:19:34 UTC (rev 5347)
+++ plog/branches/lifetype-1.2/class/view/redirectview.class.php 2007-04-26 22:30:59 UTC (rev 5348)
@@ -1,6 +1,6 @@
<?php
- include_once( PLOG_CLASS_PATH."class/view/view.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/view/view.class.php" );
/**
* This view returns no content, it just sends a
Modified: plog/branches/lifetype-1.2/class/view/smartyview.class.php
===================================================================
--- plog/branches/lifetype-1.2/class/view/smartyview.class.php 2007-04-26 21:19:34 UTC (rev 5347)
+++ plog/branches/lifetype-1.2/class/view/smartyview.class.php 2007-04-26 22:30:59 UTC (rev 5348)
@@ -129,7 +129,7 @@
*/
function isTemplateSetExist( $templateSetName )
{
- lt_include( PLOG_CLASS_PATH.'class/template/templatesets/templatesets.class.php' );
+ lt_include( PLOG_CLASS_PATH."class/template/templatesets/templatesets.class.php" );
$templateSets = new TemplateSets();
if( !$templateSets->isTemplate( $templateSetName ) && !$templateSets->isBlogTemplate( $templateSetName, $this->_blogInfo->getId() ) )
return false;
Modified: plog/branches/lifetype-1.2/class/xml/tree/Tree.php
===================================================================
--- plog/branches/lifetype-1.2/class/xml/tree/Tree.php 2007-04-26 21:19:34 UTC (rev 5347)
+++ plog/branches/lifetype-1.2/class/xml/tree/Tree.php 2007-04-26 22:30:59 UTC (rev 5348)
@@ -22,8 +22,8 @@
// $Id: Tree.php,v 1.35 2004/05/26 14:58:18 davey Exp $
//
-require_once PLOG_CLASS_PATH."class/xml/parser/Parser.php";
-require_once PLOG_CLASS_PATH."class/xml/tree/Node.php";
+lt_include(PLOG_CLASS_PATH."class/xml/parser/Parser.php");
+lt_include(PLOG_CLASS_PATH."class/xml/tree/Node.php");
/**
* \ingroup XML
Modified: plog/branches/lifetype-1.2/plugins/badbehavior/index.inc.php
===================================================================
--- plog/branches/lifetype-1.2/plugins/badbehavior/index.inc.php 2007-04-26 21:19:34 UTC (rev 5347)
+++ plog/branches/lifetype-1.2/plugins/badbehavior/index.inc.php 2007-04-26 22:30:59 UTC (rev 5348)
@@ -41,7 +41,7 @@
// Return affected rows from most recent query.
function bb2_db_affected_rows() {
- include_once( PLOG_CLASS_PATH."class/database/db.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/database/db.class.php" );
$db =& Db::getDb();
return $db->Affected_Rows();
@@ -49,7 +49,7 @@
// Escape a string for database usage
function bb2_db_escape($string) {
- include_once( PLOG_CLASS_PATH."class/database/db.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/database/db.class.php" );
return Db::qstr($string);
}
@@ -62,7 +62,7 @@
// Run a query and return the results, if any.
// Should return FALSE if an error occurred.
function bb2_db_query($query) {
- include_once( PLOG_CLASS_PATH."class/database/db.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/database/db.class.php" );
$db =& Db::getDb();
$result = $db->Execute( $query );
@@ -92,8 +92,8 @@
// retrieve settings from lifetype config
function bb2_read_settings() {
- include_once( PLOG_CLASS_PATH."class/database/db.class.php" );
- include_once( PLOG_CLASS_PATH."class/config/config.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/database/db.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
$config =& Config::getConfig();
$prefix = Db::getPrefix();
$logTable = $config->getValue( 'bb2_log_table', BB2_DEFAULT_LOG_TABLE );
@@ -111,7 +111,7 @@
// write settings to lifetype config
function bb2_write_settings($settings) {
- include_once( PLOG_CLASS_PATH."class/config/config.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
$config =& Config::getConfig();
$config->setValue( 'bb2_log_table', BB2_DEFAULT_LOG_TABLE );
$config->setValue( 'bb2_display_stats', $settings['display_stats'] );
@@ -134,7 +134,7 @@
// Return the top-level relative path of wherever we are (for cookies)
function bb2_relative_path() {
- include_once( PLOG_CLASS_PATH."class/config/config.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
$config =& Config::getConfig();
$url = parse_url( $config->getValue( 'base_url' ) );
@@ -149,7 +149,7 @@
}
// Load Bad Behavior Core
- require_once(BB2_CWD . "bad-behavior/core.inc.php");
+ lt_include(BB2_CWD . "bad-behavior/core.inc.php");
bb2_install();
$settings = bb2_read_settings();
bb2_start($settings);
Modified: plog/branches/lifetype-1.2/plugins/badbehavior/pluginbadbehavior.class.php
===================================================================
--- plog/branches/lifetype-1.2/plugins/badbehavior/pluginbadbehavior.class.php 2007-04-26 21:19:34 UTC (rev 5347)
+++ plog/branches/lifetype-1.2/plugins/badbehavior/pluginbadbehavior.class.php 2007-04-26 22:30:59 UTC (rev 5348)
@@ -1,7 +1,7 @@
<?php
- include_once( PLOG_CLASS_PATH."class/plugin/pluginbase.class.php" );
- include_once( PLOG_CLASS_PATH."class/database/db.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/plugin/pluginbase.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/database/db.class.php" );
/**
* The Bad Behaviour Plugin
Modified: plog/branches/lifetype-1.2/resserver.php
===================================================================
--- plog/branches/lifetype-1.2/resserver.php 2007-04-26 21:19:34 UTC (rev 5347)
+++ plog/branches/lifetype-1.2/resserver.php 2007-04-26 22:30:59 UTC (rev 5348)
@@ -12,7 +12,7 @@
define( "PLOG_CLASS_PATH", dirname(__FILE__)."/");
}
- include_once( PLOG_CLASS_PATH."class/object/loader.class.php" );
+ include_once( PLOG_CLASS_PATH."class/bootstrap.php" );
lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
// the functionality of the old ressever.php file have been moved
Modified: plog/branches/lifetype-1.2/runtests.php
===================================================================
--- plog/branches/lifetype-1.2/runtests.php 2007-04-26 21:19:34 UTC (rev 5347)
+++ plog/branches/lifetype-1.2/runtests.php 2007-04-26 22:30:59 UTC (rev 5348)
@@ -13,7 +13,7 @@
define( "PLOG_CLASS_PATH", dirname(__FILE__)."/");
}
- include_once( PLOG_CLASS_PATH."class/object/loader.class.php" );
+ include_once( PLOG_CLASS_PATH."class/bootstrap.php" );
lt_include( PLOG_CLASS_PATH."class/test/testrunner.class.php" );
lt_include( PLOG_CLASS_PATH."class/test/helpers/htmlreporter.class.php" );
lt_include( PLOG_CLASS_PATH."class/test/helpers/consolereporter.class.php" );
@@ -22,7 +22,7 @@
// if plugins should also be included when testing, let's load them now
$folders = Array( TEST_CLASS_FOLDER );
if( INCLUDE_PLUGIN_TESTS ) {
- include_once( PLOG_CLASS_PATH."class/plugin/pluginmanager.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/plugin/pluginmanager.class.php" );
$pm =& PluginManager::getPluginManager();
$plugins = $pm->getPluginListFromFolder();
Modified: plog/branches/lifetype-1.2/xmlrpc.php
===================================================================
--- plog/branches/lifetype-1.2/xmlrpc.php 2007-04-26 21:19:34 UTC (rev 5347)
+++ plog/branches/lifetype-1.2/xmlrpc.php 2007-04-26 22:30:59 UTC (rev 5348)
@@ -4,7 +4,7 @@
define( "PLOG_CLASS_PATH", dirname(__FILE__)."/");
}
- include_once( PLOG_CLASS_PATH."class/object/loader.class.php" );
+ include_once( PLOG_CLASS_PATH."class/bootstrap.php" );
lt_include( PLOG_CLASS_PATH."class/net/xmlrpc/xmlrpcserver.class.php" );
$server = new XmlRpcServer();
More information about the pLog-svn
mailing list