[pLog-svn] r5968 - in plog/branches/lifetype-2.0-autoload: . bin-devel class class/action class/action/admin class/action/admin/ajax class/action/admin/chooser class/bayesian class/cache class/config class/controller class/dao class/dao/customfields class/dao/misc class/dao/userdata class/data class/data/Date class/data/captcha class/data/filter class/data/forms class/data/serialize class/data/serialize/json class/data/validator class/data/validator/rules class/database class/database/pdb class/database/pdb/datadict class/database/pdb/drivers class/file class/file/finder class/file/unpacker class/gallery/dao class/gallery/data class/gallery/resizers class/gallery/template class/locale class/logger class/logger/appender class/logger/config class/logger/layout class/logger/logger class/mail class/mail/phpmailer class/misc class/net class/net/http class/net/http/phpsniff class/net/http/session class/net/xmlrpc class/object class/plugin class/security class/summary/action class/sum mary/controller class/summary/dao class/summary/data class/summary/data/validator class/summary/mail class/summary/net class/summary/view class/template class/template/editor class/template/menu class/template/smarty/plugins class/template/templatesets class/test class/test/PHPUnit class/test/PHPUnit/GUI class/test/helpers class/test/tests/config class/test/tests/dao class/test/tests/data class/test/tests/data/filter class/test/tests/data/validator class/test/tests/data/validator/rules class/test/tests/extra class/test/tests/file class/test/tests/file/unpacker class/test/tests/locale class/test/tests/logger class/test/tests/mail class/test/tests/mail/phpmailer class/test/tests/misc class/test/tests/net class/test/tests/net/http class/test/tests/net/xmlrpc class/test/tests/summary/action class/test/tests/summary/dao class/test/tests/summary/data class/test/tests/ui class/view class/view/admin class/view/admin/ajax class/view/admin/chooser class/view/ajax class/view/renderer c lass/xml/rssparser class/xml/rssparser/magpierss config install plugins/badbehavior tools
oscar at devel.lifetype.net
oscar at devel.lifetype.net
Sat Oct 6 15:08:44 EDT 2007
Author: oscar
Date: 2007-10-06 15:08:42 -0400 (Sat, 06 Oct 2007)
New Revision: 5968
Added:
plog/branches/lifetype-2.0-autoload/class/dao/daocacheconstants.class.php
plog/branches/lifetype-2.0-autoload/class/misc/installation.class.php
Removed:
plog/branches/lifetype-2.0-autoload/class/dao/daocacheconstants.properties.php
plog/branches/lifetype-2.0-autoload/install/installation.class.php
Modified:
plog/branches/lifetype-2.0-autoload/admin.php
plog/branches/lifetype-2.0-autoload/album
plog/branches/lifetype-2.0-autoload/archives
plog/branches/lifetype-2.0-autoload/bin-devel/genmd5.php
plog/branches/lifetype-2.0-autoload/blog.php
plog/branches/lifetype-2.0-autoload/category
plog/branches/lifetype-2.0-autoload/class/action/action.class.php
plog/branches/lifetype-2.0-autoload/class/action/addcommentaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/addtrackbackaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddarticlecategoryaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddblogaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddblogcategoryaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddblogtemplateaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddblogtemplatefolderaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddbloguseraction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddcustomfieldaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddfriendaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddfriendgroupaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddglobalarticlecategoryaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddlinkaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddlinkcategoryaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddlocaleaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddlocationajaxaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddpermissionaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddpostaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddresourceaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddresourcealbumaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddtemplateaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddtemplatefolderaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminadduseraction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminadminblogselectaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminbasetemplateeditoraction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminblogcategoriesaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminblogcustomfieldsaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminblogsecurityaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminblogselectaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminblogsettingsaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminchangeblogstatusaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminchangecommentsstatusaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminchangegalleryitemsalbumaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminchangegalleryitemslocationaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminchangelinkscategoryaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminchangepostscategoryaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminchangepostslocationaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminchangepostsstatusaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminchangeuserstatusaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/admincleanupaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/admincontrolcenteraction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/admincopyblogtemplatefileaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/admincopyblogtemplatesetaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/admincopytemplatefileaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/admincopytemplatesetaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/admincreateblogaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/admincreateuseraction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/admindefaultaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/admindeletearticlecategoryaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/admindeleteblogaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/admindeleteblogcategoryaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/admindeleteblogtemplateaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/admindeleteblogtemplatefileaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/admindeletebloguserpermissionsaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/admindeletecommentaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/admindeletecustomfieldsaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/admindeletefriendaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/admindeletefriendgroupaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/admindeletegalleryitemsaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/admindeleteglobalarticlecategoryaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/admindeleteinboxprivatemessageaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/admindeletelinkaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/admindeletelinkcategoryaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/admindeletelocalesaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/admindeleteoutboxprivatemessageaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/admindeletepermissionsaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/admindeletepostaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/admindeletereferreraction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/admindeleteresourceaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/admindeleteresourcealbumaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/admindeletetemplatefileaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/admindeletetemplatesaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/admindeleteusersaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/admindoregisterblogaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/admineditarticlecategoriesaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/admineditarticlecategoryaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/admineditblogaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/admineditblogcategoryaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/admineditblogtemplateaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/admineditblogtemplatefileaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/admineditblogtemplatesaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/admineditbloguseraction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/admineditcommentaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/admineditcommentsaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/admineditcustomfieldaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/admineditfriendaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/admineditfriendgroupaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/admineditfriendgroupsaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/admineditfriendsaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/admineditglobalarticlecategoriesaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/admineditglobalarticlecategoryaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/admineditinboxprivatemessagesaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/admineditlinkaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/admineditlinkcategoriesaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/admineditlinkcategoryaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/admineditlinksaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/admineditoutboxprivatemessagesaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/admineditpermissionaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/admineditpostaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/admineditpostsaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/admineditresourcealbumaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminedittemplateaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminedittemplatefileaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminedittemplatesaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminemptyaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminfriendmanagementaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminglobalsettingsaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminjsaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminlocationdisplay.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminlocationdisplayaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminloginaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminlogoutaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminmainaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminmanageaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminmarkcommentaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewarticlecategoryaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewblogcategoryaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewblogtemplateaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewblogtemplatefileaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewbloguseraction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewcustomfieldaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewfriendaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewfriendgroupaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewglobalarticlecategoryaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewlinkaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewlinkcategoryaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewlocaleaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewpermissionaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewpostaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewprivatemessageaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewresourceaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewresourcealbumaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewtemplateaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewtemplatefileaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminpermissionrequiredaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminpermissionslistaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminplugincenteraction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminpluginsettingsaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminpostmanagementcommonaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminpoststatsaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminpreviewpostaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminreadinboxprivatemessageaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminreadoutboxprivatemessageaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminregeneratepreviewaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminregisterblogaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminreplyprivatemessageaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminresendconfirmationaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminresourcealbumsaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminresourceinfoaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminresourcesaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminresourcesgroupaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminsavedraftarticleajaxaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminsendprivatemessageaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminsendreplyprivatemessageaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminsendtrackbacksaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminshowbloglocationsaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminshowblogusersaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminsiteblogsaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminsitelocalesaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminsitesettingsaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminsiteusersaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminstatisticsaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdatearticlecategoryaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdateblogcategoryaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdateblogsettingsaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdateblogtemplatefileaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdatebloguseraction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdatecommentaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdatecustomfieldaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdateeditblogaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdatefriendaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdatefriendgroupaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdateglobalarticlecategoryaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdateglobalsettingsaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdatelinkaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdatelinkcategoryaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdatelocationajaxaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdatepermissionaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdatepluginsettingsaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdatepostaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdateresourceaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdateresourcealbumaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdatetemplatefileaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdateuserprofileaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdateusersettingsaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminuploadblogtemplatefileaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminuploadtemplatefileaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminuserprofileaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminusersettingsaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminversioncheckaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/adminxmlpingaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/ajax/adminajaxaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/chooser/adminblogchooseraction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/chooser/adminblogtemplatechooseraction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/chooser/adminlocationchooseraction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/chooser/adminresourcelistaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/chooser/adminuserchooseraction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/chooser/adminuserpictureselectaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/admin/siteadminaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/blogaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/commentaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/defaultaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/locationdisplay.class.php
plog/branches/lifetype-2.0-autoload/class/action/resourceserveraction.class.php
plog/branches/lifetype-2.0-autoload/class/action/rssaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/searchaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/templateaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/viewalbumaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/viewarticleaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/viewarticletrackbacksaction.class.php
plog/branches/lifetype-2.0-autoload/class/action/viewresourceaction.class.php
plog/branches/lifetype-2.0-autoload/class/bayesian/bayesianfiltercore.class.php
plog/branches/lifetype-2.0-autoload/class/bayesian/bayesiantokenizer.class.php
plog/branches/lifetype-2.0-autoload/class/bootstrap.php
plog/branches/lifetype-2.0-autoload/class/cache/cache.class.php
plog/branches/lifetype-2.0-autoload/class/cache/cachemanager.class.php
plog/branches/lifetype-2.0-autoload/class/cache/memcache.class.php
plog/branches/lifetype-2.0-autoload/class/config/config.class.php
plog/branches/lifetype-2.0-autoload/class/config/configdbstorage.class.php
plog/branches/lifetype-2.0-autoload/class/config/configfilestorage.class.php
plog/branches/lifetype-2.0-autoload/class/config/siteconfig.class.php
plog/branches/lifetype-2.0-autoload/class/controller/admincontroller.class.php
plog/branches/lifetype-2.0-autoload/class/controller/blogcontroller.class.php
plog/branches/lifetype-2.0-autoload/class/controller/controller.class.php
plog/branches/lifetype-2.0-autoload/class/controller/resourceclassloader.class.php
plog/branches/lifetype-2.0-autoload/class/controller/sequentialcontroller.class.php
plog/branches/lifetype-2.0-autoload/class/dao/archivelink.class.php
plog/branches/lifetype-2.0-autoload/class/dao/article.class.php
plog/branches/lifetype-2.0-autoload/class/dao/articlecategories.class.php
plog/branches/lifetype-2.0-autoload/class/dao/articlecategory.class.php
plog/branches/lifetype-2.0-autoload/class/dao/articlecomments.class.php
plog/branches/lifetype-2.0-autoload/class/dao/articlecommentstatus.class.php
plog/branches/lifetype-2.0-autoload/class/dao/articlenotification.class.php
plog/branches/lifetype-2.0-autoload/class/dao/articlenotifications.class.php
plog/branches/lifetype-2.0-autoload/class/dao/articles.class.php
plog/branches/lifetype-2.0-autoload/class/dao/articlestatus.class.php
plog/branches/lifetype-2.0-autoload/class/dao/bayesianfilterinfo.class.php
plog/branches/lifetype-2.0-autoload/class/dao/bayesianfilterinfos.class.php
plog/branches/lifetype-2.0-autoload/class/dao/bayesiantoken.class.php
plog/branches/lifetype-2.0-autoload/class/dao/bayesiantokens.class.php
plog/branches/lifetype-2.0-autoload/class/dao/blogcategories.class.php
plog/branches/lifetype-2.0-autoload/class/dao/blogcategory.class.php
plog/branches/lifetype-2.0-autoload/class/dao/bloginfo.class.php
plog/branches/lifetype-2.0-autoload/class/dao/bloglinks.class.php
plog/branches/lifetype-2.0-autoload/class/dao/blogs.class.php
plog/branches/lifetype-2.0-autoload/class/dao/blogsettings.class.php
plog/branches/lifetype-2.0-autoload/class/dao/blogstatus.class.php
plog/branches/lifetype-2.0-autoload/class/dao/commentscommon.class.php
plog/branches/lifetype-2.0-autoload/class/dao/customfields/customfield.class.php
plog/branches/lifetype-2.0-autoload/class/dao/customfields/customfieldcheckboxvalue.class.php
plog/branches/lifetype-2.0-autoload/class/dao/customfields/customfielddatevalue.class.php
plog/branches/lifetype-2.0-autoload/class/dao/customfields/customfieldlistvalue.class.php
plog/branches/lifetype-2.0-autoload/class/dao/customfields/customfields.class.php
plog/branches/lifetype-2.0-autoload/class/dao/customfields/customfieldsvalues.class.php
plog/branches/lifetype-2.0-autoload/class/dao/customfields/customfieldvalue.class.php
plog/branches/lifetype-2.0-autoload/class/dao/customfields/customfieldvaluefactory.class.php
plog/branches/lifetype-2.0-autoload/class/dao/friend.class.php
plog/branches/lifetype-2.0-autoload/class/dao/friendauthorizationstatus.class.php
plog/branches/lifetype-2.0-autoload/class/dao/friendgroup.class.php
plog/branches/lifetype-2.0-autoload/class/dao/friendgroups.class.php
plog/branches/lifetype-2.0-autoload/class/dao/friends.class.php
plog/branches/lifetype-2.0-autoload/class/dao/globalarticlecategories.class.php
plog/branches/lifetype-2.0-autoload/class/dao/globalarticlecategory.class.php
plog/branches/lifetype-2.0-autoload/class/dao/location.class.php
plog/branches/lifetype-2.0-autoload/class/dao/locationawaredbobject.class.php
plog/branches/lifetype-2.0-autoload/class/dao/locations.class.php
plog/branches/lifetype-2.0-autoload/class/dao/misc/init.class.php
plog/branches/lifetype-2.0-autoload/class/dao/model.class.php
plog/branches/lifetype-2.0-autoload/class/dao/mylink.class.php
plog/branches/lifetype-2.0-autoload/class/dao/mylinks.class.php
plog/branches/lifetype-2.0-autoload/class/dao/mylinkscategories.class.php
plog/branches/lifetype-2.0-autoload/class/dao/mylinkscategory.class.php
plog/branches/lifetype-2.0-autoload/class/dao/permission.class.php
plog/branches/lifetype-2.0-autoload/class/dao/permissions.class.php
plog/branches/lifetype-2.0-autoload/class/dao/privatemessage.class.php
plog/branches/lifetype-2.0-autoload/class/dao/privatemessagebox.class.php
plog/branches/lifetype-2.0-autoload/class/dao/privatemessageboxes.class.php
plog/branches/lifetype-2.0-autoload/class/dao/privatemessagereceiverreadstatus.class.php
plog/branches/lifetype-2.0-autoload/class/dao/privatemessages.class.php
plog/branches/lifetype-2.0-autoload/class/dao/purgedata.class.php
plog/branches/lifetype-2.0-autoload/class/dao/recentarticles.class.php
plog/branches/lifetype-2.0-autoload/class/dao/referer.class.php
plog/branches/lifetype-2.0-autoload/class/dao/referers.class.php
plog/branches/lifetype-2.0-autoload/class/dao/searchengine.class.php
plog/branches/lifetype-2.0-autoload/class/dao/sitestatistics.class.php
plog/branches/lifetype-2.0-autoload/class/dao/trackback.class.php
plog/branches/lifetype-2.0-autoload/class/dao/trackbackclient.class.php
plog/branches/lifetype-2.0-autoload/class/dao/trackbacks.class.php
plog/branches/lifetype-2.0-autoload/class/dao/userauthorizationstatus.class.php
plog/branches/lifetype-2.0-autoload/class/dao/usercomment.class.php
plog/branches/lifetype-2.0-autoload/class/dao/userdata/baseuserdataprovider.class.php
plog/branches/lifetype-2.0-autoload/class/dao/userdata/joomlauserdataprovider.class.php
plog/branches/lifetype-2.0-autoload/class/dao/userdata/lifetypeuserdataprovider.class.php
plog/branches/lifetype-2.0-autoload/class/dao/userdata/phpbb2userdataprovider.class.php
plog/branches/lifetype-2.0-autoload/class/dao/userdata/simplepostnukeuserdataprovider.class.php
plog/branches/lifetype-2.0-autoload/class/dao/userdata/vbb3userdataprovider.class.php
plog/branches/lifetype-2.0-autoload/class/dao/userdata/wbbuserdataprovider.class.php
plog/branches/lifetype-2.0-autoload/class/dao/userinfo.class.php
plog/branches/lifetype-2.0-autoload/class/dao/userpermission.class.php
plog/branches/lifetype-2.0-autoload/class/dao/userpermissions.class.php
plog/branches/lifetype-2.0-autoload/class/dao/users.class.php
plog/branches/lifetype-2.0-autoload/class/dao/userstatus.class.php
plog/branches/lifetype-2.0-autoload/class/data/Date/Span.class.php
plog/branches/lifetype-2.0-autoload/class/data/captcha/captcha.class.php
plog/branches/lifetype-2.0-autoload/class/data/filter/allowedhtmlfilter.class.php
plog/branches/lifetype-2.0-autoload/class/data/filter/htmlentitiesfilter.class.php
plog/branches/lifetype-2.0-autoload/class/data/filter/htmlfilter.class.php
plog/branches/lifetype-2.0-autoload/class/data/filter/htmlspecialcharsfilter.class.php
plog/branches/lifetype-2.0-autoload/class/data/filter/regexpfilter.class.php
plog/branches/lifetype-2.0-autoload/class/data/filter/trimfilter.class.php
plog/branches/lifetype-2.0-autoload/class/data/filter/urlconverter.class.php
plog/branches/lifetype-2.0-autoload/class/data/filter/xhtmlizefilter.class.php
plog/branches/lifetype-2.0-autoload/class/data/forms/formvalidator.class.php
plog/branches/lifetype-2.0-autoload/class/data/htmlcalendar.class.php
plog/branches/lifetype-2.0-autoload/class/data/jalalicalendar.class.php
plog/branches/lifetype-2.0-autoload/class/data/plogcalendar.class.php
plog/branches/lifetype-2.0-autoload/class/data/serialize/json/jsonserializer.class.php
plog/branches/lifetype-2.0-autoload/class/data/serialize/serializerfactory.class.php
plog/branches/lifetype-2.0-autoload/class/data/textfilter.class.php
plog/branches/lifetype-2.0-autoload/class/data/timestamp.class.php
plog/branches/lifetype-2.0-autoload/class/data/validator/arrayvalidator.class.php
plog/branches/lifetype-2.0-autoload/class/data/validator/blognamevalidator.class.php
plog/branches/lifetype-2.0-autoload/class/data/validator/chainedvalidator.class.php
plog/branches/lifetype-2.0-autoload/class/data/validator/domainvalidator.class.php
plog/branches/lifetype-2.0-autoload/class/data/validator/emailvalidator.class.php
plog/branches/lifetype-2.0-autoload/class/data/validator/emptyvalidator.class.php
plog/branches/lifetype-2.0-autoload/class/data/validator/filenamematchvalidator.class.php
plog/branches/lifetype-2.0-autoload/class/data/validator/floatvalidator.class.php
plog/branches/lifetype-2.0-autoload/class/data/validator/httpurlvalidator.class.php
plog/branches/lifetype-2.0-autoload/class/data/validator/integervalidator.class.php
plog/branches/lifetype-2.0-autoload/class/data/validator/ipaddressvalidator.class.php
plog/branches/lifetype-2.0-autoload/class/data/validator/ipmatchvalidator.class.php
plog/branches/lifetype-2.0-autoload/class/data/validator/passwordvalidator.class.php
plog/branches/lifetype-2.0-autoload/class/data/validator/rules/arrayrule.class.php
plog/branches/lifetype-2.0-autoload/class/data/validator/rules/emaildnsrule.class.php
plog/branches/lifetype-2.0-autoload/class/data/validator/rules/emailformatrule.class.php
plog/branches/lifetype-2.0-autoload/class/data/validator/rules/equalrule.class.php
plog/branches/lifetype-2.0-autoload/class/data/validator/rules/filteredpatternsrule.class.php
plog/branches/lifetype-2.0-autoload/class/data/validator/rules/filteredwordsrule.class.php
plog/branches/lifetype-2.0-autoload/class/data/validator/rules/floatrule.class.php
plog/branches/lifetype-2.0-autoload/class/data/validator/rules/intrangerule.class.php
plog/branches/lifetype-2.0-autoload/class/data/validator/rules/intrule.class.php
plog/branches/lifetype-2.0-autoload/class/data/validator/rules/ipcidrformatrule.class.php
plog/branches/lifetype-2.0-autoload/class/data/validator/rules/ipformatrule.class.php
plog/branches/lifetype-2.0-autoload/class/data/validator/rules/iprangerule.class.php
plog/branches/lifetype-2.0-autoload/class/data/validator/rules/nonemptyrule.class.php
plog/branches/lifetype-2.0-autoload/class/data/validator/rules/numericrule.class.php
plog/branches/lifetype-2.0-autoload/class/data/validator/rules/regexprule.class.php
plog/branches/lifetype-2.0-autoload/class/data/validator/rules/stringrangerule.class.php
plog/branches/lifetype-2.0-autoload/class/data/validator/rules/uintrule.class.php
plog/branches/lifetype-2.0-autoload/class/data/validator/rules/urlformatrule.class.php
plog/branches/lifetype-2.0-autoload/class/data/validator/stringvalidator.class.php
plog/branches/lifetype-2.0-autoload/class/data/validator/templatenamevalidator.class.php
plog/branches/lifetype-2.0-autoload/class/data/validator/templatesetvalidator.class.php
plog/branches/lifetype-2.0-autoload/class/data/validator/uploadvalidator.class.php
plog/branches/lifetype-2.0-autoload/class/data/validator/usernamevalidator.class.php
plog/branches/lifetype-2.0-autoload/class/database/db.class.php
plog/branches/lifetype-2.0-autoload/class/database/ltdb.class.php
plog/branches/lifetype-2.0-autoload/class/database/pdb/datadict/pdbmysqldatadict.class.php
plog/branches/lifetype-2.0-autoload/class/database/pdb/datadict/pdbpgsqldatadict.class.php
plog/branches/lifetype-2.0-autoload/class/database/pdb/drivers/pdbdriverbase.class.php
plog/branches/lifetype-2.0-autoload/class/database/pdb/drivers/pdbmysqldriver.class.php
plog/branches/lifetype-2.0-autoload/class/database/pdb/drivers/pdbmysqlrecordset.class.php
plog/branches/lifetype-2.0-autoload/class/database/pdb/drivers/pdbpgsqldriver.class.php
plog/branches/lifetype-2.0-autoload/class/database/pdb/drivers/pdbpgsqlrecordset.class.php
plog/branches/lifetype-2.0-autoload/class/database/pdb/pdb.class.php
plog/branches/lifetype-2.0-autoload/class/file/file.class.php
plog/branches/lifetype-2.0-autoload/class/file/fileproperties.class.php
plog/branches/lifetype-2.0-autoload/class/file/fileuploads.class.php
plog/branches/lifetype-2.0-autoload/class/file/filtereddirectorytreeiterator.class.php
plog/branches/lifetype-2.0-autoload/class/file/finder/filefinder.class.php
plog/branches/lifetype-2.0-autoload/class/file/unpacker/rarunpacker.class.php
plog/branches/lifetype-2.0-autoload/class/file/unpacker/tarbz2unpacker.class.php
plog/branches/lifetype-2.0-autoload/class/file/unpacker/targzunpacker.class.php
plog/branches/lifetype-2.0-autoload/class/file/unpacker/unpacker.class.php
plog/branches/lifetype-2.0-autoload/class/file/unpacker/zipunpacker.class.php
plog/branches/lifetype-2.0-autoload/class/gallery/dao/galleryalbum.class.php
plog/branches/lifetype-2.0-autoload/class/gallery/dao/galleryalbums.class.php
plog/branches/lifetype-2.0-autoload/class/gallery/dao/galleryitemslist.class.php
plog/branches/lifetype-2.0-autoload/class/gallery/dao/galleryresource.class.php
plog/branches/lifetype-2.0-autoload/class/gallery/dao/galleryresourcequotas.class.php
plog/branches/lifetype-2.0-autoload/class/gallery/dao/galleryresources.class.php
plog/branches/lifetype-2.0-autoload/class/gallery/dao/galleryresourcestorage.class.php
plog/branches/lifetype-2.0-autoload/class/gallery/data/galleryresourcebasemetadatareader.class.php
plog/branches/lifetype-2.0-autoload/class/gallery/data/galleryresourceimagemetadatareader.class.php
plog/branches/lifetype-2.0-autoload/class/gallery/data/galleryresourcesoundmetadatareader.class.php
plog/branches/lifetype-2.0-autoload/class/gallery/data/galleryresourcevideometadatareader.class.php
plog/branches/lifetype-2.0-autoload/class/gallery/data/galleryresourcezipmetadatareader.class.php
plog/branches/lifetype-2.0-autoload/class/gallery/resizers/gallerygdresizer.class.php
plog/branches/lifetype-2.0-autoload/class/gallery/resizers/galleryimagemagickresizer.class.php
plog/branches/lifetype-2.0-autoload/class/gallery/resizers/gallerynullresizer.class.php
plog/branches/lifetype-2.0-autoload/class/gallery/resizers/galleryresizer.class.php
plog/branches/lifetype-2.0-autoload/class/gallery/resizers/gallerythumbnailgenerator.class.php
plog/branches/lifetype-2.0-autoload/class/gallery/template/gallerytemplatetools.class.php
plog/branches/lifetype-2.0-autoload/class/locale/bloglocale.class.php
plog/branches/lifetype-2.0-autoload/class/locale/locale.class.php
plog/branches/lifetype-2.0-autoload/class/locale/localefinder.class.php
plog/branches/lifetype-2.0-autoload/class/locale/locales.class.php
plog/branches/lifetype-2.0-autoload/class/locale/pluginlocale.class.php
plog/branches/lifetype-2.0-autoload/class/logger/appender/fileappender.class.php
plog/branches/lifetype-2.0-autoload/class/logger/appender/nullappender.class.php
plog/branches/lifetype-2.0-autoload/class/logger/appender/stdoutappender.class.php
plog/branches/lifetype-2.0-autoload/class/logger/config/loggerconfigloader.class.php
plog/branches/lifetype-2.0-autoload/class/logger/layout/patternlayout.class.php
plog/branches/lifetype-2.0-autoload/class/logger/logger/logger.class.php
plog/branches/lifetype-2.0-autoload/class/logger/loggermanager.class.php
plog/branches/lifetype-2.0-autoload/class/mail/emailservice.class.php
plog/branches/lifetype-2.0-autoload/class/mail/phpmailer/class.phpmailer.php
plog/branches/lifetype-2.0-autoload/class/misc/info.class.php
plog/branches/lifetype-2.0-autoload/class/misc/integritychecker.class.php
plog/branches/lifetype-2.0-autoload/class/misc/version.class.php
plog/branches/lifetype-2.0-autoload/class/net/baserequestgenerator.class.php
plog/branches/lifetype-2.0-autoload/class/net/customrequestgenerator.class.php
plog/branches/lifetype-2.0-autoload/class/net/customurlhandler.class.php
plog/branches/lifetype-2.0-autoload/class/net/dns.class.php
plog/branches/lifetype-2.0-autoload/class/net/http/phpsniff/phpSniff.class.php
plog/branches/lifetype-2.0-autoload/class/net/http/session/sessioninfo.class.php
plog/branches/lifetype-2.0-autoload/class/net/http/session/sessionmanager.class.php
plog/branches/lifetype-2.0-autoload/class/net/http/subdomains.class.php
plog/branches/lifetype-2.0-autoload/class/net/linkformatmatcher.class.php
plog/branches/lifetype-2.0-autoload/class/net/modrewriterequestgenerator.class.php
plog/branches/lifetype-2.0-autoload/class/net/prettyrequestgenerator.class.php
plog/branches/lifetype-2.0-autoload/class/net/rawrequestgenerator.class.php
plog/branches/lifetype-2.0-autoload/class/net/request.class.php
plog/branches/lifetype-2.0-autoload/class/net/requestgenerator.class.php
plog/branches/lifetype-2.0-autoload/class/net/xmlrpc/xmlrpcserver.class.php
plog/branches/lifetype-2.0-autoload/class/net/xmlrpcclient.class.php
plog/branches/lifetype-2.0-autoload/class/object/loader.class.php
plog/branches/lifetype-2.0-autoload/class/object/loggable.class.php
plog/branches/lifetype-2.0-autoload/class/object/object.class.php
plog/branches/lifetype-2.0-autoload/class/plugin/globalpluginconfig.class.php
plog/branches/lifetype-2.0-autoload/class/plugin/pluginbase.class.php
plog/branches/lifetype-2.0-autoload/class/plugin/pluginmanager.class.php
plog/branches/lifetype-2.0-autoload/class/security/bayesianfilter.class.php
plog/branches/lifetype-2.0-autoload/class/security/commentfilter.class.php
plog/branches/lifetype-2.0-autoload/class/security/nullpipelinefilter.class.php
plog/branches/lifetype-2.0-autoload/class/security/pipeline.class.php
plog/branches/lifetype-2.0-autoload/class/summary/action/activeaccountaction.class.php
plog/branches/lifetype-2.0-autoload/class/summary/action/bloglistaction.class.php
plog/branches/lifetype-2.0-autoload/class/summary/action/blogprofileaction.class.php
plog/branches/lifetype-2.0-autoload/class/summary/action/checkusernameajaxaction.class.php
plog/branches/lifetype-2.0-autoload/class/summary/action/chooseblogtemplateaction.class.php
plog/branches/lifetype-2.0-autoload/class/summary/action/doblogregistration.class.php
plog/branches/lifetype-2.0-autoload/class/summary/action/dofinishregister.class.php
plog/branches/lifetype-2.0-autoload/class/summary/action/doreadagreement.class.php
plog/branches/lifetype-2.0-autoload/class/summary/action/dousercreation.class.php
plog/branches/lifetype-2.0-autoload/class/summary/action/douserregister.class.php
plog/branches/lifetype-2.0-autoload/class/summary/action/postlistaction.class.php
plog/branches/lifetype-2.0-autoload/class/summary/action/registeraction.class.php
plog/branches/lifetype-2.0-autoload/class/summary/action/summaryaction.class.php
plog/branches/lifetype-2.0-autoload/class/summary/action/summarycustompageaction.class.php
plog/branches/lifetype-2.0-autoload/class/summary/action/summarydefaultaction.class.php
plog/branches/lifetype-2.0-autoload/class/summary/action/summaryregistrationaction.class.php
plog/branches/lifetype-2.0-autoload/class/summary/action/summaryrssaction.class.php
plog/branches/lifetype-2.0-autoload/class/summary/action/summarysearchaction.class.php
plog/branches/lifetype-2.0-autoload/class/summary/action/summarysendresetemail.class.php
plog/branches/lifetype-2.0-autoload/class/summary/action/summarysetnewpassword.class.php
plog/branches/lifetype-2.0-autoload/class/summary/action/summaryshowresetpasswordform.class.php
plog/branches/lifetype-2.0-autoload/class/summary/action/summaryupdatepassword.class.php
plog/branches/lifetype-2.0-autoload/class/summary/action/userlistaction.class.php
plog/branches/lifetype-2.0-autoload/class/summary/action/userprofileaction.class.php
plog/branches/lifetype-2.0-autoload/class/summary/controller/registrationcontroller.class.php
plog/branches/lifetype-2.0-autoload/class/summary/controller/summarycontroller.class.php
plog/branches/lifetype-2.0-autoload/class/summary/dao/summarystats.class.php
plog/branches/lifetype-2.0-autoload/class/summary/data/summarytools.class.php
plog/branches/lifetype-2.0-autoload/class/summary/data/validator/customsummarypagevalidator.class.php
plog/branches/lifetype-2.0-autoload/class/summary/mail/confirmemailmessage.class.php
plog/branches/lifetype-2.0-autoload/class/summary/mail/summarymailer.class.php
plog/branches/lifetype-2.0-autoload/class/summary/net/summaryrequestgenerator.class.php
plog/branches/lifetype-2.0-autoload/class/summary/view/blogtemplatechooserview.class.php
plog/branches/lifetype-2.0-autoload/class/summary/view/doblogregistrationview.class.php
plog/branches/lifetype-2.0-autoload/class/summary/view/summarybloglistview.class.php
plog/branches/lifetype-2.0-autoload/class/summary/view/summarycachedview.class.php
plog/branches/lifetype-2.0-autoload/class/summary/view/summarymessageview.class.php
plog/branches/lifetype-2.0-autoload/class/summary/view/summarypostlistview.class.php
plog/branches/lifetype-2.0-autoload/class/summary/view/summaryrssview.class.php
plog/branches/lifetype-2.0-autoload/class/summary/view/summaryusercreationview.class.php
plog/branches/lifetype-2.0-autoload/class/summary/view/summaryuserlistview.class.php
plog/branches/lifetype-2.0-autoload/class/summary/view/summaryview.class.php
plog/branches/lifetype-2.0-autoload/class/summary/view/summaryxmlview.class.php
plog/branches/lifetype-2.0-autoload/class/template/cachecontrol.class.php
plog/branches/lifetype-2.0-autoload/class/template/cachedtemplate.class.php
plog/branches/lifetype-2.0-autoload/class/template/editor/templatetools.class.php
plog/branches/lifetype-2.0-autoload/class/template/menu/menu.class.php
plog/branches/lifetype-2.0-autoload/class/template/menu/menuentry.class.php
plog/branches/lifetype-2.0-autoload/class/template/menu/menurenderer.class.php
plog/branches/lifetype-2.0-autoload/class/template/smarty/plugins/function.adminpager.php
plog/branches/lifetype-2.0-autoload/class/template/smarty/plugins/function.adminpagerajax.php
plog/branches/lifetype-2.0-autoload/class/template/smarty/plugins/function.location_chooser.php
plog/branches/lifetype-2.0-autoload/class/template/smarty/plugins/function.pager.php
plog/branches/lifetype-2.0-autoload/class/template/smarty/plugins/modifier.round.php
plog/branches/lifetype-2.0-autoload/class/template/smarty/plugins/modifier.utf8_truncate.php
plog/branches/lifetype-2.0-autoload/class/template/template.class.php
plog/branches/lifetype-2.0-autoload/class/template/templatesandbox.class.php
plog/branches/lifetype-2.0-autoload/class/template/templateservice.class.php
plog/branches/lifetype-2.0-autoload/class/template/templatesets/templatefinder.class.php
plog/branches/lifetype-2.0-autoload/class/template/templatesets/templateset.class.php
plog/branches/lifetype-2.0-autoload/class/template/templatesets/templatesets.class.php
plog/branches/lifetype-2.0-autoload/class/template/templatesets/templatesetstorage.class.php
plog/branches/lifetype-2.0-autoload/class/test/PHPUnit.php
plog/branches/lifetype-2.0-autoload/class/test/PHPUnit/GUI/Gtk.php
plog/branches/lifetype-2.0-autoload/class/test/PHPUnit/GUI/SetupDecorator.php
plog/branches/lifetype-2.0-autoload/class/test/PHPUnit/RepeatedTest.php
plog/branches/lifetype-2.0-autoload/class/test/PHPUnit/Skeleton.php
plog/branches/lifetype-2.0-autoload/class/test/PHPUnit/TestCase.php
plog/branches/lifetype-2.0-autoload/class/test/PHPUnit/TestDecorator.php
plog/branches/lifetype-2.0-autoload/class/test/PHPUnit/TestResult.php
plog/branches/lifetype-2.0-autoload/class/test/PHPUnit/TestSuite.php
plog/branches/lifetype-2.0-autoload/class/test/helpers/consolereporter.class.php
plog/branches/lifetype-2.0-autoload/class/test/helpers/htmlreporter.class.php
plog/branches/lifetype-2.0-autoload/class/test/helpers/lifetypetestcase.class.php
plog/branches/lifetype-2.0-autoload/class/test/helpers/testtools.class.php
plog/branches/lifetype-2.0-autoload/class/test/helpers/uiscriptrunner.class.php
plog/branches/lifetype-2.0-autoload/class/test/testrunner.class.php
plog/branches/lifetype-2.0-autoload/class/test/tests/config/configdbstorage_test.class.php
plog/branches/lifetype-2.0-autoload/class/test/tests/config/configfilestorage_test.class.php
plog/branches/lifetype-2.0-autoload/class/test/tests/config/properties_test.class.php
plog/branches/lifetype-2.0-autoload/class/test/tests/dao/article_test.class.php
plog/branches/lifetype-2.0-autoload/class/test/tests/dao/articlecategories_test.class.php
plog/branches/lifetype-2.0-autoload/class/test/tests/dao/bloginfo_test.class.php
plog/branches/lifetype-2.0-autoload/class/test/tests/dao/blogs_test.class.php
plog/branches/lifetype-2.0-autoload/class/test/tests/dao/commentscommon_test.class.php
plog/branches/lifetype-2.0-autoload/class/test/tests/dao/permissions_test.class.php
plog/branches/lifetype-2.0-autoload/class/test/tests/dao/searchengine_test.class.php
plog/branches/lifetype-2.0-autoload/class/test/tests/dao/trackbackclient_test.class.php
plog/branches/lifetype-2.0-autoload/class/test/tests/dao/userinfo_test.class.php
plog/branches/lifetype-2.0-autoload/class/test/tests/data/filter/filterbase_test.class.php
plog/branches/lifetype-2.0-autoload/class/test/tests/data/filter/htmlfilter_test.class.php
plog/branches/lifetype-2.0-autoload/class/test/tests/data/filter/regexpfilter_test.class.php
plog/branches/lifetype-2.0-autoload/class/test/tests/data/textfilter_test.class.php
plog/branches/lifetype-2.0-autoload/class/test/tests/data/validator/arrayvalidator_test.class.php
plog/branches/lifetype-2.0-autoload/class/test/tests/data/validator/blognamevalidator_test.class.php
plog/branches/lifetype-2.0-autoload/class/test/tests/data/validator/emailvalidator_test.class.php
plog/branches/lifetype-2.0-autoload/class/test/tests/data/validator/filenamematchvalidator_test.class.php
plog/branches/lifetype-2.0-autoload/class/test/tests/data/validator/httpurlvalidator_test.class.php
plog/branches/lifetype-2.0-autoload/class/test/tests/data/validator/integervalidator_test.class.php
plog/branches/lifetype-2.0-autoload/class/test/tests/data/validator/rules/ipformatrule_test.class.php
plog/branches/lifetype-2.0-autoload/class/test/tests/data/validator/rules/stringrangerule_test.class.php
plog/branches/lifetype-2.0-autoload/class/test/tests/data/validator/usernamevalidator_test.class.php
plog/branches/lifetype-2.0-autoload/class/test/tests/extra/sqlinjection_test.class.php
plog/branches/lifetype-2.0-autoload/class/test/tests/file/file_test.class.php
plog/branches/lifetype-2.0-autoload/class/test/tests/file/unpacker/zipunpacker_test.class.php
plog/branches/lifetype-2.0-autoload/class/test/tests/locale/locale_test.class.php
plog/branches/lifetype-2.0-autoload/class/test/tests/logger/loggerutil_test.class.php
plog/branches/lifetype-2.0-autoload/class/test/tests/mail/emailservice_test.class.php
plog/branches/lifetype-2.0-autoload/class/test/tests/mail/phpmailer/phpmailer_test.class.php
plog/branches/lifetype-2.0-autoload/class/test/tests/misc/glob_test.class.php
plog/branches/lifetype-2.0-autoload/class/test/tests/misc/version_test.class.php
plog/branches/lifetype-2.0-autoload/class/test/tests/net/http/httpclient_test.class.php
plog/branches/lifetype-2.0-autoload/class/test/tests/net/url_test.class.php
plog/branches/lifetype-2.0-autoload/class/test/tests/net/xmlrpc/xmlrpcserver_test.class.php
plog/branches/lifetype-2.0-autoload/class/test/tests/summary/action/summaryaction_test.class.php
plog/branches/lifetype-2.0-autoload/class/test/tests/summary/dao/summarystats_test.class.php
plog/branches/lifetype-2.0-autoload/class/test/tests/summary/data/summarytools_test.class.php
plog/branches/lifetype-2.0-autoload/class/test/tests/ui/articlecategoriesui_test.class.php
plog/branches/lifetype-2.0-autoload/class/test/tests/ui/login_test.class.php
plog/branches/lifetype-2.0-autoload/class/test/tests/ui/permissionsui_test.class.php
plog/branches/lifetype-2.0-autoload/class/view/admin/adminadduserview.class.php
plog/branches/lifetype-2.0-autoload/class/view/admin/adminarticlecategorieslistview.class.php
plog/branches/lifetype-2.0-autoload/class/view/admin/adminarticlecommentslistview.class.php
plog/branches/lifetype-2.0-autoload/class/view/admin/adminarticlereferrersview.class.php
plog/branches/lifetype-2.0-autoload/class/view/admin/adminbasetemplateeditorview.class.php
plog/branches/lifetype-2.0-autoload/class/view/admin/adminblogcategorieslistview.class.php
plog/branches/lifetype-2.0-autoload/class/view/admin/adminbloglocationsview.class.php
plog/branches/lifetype-2.0-autoload/class/view/admin/adminblogsettingsview.class.php
plog/branches/lifetype-2.0-autoload/class/view/admin/adminblogtemplatechooserview.class.php
plog/branches/lifetype-2.0-autoload/class/view/admin/adminblogtemplatesetslistview.class.php
plog/branches/lifetype-2.0-autoload/class/view/admin/adminbloguserslistview.class.php
plog/branches/lifetype-2.0-autoload/class/view/admin/admincreateblogview.class.php
plog/branches/lifetype-2.0-autoload/class/view/admin/admincustomfieldslistview.class.php
plog/branches/lifetype-2.0-autoload/class/view/admin/admindashboardview.class.php
plog/branches/lifetype-2.0-autoload/class/view/admin/admindefaultview.class.php
plog/branches/lifetype-2.0-autoload/class/view/admin/admineditblogtemplateview.class.php
plog/branches/lifetype-2.0-autoload/class/view/admin/admineditfriendview.class.php
plog/branches/lifetype-2.0-autoload/class/view/admin/admineditlinkview.class.php
plog/branches/lifetype-2.0-autoload/class/view/admin/admineditpostview.class.php
plog/branches/lifetype-2.0-autoload/class/view/admin/admineditresourcealbumview.class.php
plog/branches/lifetype-2.0-autoload/class/view/admin/admineditresourceview.class.php
plog/branches/lifetype-2.0-autoload/class/view/admin/admineditsiteblogview.class.php
plog/branches/lifetype-2.0-autoload/class/view/admin/admineditsiteuserview.class.php
plog/branches/lifetype-2.0-autoload/class/view/admin/adminedittemplatefileview.class.php
plog/branches/lifetype-2.0-autoload/class/view/admin/adminedittemplateview.class.php
plog/branches/lifetype-2.0-autoload/class/view/admin/adminerrordialogview.class.php
plog/branches/lifetype-2.0-autoload/class/view/admin/adminerrorview.class.php
plog/branches/lifetype-2.0-autoload/class/view/admin/adminfriendgroupslistview.class.php
plog/branches/lifetype-2.0-autoload/class/view/admin/adminfriendslistview.class.php
plog/branches/lifetype-2.0-autoload/class/view/admin/adminglobalarticlecategorieslistview.class.php
plog/branches/lifetype-2.0-autoload/class/view/admin/adminglobalsettingslistview.class.php
plog/branches/lifetype-2.0-autoload/class/view/admin/admininboxprivatemessageslistview.class.php
plog/branches/lifetype-2.0-autoload/class/view/admin/adminlinkcategorieslistview.class.php
plog/branches/lifetype-2.0-autoload/class/view/admin/adminlinkslistview.class.php
plog/branches/lifetype-2.0-autoload/class/view/admin/adminloginview.class.php
plog/branches/lifetype-2.0-autoload/class/view/admin/adminmessageview.class.php
plog/branches/lifetype-2.0-autoload/class/view/admin/adminnewalbumview.class.php
plog/branches/lifetype-2.0-autoload/class/view/admin/adminnewbloguserview.class.php
plog/branches/lifetype-2.0-autoload/class/view/admin/adminnewfriendview.class.php
plog/branches/lifetype-2.0-autoload/class/view/admin/adminnewglobalarticlecategoryview.class.php
plog/branches/lifetype-2.0-autoload/class/view/admin/adminnewlinkview.class.php
plog/branches/lifetype-2.0-autoload/class/view/admin/adminnewpostview.class.php
plog/branches/lifetype-2.0-autoload/class/view/admin/adminnewresourceview.class.php
plog/branches/lifetype-2.0-autoload/class/view/admin/adminoutboxprivatemessageslistview.class.php
plog/branches/lifetype-2.0-autoload/class/view/admin/adminpermissionslistview.class.php
plog/branches/lifetype-2.0-autoload/class/view/admin/adminplainview.class.php
plog/branches/lifetype-2.0-autoload/class/view/admin/adminpluginsettingsview.class.php
plog/branches/lifetype-2.0-autoload/class/view/admin/adminplugintemplatedview.class.php
plog/branches/lifetype-2.0-autoload/class/view/admin/adminpostslistview.class.php
plog/branches/lifetype-2.0-autoload/class/view/admin/adminreferrersview.class.php
plog/branches/lifetype-2.0-autoload/class/view/admin/adminregisterblogview.class.php
plog/branches/lifetype-2.0-autoload/class/view/admin/adminresourcealbumslistview.class.php
plog/branches/lifetype-2.0-autoload/class/view/admin/adminresourceslistview.class.php
plog/branches/lifetype-2.0-autoload/class/view/admin/adminsimpleerrorview.class.php
plog/branches/lifetype-2.0-autoload/class/view/admin/adminsimplemessageview.class.php
plog/branches/lifetype-2.0-autoload/class/view/admin/adminsiteblogslistview.class.php
plog/branches/lifetype-2.0-autoload/class/view/admin/adminsitelocaleslistview.class.php
plog/branches/lifetype-2.0-autoload/class/view/admin/adminsitetemplateslistview.class.php
plog/branches/lifetype-2.0-autoload/class/view/admin/adminsiteuserslistview.class.php
plog/branches/lifetype-2.0-autoload/class/view/admin/admintemplatedview.class.php
plog/branches/lifetype-2.0-autoload/class/view/admin/adminuserprofileview.class.php
plog/branches/lifetype-2.0-autoload/class/view/admin/adminview.class.php
plog/branches/lifetype-2.0-autoload/class/view/admin/adminxmlview.class.php
plog/branches/lifetype-2.0-autoload/class/view/admin/ajax/adminajaxview.class.php
plog/branches/lifetype-2.0-autoload/class/view/admin/chooser/adminblogchooserview.class.php
plog/branches/lifetype-2.0-autoload/class/view/admin/chooser/adminlocationchooserview.class.php
plog/branches/lifetype-2.0-autoload/class/view/admin/chooser/adminsimpleresourceslistview.class.php
plog/branches/lifetype-2.0-autoload/class/view/admin/chooser/adminuserchooserview.class.php
plog/branches/lifetype-2.0-autoload/class/view/admin/chooser/adminuserpictureselectview.class.php
plog/branches/lifetype-2.0-autoload/class/view/ajax/ajaxview.class.php
plog/branches/lifetype-2.0-autoload/class/view/blogtemplatedview.class.php
plog/branches/lifetype-2.0-autoload/class/view/blogview.class.php
plog/branches/lifetype-2.0-autoload/class/view/defaultview.class.php
plog/branches/lifetype-2.0-autoload/class/view/errorview.class.php
plog/branches/lifetype-2.0-autoload/class/view/locationview.class.php
plog/branches/lifetype-2.0-autoload/class/view/plugintemplatedview.class.php
plog/branches/lifetype-2.0-autoload/class/view/redirectview.class.php
plog/branches/lifetype-2.0-autoload/class/view/renderer/ajaxviewrenderer.class.php
plog/branches/lifetype-2.0-autoload/class/view/rssview.class.php
plog/branches/lifetype-2.0-autoload/class/view/smartyview.class.php
plog/branches/lifetype-2.0-autoload/class/view/templateview.class.php
plog/branches/lifetype-2.0-autoload/class/view/trackbackview.class.php
plog/branches/lifetype-2.0-autoload/class/view/view.class.php
plog/branches/lifetype-2.0-autoload/class/view/viewarticleview.class.php
plog/branches/lifetype-2.0-autoload/class/xml/rssparser/magpierss/rss_fetch.inc
plog/branches/lifetype-2.0-autoload/class/xml/rssparser/magpierss/rss_parse.inc
plog/branches/lifetype-2.0-autoload/class/xml/rssparser/rssitem.class.php
plog/branches/lifetype-2.0-autoload/class/xml/rssparser/rssparser.class.php
plog/branches/lifetype-2.0-autoload/comment
plog/branches/lifetype-2.0-autoload/config/config.properties.php
plog/branches/lifetype-2.0-autoload/error.php
plog/branches/lifetype-2.0-autoload/get
plog/branches/lifetype-2.0-autoload/index.php
plog/branches/lifetype-2.0-autoload/page
plog/branches/lifetype-2.0-autoload/plugins/badbehavior/index.inc.php
plog/branches/lifetype-2.0-autoload/plugins/badbehavior/pluginbadbehavior.class.php
plog/branches/lifetype-2.0-autoload/post
plog/branches/lifetype-2.0-autoload/register.php
plog/branches/lifetype-2.0-autoload/resource
plog/branches/lifetype-2.0-autoload/resserver.php
plog/branches/lifetype-2.0-autoload/rss
plog/branches/lifetype-2.0-autoload/rss.php
plog/branches/lifetype-2.0-autoload/runtests.php
plog/branches/lifetype-2.0-autoload/static
plog/branches/lifetype-2.0-autoload/summary.php
plog/branches/lifetype-2.0-autoload/tools/generateData.php
plog/branches/lifetype-2.0-autoload/tools/tbgen.php
plog/branches/lifetype-2.0-autoload/tools/updatedbschema.php
plog/branches/lifetype-2.0-autoload/trackback.php
plog/branches/lifetype-2.0-autoload/trackbacks
plog/branches/lifetype-2.0-autoload/user
plog/branches/lifetype-2.0-autoload/xmlrpc.php
Log:
Added an experimental LtLoader class that takes care of loading missing classes dynamically, using SPL's spl_autoload_register instead of defining an __autoload method. There does not seem to be any difference in the number of classes and memory used (according to our own metrics.log) and performance seems to be the same soo (but I have not run any specific tests) The good side of autloading classes is that we can get rid of all those annoying lt_include() lines at the top of each file.
Modified: plog/branches/lifetype-2.0-autoload/admin.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/admin.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/admin.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -7,12 +7,12 @@
}
include_once( PLOG_CLASS_PATH."class/bootstrap.php" );
- lt_include( PLOG_CLASS_PATH."class/controller/admincontroller.class.php" );
- lt_include( PLOG_CLASS_PATH."class/net/http/session/sessionmanager.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/userinfo.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/bloginfo.class.php" );
- lt_include( PLOG_CLASS_PATH."class/plugin/pluginmanager.class.php" );
- lt_include( PLOG_CLASS_PATH.'class/template/templatesets/templatesets.class.php' );
+
+
+
+
+
+
ini_set("arg_seperator.output", "&");
ini_set("magic_quotes_runtime", 0 );
@@ -24,7 +24,7 @@
// a security check, or else people might forget to remove the wizard.php script
//
if( File::isReadable( "wizard.php")) {
- lt_include( PLOG_CLASS_PATH."install/installation.class.php" );
+
Installation::check();
}
Modified: plog/branches/lifetype-2.0-autoload/album
===================================================================
--- plog/branches/lifetype-2.0-autoload/album 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/album 2007-10-06 19:08:42 UTC (rev 5968)
@@ -4,10 +4,10 @@
}
include_once( PLOG_CLASS_PATH."class/bootstrap.php" );
- lt_include( PLOG_CLASS_PATH."class/net/http/httpvars.class.php" );
- lt_include( PLOG_CLASS_PATH."class/net/prettyrequestparser.class.php" );
- lt_include( PLOG_CLASS_PATH."class/net/requestgenerator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
+
+
+
+
// get the configuration data
$config =& Config::getConfig();
@@ -19,9 +19,9 @@
$parser = new PrettyRequestParser( "album", $server["PATH_INFO"]);
$result = $parser->parse();
HttpVars::setRequest( $result );
- lt_include( "index.php" );
+
}
else {
- lt_include( PLOG_CLASS_PATH."blog.php" );
+
}
?>
Modified: plog/branches/lifetype-2.0-autoload/archives
===================================================================
--- plog/branches/lifetype-2.0-autoload/archives 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/archives 2007-10-06 19:08:42 UTC (rev 5968)
@@ -4,10 +4,10 @@
}
include_once( PLOG_CLASS_PATH."class/bootstrap.php" );
- lt_include( PLOG_CLASS_PATH."class/net/http/httpvars.class.php" );
- lt_include( PLOG_CLASS_PATH."class/net/prettyrequestparser.class.php" );
- lt_include( PLOG_CLASS_PATH."class/net/requestgenerator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
+
+
+
+
// get the configuration data
@@ -20,9 +20,9 @@
$parser = new PrettyRequestParser( "archives", $server["PATH_INFO"]);
$result = $parser->parse();
HttpVars::setRequest( $result );
- lt_include( PLOG_CLASS_PATH."index.php" );
+
}
else {
- lt_include( PLOG_CLASS_PATH."blog.php" );
+
}
?>
Modified: plog/branches/lifetype-2.0-autoload/bin-devel/genmd5.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/bin-devel/genmd5.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/bin-devel/genmd5.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -9,9 +9,9 @@
}
include_once( PLOG_CLASS_PATH."class/bootstrap.php" );
-lt_include( PLOG_CLASS_PATH."class/misc/integritychecker.class.php" );
-lt_include( PLOG_CLASS_PATH."class/file/file.class.php" );
+
+
File::chDir( PLOG_CLASS_PATH );
IntegrityChecker::writeMD5ListToFile();
Modified: plog/branches/lifetype-2.0-autoload/blog.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/blog.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/blog.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -5,18 +5,18 @@
}
include_once( PLOG_CLASS_PATH."class/bootstrap.php" );
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
- lt_include( PLOG_CLASS_PATH."class/net/http/httpvars.class.php" );
- lt_include( PLOG_CLASS_PATH."class/net/customurlhandler.class.php" );
- lt_include( PLOG_CLASS_PATH."class/net/request.class.php" );
+
+
+
+
// get the configuration data
$config =& Config::getConfig();
// in order to maintain compatilibity with previous version, and the alternative
// format of search-engine friendly urls
if( $config->getValue( "request_format_mode" ) == SEARCH_ENGINE_FRIENDLY_MODE ) {
- lt_include( PLOG_CLASS_PATH."error.php" );
+
die();
}
@@ -37,5 +37,5 @@
}
// and transfer execution to the main script
- lt_include( PLOG_CLASS_PATH.$includeFile );
+
?>
\ No newline at end of file
Modified: plog/branches/lifetype-2.0-autoload/category
===================================================================
--- plog/branches/lifetype-2.0-autoload/category 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/category 2007-10-06 19:08:42 UTC (rev 5968)
@@ -4,10 +4,10 @@
}
include_once( PLOG_CLASS_PATH."class/bootstrap.php" );
- lt_include( PLOG_CLASS_PATH."class/net/http/httpvars.class.php" );
- lt_include( PLOG_CLASS_PATH."class/net/prettyrequestparser.class.php" );
- lt_include( PLOG_CLASS_PATH."class/net/requestgenerator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
+
+
+
+
// get the configuration data
$config =& Config::getConfig();
@@ -19,9 +19,9 @@
$parser = new PrettyRequestParser( "category", $server["PATH_INFO"]);
$result = $parser->parse();
HttpVars::setRequest( $result );
- lt_include( "index.php" );
+
}
else {
- lt_include( PLOG_CLASS_PATH."blog.php" );
+
}
?>
Modified: plog/branches/lifetype-2.0-autoload/class/action/action.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/action.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/action.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -68,8 +68,8 @@
*/
function Action( $actionInfo, $httpRequest )
{
- lt_include( PLOG_CLASS_PATH."class/net/request.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/forms/formvalidator.class.php" );
+
+
$this->_request = new Request( $httpRequest );
@@ -181,7 +181,7 @@
*/
function getAjaxErrorView()
{
- lt_include( PLOG_CLASS_PATH."class/view/ajax/ajaxview.class.php" );
+
return( new AjaxView());
}
Modified: plog/branches/lifetype-2.0-autoload/class/action/addcommentaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/addcommentaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/addcommentaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,23 +1,23 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/blogaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/users.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/articles.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/articlecategories.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/articlenotifications.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/emailvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/httpurlvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/filter/htmlfilter.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/filter/urlconverter.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/filter/allowedhtmlfilter.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/filter/xhtmlizefilter.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/errorview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/redirectview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/bayesian/bayesianfiltercore.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/cachecontrol.class.php" );
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
/**
* \ingroup Action
@@ -84,7 +84,7 @@
function _fetchFields()
{
- lt_include( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
+
$f = new HtmlFilter( true );
@@ -158,9 +158,9 @@
*/
function perform()
{
- lt_include( PLOG_CLASS_PATH."class/dao/articlecomments.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/usercomment.class.php" );
- lt_include( PLOG_CLASS_PATH."class/net/client.class.php" );
+
+
+
// need to check the ip of the client
$clientIp = Client::getIp();
Modified: plog/branches/lifetype-2.0-autoload/class/action/addtrackbackaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/addtrackbackaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/addtrackbackaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,21 +1,21 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/action.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/trackbackview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
- lt_include( PLOG_CLASS_PATH."class/net/http/httpvars.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/articlenotifications.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/articles.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/cachecontrol.class.php" );
- lt_include( PLOG_CLASS_PATH."class/plugin/pluginmanager.class.php" );
- lt_include( PLOG_CLASS_PATH."class/net/client.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/trackbacks.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/security/pipeline.class.php" );
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
/**
* Class that takes care of adding trackbacks
*
@@ -42,7 +42,7 @@
*/
function tblog( $message )
{
- lt_include( PLOG_CLASS_PATH . "class/logger/loggermanager.class.php" );
+
$logger =& LoggerManager::getLogger( "trackback" );
$logger->debug( $message );
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,16 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/action.class.php" );
- lt_include( PLOG_CLASS_PATH."class/locale/locales.class.php" );
- lt_include( PLOG_CLASS_PATH."class/net/http/httpvars.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/templateservice.class.php" );
- lt_include( PLOG_CLASS_PATH."class/misc/version.class.php" );
- lt_include( PLOG_CLASS_PATH."class/plugin/pluginmanager.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/cachecontrol.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admindefaultview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/users.class.php" );
-
+ lt_include( PLOG_CLASS_PATH."class/dao/blogstatus.class.php" );
+
/**
* @see AdminAction::requirePermission()
*/
@@ -215,7 +206,7 @@
}
else {
// nothing else to do, just redirect the browser once we've cleaned up the session
- lt_include( PLOG_CLASS_PATH."class/view/redirectview.class.php" );
+
$view = new RedirectView( $destinationUrl );
}
}
@@ -336,11 +327,11 @@
function getAjaxErrorView()
{
if( $this->_request->getOutput() == Request::REQUEST_OUTPUT_JSON ) {
- lt_include( PLOG_CLASS_PATH."class/view/admin/ajax/adminajaxview.class.php" );
+
$view = new AdminAjaxView( $this->_blogInfo );
}
else {
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminerrordialogview.class.php" );
+
$view = new AdminErrorDialogView( $this->_blogInfo );
}
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddarticlecategoryaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddarticlecategoryaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddarticlecategoryaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,11 +1,11 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/articlecategories.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/articlecategory.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/filter/htmlfilter.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminarticlecategorieslistview.class.php" );
+
+
+
+
+
+
/**
* \ingroup Action
@@ -119,7 +119,7 @@
*/
function performAjax()
{
- lt_include( PLOG_CLASS_PATH."class/view/admin/ajax/adminajaxview.class.php" );
+
$this->_view = new AdminAjaxView( $this->_blogInfo );
if( $category = $this->addArticleCategory()) {
$this->_view->setSuccess( true );
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddblogaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddblogaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddblogaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,17 +1,17 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admincreateblogview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminsiteblogslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/blognamevalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/domainvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/filter/htmlfilter.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/users.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/articlecategories.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/articles.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/misc/init.class.php" );
+
+
+
+
+
+
+
+
+
+
+
+
/**
* \ingroup Action
@@ -150,7 +150,7 @@
{
$blog = $this->addBlog();
- lt_include( PLOG_CLASS_PATH."class/view/admin/ajax/adminajaxview.class.php" );
+
$this->_view = new AdminAjaxView( $this->_blogInfo );
if( $blog )
$this->_view->setSuccessMessage($this->_locale->pr("blog_added_ok", $blog->getBlog()));
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddblogcategoryaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddblogcategoryaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddblogcategoryaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,9 +1,9 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/blogcategories.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminblogcategorieslistview.class.php" );
+
+
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddblogtemplateaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddblogtemplateaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddblogtemplateaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,13 +1,13 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaddtemplateaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/file/unpacker/unpacker.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminblogtemplatesetslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/templatesets/templatesetstorage.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/templatesandbox.class.php" );
- lt_include( PLOG_CLASS_PATH."class/file/fileuploads.class.php" );
+
+
+
+
+
+
+
+
/**
* \ingroup Action
@@ -233,7 +233,7 @@
}
// We should update the session too, or we will get data dirty
- lt_include( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
+
$blogs = new Blogs();
$blogInfo = $blogs->getBlogInfo( $this->_blogInfo->getId() );
$this->_session->setValue( "blogInfo", $blogInfo );
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddblogtemplatefolderaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddblogtemplatefolderaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddblogtemplatefolderaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,14 +1,14 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminbasetemplateeditoraction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/templatenamevalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/filter/regexpfilter.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/templatesets/templatesets.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/editor/templatetools.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminblogtemplatesetslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminedittemplateview.class.php" );
+
+
+
+
+
+
+
+
class AdminAddBlogTemplateFolderAction extends AdminBaseTemplateEditorAction
{
function __construct( $actionInfo, $request )
@@ -44,7 +44,7 @@
{
$result = $this->createFolder();
- lt_include( PLOG_CLASS_PATH."class/view/admin/ajax/adminajaxview.class.php" );
+
$this->_view = new AdminAjaxView( $this->_blogInfo );
$this->_view->setSuccess( $result );
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddbloguseraction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddbloguseraction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddbloguseraction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,13 +1,13 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminnewbloguserview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/filter/htmlfilter.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/users.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/userpermissions.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminbloguserslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/mail/emailservice.class.php" );
+
+
+
+
+
+
+
+
/**
* \ingroup Action
@@ -123,7 +123,7 @@
function performAjax()
{
- lt_include( PLOG_CLASS_PATH."class/view/admin/ajax/adminajaxview.class.php" );
+
$this->_view = new AdminAjaxView( $this->_blogInfo );
$user = $this->addBlogUser();
if( $user ) {
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddcustomfieldaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddcustomfieldaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddcustomfieldaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,13 +1,13 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/customfields/customfields.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admincustomfieldslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/filter/htmlfilter.class.php" );
+
+
+
+
+
+
+
+
/**
* \ingroup Action
@@ -116,7 +116,7 @@
{
$customField = $this->addCustomField();
- lt_include( PLOG_CLASS_PATH."class/view/admin/ajax/adminajaxview.class.php" );
+
$this->_view = new AdminAjaxView( $this->_blogInfo );
if( !$customField )
$this->_view->setErrorMessage( $this->_locale->tr("error_adding_custom_field" ));
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddfriendaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddfriendaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddfriendaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -4,14 +4,14 @@
* Friend
*/
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/friendgroups.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminfriendslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminnewfriendview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/users.class.php" );
+
+
+
+
+
+
+
/**
* \ingroup Action
@@ -50,7 +50,7 @@
// if everything went fine, we can now send the confirmation email
// only if the user specified a valid email address
if( $userInfo->getEmail() != "" ) {
- lt_include( PLOG_CLASS_PATH."class/mail/emailservice.class.php" );
+
// build an email message
$message = new EmailMessage();
@@ -100,7 +100,7 @@
}
// create the object...
- lt_include( PLOG_CLASS_PATH."class/dao/friends.class.php" );
+
$friends = new Friends();
$friendGroups = new FriendGroups();
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddfriendgroupaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddfriendgroupaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddfriendgroupaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,10 +1,10 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/friendgroups.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminfriendgroupslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
+
+
+
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddglobalarticlecategoryaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddglobalarticlecategoryaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddglobalarticlecategoryaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -6,10 +6,10 @@
* Changed from original article category.
*/
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/globalarticlecategories.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminglobalarticlecategorieslistview.class.php" );
+
+
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddlinkaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddlinkaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddlinkaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,15 +1,15 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/mylinks.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/mylink.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/httpurlvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/emptyvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminnewlinkview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminlinkslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/filter/htmlfilter.class.php" );
+
+
+
+
+
+
+
+
+
+
/**
* \ingroup Action
@@ -115,7 +115,7 @@
function performAjax()
{
- lt_include( PLOG_CLASS_PATH."class/view/admin/ajax/adminajaxview.class.php" );
+
$this->_view = new AdminAjaxView( $this->_blogInfo );
if( $myLink = $this->addLink()) {
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddlinkcategoryaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddlinkcategoryaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddlinkcategoryaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,11 +1,11 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/mylinkscategories.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/filter/htmlfilter.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminlinkcategorieslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
+
+
+
+
+
+
/**
* \ingroup Action
@@ -92,7 +92,7 @@
{
$result = $this->addLinkCategory();
- lt_include( PLOG_CLASS_PATH."class/view/admin/ajax/adminajaxview.class.php" );
+
$this->_view = new AdminAjaxView( $this->_blogInfo, "blah blah" );
$this->_view->setSuccess( $result );
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddlocaleaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddlocaleaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddlocaleaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,11 +1,11 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/locale/locales.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminsitelocaleslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/file/fileupload.class.php" );
- lt_include( PLOG_CLASS_PATH."class/file/fileuploads.class.php" );
- lt_include( PLOG_CLASS_PATH."class/locale/localefinder.class.php" );
+
+
+
+
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddlocationajaxaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddlocationajaxaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddlocationajaxaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,10 +1,10 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/ajax/adminajaxview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/locations.class.php" );
+
+
+
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddpermissionaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddpermissionaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddpermissionaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,10 +1,10 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminpermissionslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/permissions.class.php" );
+
+
+
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddpostaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddpostaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddpostaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,13 +1,13 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminpostmanagementcommonaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminpostslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminnewpostview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/arrayvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
+
+
+
+
+
+
+
/**
* \ingroup Action
* @private
@@ -74,7 +74,7 @@
*/
function _savePostData( $article )
{
- lt_include( PLOG_CLASS_PATH."class/dao/articles.class.php" );
+
$status = $this->_postStatus;
@@ -108,8 +108,8 @@
function saveArticle()
{
- lt_include( PLOG_CLASS_PATH."class/dao/article.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
+
+
$this->_fetchCommonData();
@@ -145,13 +145,13 @@
if( $artId ) {
// train the filter, but only if enabled
if( $this->_config->getValue( "bayesian_filter_enabled" ) == true ) {
- 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 ) {
- lt_include( PLOG_CLASS_PATH."class/dao/articlenotifications.class.php" );
+
$artNotifications = new ArticleNotifications();
$artNotifications->addNotification( $artId, $this->_blogInfo->getId(), $this->_userInfo->getId());
@@ -161,7 +161,7 @@
$this->notifyEvent( EVENT_POST_POST_ADD, Array( "article" => &$article ));
// empty the cache used by this blog
- lt_include( PLOG_CLASS_PATH."class/template/cachecontrol.class.php" );
+
CacheControl::resetBlogCache( $this->_blogInfo->getId());
}
@@ -209,7 +209,7 @@
// and now check what to do with the trackbacks
if( $this->_sendTrackbacks ) {
- lt_include( PLOG_CLASS_PATH."class/data/stringutils.class.php" );
+
// get the links from the text of the post
$postLinks = StringUtils::getLinks( stripslashes($article->getText()));
@@ -268,7 +268,7 @@
function performAjax()
{
- lt_include( PLOG_CLASS_PATH."class/view/admin/ajax/adminajaxview.class.php" );
+
$this->_view = new AdminAjaxView( $this->_blogInfo );
if(( $article = $this->saveArticle())) {
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddresourceaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddresourceaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddresourceaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,18 +1,18 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminresourceslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminnewresourceview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryalbums.class.php" );
- lt_include( PLOG_CLASS_PATH."class/net/http/httpvars.class.php" );
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryresources.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/arrayvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/chooser/adminsimpleresourceslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/chooser/adminuserpictureselectview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminresourceslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/file/fileupload.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/locations.class.php" );
+
+
+
+
+
+
+
+
+
+
+
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddresourcealbumaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddresourcealbumaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddresourcealbumaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,14 +1,14 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminnewalbumview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminresourceslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/filter/htmlfilter.class.php" );
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryalbums.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/cachecontrol.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
+
+
+
+
+
+
+
+
+
/**
* \ingroup Action
@@ -100,7 +100,7 @@
function performAjax()
{
- lt_include( PLOG_CLASS_PATH."class/view/admin/ajax/adminajaxview.class.php" );
+
$this->_view = new AdminAjaxView( $this->_blogInfo );
$album = $this->addAlbum();
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddtemplateaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddtemplateaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddtemplateaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,15 +1,15 @@
<?php
- lt_include( PLOG_CLASS_PATH.'class/action/admin/siteadminaction.class.php' );
- lt_include( PLOG_CLASS_PATH.'class/view/admin/adminsitetemplateslistview.class.php' );
- lt_include( PLOG_CLASS_PATH.'class/view/admin/admintemplatedview.class.php' );
- lt_include( PLOG_CLASS_PATH.'class/file/unpacker/unpacker.class.php' );
- lt_include( PLOG_CLASS_PATH.'class/data/validator/stringvalidator.class.php' );
- lt_include( PLOG_CLASS_PATH.'class/template/templatesandbox.class.php' );
- lt_include( PLOG_CLASS_PATH.'class/file/fileuploads.class.php' );
- lt_include( PLOG_CLASS_PATH.'class/template/templatesets/templatesetstorage.class.php' );
- lt_include( PLOG_CLASS_PATH.'class/template/templatesets/templatefinder.class.php' );
- lt_include( PLOG_CLASS_PATH.'class/data/validator/uploadvalidator.class.php' );
+
+
+
+
+
+
+
+
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddtemplatefolderaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddtemplatefolderaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminaddtemplatefolderaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,14 +1,14 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminbasetemplateeditoraction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/templatenamevalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/filter/regexpfilter.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/templatesets/templatesets.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/editor/templatetools.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminsitetemplateslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminerrordialogview.class.php" );
+
+
+
+
+
+
+
+
class AdminAddTemplateFolderAction extends AdminBaseTemplateEditorAction
{
function __construct( $actionInfo, $request )
@@ -42,7 +42,7 @@
{
$result = $this->createFolder();
- lt_include( PLOG_CLASS_PATH."class/view/admin/ajax/adminajaxview.class.php" );
+
$this->_view = new AdminAjaxView( $this->_blogInfo );
$this->_view->setSuccess( $result );
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminadduseraction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminadduseraction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminadduseraction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,19 +1,19 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/passwordvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/emailvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/usernamevalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/users.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/userpermissions.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/permissions.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/friendgroups.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/privatemessageboxes.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminadduserview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminsiteuserslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/filter/htmlfilter.class.php" );
+
+
+
+
+
+
+
+
+
+
+
+
+
+
/**
* \ingroup Action
@@ -161,7 +161,7 @@
function performAjax()
{
- lt_include( PLOG_CLASS_PATH."class/view/admin/ajax/adminajaxview.class.php" );
+
$result = $this->addUser();
$this->_view = new AdminAjaxView( $this->_blogInfo );
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminadminblogselectaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminadminblogselectaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminadminblogselectaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminsiteblogslistview.class.php" );
+
+
+
/**
* \ingroup Action
@@ -40,7 +40,7 @@
$this->_blogId = $this->_request->getValue( "blogId" );
// load the blog
- lt_include( PLOG_CLASS_PATH . "class/dao/blogs.class.php" );
+
$blogs = new Blogs();
$blogInfo = $blogs->getBlogInfo( $this->_blogId );
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminbasetemplateeditoraction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminbasetemplateeditoraction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminbasetemplateeditoraction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,9 +1,9 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/editor/templatetools.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/templatenamevalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
+
+
+
+
/**
* \ingroup Action
@@ -68,7 +68,7 @@
// we have to check if we're dealing with a folder, because we don't need to check if the folder
// has one of the allowed extensions
- lt_include( PLOG_CLASS_PATH."class/template/templatesets/templatesetstorage.class.php" );
+
$filePath = TemplateSetStorage::getTemplateFolder( $this->_templateId, $this->blogId ) . $this->_path . "/" . $this->_file;
if( File::isDir( $filePath )) {
if( !TemplateTools::isValidTemplateFile( $this->_templateId, $this->_path, $this->_file, $this->blogId ) ||
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminblogcategoriesaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminblogcategoriesaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminblogcategoriesaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminblogcategorieslistview.class.php" );
+
+
class AdminBlogCategoriesAction extends AdminAction
{
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminblogcustomfieldsaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminblogcustomfieldsaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminblogcustomfieldsaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admincustomfieldslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/customfields/customfields.class.php" );
+
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminblogsecurityaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminblogsecurityaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminblogsecurityaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminblogselectaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminblogselectaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminblogselectaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,17 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/action.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admindashboardview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admindefaultview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/users.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
- lt_include( PLOG_CLASS_PATH."class/net/http/session/sessioninfo.class.php" );
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
- lt_include( PLOG_CLASS_PATH."class/misc/version.class.php" );
- lt_include( PLOG_CLASS_PATH."class/locale/locales.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminnewpostview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/filter/htmlfilter.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/blogstatus.class.php" );
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminblogsettingsaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminblogsettingsaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminblogsettingsaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminblogsettingsview.class.php" );
+
+
/**
* \ingroup Action
@@ -40,7 +40,7 @@
*/
function performAjax()
{
- lt_include( PLOG_CLASS_PATH."class/view/admin/ajax/adminajaxview.class.php" );
+
$this->_view = new AdminAjaxView( $this->_blogInfo );
$this->_view->setSuccess( true );
$this->_view->setResult( $this->_blogInfo );
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminchangeblogstatusaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminchangeblogstatusaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminchangeblogstatusaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,11 +1,11 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminsiteblogslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/articles.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/cachecontrol.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/arrayvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
+
+
+
+
+
+
/**
* \ingroup Action
@@ -105,7 +105,7 @@
{
$results = $this->_changeBlogsStatus();
- lt_include( PLOG_CLASS_PATH."class/view/admin/ajax/adminajaxview.class.php" );
+
$this->_view = new AdminAjaxView( $this->_blogInfo );
$this->_view->setMessage( $results );
$this->_view->setSuccess( true );
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminchangecommentsstatusaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminchangecommentsstatusaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminchangecommentsstatusaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,12 +1,12 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminarticlecommentslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/articles.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/commentscommon.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/arrayvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/filter/htmlfilter.class.php" );
+
+
+
+
+
+
+
/**
* \ingroup Action
@@ -65,7 +65,7 @@
{
$results = $this->_changeComments();
- lt_include( PLOG_CLASS_PATH."class/view/admin/ajax/adminajaxview.class.php" );
+
$this->_view = new AdminAjaxView( $this->_blogInfo );
$this->_view->setMessage( $results );
$this->_view->setSuccess( true );
@@ -170,7 +170,7 @@
$this->notifyEvent( EVENT_PRE_MARK_SPAM_COMMENT, Array( "commentId" => $comment->getId() ));
// We should get the comment and train the filter to recognize this as spam...
- lt_include( PLOG_CLASS_PATH."class/bayesian/bayesianfiltercore.class.php" );
+
$bayesian = new BayesianFilterCore();
$bayesian->untrain( $this->_blogInfo->getId(),
@@ -202,7 +202,7 @@
$this->notifyEvent( EVENT_PRE_MARK_NO_SPAM_COMMENT, Array( "commentId" => $comment->getId() ));
// we should get the comment and train the filter
- lt_include( PLOG_CLASS_PATH."class/bayesian/bayesianfiltercore.class.php" );
+
$bayesian = new BayesianFilterCore();
$bayesian->untrain( $this->_blogInfo->getId(),
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminchangegalleryitemsalbumaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminchangegalleryitemsalbumaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminchangegalleryitemsalbumaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,12 +1,12 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryresource.class.php" );
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryalbums.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/cachecontrol.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/arrayvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminresourceslistview.class.php" );
+
+
+
+
+
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminchangegalleryitemslocationaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminchangegalleryitemslocationaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminchangegalleryitemslocationaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,12 +1,12 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryresource.class.php" );
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryalbums.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/cachecontrol.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/arrayvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminresourceslistview.class.php" );
+
+
+
+
+
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminchangelinkscategoryaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminchangelinkscategoryaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminchangelinkscategoryaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,10 +1,10 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/mylinks.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/arrayvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminlinkslistview.class.php" );
+
+
+
+
+
/**
* \ingroup Action
@@ -52,7 +52,7 @@
{
$results = $this->_changeLinks();
- lt_include( PLOG_CLASS_PATH."class/view/admin/ajax/adminajaxview.class.php" );
+
$this->_view = new AdminAjaxView( $this->_blogInfo );
$this->_view->setMessage( $results );
$this->_view->setSuccess( true );
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminchangepostscategoryaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminchangepostscategoryaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminchangepostscategoryaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,11 +1,11 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminpostslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/articles.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/cachecontrol.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/arrayvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
+
+
+
+
+
+
/**
* \ingroup Action
@@ -106,7 +106,7 @@
{
$results = $this->_changePostsCategory();
- lt_include( PLOG_CLASS_PATH."class/view/admin/ajax/adminajaxview.class.php" );
+
$this->_view = new AdminAjaxView( $this->_blogInfo );
$this->_view->setMessage( $results );
$this->_view->setSuccess( true );
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminchangepostslocationaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminchangepostslocationaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminchangepostslocationaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,12 +1,12 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminpostslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/articles.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/locations.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/cachecontrol.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/arrayvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
+
+
+
+
+
+
+
/**
* \ingroup Action
@@ -108,7 +108,7 @@
{
$results = $this->_changePostsLocation();
- lt_include( PLOG_CLASS_PATH."class/view/admin/ajax/adminajaxview.class.php" );
+
$this->_view = new AdminAjaxView( $this->_blogInfo );
$this->_view->setMessage( $results );
$this->_view->setSuccess( true );
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminchangepostsstatusaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminchangepostsstatusaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminchangepostsstatusaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,11 +1,11 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminpostslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/articles.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/cachecontrol.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/arrayvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
+
+
+
+
+
+
/**
* \ingroup Action
@@ -106,7 +106,7 @@
{
$results = $this->_changePostsStatus();
- lt_include( PLOG_CLASS_PATH."class/view/admin/ajax/adminajaxview.class.php" );
+
$this->_view = new AdminAjaxView( $this->_blogInfo );
$this->_view->setMessage( $results );
$this->_view->setSuccess( true );
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminchangeuserstatusaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminchangeuserstatusaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminchangeuserstatusaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,11 +1,11 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminsiteuserslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/users.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/cachecontrol.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/arrayvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
+
+
+
+
+
+
/**
* \ingroup Action
@@ -99,7 +99,7 @@
{
$results = $this->_changeUserStatus();
- lt_include( PLOG_CLASS_PATH."class/view/admin/ajax/adminajaxview.class.php" );
+
$this->_view = new AdminAjaxView( $this->_blogInfo );
$this->_view->setMessage( $results );
$this->_view->setSuccess( true );
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/admincleanupaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/admincleanupaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/admincleanupaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,10 +1,10 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/articles.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/commentscommon.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/users.class.php" );
+
+
+
+
+
/**
* \ingroup Action
@@ -49,8 +49,8 @@
*/
function cleanupPosts()
{
- lt_include( PLOG_CLASS_PATH."class/dao/purgedata.class.php" );
+
$purge = new PurgeData();
$result = $purge->purgePosts();
if($result === false){
@@ -77,8 +77,8 @@
*/
function cleanupUsers()
{
- lt_include( PLOG_CLASS_PATH."class/dao/purgedata.class.php" );
+
$purge = new PurgeData();
$result = $purge->purgeUsers();
if($result === false){
@@ -105,8 +105,8 @@
*/
function cleanupBlogs()
{
- lt_include( PLOG_CLASS_PATH."class/dao/purgedata.class.php" );
+
$purge = new PurgeData();
$result = $purge->purgeBlogs();
@@ -134,8 +134,8 @@
*/
function cleanupComments()
{
- lt_include( PLOG_CLASS_PATH."class/dao/purgedata.class.php" );
+
$purge = new PurgeData();
$result = $purge->purgeSpamComments();
if($result === false){
@@ -164,7 +164,7 @@
*/
function cleanupTemp()
{
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
+
$config =& Config::getConfig();
$tmpFolder = $config->getValue( "temp_folder" );
$excludes = array('.htaccess', '.svn');
@@ -173,7 +173,7 @@
// Iterate through all of the blogs, and give the
// plugins a chance to regenerate any files that
// were deleted
- lt_include( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
+
$blogs = new Blogs();
$activeBlogs = $blogs->getAllBlogs( BLOG_STATUS_ACTIVE );
@@ -205,12 +205,12 @@
$result = $this->cleanupPosts();
}
elseif( $this->_op == "cleanupUsers" ) {
- lt_include( PLOG_CLASS_PATH."class/template/cachecontrol.class.php" );
+
$result = $this->cleanupUsers();
CacheControl::resetSummaryCache();
}
elseif( $this->_op == "cleanupBlogs" ) {
- lt_include( PLOG_CLASS_PATH."class/template/cachecontrol.class.php" );
+
$result = $this->cleanupBlogs();
CacheControl::resetSummaryCache();
}
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/admincontrolcenteraction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/admincontrolcenteraction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/admincontrolcenteraction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/admincopyblogtemplatefileaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/admincopyblogtemplatefileaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/admincopyblogtemplatefileaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,14 +1,14 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminbasetemplateeditoraction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/templatenamevalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/filter/regexpfilter.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/templatesets/templatesets.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/editor/templatetools.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminsitetemplateslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminerrordialogview.class.php" );
+
+
+
+
+
+
+
+
class AdminCopyBlogTemplateFileAction extends AdminBaseTemplateEditorAction
{
protected $_template;
@@ -80,7 +80,7 @@
{
$result = $this->copyFile();
- lt_include( PLOG_CLASS_PATH."class/view/admin/ajax/adminajaxview.class.php" );
+
$this->_view = new AdminAjaxView( $this->_blogInfo );
$this->_view->setSuccess( $result );
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/admincopyblogtemplatesetaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/admincopyblogtemplatesetaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/admincopyblogtemplatesetaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,15 +1,15 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminbasetemplateeditoraction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/templatenamevalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/filter/regexpfilter.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/templatesets/templatesets.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/editor/templatetools.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminblogtemplatesetslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminerrordialogview.class.php" );
+
+
+
+
+
+
+
+
+
class AdminCopyBlogTemplateSetAction extends AdminBaseTemplateEditorAction
{
protected $_templateId;
@@ -83,8 +83,8 @@
function copyTemplateSet()
{
- lt_include( PLOG_CLASS_PATH."class/file/directorytreeiterator.class.php" );
+
if( $this->_sourceTemplateType == AdminCopyBlogtemplateSetAction::GLOBAL_TEMPLATE )
$path = TemplateSetStorage::getTemplateFolder( $this->_templateId);
else
@@ -132,7 +132,7 @@
{
$result = $this->copyTemplateSet();
- lt_include( PLOG_CLASS_PATH."class/view/admin/ajax/adminajaxview.class.php" );
+
$this->_view = new AdminAjaxView( $this->_blogInfo );
$this->_view->setSuccess( $result );
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/admincopytemplatefileaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/admincopytemplatefileaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/admincopytemplatefileaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,14 +1,14 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminbasetemplateeditoraction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/templatenamevalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/filter/regexpfilter.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/templatesets/templatesets.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/editor/templatetools.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminsitetemplateslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminerrordialogview.class.php" );
+
+
+
+
+
+
+
+
class AdminCopyTemplateFileAction extends AdminBaseTemplateEditorAction
{
protected $_template;
@@ -75,7 +75,7 @@
{
$result = $this->copyFile();
- lt_include( PLOG_CLASS_PATH."class/view/admin/ajax/adminajaxview.class.php" );
+
$this->_view = new AdminAjaxView( $this->_blogInfo );
$this->_view->setSuccess( $result );
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/admincopytemplatesetaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/admincopytemplatesetaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/admincopytemplatesetaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,14 +1,14 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminbasetemplateeditoraction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/templatenamevalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/filter/regexpfilter.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/templatesets/templatesets.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/editor/templatetools.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminsitetemplateslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminerrordialogview.class.php" );
+
+
+
+
+
+
+
+
class AdminCopyTemplateSetAction extends AdminBaseTemplateEditorAction
{
protected $_templateId;
@@ -59,8 +59,8 @@
function copyTemplateSet()
{
- lt_include( PLOG_CLASS_PATH."class/file/directorytreeiterator.class.php" );
+
$path = TemplateSetStorage::getTemplateFolder( $this->_templateId);
$newTemplateFolder = TemplateSetStorage::getBaseTemplateFolder() . "/" . $this->_destTemplate;
if( !File::createDir( $newTemplateFolder ))
@@ -98,7 +98,7 @@
{
$result = $this->copyTemplateSet();
- lt_include( PLOG_CLASS_PATH."class/view/admin/ajax/adminajaxview.class.php" );
+
$this->_view = new AdminAjaxView( $this->_blogInfo );
$this->_view->setSuccess( $result );
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/admincreateblogaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/admincreateblogaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/admincreateblogaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admincreateblogview.class.php" );
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/admincreateuseraction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/admincreateuseraction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/admincreateuseraction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminadduserview.class.php" );
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/admindefaultaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/admindefaultaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/admindefaultaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/action.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admindefaultview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/net/http/httpvars.class.php" );
+
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/admindeletearticlecategoryaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/admindeletearticlecategoryaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/admindeletearticlecategoryaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,11 +1,11 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/articlecategories.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/arrayvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/emptyvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminarticlecategorieslistview.class.php" );
+
+
+
+
+
+
/**
* \ingroup Action
@@ -127,7 +127,7 @@
{
$results = $this->_deleteArticleCategories();
- lt_include( PLOG_CLASS_PATH."class/view/admin/ajax/adminajaxview.class.php" );
+
$this->_view = new AdminAjaxView( $this->_blogInfo );
$this->_view->setMessage( $results );
$this->_view->setSuccess( true );
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/admindeleteblogaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/admindeleteblogaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/admindeleteblogaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,10 +1,10 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminsiteblogslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/arrayvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
+
+
+
+
+
/**
* \ingroup Action
@@ -50,7 +50,7 @@
{
$results = $this->_disableBlogs();
- lt_include( PLOG_CLASS_PATH."class/view/admin/ajax/adminajaxview.class.php" );
+
$this->_view = new AdminAjaxView( $this->_blogInfo );
$this->_view->setMessage( $results );
$this->_view->setSuccess( true );
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/admindeleteblogcategoryaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/admindeleteblogcategoryaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/admindeleteblogcategoryaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,11 +1,11 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/blogcategories.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/arrayvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/emptyvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminblogcategorieslistview.class.php" );
+
+
+
+
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/admindeleteblogtemplateaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/admindeleteblogtemplateaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/admindeleteblogtemplateaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,12 +1,12 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminblogtemplatesetslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/arrayvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/templatesets/templatesetstorage.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/filter/regexpfilter.class.php" );
+
+
+
+
+
+
/**
* \ingroup Action
* @private
@@ -48,7 +48,7 @@
{
$results = $this->_deleteTemplates();
- lt_include( PLOG_CLASS_PATH."class/view/admin/ajax/adminajaxview.class.php" );
+
$this->_view = new AdminAjaxView( $this->_blogInfo );
$this->_view->setMessage( $results );
$this->_view->setSuccess( true );
@@ -98,7 +98,7 @@
}
// We should update the session too, or we will get data dirty
- lt_include( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
+
$blogs = new Blogs();
$blogInfo = $blogs->getBlogInfo( $this->_blogInfo->getId() );
$this->_session->setValue( "blogInfo", $blogInfo );
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/admindeleteblogtemplatefileaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/admindeleteblogtemplatefileaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/admindeleteblogtemplatefileaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,16 +1,16 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminbasetemplateeditoraction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/templatenamevalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/filter/regexpfilter.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/templatesets/templatesets.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/editor/templatetools.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminsitetemplateslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminedittemplateview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminerrordialogview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/file/file.class.php" );
+
+
+
+
+
+
+
+
+
+
class AdminDeleteBlogTemplateFileAction extends AdminBaseTemplateEditorAction
{
@@ -60,7 +60,7 @@
function performAjax()
{
- lt_include( PLOG_CLASS_PATH."class/view/admin/ajax/adminajaxview.class.php" );
+
$this->_view = new AdminAjaxView( $this->_blogInfo );
if( $this->deleteFile())
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/admindeletebloguserpermissionsaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/admindeletebloguserpermissionsaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/admindeletebloguserpermissionsaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,12 +1,12 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminbloguserslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/users.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/userpermissions.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/permissions.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/arrayvalidator.class.php" );
+
+
+
+
+
+
+
/**
* \ingroup Action
@@ -93,7 +93,7 @@
// perform the action itself...
$results = $this->_revokePermissions();
- lt_include( PLOG_CLASS_PATH."class/view/admin/ajax/adminajaxview.class.php" );
+
$this->_view = new AdminAjaxView( $this->_blogInfo );
if( $results["errorMessage"] != "" ) $this->_view->setErrorMessage( $results["errorMessage"] );
if( $results["successMessage"] != "" ) $this->_view->setSuccessMessage( $results["successMessage"] );
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/admindeletecommentaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/admindeletecommentaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/admindeletecommentaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,12 +1,12 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminarticlecommentslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/articles.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/commentscommon.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/arrayvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/filter/htmlfilter.class.php" );
+
+
+
+
+
+
+
/**
* \ingroup Action
@@ -70,7 +70,7 @@
{
$results = $this->_deleteComments();
- lt_include( PLOG_CLASS_PATH."class/view/admin/ajax/adminajaxview.class.php" );
+
$this->_view = new AdminAjaxView( $this->_blogInfo );
$this->_view->setMessage( $results );
$this->_view->setResult( true );
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/admindeletecustomfieldsaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/admindeletecustomfieldsaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/admindeletecustomfieldsaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,12 +1,12 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/dao/customfields/customfields.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/customfields/customfieldsvalues.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admincustomfieldslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/arrayvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
+
+
+
+
+
+
/**
* \ingroup Action
* @private
@@ -58,7 +58,7 @@
{
$results = $this->_deleteFields();
- lt_include( PLOG_CLASS_PATH."class/view/admin/ajax/adminajaxview.class.php" );
+
$this->_view = new AdminAjaxView( $this->_blogInfo );
$this->_view->setMessage( $results );
$this->_view->setSuccess( true );
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/admindeletefriendaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/admindeletefriendaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/admindeletefriendaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,10 +1,10 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/friends.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/arrayvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminfriendslistview.class.php" );
+
+
+
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/admindeletefriendgroupaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/admindeletefriendgroupaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/admindeletefriendgroupaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,10 +1,10 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/friendgroups.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/arrayvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminfriendgroupslistview.class.php" );
+
+
+
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/admindeletegalleryitemsaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/admindeletegalleryitemsaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/admindeletegalleryitemsaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,12 +1,12 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryresource.class.php" );
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryalbums.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/cachecontrol.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/arrayvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminresourceslistview.class.php" );
+
+
+
+
+
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/admindeleteglobalarticlecategoryaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/admindeleteglobalarticlecategoryaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/admindeleteglobalarticlecategoryaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -4,12 +4,12 @@
* version 1.0
* Changed from original article category.
*/
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/globalarticlecategories.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/arrayvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/emptyvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminglobalarticlecategorieslistview.class.php" );
+
+
+
+
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/admindeleteinboxprivatemessageaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/admindeleteinboxprivatemessageaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/admindeleteinboxprivatemessageaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/arrayvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admininboxprivatemessageslistview.class.php" );
+
+
+
+
/**
* \ingroup Action
@@ -42,7 +42,7 @@
*/
function _deleteInboxPrivateMessages()
{
- lt_include( PLOG_CLASS_PATH."class/dao/privatemessages.class.php" );
+
$privateMessages = new PrivateMessages();
$errorMessage = "";
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/admindeletelinkaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/admindeletelinkaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/admindeletelinkaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,10 +1,10 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/mylinks.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/arrayvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminlinkslistview.class.php" );
+
+
+
+
+
/**
* \ingroup Action
@@ -50,7 +50,7 @@
{
$results = $this->_deleteLinks();
- lt_include( PLOG_CLASS_PATH."class/view/admin/ajax/adminajaxview.class.php" );
+
$this->_view = new AdminAjaxView( $this->_blogInfo );
$this->_view->setMessage( $results );
$this->_view->setSuccess( true );
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/admindeletelinkcategoryaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/admindeletelinkcategoryaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/admindeletelinkcategoryaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,10 +1,10 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/mylinkscategories.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/arrayvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminlinkcategorieslistview.class.php" );
+
+
+
+
+
/**
* \ingroup Action
@@ -113,7 +113,7 @@
{
$results = $this->_deleteLinkCategories();
- lt_include( PLOG_CLASS_PATH."class/view/admin/ajax/adminajaxview.class.php" );
+
$this->_view = new AdminAjaxView( $this->_blogInfo );
$this->_view->setMessage( $results );
$this->_view->setSuccess( true );
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/admindeletelocalesaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/admindeletelocalesaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/admindeletelocalesaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,11 +1,11 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminsitelocaleslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/locale/locales.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/arrayvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/filter/htmlfilter.class.php" );
+
+
+
+
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/admindeleteoutboxprivatemessageaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/admindeleteoutboxprivatemessageaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/admindeleteoutboxprivatemessageaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/arrayvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminoutboxprivatemessageslistview.class.php" );
+
+
+
+
/**
* \ingroup Action
@@ -42,7 +42,7 @@
*/
function _deleteOutboxPrivateMessages()
{
- lt_include( PLOG_CLASS_PATH."class/dao/privatemessages.class.php" );
+
$privateMessages = new PrivateMessages();
$errorMessage = "";
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/admindeletepermissionsaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/admindeletepermissionsaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/admindeletepermissionsaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,11 +1,11 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/permissions.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/arrayvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/emptyvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminpermissionslistview.class.php" );
+
+
+
+
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/admindeletepostaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/admindeletepostaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/admindeletepostaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,11 +1,11 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminpostslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/articles.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/cachecontrol.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/arrayvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
+
+
+
+
+
+
/**
* \ingroup Action
@@ -135,7 +135,7 @@
{
$results = $this->_deletePosts();
- lt_include( PLOG_CLASS_PATH."class/view/admin/ajax/adminajaxview.class.php" );
+
$this->_view = new AdminAjaxView( $this->_blogInfo );
$this->_view->setMessage( $results );
$this->_view->setSuccess( true );
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/admindeletereferreraction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/admindeletereferreraction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/admindeletereferreraction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,11 +1,11 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/referers.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/arrayvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/articles.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminreferrersview.class.php" );
+
+
+
+
+
+
/**
* \ingroup Action
@@ -113,7 +113,7 @@
{
$results = $this->_deleteReferrers();
- lt_include( PLOG_CLASS_PATH."class/view/admin/ajax/adminajaxview.class.php" );
+
$this->_view = new AdminAjaxView( $this->_blogInfo );
$this->_view->setMessage( $results );
$this->_view->setSuccess( true );
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/admindeleteresourceaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/admindeleteresourceaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/admindeleteresourceaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,11 +1,11 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminresourceslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryresource.class.php" );
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryalbums.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/cachecontrol.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
+
+
+
+
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/admindeleteresourcealbumaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/admindeleteresourcealbumaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/admindeleteresourcealbumaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,10 +1,10 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminresourceslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryresource.class.php" );
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryalbums.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
+
+
+
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/admindeletetemplatefileaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/admindeletetemplatefileaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/admindeletetemplatefileaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,16 +1,16 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminbasetemplateeditoraction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/templatenamevalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/filter/regexpfilter.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/templatesets/templatesets.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/editor/templatetools.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminsitetemplateslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminedittemplateview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminerrordialogview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/file/file.class.php" );
+
+
+
+
+
+
+
+
+
+
class AdminDeleteTemplateFileAction extends AdminBaseTemplateEditorAction
{
@@ -60,7 +60,7 @@
function performAjax()
{
- lt_include( PLOG_CLASS_PATH."class/view/admin/ajax/adminajaxview.class.php" );
+
$this->_view = new AdminAjaxView( $this->_blogInfo );
if( $this->deleteFile())
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/admindeletetemplatesaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/admindeletetemplatesaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/admindeletetemplatesaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,11 +1,11 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/templatesets/templatesetstorage.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminsitetemplateslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/arrayvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/filter/regexpfilter.class.php" );
+
+
+
+
+
+
/**
* \ingroup Action
@@ -95,7 +95,7 @@
{
$results = $this->_deleteTemplates();
- lt_include( PLOG_CLASS_PATH."class/view/admin/ajax/adminajaxview.class.php" );
+
$this->_view = new AdminAjaxView( $this->_blogInfo );
$this->_view->setMessage( $results );
$this->_view->setSuccess( true );
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/admindeleteusersaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/admindeleteusersaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/admindeleteusersaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,10 +1,10 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/users.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/arrayvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminsiteuserslistview.class.php" );
+
+
+
+
+
/**
* \ingroup Action
@@ -101,7 +101,7 @@
{
$results = $this->_disableUsers();
- lt_include( PLOG_CLASS_PATH."class/view/admin/ajax/adminajaxview.class.php" );
+
$this->_view = new AdminAjaxView( $this->_blogInfo );
$this->_view->setMessage( $results );
$this->_view->setSuccess( true );
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/admindoregisterblogaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/admindoregisterblogaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/admindoregisterblogaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,21 +1,21 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminregisterblogview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admindashboardview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/blognamevalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/domainvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/users.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/articles.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/articlecategories.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
- lt_include( PLOG_CLASS_PATH."class/net/http/subdomains.class.php" );
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryalbums.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/mylinkscategories.class.php" );
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
class AdminDoRegisterBlogAction extends AdminAction
{
@@ -149,13 +149,13 @@
$albums->addAlbum( $album );
// add a new default mylinkscategory
- lt_include( PLOG_CLASS_PATH."class/dao/mylinkscategories.class.php" );
+
$linksCategory = new MyLinksCategory( $locale->tr("register_default_category" ), $newBlogId );
$linksCategories = new MyLinksCategories();
$linksCategories->addMyLinksCategory( $linksCategory );
// after we update everything, we need to get the userInfo from db and set to session again.
- lt_include( PLOG_CLASS_PATH."class/dao/users.class.php" );
+
$users = new Users();
$this->_userInfo = $users->getUserInfoFromId( $this->_userInfo->getId() );
$this->_session->setValue( "userInfo", $this->_userInfo );
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/admineditarticlecategoriesaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/admineditarticlecategoriesaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/admineditarticlecategoriesaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminarticlecategorieslistview.class.php" );
+
+
/**
* \ingroup Action
@@ -44,7 +44,7 @@
else {
$categoriesListView = new AdminArticleCategoriesListView( $this->_blogInfo );
$categoriesListView->loadData();
- lt_include( PLOG_CLASS_PATH."class/view/renderer/ajaxviewrenderer.class.php" );
+
$this->_view = new AjaxViewRenderer( $categoriesListView );
$this->_view->setResultObject( "categories" );
}
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/admineditarticlecategoryaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/admineditarticlecategoryaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/admineditarticlecategoryaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,13 +1,13 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminarticlecategorieslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminerrordialogview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/articlecategories.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/emptyvalidator.class.php" );
+
+
+
+
+
+
+
+
/**
* \ingroup Action
@@ -90,7 +90,7 @@
function performAjax()
{
if( $this->_request->getOutput() == Request::REQUEST_OUTPUT_JSON ) {
- lt_include( PLOG_CLASS_PATH."class/view/admin/ajax/adminajaxview.class.php" );
+
$this->_view = new AdminAjaxView( $this->_blogInfo );
$category = $this->loadData();
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/admineditblogaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/admineditblogaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/admineditblogaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,10 +1,10 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminsiteblogslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admineditsiteblogview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
+
+
+
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/admineditblogcategoryaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/admineditblogcategoryaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/admineditblogcategoryaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,12 +1,12 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminblogcategorieslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/blogcategories.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/emptyvalidator.class.php" );
+
+
+
+
+
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/admineditblogtemplateaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/admineditblogtemplateaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/admineditblogtemplateaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,13 +1,13 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminbasetemplateeditoraction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/templatenamevalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/filter/regexpfilter.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/templatesets/templatesets.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/editor/templatetools.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminblogtemplatesetslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admineditblogtemplateview.class.php" );
+
+
+
+
+
+
+
class AdminEditBlogTemplateAction extends AdminBaseTemplateEditorAction
{
protected $_templateId;
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/admineditblogtemplatefileaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/admineditblogtemplatefileaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/admineditblogtemplatefileaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,13 +1,13 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminbasetemplateeditoraction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/templatenamevalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/filter/regexpfilter.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/templatesets/templatesets.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/editor/templatetools.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminblogtemplatesetslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminedittemplatefileview.class.php" );
+
+
+
+
+
+
+
+
class AdminEditBlogTemplateFileAction extends AdminBaseTemplateEditorAction
{
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/admineditblogtemplatesaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/admineditblogtemplatesaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/admineditblogtemplatesaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminblogtemplatesetslistview.class.php" );
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/admineditbloguseraction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/admineditbloguseraction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/admineditbloguseraction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,10 +1,10 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminbloguserslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/permissions.class.php" );
+
+
+
+
+
/**
* \ingroup Action
@@ -67,7 +67,7 @@
function performAjax()
{
- lt_include( PLOG_CLASS_PATH."class/view/admin/ajax/adminajaxview.class.php" );
+
$this->_view = new AdminAjaxView( $this->_blogInfo );
$userInfo = $this->loadUser();
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/admineditcommentaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/admineditcommentaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/admineditcommentaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,11 +1,11 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminarticlecommentslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminerrordialogview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminarticlecommentslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
+
+
+
+
+
+
/**
* actions that displays the selected comment for editing
@@ -80,7 +80,7 @@
function performAjax()
{
- lt_include( PLOG_CLASS_PATH."class/view/admin/ajax/adminajaxview.class.php" );
+
$this->_view = new AdminAjaxView( $this->_blogInfo );
if(( $comment = $this->getComment())) {
$this->_view->setSuccess( true );
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/admineditcommentsaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/admineditcommentsaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/admineditcommentsaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,11 +1,11 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminarticlecommentslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminpostslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/filter/htmlspecialcharsfilter.class.php" );
+
+
+
+
+
/**
* \ingroup Action
* @private
@@ -88,7 +88,7 @@
$articles = new Articles();
$article = $articles->getBlogArticle( $params["articleId"], $this->_blogInfo->getId());
if( !$article ) {
- lt_include( PLOG_CLASS_PATH."class/view/admin/ajax/adminajaxview.class.php" );
+
$view = new AdminAjaxView( $this->_blogInfo );
$view->setErrorMessage( $this->_locale->tr("error_fetching_article" ));
return( false );
@@ -104,7 +104,7 @@
}
$view->loadData();
- lt_include( PLOG_CLASS_PATH."class/view/renderer/ajaxviewrenderer.class.php" );
+
$this->_view = new AjaxViewRenderer( $view );
$this->_view->setResultObject( "comments" );
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/admineditcustomfieldaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/admineditcustomfieldaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/admineditcustomfieldaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,11 +1,11 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/dao/customfields/customfields.class.php" );
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admincustomfieldslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminerrordialogview.class.php" );
+
+
+
+
+
+
/**
* \ingroup Action
@@ -81,7 +81,7 @@
function performAjax()
{
if( $this->_request->getOutput() == Request::REQUEST_OUTPUT_JSON ) {
- lt_include( PLOG_CLASS_PATH."class/view/admin/ajax/adminajaxview.class.php" );
+
$this->_view = new AdminAjaxView( $this->_blogInfo );
$field = $this->getCustomField();
if( !$field )
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/admineditfriendaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/admineditfriendaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/admineditfriendaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -3,12 +3,12 @@
* Friend
*/
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admineditfriendview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminfriendslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/friendgroups.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
+
+
+
+
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/admineditfriendgroupaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/admineditfriendgroupaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/admineditfriendgroupaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,10 +1,10 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminfriendgroupslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/friendgroups.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
+
+
+
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/admineditfriendgroupsaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/admineditfriendgroupsaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/admineditfriendgroupsaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminfriendgroupslistview.class.php" );
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/admineditfriendsaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/admineditfriendsaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/admineditfriendsaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -2,9 +2,9 @@
/**
* Friend
*/
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminfriendslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
+
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/admineditglobalarticlecategoriesaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/admineditglobalarticlecategoriesaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/admineditglobalarticlecategoriesaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -4,8 +4,8 @@
* version 1.0
* Changed from original article category.
*/
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminglobalarticlecategorieslistview.class.php" );
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/admineditglobalarticlecategoryaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/admineditglobalarticlecategoryaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/admineditglobalarticlecategoryaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -5,13 +5,13 @@
* Changed from original article category.
*/
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminglobalarticlecategorieslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/globalarticlecategories.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/emptyvalidator.class.php" );
+
+
+
+
+
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/admineditinboxprivatemessagesaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/admineditinboxprivatemessagesaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/admineditinboxprivatemessagesaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admininboxprivatemessageslistview.class.php" );
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/admineditlinkaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/admineditlinkaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/admineditlinkaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,12 +1,12 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/admin/admineditlinkview.class.php");
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminlinkslistview.class.php");
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminerrordialogview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/mylinkscategories.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/mylinks.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
+
+
+
+
+
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/admineditlinkcategoriesaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/admineditlinkcategoriesaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/admineditlinkcategoriesaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminlinkcategorieslistview.class.php" );
+
+
/**
* \ingroup Action
@@ -43,21 +43,21 @@
if( $this->_request->getOutput() == Request::REQUEST_OUTPUT_JSON ) {
if( $this->_request->loadAllData()) {
// in this case, we load all data
- lt_include( PLOG_CLASS_PATH."class/dao/mylinkscategories.class.php" );
+
$blogSettings = $this->_blogInfo->getSettings();
- $linkCategoriesOrder = $blogSettings->getValue( "link_categories_order", MYLINKS_CATEGORIES_NO_ORDER );
+ $linkCategoriesOrder = $blogSettings->getValue( "link_categories_order", MyLinksCategories::MYLINKS_CATEGORIES_NO_ORDER );
// get the link categories
$linkCategories = new MyLinksCategories();
$blogLinkCategories = $linkCategories->getMyLinksCategories( $this->_blogInfo->getId(),
$linkCategoriesOrder );
// pass it to the view
- lt_include( PLOG_CLASS_PATH."class/view/admin/ajax/adminajaxview.class.php" );
+
$this->_view = new AdminAjaxView( $this->_blogInfo );
$this->_view->setSuccess( true );
$this->_view->setResult( $blogLinkCategories );
}
else {
- lt_include( PLOG_CLASS_PATH."class/view/renderer/ajaxviewrenderer.class.php" );
+
$searchTerms = $this->_request->getValue( "searchTerms" );
$this->_view = new AjaxViewRenderer( new AdminLinkCategoriesListView( $this->_blogInfo, Array( "searchTerms" => $searchTerms )));
$this->_view->setSuccess( true );
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/admineditlinkcategoryaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/admineditlinkcategoryaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/admineditlinkcategoryaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,11 +1,11 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminerrordialogview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminlinkcategorieslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/mylinkscategories.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
+
+
+
+
+
+
/**
* \ingroup Action
@@ -93,7 +93,7 @@
}
// otherwise show the form to edit its fields
- lt_include( PLOG_CLASS_PATH."class/view/admin/ajax/adminajaxview.class.php" );
+
$this->_view = new AdminAjaxView( $this->_blogInfo );
$this->_view->setResult( $category );
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/admineditlinksaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/admineditlinksaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/admineditlinksaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminlinkslistview.class.php" );
+
+
+
/**
* \ingroup Action
@@ -27,7 +27,7 @@
// bother doing anything... we'll just show the whole list of categories
$this->registerFieldValidator( "showCategory", new IntegerValidator(), true);
$blogSettings = $this->_blogInfo->getSettings();
- $this->_linkCategoriesOrder = $blogSettings->getValue( "link_categories_order", MYLINKS_CATEGORIES_NO_ORDER );
+ $this->_linkCategoriesOrder = $blogSettings->getValue( "link_categories_order", MyLinksCategories::MYLINKS_CATEGORIES_NO_ORDER );
$this->setValidationErrorView( new AdminLinksListView( $this->_blogInfo,
Array( "showCategory" => 0,
"searchTerms" => "",
@@ -63,7 +63,7 @@
"searchTerms" => $this->_searchTerms,
"showOrder" => $this->_linkCategoriesOrder ));
$linksListView->loadData();
- lt_include( PLOG_CLASS_PATH."class/view/renderer/ajaxviewrenderer.class.php" );
+
$this->_view = new AjaxViewRenderer( $linksListView );
$this->_view->setResultObject( "links" );
}
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/admineditoutboxprivatemessagesaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/admineditoutboxprivatemessagesaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/admineditoutboxprivatemessagesaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminoutboxprivatemessageslistview.class.php" );
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/admineditpermissionaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/admineditpermissionaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/admineditpermissionaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,10 +1,10 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminpermissionslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/permissions.class.php" );
+
+
+
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/admineditpostaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/admineditpostaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/admineditpostaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,10 +1,10 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminpostslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admineditpostview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/articles.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
+
+
+
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/admineditpostsaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/admineditpostsaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/admineditpostsaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminpostslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
+
+
+
/**
* \ingroup Action
@@ -79,7 +79,7 @@
// use the same view class as in the perform() method
// but then convert it to Ajax with the help of this view renderer
if( $this->_request->getOutput() == Request::REQUEST_OUTPUT_JSON ) {
- lt_include( PLOG_CLASS_PATH."class/view/renderer/ajaxviewrenderer.class.php" );
+
// create the view
$articlesListView = new AdminPostsListView( $this->_blogInfo,
Array( "showCategory" => $this->_request->getValue( "showCategory" ),
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/admineditresourcealbumaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/admineditresourcealbumaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/admineditresourcealbumaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,10 +1,10 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admineditresourcealbumview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminresourceslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryalbums.class.php" );
+
+
+
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminedittemplateaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminedittemplateaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminedittemplateaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,13 +1,13 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminbasetemplateeditoraction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/templatenamevalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/filter/regexpfilter.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/templatesets/templatesets.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/editor/templatetools.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminsitetemplateslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminedittemplateview.class.php" );
+
+
+
+
+
+
+
class AdminEditTemplateAction extends AdminBaseTemplateEditorAction
{
protected $_templateId;
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminedittemplatefileaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminedittemplatefileaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminedittemplatefileaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,16 +1,16 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminbasetemplateeditoraction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/templatenamevalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/filter/regexpfilter.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/templatesets/templatesets.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/editor/templatetools.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminsitetemplateslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminedittemplatefileview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminerrordialogview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/file/file.class.php" );
+
+
+
+
+
+
+
+
+
+
class AdminEditTemplateFileAction extends AdminBaseTemplateEditorAction
{
protected $_templateId;
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminedittemplatesaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminedittemplatesaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminedittemplatesaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminsitetemplateslistview.class.php" );
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminemptyaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminemptyaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminemptyaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminfriendmanagementaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminfriendmanagementaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminfriendmanagementaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminglobalsettingsaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminglobalsettingsaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminglobalsettingsaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminglobalsettingslistview.class.php" );
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminjsaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminjsaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminjsaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
+
+
class AdminJsAction extends AdminAction
{
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminlocationdisplay.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminlocationdisplay.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminlocationdisplay.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/locationview.class.php" );
+
+
class AdminLocationDisplayAction extends AdminAction
{
function perform()
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminlocationdisplayaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminlocationdisplayaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminlocationdisplayaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/chooser/adminlocationchooserview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminbloglocationsview.class.php" );
+
+
+
class AdminLocationDisplayAction extends AdminAction
{
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminloginaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminloginaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminloginaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,17 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/action.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admindashboardview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admindefaultview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/users.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
- lt_include( PLOG_CLASS_PATH."class/net/http/session/sessioninfo.class.php" );
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
- lt_include( PLOG_CLASS_PATH."class/misc/version.class.php" );
- lt_include( PLOG_CLASS_PATH."class/locale/locales.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminnewpostview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/filter/htmlfilter.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/blogstatus.class.php" );
/**
* \ingroup Action
@@ -125,7 +114,7 @@
function performAjax()
{
- lt_include( PLOG_CLASS_PATH."class/view/ajax/ajaxview.class.php" );
+
$this->_view = new AjaxView();
$userInfo = $this->authenticateUser();
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminlogoutaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminlogoutaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminlogoutaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,9 +1,9 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admindefaultview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/redirectview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/net/http/httpvars.class.php" );
+
+
+
+
/**
* \ingroup Action
@@ -69,7 +69,7 @@
{
$this->doLogout();
- lt_include( PLOG_CLASS_PATH."class/view/admin/ajax/adminajaxview.class.php" );
+
$this->_view = new AdminAjaxView( $this->_blogInfo );
$this->_view->setSuccessMessage( $this->_locale->tr( "logout_message" ));
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminmainaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminmainaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminmainaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/userpermissions.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
+
+
+
/**
* \ingroup Action
@@ -29,13 +29,13 @@
// first of all, check if we have a valid blog id
$this->_blogId = $this->_request->getValue( "blogId" );
if( $this->_blogId == "" || $this->_blogId < 0 ) {
- lt_include( PLOG_CLASS_PATH."class/dao/users.class.php" );
+
// check if the user really belongs to one or more blogs and if not, quit
$users = new Users();
$userBlogs = $users->getUsersBlogs( $this->_userInfo->getId(), BLOG_STATUS_ACTIVE );
if( count($userBlogs) == 0 ) {
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminsimpleerrorview.class.php" );
+
$this->_view = new AdminSimpleErrorView();
$this->_view->setValue( "message", $this->_locale->tr("error_dont_belong_to_any_blog" ));
@@ -43,20 +43,20 @@
}
// if everything went fine, then we can continue...
- lt_include( PLOG_CLASS_PATH."class/view/admin/admindashboardview.class.php" );
+
$this->_view = new AdminDashboardView( $this->_userInfo, $userBlogs );
return false;
}
// load the blog
- lt_include( PLOG_CLASS_PATH . "class/dao/blogs.class.php" );
+
$blogs = new Blogs();
$this->_blogInfo = $blogs->getBlogInfo( $this->_blogId );
// check if the blog really exists
if( !$this->_blogInfo ) {
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminsimpleerrorview.class.php" );
+
$this->_view = new AdminSimpleErrorView();
$this->_view->setValue( "message", $this->_locale->tr("error_incorrect_blog_id" ));
@@ -66,7 +66,7 @@
// if so, check that it is active
if( $this->_blogInfo->getStatus() != BLOG_STATUS_ACTIVE ) {
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminsimpleerrorview.class.php" );
+
$this->_view = new AdminSimpleErrorView();
$this->_view->setValue( "message", $this->_locale->tr("error_incorrect_blog_id" ));
@@ -79,7 +79,7 @@
$userPermissions = new UserPermissions();
$blogUserPermissions = $userPermissions->getUserPermissions( $this->_userInfo->getId(), $this->_blogInfo->getId());
if( (!$blogUserPermissions) && ($this->_blogInfo->getOwnerId() != $this->_userInfo->getId())) {
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminsimpleerrorview.class.php" );
+
$this->_view = new AdminSimpleErrorView();
$this->_view->setValue( "message", $this->_locale->tr("error_no_permissions" ));
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminmanageaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminmanageaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminmanageaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminmarkcommentaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminmarkcommentaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminmarkcommentaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,13 +1,13 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/commentscommon.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/articles.class.php" );
- lt_include( PLOG_CLASS_PATH."class/bayesian/bayesianfiltercore.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminpostslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminarticlecommentslistview.class.php" );
+
+
+
+
+
+
+
/**
* \ingroup Action
* @private
@@ -227,7 +227,7 @@
{
$result = $this->_markComment();
- lt_include( PLOG_CLASS_PATH."class/view/admin/ajax/adminajaxview.class.php" );
+
$this->_view = new AdminAjaxView( $this->_blogInfo );
if( $result ) {
$this->_view->setSuccessMessage( $this->_message );
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewarticlecategoryaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewarticlecategoryaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewarticlecategoryaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,9 +1,9 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/articlecategories.class.php" );
+
+
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewblogcategoryaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewblogcategoryaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewblogcategoryaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewblogtemplateaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewblogtemplateaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewblogtemplateaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,10 +1,10 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminerrordialogview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/templatesets/templatesetstorage.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminblogtemplatesetslistview.class.php" );
+
+
+
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewblogtemplatefileaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewblogtemplatefileaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewblogtemplatefileaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminbasetemplateeditoraction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
+
+
class AdminNewBlogTemplateFileAction extends AdminBaseTemplateEditorAction
{
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewbloguseraction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewbloguseraction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewbloguseraction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminnewbloguserview.class.php" );
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewcustomfieldaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewcustomfieldaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewcustomfieldaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewfriendaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewfriendaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewfriendaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -4,8 +4,8 @@
*/
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminnewfriendview.class.php" );
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewfriendgroupaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewfriendgroupaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewfriendgroupaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewglobalarticlecategoryaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewglobalarticlecategoryaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewglobalarticlecategoryaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -6,8 +6,8 @@
*/
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewlinkaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewlinkaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewlinkaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,10 +1,10 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminnewlinkview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminlinkslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/mylinkscategories.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/mylinkscategory.class.php" );
+
+
+
+
+
/**
* \ingroup Action
@@ -33,7 +33,7 @@
{
// fetch all the link categories
$blogSettings = $this->_blogInfo->getSettings();
- $linkCategoriesOrder = $blogSettings->getValue( "link_categories_order", MYLINKS_CATEGORIES_NO_ORDER );
+ $linkCategoriesOrder = $blogSettings->getValue( "link_categories_order", MyLinksCategories::MYLINKS_CATEGORIES_NO_ORDER );
$linkCategories = new MyLinksCategories();
$blogLinkCategories = $linkCategories->getMyLinksCategories( $this->_blogInfo->getId(), $linkCategoriesOrder );
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewlinkcategoryaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewlinkcategoryaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewlinkcategoryaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewlocaleaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewlocaleaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewlocaleaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewpermissionaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewpermissionaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewpermissionaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewpostaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewpostaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewpostaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,9 +1,9 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminnewpostview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/articlecategories.class.php" );
+
+
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewprivatemessageaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewprivatemessageaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewprivatemessageaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewresourceaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewresourceaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewresourceaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,14 +1,14 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminnewresourceview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminnewalbumview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminerrorview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminresourceslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryalbums.class.php" );
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryresourcestorage.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/filter/htmlfilter.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
+
+
+
+
+
+
+
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewresourcealbumaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewresourcealbumaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewresourcealbumaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,9 +1,9 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminnewalbumview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/filter/htmlfilter.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
+
+
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewtemplateaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewtemplateaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewtemplateaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/templatesets/templatesetstorage.class.php" );
+
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewtemplatefileaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewtemplatefileaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminnewtemplatefileaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminbasetemplateeditoraction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
+
+
class AdminNewTemplateFileAction extends AdminBaseTemplateEditorAction
{
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminpermissionrequiredaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminpermissionrequiredaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminpermissionrequiredaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminerrorview.class.php" );
+
+
/**
* This is the action loaded every time there is a problem with permissions
@@ -19,7 +19,7 @@
function performAjax()
{
- lt_include( PLOG_CLASS_PATH."class/view/admin/ajax/adminajaxview.class.php" );
+
$this->_view = new AdminAjaxView( $this->_blogInfo );
$this->_view->setErrorMessage( $this->_locale->tr( "error_permission_required" ));
}
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminpermissionslistaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminpermissionslistaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminpermissionslistaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminpermissionslistview.class.php" );
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminplugincenteraction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminplugincenteraction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminplugincenteraction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,10 +1,10 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminerrorview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/plugin/pluginmanager.class.php" );
- lt_include( PLOG_CLASS_PATH."class/xml/rssparser/rssparser.class.php" );
+
+
+
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminpluginsettingsaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminpluginsettingsaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminpluginsettingsaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminpluginsettingsview.class.php" );
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminpostmanagementcommonaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminpostmanagementcommonaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminpostmanagementcommonaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,12 +1,12 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/customfields/customfieldvaluefactory.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/articlecategories.class.php" );
+
+
+
+
+
+
/**
* \ingroup Action
@@ -101,7 +101,7 @@
if( !$this->_config->getValue( "xmlrpc_ping_enabled", false ))
return "";
- lt_include( PLOG_CLASS_PATH."class/dao/articlenotifications.class.php" );
+
$notifications = new ArticleNotifications();
$resultArray = $notifications->updateNotify( $this->_blogInfo );
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminpoststatsaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminpoststatsaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminpoststatsaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,9 +1,9 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminpostslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminarticlereferrersview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
+
+
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminpreviewpostaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminpreviewpostaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminpreviewpostaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH.'class/action/admin/adminpostmanagementcommonaction.class.php' );
- lt_include( PLOG_CLASS_PATH.'class/view/viewarticleview.class.php' );
- lt_include( PLOG_CLASS_PATH.'class/dao/article.class.php' );
+
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminreadinboxprivatemessageaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminreadinboxprivatemessageaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminreadinboxprivatemessageaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,9 +1,9 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admininboxprivatemessageslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/privatemessages.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
+
+
+
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminreadoutboxprivatemessageaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminreadoutboxprivatemessageaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminreadoutboxprivatemessageaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,9 +1,9 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminoutboxprivatemessageslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/privatemessages.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
+
+
+
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminregeneratepreviewaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminregeneratepreviewaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminregeneratepreviewaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,13 +1,13 @@
<?php
-lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
-lt_include( PLOG_CLASS_PATH."class/view/admin/adminresourceslistview.class.php" );
-lt_include( PLOG_CLASS_PATH."class/view/admin/admineditresourceview.class.php" );
-lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
-lt_include( PLOG_CLASS_PATH."class/gallery/resizers/galleryresizer.class.php" );
-lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryresources.class.php" );
-lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryresourcestorage.class.php" );
+
+
+
+
+
+
+
/**
* \ingroup Action
* @private
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminregisterblogaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminregisterblogaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminregisterblogaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminregisterblogview.class.php" );
+
+
class AdminRegisterBlogAction extends AdminAction
{
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminreplyprivatemessageaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminreplyprivatemessageaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminreplyprivatemessageaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,9 +1,9 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admininboxprivatemessageslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/privatemessages.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
+
+
+
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminresendconfirmationaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminresendconfirmationaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminresendconfirmationaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,10 +1,10 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminsiteblogslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admineditsiteblogview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
+
+
+
+
+
/**
* \ingroup Action
@@ -46,8 +46,8 @@
$this->notifyEvent( EVENT_BLOG_LOADED, Array( "blog" => &$blogInfo ));
// now that we have the right blog loaded, regenerate the confirmation email
- lt_include( PLOG_CLASS_PATH."class/summary/mail/summarymailer.class.php" );
+
// load the blog owner
$blogOwner = $blogInfo->getOwnerInfo();
// generate and send the right link
@@ -76,7 +76,7 @@
function performAjax()
{
- lt_include( PLOG_CLASS_PATH."class/view/admin/ajax/adminajaxview.class.php" );
+
$this->_view = new AdminAjaxView( $this->_blogInfo );
if( $this->sendConfirmation())
$this->_view->setSuccessMessage( $this->_locale->tr( "confirmation_message_resent_ok" ));
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminresourcealbumsaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminresourcealbumsaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminresourcealbumsaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminresourcealbumslistview.class.php" );
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminresourceinfoaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminresourceinfoaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminresourceinfoaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,11 +1,11 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admineditresourceview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminresourceslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryresource.class.php" );
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryalbums.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
+
+
+
+
+
+
/**
* \ingroup Action
@@ -74,7 +74,7 @@
function performAjax()
{
- lt_include( PLOG_CLASS_PATH."class/view/admin/ajax/adminajaxview.class.php" );
+
$this->_view = new AdminAjaxView( $this->_blogInfo );
$resource = $this->loadResource();
if( !$resource ) {
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminresourcesaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminresourcesaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminresourcesaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,10 +1,10 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminresourceslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminerrorview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryresourcestorage.class.php" );
+
+
+
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminresourcesgroupaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminresourcesgroupaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminresourcesgroupaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminsavedraftarticleajaxaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminsavedraftarticleajaxaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminsavedraftarticleajaxaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,9 +1,9 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/ajax/adminajaxaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/ajax/adminajaxview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/timestamp.class.php");
- lt_include( PLOG_CLASS_PATH."class/dao/articles.class.php" );
+
+
+
+
/**
* \ingroup Action
@@ -91,7 +91,7 @@
// prepare the custom fields
$fields = Array();
if( is_array($this->_customFields)) {
- lt_include( PLOG_CLASS_PATH."class/dao/customfields/customfieldvalue.class.php" );
+
foreach( $this->_customFields as $fieldId => $fieldValue ) {
// 3 of those parameters are not really need when creating a new object... it's enough that
// we know the field definition id.
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminsendprivatemessageaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminsendprivatemessageaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminsendprivatemessageaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,9 +1,9 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/privatemessages.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminoutboxprivatemessageslistview.class.php" );
+
+
+
+
+
/**
* \ingroup Action
@@ -52,7 +52,7 @@
$this->_backupPrivateMessage = $this->_request->getValue("backupPrivateMessage") ? 1 : 0;
// check the receiver exist or not
- lt_include( PLOG_CLASS_PATH."class/dao/users.class.php" );
+
$users = new Users();
$receiver = $users->getUserInfoFromUsername( $this->_receiverName );
@@ -71,12 +71,12 @@
$this->_senderId = $this->_userInfo->getId();
// get private message inbox from receiver id
- lt_include( PLOG_CLASS_PATH."class/dao/privatemessageboxes.class.php" );
+
$privateMessageBoxes = new PrivateMessageBoxes();
$receiverInbox = $privateMessageBoxes->getPrivateMessageInboxFromUserId( $this->_receiverId );
// create the private message object...
- lt_include( PLOG_CLASS_PATH."class/dao/privatemessages.class.php" );
+
$privateMessages = new PrivateMessages();
$receiverPrivateMessage = new PrivateMessage( $receiverInbox->getId(),
$this->_receiverId,
@@ -123,7 +123,7 @@
// if everything went fine, we can now send the private message to the receiver
// only if the receiver specified a valid email address
if( $userInfo->getEmail() != "" ) {
- lt_include( PLOG_CLASS_PATH."class/mail/emailservice.class.php" );
+
// build an email message
$emailMessage = new EmailMessage();
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminsendreplyprivatemessageaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminsendreplyprivatemessageaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminsendreplyprivatemessageaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,9 +1,9 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/privatemessages.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminoutboxprivatemessageslistview.class.php" );
+
+
+
+
+
/**
* \ingroup Action
@@ -52,7 +52,7 @@
$this->_backupPrivateMessage = $this->_request->getValue("backupPrivateMessage") ? 1 : 0;
// check the receiver exist or not
- lt_include( PLOG_CLASS_PATH."class/dao/users.class.php" );
+
$users = new Users();
$receiver = $users->getUserInfoFromUsername( $this->_receiverName );
@@ -71,12 +71,12 @@
$this->_senderId = $this->_userInfo->getId();
// get private message inbox from receiver id
- lt_include( PLOG_CLASS_PATH."class/dao/privatemessageboxes.class.php" );
+
$privateMessageBoxes = new PrivateMessageBoxes();
$receiverInbox = $privateMessageBoxes->getPrivateMessageInboxFromUserId( $this->_receiverId );
// create the private message object...
- lt_include( PLOG_CLASS_PATH."class/dao/privatemessages.class.php" );
+
$privateMessages = new PrivateMessages();
$receiverPrivateMessage = new PrivateMessage( $receiverInbox->getId(),
$this->_receiverId,
@@ -123,7 +123,7 @@
// if everything went fine, we can now send the private message to the receiver
// only if the receiver specified a valid email address
if( $userInfo->getEmail() != "" ) {
- lt_include( PLOG_CLASS_PATH."class/mail/emailservice.class.php" );
+
// build an email message
$emailMessage = new EmailMessage();
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminsendtrackbacksaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminsendtrackbacksaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminsendtrackbacksaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,12 +1,12 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminpostslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminnewpostview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/arrayvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/trackbackclient.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/articles.class.php" );
+
+
+
+
+
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminshowbloglocationsaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminshowbloglocationsaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminshowbloglocationsaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminerrorview.class.php" );
+
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminshowblogusersaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminshowblogusersaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminshowblogusersaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminbloguserslistview.class.php" );
+
+
/**
* \ingroup Action
@@ -30,8 +30,8 @@
function performAjax()
{
- lt_include( PLOG_CLASS_PATH."class/view/renderer/ajaxviewrenderer.class.php" );
+
$view = new AdminBlogUsersListView( $this->_blogInfo );
$view->loadData();
$this->_view = new AjaxViewRenderer( $view );
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminsiteblogsaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminsiteblogsaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminsiteblogsaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminsiteblogslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
+
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminsitelocalesaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminsitelocalesaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminsitelocalesaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminsitelocaleslistview.class.php" );
+
+
/**
* \ingroup Action
* @private
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminsitesettingsaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminsitesettingsaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminsitesettingsaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminsiteusersaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminsiteusersaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminsiteusersaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminsiteuserslistview.class.php" );
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminstatisticsaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminstatisticsaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminstatisticsaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminreferrersview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
+
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdatearticlecategoryaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdatearticlecategoryaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdatearticlecategoryaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,13 +1,13 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/articlecategories.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/emptyvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminarticlecategorieslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/filter/htmlfilter.class.php" );
+
+
+
+
+
+
+
+
/**
* \ingroup Action
@@ -133,7 +133,7 @@
function performAjax()
{
$result = $this->updateCategory();
- lt_include( PLOG_CLASS_PATH."class/view/admin/ajax/adminajaxview.class.php" );
+
$this->_view = new AdminAjaxView( $this->_blogInfo );
$this->_view->setSuccess( $result );
if( $result ) {
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdateblogcategoryaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdateblogcategoryaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdateblogcategoryaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,13 +1,13 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/blogcategories.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/emptyvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminblogcategorieslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
+
+
+
+
+
+
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdateblogsettingsaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdateblogsettingsaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdateblogsettingsaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,16 +1,16 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/blognamevalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminblogsettingsview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/domainvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/rules/intrangerule.class.php" );
- lt_include( PLOG_CLASS_PATH."class/net/http/subdomains.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/filter/htmlfilter.class.php" );
+
+
+
+
+
+
+
+
+
+
+
/**
* \ingroup Action
@@ -223,7 +223,7 @@
*/
function performAjax()
{
- lt_include( PLOG_CLASS_PATH."class/view/admin/ajax/adminajaxview.class.php" );
+
$this->_view = new AdminAjaxView( $this->_blogInfo );
$blogSettings = $this->_blogInfo->getSettings();
$this->_locale =& Locales::getLocale( $blogSettings->getValue( "locale" ));
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdateblogtemplatefileaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdateblogtemplatefileaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdateblogtemplatefileaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,15 +1,15 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminbasetemplateeditoraction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/templatenamevalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/filter/regexpfilter.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/templatesets/templatesets.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/editor/templatetools.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminblogtemplatesetslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminedittemplateview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminedittemplatefileview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/file/file.class.php" );
+
+
+
+
+
+
+
+
+
+
class AdminUpdateBlogTemplateFileAction extends AdminBaseTemplateEditorAction
{
@@ -66,7 +66,7 @@
{
$result = $this->writeFile();
- lt_include( PLOG_CLASS_PATH."class/view/admin/ajax/adminajaxview.class.php" );
+
$this->_view = new AdminAjaxView( $this->_blogInfo );
if( $result )
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdatebloguseraction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdatebloguseraction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdatebloguseraction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,10 +1,10 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminbloguserslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/permissions.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/userpermissions.class.php" );
+
+
+
+
+
/**
* \ingroup Action
@@ -87,7 +87,7 @@
function performAjax()
{
- lt_include( PLOG_CLASS_PATH."class/view/admin/ajax/adminajaxview.class.php" );
+
$this->_view = new AdminAjaxView( $this->_blogInfo );
if( !$this->updateUser())
$this->_view->setErrorMessage( $this->_message );
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdatecommentaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdatecommentaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdatecommentaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,18 +1,18 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/dao/commentscommon.class.php" );
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/emailvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/httpurlvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/usernamevalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/ipaddressvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminarticlecommentslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminpostslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/filter/htmlfilter.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/filter/allowedhtmlfilter.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/filter/trimfilter.class.php" );
+
+
+
+
+
+
+
+
+
+
+
+
+
class AdminUpdateCommentAction extends AdminAction
{
@@ -151,7 +151,7 @@
function performAjax()
{
- lt_include( PLOG_CLASS_PATH."class/view/admin/ajax/adminajaxview.class.php" );
+
$this->_view = new AdminAjaxView( $this->_blogInfo );
if(( $comment = $this->updateComment())) {
$this->_view->setSuccessMessage( $this->_locale->tr( "comment_updated_ok" ));
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdatecustomfieldaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdatecustomfieldaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdatecustomfieldaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,11 +1,11 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admincustomfieldslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/customfields/customfields.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/filter/htmlfilter.class.php" );
+
+
+
+
+
+
/**
* \ingroup Action
@@ -117,7 +117,7 @@
function performAjax()
{
- lt_include( PLOG_CLASS_PATH."class/view/admin/ajax/adminajaxview.class.php" );
+
$this->_view = new AdminAjaxView( $this->_blogInfo );
$field = $this->updateCustomField();
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdateeditblogaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdateeditblogaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdateeditblogaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,17 +1,17 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminsiteblogslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admineditsiteblogview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/users.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/userpermissions.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/blognamevalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/domainvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/arrayvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/filter/htmlfilter.class.php" );
+
+
+
+
+
+
+
+
+
+
+
+
/**
* \ingroup Action
@@ -184,7 +184,7 @@
function performAjax()
{
- lt_include( PLOG_CLASS_PATH."class/view/admin/ajax/adminajaxview.class.php" );
+
$this->_view = new AdminAjaxView( $this->_blogInfo );
$blog = $this->updateBlog();
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdatefriendaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdatefriendaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdatefriendaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -2,14 +2,14 @@
/**
* Friend
*/
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/friendgroups.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/friends.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admineditfriendview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminfriendslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
+
+
+
+
+
+
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdatefriendgroupaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdatefriendgroupaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdatefriendgroupaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,11 +1,11 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminfriendgroupslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/friendgroups.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
+
+
+
+
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdateglobalarticlecategoryaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdateglobalarticlecategoryaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdateglobalarticlecategoryaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -4,14 +4,14 @@
* version 1.0
* Changed from original article category.
*/
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/globalarticlecategories.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/emptyvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminglobalarticlecategorieslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
+
+
+
+
+
+
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdateglobalsettingsaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdateglobalsettingsaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdateglobalsettingsaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminglobalsettingslistview.class.php" );
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdatelinkaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdatelinkaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdatelinkaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,14 +1,14 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminlinkslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admineditlinkview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/mylinks.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/httpurlvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/emptyvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/filter/htmlfilter.class.php" );
+
+
+
+
+
+
+
+
+
/**
* \ingroup Action
@@ -111,7 +111,7 @@
function performAjax()
{
- lt_include( PLOG_CLASS_PATH."class/view/admin/ajax/adminajaxview.class.php" );
+
$this->_view = new AdminAjaxView( $this->_blogInfo );
if(( $link = $this->updateLink())) {
$this->_view->setSuccess( true );
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdatelinkcategoryaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdatelinkcategoryaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdatelinkcategoryaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,12 +1,12 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminlinkcategorieslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/mylinkscategories.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/filter/htmlfilter.class.php" );
+
+
+
+
+
+
+
/**
* \ingroup Action
@@ -94,7 +94,7 @@
*/
function performAjax()
{
- lt_include( PLOG_CLASS_PATH."class/view/admin/ajax/adminajaxview.class.php" );
+
$this->_view = new AdminAjaxView( $this->_blogInfo );
$this->_view->setSuccess( $this->updateLinkCategory());
$this->_view->setMessage( $this->_message );
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdatelocationajaxaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdatelocationajaxaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdatelocationajaxaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,10 +1,10 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/ajax/adminajaxview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/locations.class.php" );
+
+
+
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdatepermissionaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdatepermissionaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdatepermissionaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,11 +1,11 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminpermissionslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/permissions.class.php" );
+
+
+
+
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdatepluginsettingsaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdatepluginsettingsaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdatepluginsettingsaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,10 +1,10 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminpluginsettingsview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/plugin/pluginmanager.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/emptyvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/plugin/globalpluginconfig.class.php" );
+
+
+
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdatepostaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdatepostaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdatepostaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,18 +1,18 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminpostmanagementcommonaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminpostslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admineditpostview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/arrayvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/articles.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/customfields/customfieldsvalues.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/customfields/customfields.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/cachecontrol.class.php" );
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/stringutils.class.php" );
+
+
+
+
+
+
+
+
+
+
+
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdateresourceaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdateresourceaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdateresourceaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,11 +1,11 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminresourceslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admineditresourceview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryresources.class.php" );
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryalbums.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
+
+
+
+
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdateresourcealbumaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdateresourcealbumaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdateresourcealbumaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,11 +1,11 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admineditresourcealbumview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminresourceslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryalbums.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
+
+
+
+
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdatetemplatefileaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdatetemplatefileaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdatetemplatefileaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,15 +1,15 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminbasetemplateeditoraction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/templatenamevalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/filter/regexpfilter.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/templatesets/templatesets.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/editor/templatetools.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminsitetemplateslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminedittemplateview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminedittemplatefileview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/file/file.class.php" );
+
+
+
+
+
+
+
+
+
+
class AdminUpdateTemplateFileAction extends AdminBaseTemplateEditorAction
{
@@ -66,7 +66,7 @@
{
$result = $this->writeFile();
- lt_include( PLOG_CLASS_PATH."class/view/admin/ajax/adminajaxview.class.php" );
+
$this->_view = new AdminAjaxView( $this->_blogInfo );
if( $result )
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdateuserprofileaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdateuserprofileaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdateuserprofileaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,15 +1,15 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/emailvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admineditsiteuserview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminsiteuserslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/passwordvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/filter/htmlfilter.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/users.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/userpermissions.class.php" );
+
+
+
+
+
+
+
+
+
+
/**
* \ingroup Action
@@ -127,7 +127,7 @@
function performAjax()
{
- lt_include( PLOG_CLASS_PATH."class/view/admin/ajax/adminajaxview.class.php" );
+
$this->_view = new AdminAjaxView( $this->_blogInfo );
$user = $this->updateUser();
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdateusersettingsaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdateusersettingsaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminupdateusersettingsaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,13 +1,13 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/emailvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/passwordvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/users.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/filter/trimfilter.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/filter/htmlfilter.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminuserprofileview.class.php" );
+
+
+
+
+
+
+
+
/**
* \ingroup Action
@@ -120,7 +120,7 @@
*/
function performAjax()
{
- lt_include( PLOG_CLASS_PATH."class/view/admin/ajax/adminajaxview.class.php" );
+
$this->_view = new AdminAjaxView( $this->_blogInfo );
if( !$this->updateUser())
$this->_view->setErrorMessage( $this->_locale->tr("error_updating_user_settings"));
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminuploadblogtemplatefileaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminuploadblogtemplatefileaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminuploadblogtemplatefileaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,12 +1,12 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminbasetemplateeditoraction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminedittemplateview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminplainview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/file/fileuploads.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminblogtemplatesetslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admineditblogtemplateview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/uploadvalidator.class.php" );
+
+
+
+
+
+
+
class AdminUploadBlogTemplateFileAction extends AdminBaseTemplateEditorAction
{
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminuploadtemplatefileaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminuploadtemplatefileaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminuploadtemplatefileaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,11 +1,11 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminbasetemplateeditoraction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminedittemplateview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/file/fileuploads.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminsitetemplateslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/uploadvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminplainview.class.php" );
+
+
+
+
+
+
class AdminUploadTemplateFileAction extends AdminBaseTemplateEditorAction
{
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminuserprofileaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminuserprofileaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminuserprofileaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,10 +1,10 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminsiteuserslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admineditsiteuserview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/users.class.php" );
+
+
+
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminusersettingsaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminusersettingsaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminusersettingsaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminuserprofileview.class.php" );
+
+
/**
* \ingroup Action
@@ -35,7 +35,7 @@
function performAjax()
{
- lt_include( PLOG_CLASS_PATH."class/view/admin/ajax/adminajaxview.class.php" );
+
$this->_view = new AdminAjaxView( $this->_blogInfo );
$this->_view->setResult( $this->_userInfo );
$this->_view->setSuccess( true );
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminversioncheckaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminversioncheckaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminversioncheckaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,10 +1,10 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/misc/integritychecker.class.php" );
- lt_include( PLOG_CLASS_PATH."class/xml/rssparser/rssparser.class.php" );
+
+
+
+
/**
* \ingroup Action
* @private
@@ -70,7 +70,7 @@
}
}
- lt_include( PLOG_CLASS_PATH."class/misc/version.class.php" );
+
$this->_view->setValue( "version", Version::getVersion());
$this->setCommonData();
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/adminxmlpingaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/adminxmlpingaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/adminxmlpingaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminxmlview.class.php" );
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/ajax/adminajaxaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/ajax/adminajaxaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/ajax/adminajaxaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/ajax/adminajaxview.class.php" );
+
+
/**
* Implements specific support for XmlHttpRequest requests
@@ -28,7 +28,7 @@
*/
function mustAuthenticatePage()
{
- lt_include( PLOG_CLASS_PATH."class/data/serialize/serializerfactory.class.php" );
+
print( SerializerFactory::toJson( Array( "success" => false, "message" => "Access forbidden, you must first authenticate" )));
die();
}
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/chooser/adminblogchooseraction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/chooser/adminblogchooseraction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/chooser/adminblogchooseraction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/chooser/adminblogchooserview.class.php" );
+
+
class AdminBlogChooserAction extends AdminAction
{
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/chooser/adminblogtemplatechooseraction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/chooser/adminblogtemplatechooseraction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/chooser/adminblogtemplatechooseraction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminblogtemplatechooserview.class.php" );
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/chooser/adminlocationchooseraction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/chooser/adminlocationchooseraction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/chooser/adminlocationchooseraction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/chooser/adminlocationchooserview.class.php" );
+
+
class AdminLocationChooserAction extends AdminAction
{
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/chooser/adminresourcelistaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/chooser/adminresourcelistaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/chooser/adminresourcelistaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/chooser/adminsimpleresourceslistview.class.php" );
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/chooser/adminuserchooseraction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/chooser/adminuserchooseraction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/chooser/adminuserchooseraction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/chooser/adminuserchooserview.class.php" );
+
+
class AdminUserChooserAction extends AdminAction
{
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/chooser/adminuserpictureselectaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/chooser/adminuserpictureselectaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/chooser/adminuserpictureselectaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/chooser/adminuserpictureselectview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
+
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/admin/siteadminaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/admin/siteadminaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/admin/siteadminaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/action/blogaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/blogaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/blogaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/action.class.php" );
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
+
+
+
/**
* \ingroup Action
@@ -34,9 +34,9 @@
*/
function BlogAction( $actionInfo, $request )
{
- lt_include( PLOG_CLASS_PATH."class/plugin/pluginmanager.class.php" );
- lt_include( PLOG_CLASS_PATH."class/security/pipeline.class.php" );
- lt_include( PLOG_CLASS_PATH."class/net/http/httpvars.class.php" );
+
+
+
$this->Action( $actionInfo, $request );
@@ -47,9 +47,9 @@
$this->_config =& Config::getConfig();
if( !$this->_getBlogInfo() ) {
- lt_include( PLOG_CLASS_PATH."class/view/view.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/redirectview.class.php" );
+
+
$this->_session->setValue( 'blogId', null );
$blogDoesNotExistUrl = $this->_config->getValue( "blog_does_not_exist_url" );
if ( empty($blogDoesNotExistUrl) )
@@ -87,7 +87,7 @@
if( !$result->isValid()) {
if( !$result->hasView()) {
// use the default view
- lt_include( PLOG_CLASS_PATH."class/view/errorview.class.php" );
+
$message = $this->_locale->tr('error_you_have_been_blocked').'<br/><br/>';
$message .= $result->getErrorMessage();
$this->_view = new ErrorView( $this->_blogInfo, $message );
@@ -163,7 +163,7 @@
// see if we're using subdomains
$config =& Config::getConfig();
if( $config->getValue( "subdomains_enabled" )) {
- lt_include( PLOG_CLASS_PATH."class/net/http/subdomains.class.php" );
+
$subdomainInfo = Subdomains::getSubdomainInfoFromRequest();
@@ -189,7 +189,7 @@
if( !$blogId && !$blogName && !$blogDomain) {
// check if there was a user parameter
if( !empty($userName) ) {
- lt_include( PLOG_CLASS_PATH."class/dao/users.class.php" );
+
// if so, check to which blogs the user belongs
$users = new Users();
$userInfo = $users->getUserInfoFromUsername( $userName );
@@ -229,20 +229,20 @@
}
// fetch the BlogInfo object
- 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" );
+
$blogs = new Blogs();
$this->_blogInfo = $blogs->getBlogInfo( $blogId );
}
else if($blogName) {
- lt_include( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
+
$blogs = new Blogs();
$this->_blogInfo = $blogs->getBlogInfoByName( $blogName );
}
else if($blogDomain) {
- lt_include( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
+
$blogs = new Blogs();
$this->_blogInfo = $blogs->getBlogInfoByDomain( $blogDomain );
}
@@ -305,7 +305,7 @@
return true;
// update the referer statistics
- lt_include( PLOG_CLASS_PATH."class/dao/referers.class.php" );
+
if( $this->_config->getValue( "referer_tracker_enabled", true )) {
$referers = new Referers();
@@ -372,7 +372,7 @@
*/
function _getPage()
{
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php");
+
// get the value from the request
$page = HttpVars::getRequestValue( "page" );
// but first of all, validate it
Modified: plog/branches/lifetype-2.0-autoload/class/action/commentaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/commentaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/commentaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,13 +1,13 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/blogaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/blogview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/errorview.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" );
- lt_include( PLOG_CLASS_PATH."class/dao/users.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
+
+
+
+
+
+
+
+
/**
* \ingroup Action
@@ -71,7 +71,7 @@
}
// fetch the comments so far
- lt_include( PLOG_CLASS_PATH."class/dao/articlecomments.class.php" );
+
$comments = new ArticleComments();
$postComments = $comments->getPostComments( $article->getId());
if( $this->_parentId > 0 ) {
Modified: plog/branches/lifetype-2.0-autoload/class/action/defaultaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/defaultaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/defaultaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,11 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/blogaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/plugin/pluginmanager.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/errorview.class.php" );
-
+ lt_include( PLOG_CLASS_PATH."class/dao/articlestatus.class.php" );
+
/**
* \ingroup Action
* @private
@@ -65,8 +61,8 @@
*/
function perform()
{
- lt_include( PLOG_CLASS_PATH."class/view/defaultview.class.php" );
+
// first of all, we have to determine which blog we would like to see
$blogId = $this->_blogInfo->getId();
@@ -92,11 +88,11 @@
return true;
}
- lt_include( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/articlecategories.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/pager/pager.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/articles.class.php" );
- lt_include( PLOG_CLASS_PATH."class/config/siteconfig.class.php" );
+
+
+
+
+
// if we got a category name instead of a category id, then we
// should first look up this category in the database and see if
@@ -135,7 +131,7 @@
if( isset($category) )
$this->_view->setValue( "category", $category );
- lt_include( PLOG_CLASS_PATH."class/dao/users.class.php" );
+
$users = new Users();
// if we got a user user id, then we should first look up this id
Modified: plog/branches/lifetype-2.0-autoload/class/action/locationdisplay.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/locationdisplay.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/locationdisplay.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,10 +1,10 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/blogaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/locations.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/locationview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/errorview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
+
+
+
+
+
class LocationDisplay extends BlogAction
{
Modified: plog/branches/lifetype-2.0-autoload/class/action/resourceserveraction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/resourceserveraction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/resourceserveraction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -5,15 +5,15 @@
define( 'RESOURCE_VIEW_MODE_PREVIEW', 'preview' );
define( 'RESOURCE_VIEW_MODE_MEDIUM', 'medium' );
- lt_include( PLOG_CLASS_PATH."class/action/action.class.php" );
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/redirectview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/net/http/subdomains.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryresources.class.php" );
- lt_include( PLOG_CLASS_PATH."class/security/pipeline.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
+
+
+
+
+
+
+
+
+
/**
* \ingroup Action
@@ -90,7 +90,7 @@
// check if there was a user parameter
if( !empty($userName) ) {
// if so, check to which blogs the user belongs
- 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
- lt_include( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
+
$blogs = new Blogs();
if( $blogId ) {
$this->_blogInfo = $blogs->getBlogInfo( $blogId );
@@ -164,7 +164,7 @@
// because we got an album name instead of an album id
if( !empty($this->_albumId) || !empty($this->_albumName)) {
if( $this->_albumName ) {
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryalbums.class.php" );
+
$albums = new GalleryAlbums();
$album = $albums->getAlbumByName( $this->_albumName );
if( !$album ) {
Modified: plog/branches/lifetype-2.0-autoload/class/action/rssaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/rssaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/rssaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,9 +1,9 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/blogaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/rssview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
+
+
+
+
/**
@@ -46,7 +46,7 @@
//Check the rdf syndication is allowed or not
$rdfEnabled = $this->_config->getValue( "rdf_enabled" );
if ( !$rdfEnabled ) {
- lt_include( PLOG_CLASS_PATH."class/view/errorview.class.php" );
+
$message = $this->_locale->tr('error_rdf_syndication_not_allowed').'<br/><br/>';
$this->_view = new ErrorView( $this->_blogInfo, $message );
$this->setCommonData();
@@ -96,11 +96,11 @@
return true;
}
- lt_include( PLOG_CLASS_PATH."class/dao/articles.class.php" );
- lt_include( PLOG_CLASS_PATH."class/locale/locales.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
- lt_include( PLOG_CLASS_PATH."class/config/siteconfig.class.php" );
+
+
+
+
$articles = new Articles();
// fetch the posts, though we are going to fetch the same amount in both branches
@@ -130,7 +130,7 @@
// load the category
if( $categoryId > 0 ) {
- lt_include( PLOG_CLASS_PATH."class/dao/articlecategories.class.php" );
+
$articleCategories = new ArticleCategories();
$category = $articleCategories->getCategory( $categoryId );
$this->_view->setValue( "rsscategory", $category );
Modified: plog/branches/lifetype-2.0-autoload/class/action/searchaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/searchaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/searchaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -3,14 +3,14 @@
/**
* @package action
*/
- lt_include( PLOG_CLASS_PATH."class/action/blogaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/searchengine.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/blogtemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/filter/htmlfilter.class.php" );
- lt_include( PLOG_CLASS_PATH."class/net/http/httpvars.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/errorview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/pager/pager.class.php" );
+
+
+
+
+
+
+
+
define( "VIEW_SEARCH_TEMPLATE", "searchresults" );
@@ -89,7 +89,7 @@
$permalink = $url->postPermalink( $article );
// load the view and redirect the flow
- lt_include( PLOG_CLASS_PATH."class/view/redirectview.class.php" );
+
$this->_view = new RedirectView( $permalink );
return( true );
Modified: plog/branches/lifetype-2.0-autoload/class/action/templateaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/templateaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/templateaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,9 +1,9 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/blogaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/templateview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/templatenamevalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/errorview.class.php" );
+
+
+
+
/**
* \ingroup Action
@@ -60,7 +60,7 @@
$templateFile = $this->_request->getValue( "show" );
// then, check if it has any extraneous character
if( !$templateFile || strstr( $templateFile, ".." )) {
- lt_include( PLOG_CLASS_PATH."class/view/errorview.class.php" );
+
$view = new ErrorView( $this->_blogInfo, "error_parameter_missing" );
$this->setValidationErrorView( $view );
Modified: plog/branches/lifetype-2.0-autoload/class/action/viewalbumaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/viewalbumaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/viewalbumaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,10 +1,10 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/blogaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/blogview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/errorview.class.php" );
+
+
+
+
define( "VIEW_ALBUMS_TEMPLATE", "albums" );
define( "VIEW_ALBUM_TEMPLATE", "album" );
@@ -67,11 +67,11 @@
return true;
}
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryresources.class.php" );
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryalbums.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/pager/pager.class.php" );
+
+
+
+
$galleryResources = new GalleryResources();
$galleryAlbums = new GalleryAlbums();
Modified: plog/branches/lifetype-2.0-autoload/class/action/viewarticleaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/viewarticleaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/viewarticleaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,11 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/blogaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/errorview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/config/siteconfig.class.php" );
-
+ lt_include( PLOG_CLASS_PATH."class/dao/articlestatus.class.php" );
+
/**
* \ingroup Action
* @private
@@ -89,7 +85,7 @@
*/
function _updateArticleReferrersById($articleId)
{
- lt_include( PLOG_CLASS_PATH."class/dao/referers.class.php" );
+
if ( array_key_exists( 'HTTP_REFERER', $_SERVER ) )
{
@@ -104,7 +100,7 @@
*/
function _updateArticleReferrersByTitle($slug)
{
- lt_include( PLOG_CLASS_PATH."class/dao/articles.class.php" );
+
$articles = new Articles();
$article = $articles->getBlogArticleByTitle( $slug, $this->_blogInfo->getId());
$article ? $id = $article->getId() : $id = 0;
@@ -130,8 +126,8 @@
function perform()
{
- lt_include( PLOG_CLASS_PATH."class/view/viewarticleview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/articles.class.php" );
+
+
$this->_view = new ViewArticleView( $this->_blogInfo,
Array( "articleId" => $this->_articleId,
@@ -161,11 +157,11 @@
}
- lt_include( PLOG_CLASS_PATH."class/dao/articlecategories.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/users.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
- lt_include( PLOG_CLASS_PATH.'class/data/pager/pager.class.php' );
- lt_include( PLOG_CLASS_PATH.'class/dao/articlecomments.class.php' );
+
+
+
+
+
// ---
// if we got a category name or a user name instead of a category
Modified: plog/branches/lifetype-2.0-autoload/class/action/viewarticletrackbacksaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/viewarticletrackbacksaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/viewarticletrackbacksaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/blogaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/errorview.class.php" );
+
+
+
define( "VIEW_TRACKBACKS_TEMPLATE", "posttrackbacks" );
@@ -60,7 +60,7 @@
function perform()
{
- lt_include( PLOG_CLASS_PATH."class/view/blogview.class.php" );
+
$this->_view = new BlogView( $this->_blogInfo,
VIEW_TRACKBACKS_TEMPLATE,
@@ -78,10 +78,10 @@
return true;
}
- lt_include( PLOG_CLASS_PATH."class/dao/articles.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/articlecategories.class.php" );
+
+
+
+
// ---
// if we got a category name or a user name instead of a category
Modified: plog/branches/lifetype-2.0-autoload/class/action/viewresourceaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/action/viewresourceaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/action/viewresourceaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,10 +1,10 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/blogaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/errorview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryresources.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
+
+
+
+
+
define( "VIEW_RESOURCE_TEMPLATE", "resource" );
@@ -85,7 +85,7 @@
// try to find the album to which this resource belongs
if( $this->_albumName ) {
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryalbums.class.php" );
+
$galleryAlbums = new GalleryAlbums();
$album = $galleryAlbums->getAlbumByName( $this->_albumName, $this->_blogInfo->getId(), false, false );
if( !$album ) {
Modified: plog/branches/lifetype-2.0-autoload/class/bayesian/bayesianfiltercore.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/bayesian/bayesianfiltercore.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/bayesian/bayesianfiltercore.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -11,9 +11,9 @@
- lt_include( PLOG_CLASS_PATH."class/bayesian/bayesiantokenizer.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/bayesianfilterinfos.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/bayesiantokens.class.php" );
+
+
+
/**
* \ingroup Bayesian
Modified: plog/branches/lifetype-2.0-autoload/class/bayesian/bayesiantokenizer.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/bayesian/bayesiantokenizer.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/bayesian/bayesiantokenizer.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/dao/bayesiantoken.class.php" );
- lt_include( PLOG_CLASS_PATH."class/bayesian/tokenizer.class.php" );
+
+
define( "SPLIT_REG_EXP", "[^a-zA-Z0-9àáèéíïòóúüÀÁÈÉÍÏÒÓÚÜ'$!,.^-]+");
Modified: plog/branches/lifetype-2.0-autoload/class/bootstrap.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/bootstrap.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/bootstrap.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -19,12 +19,12 @@
* classes, etc
*/
- // load our custom lt_include method to speed up the inclusion of files
+ // load our custom method to speed up the inclusion of files
include( PLOG_CLASS_PATH."class/object/loader.class.php" );
+
+ // replacement code for the UTF-8 libraries in case they are not installed
+ lt_include( PLOG_CLASS_PATH."class/data/utf8/utf8.php" );
- // for performance logging purposes
- lt_include( PLOG_CLASS_PATH."class/misc/info.class.php" );
-
- // replacement code for the UTF-8 libraries in case they are not installed
- lt_include( PLOG_CLASS_PATH."class/data/utf8/utf8.php" );
+ // register our autoloader via SPL (so that we can have more than one)
+ spl_autoload_register( Array( "LTClassLoader", "load" ));
?>
\ No newline at end of file
Modified: plog/branches/lifetype-2.0-autoload/class/cache/cache.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/cache/cache.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/cache/cache.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -37,8 +37,8 @@
*/
function Cache( $cacheProperties )
{
- 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-2.0-autoload/class/cache/cachemanager.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/cache/cachemanager.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/cache/cachemanager.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -24,12 +24,12 @@
if( $cache == null ) {
// source the neccessary files
- 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' ) {
- 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 {
- 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-2.0-autoload/class/cache/memcache.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/cache/memcache.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/cache/memcache.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -18,8 +18,8 @@
function MemCache( $cacheProperties )
{
- 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-2.0-autoload/class/config/config.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/config/config.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/config/config.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -98,7 +98,7 @@
// if all went fine, get the name for that class
$className = $storageTypes[$storage];
- lt_include( PLOG_CLASS_PATH.'class/config/'.strtolower($className).'.class.php' );
+
// and create an object
$configInstance[$storage] = new $className( $params );
}
Modified: plog/branches/lifetype-2.0-autoload/class/config/configdbstorage.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/config/configdbstorage.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/config/configdbstorage.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,9 +1,5 @@
<?php
-
- lt_include( PLOG_CLASS_PATH."class/config/configabstractstorage.class.php" );
- lt_include( PLOG_CLASS_PATH."class/cache/cachemanager.class.php" );
- lt_include( PLOG_CLASS_PATH.'class/dao/daocacheconstants.properties.php' );
/**
* \ingroup Config
@@ -52,7 +48,7 @@
$this->_cache =& CacheManager::getCache();
// load data from the databas, but only if it was already not in the cache
- if( (!$this->_data = $this->_cache->getData( CACHE_CONFIGDBSTORAGE, CACHE_GLOBAL ))) {
+ if( (!$this->_data = $this->_cache->getData( DaoCacheConstants::CACHE_CONFIGDBSTORAGE, DaoCacheConstants::CACHE_GLOBAL ))) {
$this->_loadAllValuesFromDatabase();
}
}
@@ -66,7 +62,7 @@
$this->_loadData();
// and build the cache
- $this->_cache->setData( CACHE_CONFIGDBSTORAGE, CACHE_GLOBAL, $this->_data );
+ $this->_cache->setData( DaoCacheConstants::CACHE_CONFIGDBSTORAGE, DaoCacheConstants::CACHE_GLOBAL, $this->_data );
}
/**
@@ -77,7 +73,7 @@
{
if ($this->_db == null) {
// source the neccessary class files
- lt_include( PLOG_CLASS_PATH."class/database/ltdb.class.php" );
+
// initialize the connection
$this->_db =& LtDb::getDb();
@@ -322,7 +318,7 @@
}
// update the cache
- $this->_cache->setData( CACHE_CONFIGDBSTORAGE, CACHE_GLOBAL, $this->_data );
+ $this->_cache->setData( DaoCacheConstants::CACHE_CONFIGDBSTORAGE, DaoCacheConstants::CACHE_GLOBAL, $this->_data );
// saveValue is already reloading the data for us everytime!
return true;
@@ -351,7 +347,7 @@
// update the cache
$this->_data[$key] = $value;
- $this->_cache->removeData( CACHE_CONFIGDBSTORAGE, CACHE_GLOBAL );
+ $this->_cache->removeData( DaoCacheConstants::CACHE_CONFIGDBSTORAGE, DaoCacheConstants::CACHE_GLOBAL );
// we better reload the data just in case
// $this->reload();
Modified: plog/branches/lifetype-2.0-autoload/class/config/configfilestorage.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/config/configfilestorage.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/config/configfilestorage.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/config/configabstractstorage.class.php" );
+
if (!defined("DEFAULT_CONFIG_FILE")) {
define( "DEFAULT_CONFIG_FILE", PLOG_CLASS_PATH."config/config.properties.php" );
@@ -52,8 +52,8 @@
*/
function reload()
{
- 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 )) {
// Note: It is correct to not use lt_include() here
include( $this->_configFile );
@@ -106,7 +106,7 @@
$config[\'db_prefix\'] = \'\';
?>';
- lt_include( PLOG_CLASS_PATH."class/file/file.class.php" );
+
$file = new File( $configFileName );
$writable = $file->open( 'w' );
if ($writable) {
@@ -190,7 +190,7 @@
function saveValue( $name, $value )
{
// open the config file
- lt_include( PLOG_CLASS_PATH."class/file/file.class.php" );
+
$f = new File( $this->_configFile );
// there was a problem opening the file
Modified: plog/branches/lifetype-2.0-autoload/class/config/siteconfig.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/config/siteconfig.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/config/siteconfig.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
+
/**
* some default values for the method below
*/
Modified: plog/branches/lifetype-2.0-autoload/class/controller/admincontroller.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/controller/admincontroller.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/controller/admincontroller.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,9 +1,9 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/controller/controller.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/bloginfo.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/userinfo.class.php" );
+
+
+
$_plogAdminController_running = null;
/**
Modified: plog/branches/lifetype-2.0-autoload/class/controller/blogcontroller.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/controller/blogcontroller.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/controller/blogcontroller.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/controller/controller.class.php" );
+
$_plogBlogController_running = null;
/**
Modified: plog/branches/lifetype-2.0-autoload/class/controller/controller.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/controller/controller.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/controller/controller.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -14,8 +14,8 @@
* from a certain set of folders.
*/
- lt_include( PLOG_CLASS_PATH."class/action/action.class.php" );
- lt_include( PLOG_CLASS_PATH."class/controller/resourceclassloader.class.php" );
+
+
//
// various constants that will come handy
@@ -291,7 +291,7 @@
*/
function process( $httpRequest )
{
- lt_include( PLOG_CLASS_PATH."class/net/request.class.php" );
+
// get the name of the action
$request = new Request( $httpRequest );
@@ -331,7 +331,7 @@
}
if( !$performed ) {
- lt_include( PLOG_CLASS_PATH."class/action/actioninfo.class.php" );
+
// load the class if it hasn't been loaded yet
$this->loadActionClass( $actionClass );
Modified: plog/branches/lifetype-2.0-autoload/class/controller/resourceclassloader.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/controller/resourceclassloader.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/controller/resourceclassloader.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -101,7 +101,7 @@
*/
function load( $actionClassName )
{
- lt_include(PLOG_CLASS_PATH . "class/file/file.class.php");
+
//foreach( $this->_paths as $path ) {
$i = 0;
@@ -114,9 +114,9 @@
// build up the file name
$fileName = $path.strtolower($actionClassName).$this->_classFileSuffix;
// and see if it exists and can be loaded
- lt_include( PLOG_CLASS_PATH."class/file/file.class.php" );
+
if( File::exists( $fileName ) && File::isReadable( $fileName )) {
- lt_include( $fileName );
+
$loaded = true;
}
// increase the counter
Modified: plog/branches/lifetype-2.0-autoload/class/controller/sequentialcontroller.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/controller/sequentialcontroller.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/controller/sequentialcontroller.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,9 +1,9 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/controller/controller.class.php" );
- lt_include( PLOG_CLASS_PATH."class/net/http/session/sessionmanager.class.php" );
- lt_include( PLOG_CLASS_PATH."class/net/http/httpvars.class.php" );
+
+
+
define( "SEQUENTIAL_CONTROLLER_SESSION_PARAMETER", "ltSeqControllerCurrentStep" );
/**
@@ -100,13 +100,13 @@
{
global $_plogController_previousAction;
- lt_include( PLOG_CLASS_PATH."class/net/request.class.php" );
+
// get the name of the action
$request = new Request( $httpRequest );
- lt_include( PLOG_CLASS_PATH."class/action/actioninfo.class.php" );
+
$currentStep = $this->getCurrentStep();
$actionClass = $this->_steps[ $currentStep ];
Modified: plog/branches/lifetype-2.0-autoload/class/dao/archivelink.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/archivelink.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/archivelink.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/dao/mylink.class.php" );
+
/**
* used for the archive links, it extends it adding an additional method to fetch
* the number of posts in that month
Modified: plog/branches/lifetype-2.0-autoload/class/dao/article.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/article.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/article.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/dao/locationawaredbobject.class.php" );
+
lt_include( PLOG_CLASS_PATH.'class/dao/articlestatus.class.php' );
- lt_include( PLOG_CLASS_PATH.'class/dao/articlecommentstatus.class.php' );
- lt_include( PLOG_CLASS_PATH.'class/data/timestamp.class.php' );
+ lt_include( PLOG_CLASS_PATH.'class/dao/articlecommentstatus.class.php' );
define( 'POST_EXTENDED_TEXT_MODIFIER', '[@more@]' );
@@ -234,7 +233,7 @@
function getCategories()
{
if( $this->_categories == null ) {
- lt_include( PLOG_CLASS_PATH."class/dao/articlecategories.class.php" );
+
$categories = new ArticleCategories();
foreach( $this->getCategoryIds() as $categoryId ) {
if(( $category = $categories->getCategory( $categoryId )))
@@ -316,7 +315,7 @@
// get the offset
$offset = $this->getTimeOffset();
// and calculate the date without offset
- lt_include( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
+
$date = Timestamp::getDateWithOffset( $this->getDate(), -$offset );
return( $date );
}
@@ -326,7 +325,7 @@
// get the offset
$offset = $this->getTimeOffset();
// and calculate the date without offset
- lt_include( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
+
$t = new Timestamp( Timestamp::getDateWithOffset( $this->getDate(), -$offset ));
return( $t );
}
@@ -343,7 +342,7 @@
{
// load the comments if they haven't been loaded yet
if( is_null( $this->_comments[$status] )) {
- lt_include( PLOG_CLASS_PATH.'class/dao/articlecomments.class.php' );
+
$userComments = new ArticleComments();
$blogInfo = $this->getBlogInfo();
$blogSettings = $blogInfo->getSettings();
@@ -364,7 +363,7 @@
{
// load the comments if they haven't been loaded yet
if( is_null($this->_trackbacks) ) {
- lt_include( PLOG_CLASS_PATH.'class/dao/trackbacks.class.php' );
+
$trackbacks = new Trackbacks();
$blogInfo = $this->getBlogInfo();
$blogSettings = $blogInfo->getSettings();
@@ -397,7 +396,7 @@
{
// load the user if it hasn't been loaded yet
if( is_null($this->_userInfo) ) {
- lt_include( PLOG_CLASS_PATH.'class/dao/users.class.php' );
+
$users = new Users();
$this->setUserInfo( $users->getUserInfoFromId( $this->getUser()));
}
@@ -454,7 +453,7 @@
function getBlogInfo()
{
if( $this->_blogInfo == null ) {
- lt_include( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
+
$blogs = new Blogs();
$this->_blogInfo = $blogs->getBlogInfo( $this->getBlogId());
}
@@ -709,7 +708,7 @@
*/
function setDate( $newDate )
{
- lt_include( PLOG_CLASS_PATH.'class/data/timestamp.class.php' );
+
$this->_date = $newDate;
@@ -750,7 +749,7 @@
// get the offset
$offset = $this->getTimeOffset();
// and calculate the date without offset
- lt_include( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
+
$date = Timestamp::getDateWithOffset( $this->getModificationDate(), -$offset );
return( $date );
}
@@ -760,7 +759,7 @@
// get the offset
$offset = $this->getTimeOffset();
// and calculate the date without offset
- lt_include( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
+
$date = new Timestamp( Timestamp::getDateWithOffset( $this->getModificationDate(), -$offset ));
return( $date );
}
@@ -879,7 +878,7 @@
function getCustomFields()
{
if( is_null( $this->_customFields )) {
- lt_include( PLOG_CLASS_PATH.'class/dao/customfields/customfieldsvalues.class.php' );
+
// get the custom fields
$customFields = new CustomFieldsValues();
$fields = $customFields->getArticleCustomFieldsValues( $this->getId(), $this->getBlog());
@@ -977,7 +976,7 @@
function getPostSlug()
{
if( $this->_slug == "" ) {
- lt_include( PLOG_CLASS_PATH.'class/data/textfilter.class.php' );
+
$slug = Textfilter::slugify( $this->getTopic());
} else {
$slug = $this->_slug;
@@ -993,7 +992,7 @@
*/
function setPostSlug( $slug )
{
- lt_include( PLOG_CLASS_PATH.'class/data/textfilter.class.php' );
+
$this->_slug = Textfilter::slugify( $slug );
}
@@ -1005,7 +1004,7 @@
function getPrevArticle()
{
if( !isset($this->_prevArticle )) {
- lt_include( PLOG_CLASS_PATH.'class/dao/articles.class.php' );
+
$articles = new Articles();
$this->_prevArticle = $articles->getBlogPrevArticle( $this );
}
@@ -1021,7 +1020,7 @@
function getNextArticle()
{
if( !isset($this->_nextArticle )) {
- lt_include( PLOG_CLASS_PATH.'class/dao/articles.class.php' );
+
$articles = new Articles();
$this->_nextArticle = $articles->getBlogNextArticle( $this );
}
@@ -1043,9 +1042,9 @@
*/
function getArticleResources()
{
- lt_include( PLOG_CLASS_PATH."class/data/stringutils.class.php" );
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryresources.class.php" );
+
+
// extract all the "res_XX" values
$regexp ="|<a.*id=\"res_([0-9]+)\".*>.*<\/a>|U";
$resources = Array();
@@ -1097,7 +1096,7 @@
function getGlobalCategory()
{
if( $this->_globalCategory == null ) {
- lt_include( PLOG_CLASS_PATH."class/dao/globalarticlecategories.class.php" );
+
$globalCategories = new GlobalArticleCategories();
$this->_globalCategory = $globalCategories->getGlobalArticleCategory( $this->_globalCategoryId );
}
Modified: plog/branches/lifetype-2.0-autoload/class/dao/articlecategories.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/articlecategories.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/articlecategories.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,10 +1,10 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/dao/model.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/articlecategory.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/daocacheconstants.properties.php" );
+
+
+
+
/*
* different modes in which the listing of categories can be obtained
*/
@@ -48,7 +48,7 @@
{
$category = $this->get( "id",
$categoryId,
- CACHE_ARTICLE_CATEGORIES );
+ DaoCacheConstants::CACHE_ARTICLE_CATEGORIES );
if( !$category )
return false;
if( $blogId > -1 && $category->getBlogId() != $blogId )
@@ -68,8 +68,8 @@
{
$categories = $this->getMany( "mangled_name",
$categoryName,
- CACHE_ARTICLE_CATEGORIES_BYNAME,
- Array( CACHE_ARTICLE_CATEGORIES => "getId" ));
+ DaoCacheConstants::CACHE_ARTICLE_CATEGORIES_BYNAME,
+ Array( DaoCacheConstants::CACHE_ARTICLE_CATEGORIES => "getId" ));
// no categories
if( !$categories )
@@ -164,8 +164,8 @@
$categories = $this->getMany( "blog_id",
$blogId,
- CACHE_ARTICLE_CATEGORIES_BLOG,
- Array( CACHE_ARTICLE_CATEGORIES => "getId" ),
+ DaoCacheConstants::CACHE_ARTICLE_CATEGORIES_BLOG,
+ Array( DaoCacheConstants::CACHE_ARTICLE_CATEGORIES => "getId" ),
$sorting,
$searchTerms );
@@ -228,9 +228,9 @@
*/
function addArticleCategory( &$articleCategory )
{
- if(( $result = $this->add( $articleCategory, Array( CACHE_ARTICLE_CATEGORIES => "getId" )))) {
- $this->_cache->removeData( $articleCategory->getBlogId(), CACHE_ARTICLE_CATEGORIES_BLOG );
- $this->_cache->removeData( $articleCategory->getMangledName(), CACHE_ARTICLE_CATEGORIES_BYNAME );
+ if(( $result = $this->add( $articleCategory, Array( DaoCacheConstants::CACHE_ARTICLE_CATEGORIES => "getId" )))) {
+ $this->_cache->removeData( $articleCategory->getBlogId(), DaoCacheConstants::CACHE_ARTICLE_CATEGORIES_BLOG );
+ $this->_cache->removeData( $articleCategory->getMangledName(), DaoCacheConstants::CACHE_ARTICLE_CATEGORIES_BYNAME );
}
return( $result );
@@ -252,12 +252,12 @@
{
if ( $this->delete( "id", $categoryId ) )
{
- $this->_cache->removeData( $categoryId, CACHE_ARTICLE_CATEGORIES );
- $this->_cache->removeData( $blogId, CACHE_ARTICLE_CATEGORIES_BLOG );
- $this->_cache->removeData( $category->getMangledName(), CACHE_ARTICLE_CATEGORIES_BYNAME );
+ $this->_cache->removeData( $categoryId, DaoCacheConstants::CACHE_ARTICLE_CATEGORIES );
+ $this->_cache->removeData( $blogId, DaoCacheConstants::CACHE_ARTICLE_CATEGORIES_BLOG );
+ $this->_cache->removeData( $category->getMangledName(), DaoCacheConstants::CACHE_ARTICLE_CATEGORIES_BYNAME );
foreach( $category->getArticles() as $article)
{
- $this->_cache->removeData( $article->getId(), CACHE_ARTICLE_CATEGORIES_LINK );
+ $this->_cache->removeData( $article->getId(), DaoCacheConstants::CACHE_ARTICLE_CATEGORIES_LINK );
}
}
return( true );
@@ -274,7 +274,7 @@
function deleteBlogCategories( $blogId )
{
if(($result = $this->delete( "blog_id", $blogId ))) {
- $this->_cache->removeData( "all", CACHE_ARTICLE_CATEGORIES_BLOG );
+ $this->_cache->removeData( "all", DaoCacheConstants::CACHE_ARTICLE_CATEGORIES_BLOG );
/**
* :TODO:
* remove each single cached category!
@@ -306,8 +306,8 @@
"acl.category_id"
));
if( $result = $this->update( $category )) {
- $this->_cache->removeData( $category->getBlogId(), CACHE_ARTICLE_CATEGORIES_BLOG );
- $this->_cache->setData( $category->getId(), CACHE_ARTICLE_CATEGORIES, $category );
+ $this->_cache->removeData( $category->getBlogId(), DaoCacheConstants::CACHE_ARTICLE_CATEGORIES_BLOG );
+ $this->_cache->setData( $category->getId(), DaoCacheConstants::CACHE_ARTICLE_CATEGORIES, $category );
}
return( $result );
@@ -324,7 +324,7 @@
*/
function getArticleCategories( $articleId, $blogId = -1 )
{
- $categoryLinks = $this->_cache->getData( $articleId, CACHE_ARTICLE_CATEGORIES_LINK );
+ $categoryLinks = $this->_cache->getData( $articleId, DaoCacheConstants::CACHE_ARTICLE_CATEGORIES_LINK );
if( !$categoryLinks ) {
$query = "SELECT category_id FROM ".$this->getPrefix()."article_categories_link
@@ -335,7 +335,7 @@
$categoryLinks[] = $row["category_id"];
}
$result->Close();
- $this->_cache->setData( $articleId, CACHE_ARTICLE_CATEGORIES_LINK, $categoryLinks );
+ $this->_cache->setData( $articleId, DaoCacheConstants::CACHE_ARTICLE_CATEGORIES_LINK, $categoryLinks );
}
else
return( Array());
Modified: plog/branches/lifetype-2.0-autoload/class/dao/articlecategory.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/articlecategory.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/articlecategory.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/database/dbobject.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/articlestatus.class.php" );
+
+
/**
* \ingroup DAO
@@ -41,7 +41,7 @@
*/
function ArticleCategory( $name, $url, $blogId, $inMainPage, $description = "", $numArticles = 0, $properties = Array(), $id = -1, $lastModification=null, $parentId = 0)
{
- lt_include( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
+
$this->DbObject();
@@ -248,7 +248,7 @@
*/
function getArticles( $status = POST_STATUS_PUBLISHED )
{
- lt_include( PLOG_CLASS_PATH."class/dao/articles.class.php" );
+
if( !is_array( $this->_articles[$status] ) || $this->_articles[$status] == null ) {
$articles = new Articles();
@@ -348,7 +348,7 @@
function getMangledName()
{
if( $this->_mangledName == "" ) {
- lt_include( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
+
$this->_mangledName = Textfilter::urlize( $this->getName());
}
@@ -374,7 +374,7 @@
function getBlog()
{
if( $this->_blog == null ) {
- lt_include( PLOG_CLASS_PATH."class/dao/bloginfo.class.php" );
+
$blogs = new Blogs();
$this->_blog = $blogs->getBlogInfoById( $this->getBlogId());
}
Modified: plog/branches/lifetype-2.0-autoload/class/dao/articlecomments.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/articlecomments.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/articlecomments.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/dao/commentscommon.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/usercomment.class.php" );
+
+
/**
* \ingroup DAO
Modified: plog/branches/lifetype-2.0-autoload/class/dao/articlecommentstatus.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/articlecommentstatus.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/articlecommentstatus.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/dao/status/genericstatuslist.class.php" );
+
define( "COMMENT_STATUS_ALL", -1, true );
define( "COMMENT_STATUS_NONSPAM", 0, true );
Modified: plog/branches/lifetype-2.0-autoload/class/dao/articlenotification.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/articlenotification.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/articlenotification.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/database/dbobject.class.php" );
+
/**
* \ingroup DAO
Modified: plog/branches/lifetype-2.0-autoload/class/dao/articlenotifications.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/articlenotifications.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/articlenotifications.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,9 +1,9 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/dao/model.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/articlenotification.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/userinfo.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/templateservice.class.php" );
+
+
+
+
define( "EMAILNOTIFIER_TEMPLATE", "email_notifier" );
@@ -76,9 +76,9 @@
*/
function notifyUser( $notification, $userInfo, $subject, $body, $locale )
{
- lt_include( PLOG_CLASS_PATH."class/mail/emailservice.class.php" );
- lt_include( PLOG_CLASS_PATH."class/mail/emailmessage.class.php" );
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
+
+
+
$config =& Config::getConfig();
$message = new EmailMessage();
@@ -100,9 +100,9 @@
*/
function notifyUsers( $postId, $blogInfo)
{
- lt_include( PLOG_CLASS_PATH."class/dao/users.class.php" );
+
$blogId = $blogInfo->getId();
$artNotifs = $this->getArticleNotifications( $postId, $blogId );
@@ -188,8 +188,8 @@
function updateNotify( $blogInfo )
{
// source classes
- lt_include( PLOG_CLASS_PATH."class/net/xmlrpcclient.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-2.0-autoload/class/dao/articles.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/articles.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/articles.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,10 +1,10 @@
<?php
- lt_include( PLOG_CLASS_PATH.'class/dao/model.class.php' );
- lt_include( PLOG_CLASS_PATH.'class/dao/article.class.php' );
- lt_include( PLOG_CLASS_PATH.'class/dao/articlestatus.class.php' );
- lt_include( PLOG_CLASS_PATH.'class/dao/daocacheconstants.properties.php' );
+
+
+
+
/**
* Constants used as the $order parameter in method getBlogArticles
*/
@@ -35,7 +35,7 @@
*/
function getArticle( $articleId )
{
- return( $this->get( "id", $articleId, CACHE_ARTICLES ));
+ return( $this->get( "id", $articleId, DaoCacheConstants::CACHE_ARTICLES ));
}
/**
@@ -95,8 +95,8 @@
// load all the articles with the same title
$articles = $this->getMany( "slug",
$articleTitle,
- CACHE_ARTICLES_BYNAME,
- Array( CACHE_ARTICLES => "getId" ));
+ DaoCacheConstants::CACHE_ARTICLES_BYNAME,
+ Array( DaoCacheConstants::CACHE_ARTICLES => "getId" ));
$found = false;
if($articles){
foreach( $articles as $article ) {
@@ -147,7 +147,7 @@
*/
function getBlogNextArticle( $article )
{
- lt_include( PLOG_CLASS_PATH.'class/data/timestamp.class.php' );
+
$blogInfo = $article->getBlogInfo();
$blogSettings = $blogInfo->getSettings();
@@ -177,7 +177,7 @@
*/
function getBlogPrevArticle( $article )
{
- lt_include( PLOG_CLASS_PATH.'class/data/timestamp.class.php' );
+
// we need to keep the timestamp in mind
$date = $article->getDateObject();
@@ -299,7 +299,7 @@
*/
// prepare the query string
- lt_include( PLOG_CLASS_PATH."class/dao/searchengine.class.php" );
+
$searchTerms = SearchEngine::adaptSearchString( $searchTerms );
$db =& LtDb::getDb();
@@ -368,7 +368,7 @@
}
if( $date != -1 ) {
// consider the time difference
- lt_include( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
+
$blogs = new Blogs();
$blogInfo = $blogs->getBlogInfo( $blogId );
$blogSettings = $blogInfo->getSettings();
@@ -515,8 +515,8 @@
$article = $this->mapRow( $row );
$articles[] = $article;
// and cache it for later use, we might need it
- $this->_cache->setData( $article->getId(), CACHE_ARTICLES, $article );
- $this->_cache->setMultipleData( $article->getPostSlug(), CACHE_ARTICLES_BYNAME, $article );
+ $this->_cache->setData( $article->getId(), DaoCacheConstants::CACHE_ARTICLES, $article );
+ $this->_cache->setMultipleData( $article->getPostSlug(), DaoCacheConstants::CACHE_ARTICLES_BYNAME, $article );
}
$result->Close();
@@ -535,11 +535,11 @@
function getNumberPostsPerMonth( $blogId )
{
- $archives = $this->_cache->getData( $blogId, CACHE_ARTICLESPERMONTH );
+ $archives = $this->_cache->getData( $blogId, DaoCacheConstants::CACHE_ARTICLESPERMONTH );
$arcnives = false;
if( !$archives ) {
- lt_include( PLOG_CLASS_PATH . 'class/dao/blogs.class.php' );
+
$blogs = new Blogs();
$blogInfo = $blogs->getBlogInfo( $blogId );
$blogSettings = $blogInfo->getSettings();
@@ -572,7 +572,7 @@
$archives[$row["year"]][$row["month"]] = $row["count"];
}
$result->Close();
- $this->_cache->setData( $blogId, CACHE_ARTICLESPERMONTH, $archives );
+ $this->_cache->setData( $blogId, DaoCacheConstants::CACHE_ARTICLESPERMONTH, $archives );
}
return $archives;
@@ -616,7 +616,7 @@
*/
function getDaysWithPosts( $blogId, $year = null , $month = null )
{
- lt_include( PLOG_CLASS_PATH.'class/data/timestamp.class.php' );
+
$t = new Timestamp();
// if month and/or year are empty, get the current ones
if( $year == null )
@@ -652,7 +652,7 @@
if( !$result )
return Array();
- lt_include( PLOG_CLASS_PATH.'class/data/timestamp.class.php' );
+
$postsPerDay = Array();
while( $row = $result->FetchRow()) {
@@ -676,9 +676,9 @@
*/
function addPostCategoriesLink( $article )
{
- 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();
@@ -697,7 +697,7 @@
$category = $articleCategories->getCategory( $categoryId );
if( $article->getStatus() == POST_STATUS_PUBLISHED ) {
//$category->setNumPublishedArticles( $category->getNumPublishedArticles() +1 );
- lt_include( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
+
$category->setLastModification( new Timestamp());
}
//$category->setNumArticles( $category->getNumAllArticles() + 1 );
@@ -713,8 +713,8 @@
*/
function deletePostCategoriesLink( $article )
{
- 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 = '".LtDb::qstr( $article->getId())."'";
@@ -726,7 +726,7 @@
$articleCategories->updateCategory( $category );
}
// clean the cache that contains the links
- $this->_cache->removeData( $article->getId(), CACHE_ARTICLE_CATEGORIES_LINK );
+ $this->_cache->removeData( $article->getId(), DaoCacheConstants::CACHE_ARTICLE_CATEGORIES_LINK );
}
return( $result );
@@ -756,7 +756,7 @@
*/
function updateGlobalArticleCategoriesLink( $article, $oldArticle = null )
{
- lt_include( PLOG_CLASS_PATH."class/dao/globalarticlecategories.class.php" );
+
$cats = new GlobalArticleCategories();
$artCategory = $article->getGlobalCategory();
@@ -789,7 +789,7 @@
function addArticle( &$newArticle )
{
// Check if we need to force the article slug to be unique
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
+
$config =& Config::getConfig();
if($config->getValue("force_posturl_unique"))
{
@@ -809,9 +809,9 @@
$newArticle->setPostSlug($slug);
}
- lt_include( PLOG_CLASS_PATH.'class/dao/customfields/customfields.class.php' );
- lt_include( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
+
+
$result = $this->add( $newArticle );
if( !$result )
@@ -839,7 +839,7 @@
// update the blog counters
if( $newArticle->getStatus() == POST_STATUS_PUBLISHED ) {
- lt_include( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
+
$blogs = new Blogs();
$blogInfo = $newArticle->getBlogInfo();
$blogInfo->setTotalPosts( $blogInfo->getTotalPosts() + 1 );
@@ -848,9 +848,9 @@
}
// and finally clear the cache :)
- lt_include( PLOG_CLASS_PATH."class/dao/recentarticles.class.php" );
+
RecentArticles::resetRecentArticlesCache( $newArticle->getBlogId());
- $this->_cache->removeData( $newArticle->getBlogId(), CACHE_ARTICLESPERMONTH );
+ $this->_cache->removeData( $newArticle->getBlogId(), DaoCacheConstants::CACHE_ARTICLESPERMONTH );
return( $newArticle->getId());
}
@@ -864,7 +864,7 @@
*/
function addArticleText( $newArticle )
{
- 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) ".
@@ -886,7 +886,7 @@
*/
function getArticleText( $articleId )
{
- $text = $this->_cache->getData( $articleId, CACHE_ARTICLETEXT );
+ $text = $this->_cache->getData( $articleId, DaoCacheConstants::CACHE_ARTICLETEXT );
if( !$text ) {
$query = "SELECT text, normalized_text, topic, normalized_topic FROM ".$this->getPrefix()."articles_text ".
@@ -894,7 +894,7 @@
$result = $this->Execute( $query );
$text = $result->FetchRow();
$result->Close();
- $this->_cache->setData( $articleId, CACHE_ARTICLETEXT, $text );
+ $this->_cache->setData( $articleId, DaoCacheConstants::CACHE_ARTICLETEXT, $text );
}
return $text;
@@ -908,7 +908,7 @@
*/
function updateArticleText( $article )
{
- lt_include( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
+
$filter = new Textfilter();
$query = "UPDATE ".$this->getPrefix()."articles_text SET ".
@@ -918,7 +918,7 @@
"normalized_topic = '".LtDb::qstr($filter->normalizeText( $article->getTopic()))."' ".
"WHERE article_id = '".LtDb::qstr( $article->getId())."'";
- $this->_cache->removeData( $article->getId(), CACHE_ARTICLETEXT );
+ $this->_cache->removeData( $article->getId(), DaoCacheConstants::CACHE_ARTICLETEXT );
return($this->Execute( $query ));
}
@@ -932,7 +932,7 @@
function updateArticle( $article )
{
// Check if we need to force the article slug to be unique
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
+
$config =& Config::getConfig();
if($config->getValue("force_posturl_unique"))
{
@@ -987,14 +987,14 @@
// update the blog counter
if( $oldArticle->getStatus() == POST_STATUS_PUBLISHED && $article->getStatus() != POST_STATUS_PUBLISHED ) {
- 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 ) {
- lt_include( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
+
$blogs = new Blogs();
$blogInfo = $article->getBlogInfo();
$blogInfo->setTotalPosts( $blogInfo->getTotalPosts() + 1 );
@@ -1003,12 +1003,12 @@
}
// clean up the cache
- lt_include( PLOG_CLASS_PATH."class/dao/recentarticles.class.php" );
+
RecentArticles::resetRecentArticlesCache( $article->getBlogId());
- $this->_cache->removeData( $article->getBlogId(), CACHE_ARTICLESPERMONTH );
- $this->_cache->removeData( $article->getId(), CACHE_ARTICLETEXT );
- $this->_cache->setData( $article->getId(), CACHE_ARTICLES, $article );
- $this->_cache->removeData( $article->getPostSlug(), CACHE_ARTICLES_BYNAME );
+ $this->_cache->removeData( $article->getBlogId(), DaoCacheConstants::CACHE_ARTICLESPERMONTH );
+ $this->_cache->removeData( $article->getId(), DaoCacheConstants::CACHE_ARTICLETEXT );
+ $this->_cache->setData( $article->getId(), DaoCacheConstants::CACHE_ARTICLES, $article );
+ $this->_cache->removeData( $article->getPostSlug(), DaoCacheConstants::CACHE_ARTICLES_BYNAME );
return true;
}
@@ -1025,7 +1025,7 @@
*/
function updateArticleCustomFields( $artId, $blogId, $fields )
{
- lt_include( PLOG_CLASS_PATH."class/dao/customfields/customfieldsvalues.class.php" );
+
$customFields = new CustomFieldsValues();
// first remove the values
@@ -1052,7 +1052,7 @@
*/
function updateArticleNumReads( $articleId )
{
- lt_include( PLOG_CLASS_PATH . 'class/database/db.class.php' );
+
$query = "UPDATE ".$this->getPrefix()."articles SET ".
" num_reads = num_reads+1, date = date".
@@ -1103,12 +1103,12 @@
*/
function deleteArticle( $artId, $userId, $blogId, $forever = false )
{
- lt_include( PLOG_CLASS_PATH.'class/dao/articlecomments.class.php' );
- lt_include( PLOG_CLASS_PATH.'class/database/db.class.php' );
- lt_include( PLOG_CLASS_PATH.'class/dao/trackbacks.class.php' );
- lt_include( PLOG_CLASS_PATH.'class/dao/customfields/customfieldsvalues.class.php' );
- lt_include( PLOG_CLASS_PATH.'class/dao/articlenotifications.class.php' );
+
+
+
+
+
$article = $this->getBlogArticle( $artId, $blogId, true, -1, -1, $userId );
if( !$article )
return false;
@@ -1140,10 +1140,10 @@
return false;
// remove all related cache
- lt_include( PLOG_CLASS_PATH."class/dao/recentarticles.class.php" );
+
RecentArticles::resetRecentArticlesCache( $blogId );
- $this->_cache->removeData( $blogId, CACHE_ARTICLESPERMONTH );
- $this->_cache->removeData( $artId, CACHE_ARTICLES );
+ $this->_cache->removeData( $blogId, DaoCacheConstants::CACHE_ARTICLESPERMONTH );
+ $this->_cache->removeData( $artId, DaoCacheConstants::CACHE_ARTICLES );
}
else {
$article->setStatus( POST_STATUS_DELETED );
@@ -1192,10 +1192,10 @@
*/
function mapRow( $query_result )
{
- lt_include( PLOG_CLASS_PATH."class/dao/articlecategories.class.php" );
- lt_include( PLOG_CLASS_PATH.'class/data/timestamp.class.php' );
- lt_include( PLOG_CLASS_PATH.'class/dao/users.class.php' );
- lt_include( PLOG_CLASS_PATH.'class/dao/blogs.class.php' );
+
+
+
+
$id = $query_result['id'];
Modified: plog/branches/lifetype-2.0-autoload/class/dao/articlestatus.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/articlestatus.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/articlestatus.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/dao/status/genericstatuslist.class.php" );
+
define( "POST_STATUS_ALL", -1, true );
define( "POST_STATUS_PUBLISHED", 1, true );
Modified: plog/branches/lifetype-2.0-autoload/class/dao/bayesianfilterinfo.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/bayesianfilterinfo.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/bayesianfilterinfo.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/database/dbobject.class.php" );
+
/**
* \ingroup DAO
Modified: plog/branches/lifetype-2.0-autoload/class/dao/bayesianfilterinfos.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/bayesianfilterinfos.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/bayesianfilterinfos.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/dao/model.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/bayesianfilterinfo.class.php" );
+
+
/**
* \ingroup DAO
Modified: plog/branches/lifetype-2.0-autoload/class/dao/bayesiantoken.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/bayesiantoken.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/bayesiantoken.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/database/dbobject.class.php" );
+
define("TOKEN_DEFAULT_PROBABILITY", 0.4);
Modified: plog/branches/lifetype-2.0-autoload/class/dao/bayesiantokens.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/bayesiantokens.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/bayesiantokens.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/dao/model.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/bayesiantoken.class.php" );
+
+
/**
* Takes care of dealing with fetching filtered contents from the database
Modified: plog/branches/lifetype-2.0-autoload/class/dao/blogcategories.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/blogcategories.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/blogcategories.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/dao/model.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/blogcategory.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/daocacheconstants.properties.php" );
+
+
+
/**
* \ingroup DAO
@@ -26,7 +26,7 @@
*/
function getBlogCategory( $id )
{
- return( $this->get( "id", $id, CACHE_BLOGCATEGORIES ));
+ return( $this->get( "id", $id, DaoCacheConstants::CACHE_BLOGCATEGORIES ));
}
/**
@@ -38,8 +38,8 @@
*/
function addBlogCategory( &$category )
{
- if( ($result = $this->add( $category, Array( CACHE_BLOGCATEGORIES => "getId" )))) {
- $this->_cache->removeData( "_all_", CACHE_BLOGCATEGORIES_ALL );
+ if( ($result = $this->add( $category, Array( DaoCacheConstants::CACHE_BLOGCATEGORIES => "getId" )))) {
+ $this->_cache->removeData( "_all_", DaoCacheConstants::CACHE_BLOGCATEGORIES_ALL );
}
return( $result );
@@ -56,8 +56,8 @@
function deleteBlogCategory( $id )
{
if( ($result = $this->delete( "id", $id ))) {
- $this->_cache->removeData( $id, CACHE_BLOGCATEGORIES );
- $this->_cache->removeData( "_all_", CACHE_BLOGCATEGORIES_ALL );
+ $this->_cache->removeData( $id, DaoCacheConstants::CACHE_BLOGCATEGORIES );
+ $this->_cache->removeData( "_all_", DaoCacheConstants::CACHE_BLOGCATEGORIES_ALL );
}
return( $result );
@@ -72,8 +72,8 @@
function updateBlogCategory( $category )
{
if( ($result = $this->update( $category ))) {
- $this->_cache->removeData( $category->getId(), CACHE_BLOGCATEGORIES );
- $this->_cache->removeData( "_all_", CACHE_BLOGCATEGORIES_ALL );
+ $this->_cache->removeData( $category->getId(), DaoCacheConstants::CACHE_BLOGCATEGORIES );
+ $this->_cache->removeData( "_all_", DaoCacheConstants::CACHE_BLOGCATEGORIES_ALL );
}
return( $result );
@@ -100,8 +100,8 @@
function getBlogCategories( $searchTerms = "", $page = -1, $itemsPerPage = DEFAULT_ITEMS_PER_PAGE )
{
$categories = $this->getAll( "all",
- CACHE_BLOGCATEGORIES_ALL,
- Array( CACHE_BLOGCATEGORIES => "getId" ),
+ DaoCacheConstants::CACHE_BLOGCATEGORIES_ALL,
+ Array( DaoCacheConstants::CACHE_BLOGCATEGORIES => "getId" ),
Array( "name" => "ASC" ),
$searchTerms,
$page,
Modified: plog/branches/lifetype-2.0-autoload/class/dao/blogcategory.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/blogcategory.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/blogcategory.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/database/dbobject.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/blogstatus.class.php" );
+
+
/**
* \ingroup DAO
@@ -99,7 +99,7 @@
elseif( $status == BLOG_STATUS_ACTIVE )
return( $this->_numActiveBlogs );
else {
- lt_include( PLOG_CLASS_PATH."class/dao/blogcategories.class.php" );
+
$categories = new BlogCategories();
return( $categories->getNumBlogsCategory( $this->getId(), $status ));
}
@@ -160,7 +160,7 @@
function getMangledName()
{
if( $this->_mangledName == "" ) {
- lt_include( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
+
$this->_mangledName = Textfilter::urlize( $this->getName() );
}
Modified: plog/branches/lifetype-2.0-autoload/class/dao/bloginfo.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/bloginfo.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/bloginfo.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/dao/locationawaredbobject.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/blogsettings.class.php" );
+
+
/**
* \ingroup DAO
@@ -45,7 +45,7 @@
function BlogInfo( $blog, $owner, $about, $settings, $id = -1 )
{
- lt_include( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
+
$this->LocationAwareDbObject();
@@ -148,7 +148,7 @@
$text = $this->_about;
if( $format ) {
- lt_include( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
+
$text = TextFilter::autoP( $text );
}
@@ -232,7 +232,7 @@
*/
function getCreateDateObject()
{
- lt_include( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
+
return( new Timestamp( $this->_createDate ));
}
@@ -250,7 +250,7 @@
*/
function getUpdateDateObject()
{
- lt_include( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
+
return( new Timestamp( $this->_updateDate ));
}
@@ -315,7 +315,7 @@
*/
function getOwnerInfo()
{
- lt_include( PLOG_CLASS_PATH."class/dao/users.class.php" );
+
if( $this->_ownerInfo === null ) {
$users = new Users();
@@ -334,7 +334,7 @@
*/
function getUsersInfo()
{
- lt_include( PLOG_CLASS_PATH."class/dao/users.class.php" );
+
if( $this->_usersInfo === null ) {
$users = new Users();
@@ -360,7 +360,7 @@
*/
function setBlog( $blog )
{
- lt_include( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
+
$tf = new Textfilter();
$this->_blog = $tf->filterAllHTML($blog);
@@ -452,7 +452,7 @@
*/
function getBlogRequestGenerator()
{
- lt_include( PLOG_CLASS_PATH."class/net/requestgenerator.class.php" );
+
return RequestGenerator::getRequestGenerator( $this );
}
@@ -468,7 +468,7 @@
// since including these files is quite a costly operation, let's do it only
// whenever we have to instead of always and always always... :)
if( $this->_templateSet === null ) {
- lt_include( PLOG_CLASS_PATH."class/template/templatesets/templatesets.class.php" );
+
$ts = new TemplateSets();
$this->_templateSet = $ts->getTemplateSet( $this->getTemplate(), $this->getId());
if( $this->_templateSet == null ) {
@@ -501,7 +501,7 @@
function &getLocale()
{
if( $this->_locale === null ) {
- lt_include( PLOG_CLASS_PATH."class/locale/locales.class.php" );
+
$this->_locale =& Locales::getLocale( $this->getSetting( "locale" ), "en_UK" );
}
@@ -511,7 +511,7 @@
function &getBlogLocale()
{
if( $this->_blogLocale === null ) {
- lt_include( PLOG_CLASS_PATH."class/locale/locales.class.php" );
+
$this->_blogLocale =& Locales::getBlogLocale( $this->getSetting( "locale" ), "en_UK" );
}
@@ -569,7 +569,7 @@
// if there is no quota for this blog, then fetch it from the global
// settings
if( $quota == "" ) {
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryresourcequotas.class.php" );
+
$quota = GalleryResourceQuotas::getGlobalResourceQuota();
}
@@ -625,7 +625,7 @@
return( false );
if( $this->_category == null ) {
- lt_include( PLOG_CLASS_PATH."class/dao/blogcategories.class.php" );
+
$blogCategories = new BlogCategories();
$this->_category = $blogCategories->getBlogCategory( $this->_categoryId );
}
@@ -641,7 +641,7 @@
function setMangledBlogName( $mangledBlog, $modify = false )
{
if( $modify ) {
- lt_include( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
+
$mangledBlog = Textfilter::domainize( $mangledBlog );
}
$this->_mangledBlog = $mangledBlog;
@@ -654,7 +654,7 @@
{
// fill in the field if it hasn't been filled yet
if( $this->_mangledBlog === null ) {
- lt_include( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
+
$this->setMangledBlogName( $this->getBlog(), true );
}
@@ -669,7 +669,7 @@
*/
function setCustomDomain($customDomain)
{
- lt_include( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
+
$this->_customDomain = Textfilter::domainize($customDomain);
}
@@ -680,7 +680,7 @@
{
// fill in the field if it hasn't been filled yet
if($this->_customDomain === null){
- lt_include( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
+
$this->_customDomain = Textfilter::domainize($this->getMangledBlog());
}
Modified: plog/branches/lifetype-2.0-autoload/class/dao/bloglinks.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/bloglinks.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/bloglinks.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,5 +1,5 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/database/dbobject.class.php" );
+
/**
* \ingroup DAO
Modified: plog/branches/lifetype-2.0-autoload/class/dao/blogs.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/blogs.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/blogs.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,9 +1,7 @@
<?php
-
- lt_include( PLOG_CLASS_PATH."class/dao/model.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/blogstatus.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/daocacheconstants.properties.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/blogstatus.class.php" );
+
define( "ALL_BLOG_CATEGORIES", 0 );
/**
@@ -27,11 +25,11 @@
*/
function getBlogInfo( $blogId )
{
- lt_include( PLOG_CLASS_PATH . 'class/dao/bloginfo.class.php' );
+
return( $this->get( "id", $blogId,
- CACHE_BLOGINFOS,
- Array( CACHE_BLOGIDBYNAME => "getMangledBlogName",
- CACHE_BLOGIDBYDOMAIN => "getCustomDomain")));
+ DaoCacheConstants::CACHE_BLOGINFOS,
+ Array( DaoCacheConstants::CACHE_BLOGIDBYNAME => "getMangledBlogName",
+ DaoCacheConstants::CACHE_BLOGIDBYDOMAIN => "getCustomDomain")));
}
/**
@@ -42,17 +40,17 @@
*/
function getBlogInfoByName( $blogName, $extendedInfo = false )
{
- lt_include( PLOG_CLASS_PATH . 'class/dao/bloginfo.class.php' );
+
return( $this->get( "mangled_blog", $blogName,
- CACHE_BLOGIDBYNAME,
- Array( CACHE_BLOGINFOS => "getId" )));
+ DaoCacheConstants::CACHE_BLOGIDBYNAME,
+ Array( DaoCacheConstants::CACHE_BLOGINFOS => "getId" )));
}
function getBlogInfoByDomain($blogDomain, $extendedInfo = false){
- lt_include(PLOG_CLASS_PATH . 'class/dao/bloginfo.class.php');
+
return( $this->get( "custom_domain", $blogDomain,
- CACHE_BLOGIDBYDOMAIN,
- Array( CACHE_BLOGINFOS => "getId" )));
+ DaoCacheConstants::CACHE_BLOGIDBYDOMAIN,
+ Array( DaoCacheConstants::CACHE_BLOGINFOS => "getId" )));
}
/**
@@ -70,7 +68,7 @@
*/
function updateBlogCategoriesLink( $blogInfo, $oldBlogInfo = null )
{
- lt_include( PLOG_CLASS_PATH."class/dao/blogcategories.class.php" );
+
$blogCategories = new BlogCategories();
$blogCategory = $blogInfo->getBlogCategory();
@@ -125,9 +123,9 @@
if( ($result = $this->update( $blog ))) {
// reset the caches
- $this->_cache->removeData( $blog->getCustomDomain(), CACHE_BLOGIDBYDOMAIN );
- $this->_cache->removeData( $blog->getMangledBlogName(), CACHE_BLOGIDBYNAME );
- $this->_cache->removeData( $blog->getId(), CACHE_BLOGINFOS );
+ $this->_cache->removeData( $blog->getCustomDomain(), DaoCacheConstants::CACHE_BLOGIDBYDOMAIN );
+ $this->_cache->removeData( $blog->getMangledBlogName(), DaoCacheConstants::CACHE_BLOGIDBYNAME );
+ $this->_cache->removeData( $blog->getId(), DaoCacheConstants::CACHE_BLOGINFOS );
// update blog categories
$this->updateBlogCategoriesLink( $blog, $prevVersion );
@@ -135,8 +133,8 @@
// some settings in the BlogSettings object might affect other database items, such
// as the sorting order of categories and link cateegories. Hence, we should reset
// those caches too
- $this->_cache->removeData( $blog->getId(), CACHE_ARTICLE_CATEGORIES_BLOG );
- $this->_cache->removeData( $blog->getId(), CACHE_MYLINKCATEGORIES_ALL );
+ $this->_cache->removeData( $blog->getId(), DaoCacheConstants::CACHE_ARTICLE_CATEGORIES_BLOG );
+ $this->_cache->removeData( $blog->getId(), DaoCacheConstants::CACHE_MYLINKCATEGORIES_ALL );
}
// always return true,
@@ -155,8 +153,8 @@
function addBlog( &$blog )
{
// source classes
- lt_include( PLOG_CLASS_PATH."class/dao/bayesianfilterinfos.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
+
+
$blogSettings = $blog->getSettings();
if( !$blogSettings )
@@ -183,8 +181,8 @@
$bayesianFilterInfo = new BayesianFilterInfos();
$bayesianFilterInfo->insert( $blogId );
- $this->_cache->setData( $blogId, CACHE_BLOGINFOS, $blog );
-// $this->_cache->setData( $blog->getMangledBlogName(), CACHE_BLOGIDBYNAME );
+ $this->_cache->setData( $blogId, DaoCacheConstants::CACHE_BLOGINFOS, $blog );
+// $this->_cache->setData( $blog->getMangledBlogName(), DaoCacheConstants::CACHE_BLOGIDBYNAME );
// and return the blog identifier
return $blogId;
@@ -242,9 +240,9 @@
$blogs[$blog->getId()] = $blog;
// and cache whatever we loaded for later use, just in case
- $this->_cache->setData( $blog->getId(), CACHE_BLOGINFOS, $blog );
- $this->_cache->setData( $blog->getMangledBlogName(), CACHE_BLOGIDBYNAME, $blog );
- $this->_cache->setData( $blog->getCustomDomain(), CACHE_BLOGIDBYDOMAIN, $blog );
+ $this->_cache->setData( $blog->getId(), DaoCacheConstants::CACHE_BLOGINFOS, $blog );
+ $this->_cache->setData( $blog->getMangledBlogName(), DaoCacheConstants::CACHE_BLOGIDBYNAME, $blog );
+ $this->_cache->setData( $blog->getCustomDomain(), DaoCacheConstants::CACHE_BLOGIDBYDOMAIN, $blog );
}
$result->Close();
@@ -316,7 +314,7 @@
$this->updateBlogCategoriesLink( $blog );
// source class
- lt_include( PLOG_CLASS_PATH."class/template/templatesets/templatesets.class.php" );
+
// delete the blog template sets
$templateSets = new TemplateSets();
@@ -329,9 +327,9 @@
File::deleteDir( TemplateSetStorage::getBlogBaseTemplateFolder( $blogId ));
// and finally, remove the cache and delete the blog
- $this->_cache->removeData( $blog->getCustomDomain(), CACHE_BLOGIDBYDOMAIN );
- $this->_cache->removeData( $blog->getMangledBlogName(), CACHE_BLOGIDBYNAME );
- $this->_cache->removeData( $blog->getId(), CACHE_BLOGINFOS );
+ $this->_cache->removeData( $blog->getCustomDomain(), DaoCacheConstants::CACHE_BLOGIDBYDOMAIN );
+ $this->_cache->removeData( $blog->getMangledBlogName(), DaoCacheConstants::CACHE_BLOGIDBYNAME );
+ $this->_cache->removeData( $blog->getId(), DaoCacheConstants::CACHE_BLOGINFOS );
return( $this->delete( "id", $blogId ));
}
@@ -341,7 +339,7 @@
function mapRow( $row )
{
// source class
- lt_include( PLOG_CLASS_PATH."class/dao/bloginfo.class.php" );
+
// create new BlogInfo
$blogInfo = new BlogInfo( stripslashes($row["blog"]),
Modified: plog/branches/lifetype-2.0-autoload/class/dao/blogsettings.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/blogsettings.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/blogsettings.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/config/properties.class.php" );
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
+
+
/**
* default time offset that is applied to new blogs
*/
@@ -52,7 +52,7 @@
{
// is it a plugin key?
if( substr( $key, 0, strlen( "plugin_" )) == "plugin_" ) {
- 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-2.0-autoload/class/dao/blogstatus.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/blogstatus.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/blogstatus.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/dao/status/genericstatuslist.class.php" );
+
define( "BLOG_STATUS_ALL", -1, true );
define( "BLOG_STATUS_ACTIVE", 1, true );
Modified: plog/branches/lifetype-2.0-autoload/class/dao/commentscommon.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/commentscommon.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/commentscommon.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,10 +1,10 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/dao/model.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/articlecommentstatus.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/daocacheconstants.properties.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/usercomment.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/trackback.class.php" );
+
+
+
+
+
/**
* different orders that comments can have
@@ -56,9 +56,9 @@
function addComment( &$comment )
{
if(( $result = $this->add( $comment ))) {
- lt_include( PLOG_CLASS_PATH."class/dao/articles.class.php" );
- $this->_cache->removeData( $comment->getArticleId(), CACHE_ARTICLE_COMMENTS_BYARTICLE_NEWEST_TO_OLDEST );
- $this->_cache->removeData( $comment->getArticleId(), CACHE_ARTICLE_COMMENTS_BYARTICLE_OLDEST_TO_NEWEST );
+
+ $this->_cache->removeData( $comment->getArticleId(), DaoCacheConstants::CACHE_ARTICLE_COMMENTS_BYARTICLE_NEWEST_TO_OLDEST );
+ $this->_cache->removeData( $comment->getArticleId(), DaoCacheConstants::CACHE_ARTICLE_COMMENTS_BYARTICLE_OLDEST_TO_NEWEST );
// update the article comments
$article = $comment->getArticle();
$blog = $article->getBlogInfo();
@@ -82,10 +82,10 @@
$blog->setTotalTrackbacks($this->getNumItems( $this->getPrefix().'articles_comments',
'blog_id = '.$blog->getId().' AND type = '.$comment->getType()));
}
- lt_include( PLOG_CLASS_PATH."class/dao/articles.class.php" );
+
$articles = new Articles();
$articles->updateArticle( $article );
- lt_include( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
+
$blogs = new Blogs();
$blogs->updateBlog( $blog );
}
@@ -148,7 +148,7 @@
*/
function getNumPostComments( $artId, $status = COMMENT_STATUS_ALL, $type = COMMENT_TYPE_ANY )
{
- lt_include( PLOG_CLASS_PATH."class/dao/articles.class.php" );
+
$numComments = 0;
$articles = new Articles();
$article = $articles->getArticle( $artId );
@@ -205,7 +205,7 @@
{
if( $status == COMMENT_STATUS_ALL && $type != COMMENT_TYPE_ANY && $searchTerms == "" ) {
// fast case, we can load the blog and query one of its intrinsic fields
- lt_include( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
+
$blogs = new Blogs();
$blogInfo = $blogs->getBlogInfo( $blogId );
if( !$blogInfo )
@@ -254,13 +254,13 @@
LtDb::qstr($commentid)."' AND article_id = '".
LtDb::qstr( $comment->getArticleId())."'";
$result = $this->Execute( $query );
- $this->_cache->removeData( $comment->getArticleId(), CACHE_ARTICLE_COMMENTS_BYARTICLE_NEWEST_TO_OLDEST );
- $this->_cache->removeData( $comment->getArticleId(), CACHE_ARTICLE_COMMENTS_BYARTICLE_OLDEST_TO_NEWEST );
- $this->_cache->removeData( $comment->getId(), CACHE_ARTICLE_COMMENTS );
+ $this->_cache->removeData( $comment->getArticleId(), DaoCacheConstants::CACHE_ARTICLE_COMMENTS_BYARTICLE_NEWEST_TO_OLDEST );
+ $this->_cache->removeData( $comment->getArticleId(), DaoCacheConstants::CACHE_ARTICLE_COMMENTS_BYARTICLE_OLDEST_TO_NEWEST );
+ $this->_cache->removeData( $comment->getId(), DaoCacheConstants::CACHE_ARTICLE_COMMENTS );
// update the blog and the article counters
- lt_include( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/articles.class.php" );
+
+
$article = $comment->getArticle();
$blog = $article->getBlogInfo();
@@ -316,11 +316,11 @@
if(($result = $this->update( $comment ))) {
// reset the cache
- $this->_cache->removeData( $comment->getArticleId(), CACHE_ARTICLE_COMMENTS_BYARTICLE_NEWEST_TO_OLDEST );
- $this->_cache->removeData( $comment->getArticleId(), CACHE_ARTICLE_COMMENTS_BYARTICLE_OLDEST_TO_NEWEST );
- $this->_cache->removeData( $comment->getId(), CACHE_ARTICLE_COMMENTS );
+ $this->_cache->removeData( $comment->getArticleId(), DaoCacheConstants::CACHE_ARTICLE_COMMENTS_BYARTICLE_NEWEST_TO_OLDEST );
+ $this->_cache->removeData( $comment->getArticleId(), DaoCacheConstants::CACHE_ARTICLE_COMMENTS_BYARTICLE_OLDEST_TO_NEWEST );
+ $this->_cache->removeData( $comment->getId(), DaoCacheConstants::CACHE_ARTICLE_COMMENTS );
// update counters in the articles table according to the status
- lt_include( PLOG_CLASS_PATH."class/dao/articles.class.php" );
+
$articles = new Articles();
// load the article
$article = $comment->getArticle();
@@ -357,7 +357,7 @@
*/
function getComment( $id, $type = COMMENT_TYPE_ANY )
{
- $comment = $this->get( "id" , $id, CACHE_ARTICLE_COMMENTS );
+ $comment = $this->get( "id" , $id, DaoCacheConstants::CACHE_ARTICLE_COMMENTS );
if( !$comment )
return false;
if( $type != COMMENT_TYPE_ANY ) {
@@ -422,7 +422,7 @@
}
$comments = Array();
- lt_include( PLOG_CLASS_PATH."class/dao/articles.class.php" );
+
$articles = new Articles();
while( $row = $result->FetchRow()) {
$comments[] = $this->mapRow( $row );
@@ -441,8 +441,8 @@
*/
function mapRow( $row )
{
- 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"];
@@ -487,8 +487,8 @@
*/
function getSearchConditions( $searchTerms )
{
- lt_include( PLOG_CLASS_PATH."class/dao/searchengine.class.php" );
+
$query = SearchEngine::adaptSearchString($searchTerms);
// MARKWU: I also need to take care when there are multiplu search term
@@ -532,8 +532,8 @@
*/
function deleteArticleComments( $articleId )
{
- lt_include( PLOG_CLASS_PATH."class/dao/articles.class.php" );
+
$articles = new Articles();
$art = $articles->getArticle( $articleId );
Modified: plog/branches/lifetype-2.0-autoload/class/dao/customfields/customfield.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/customfields/customfield.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/customfields/customfield.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/database/dbobject.class.php" );
+
/**
* Defines a custom field
@@ -70,7 +70,7 @@
function setName( $name )
{
- lt_include( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
+
$this->_name = Textfilter::filterAllHTML( $name );
}
Modified: plog/branches/lifetype-2.0-autoload/class/dao/customfields/customfieldcheckboxvalue.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/customfields/customfieldcheckboxvalue.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/customfields/customfieldcheckboxvalue.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/dao/customfields/customfieldvalue.class.php" );
+
/**
* offers methods for dealing with checkboxes
*
Modified: plog/branches/lifetype-2.0-autoload/class/dao/customfields/customfielddatevalue.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/customfields/customfielddatevalue.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/customfields/customfielddatevalue.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/dao/customfields/customfieldvalue.class.php" );
+
/**
* offers methods for dealing with custom fields that represent dates
*
@@ -41,7 +41,7 @@
*/
function setValue( $value )
{
- lt_include( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
+
$this->_timestamp = new Timestamp();
$dateTimeParts = explode(" ", $value );
@@ -66,7 +66,7 @@
*/
function getDateFormatted()
{
- lt_include( PLOG_CLASS_PATH."class/locale/locales.class.php" );
+
$locale = Locales::getLocale( "en_UK" );
$dateFormatted = $locale->formatDate( $this->getDateObject(), "%d/%m/%Y %H:%M" );
@@ -81,7 +81,7 @@
*/
function getDefaultValue()
{
- lt_include( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
+
return( new Timestamp());
}
Modified: plog/branches/lifetype-2.0-autoload/class/dao/customfields/customfieldlistvalue.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/customfields/customfieldlistvalue.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/customfields/customfieldlistvalue.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/dao/customfields/customfieldvalue.class.php" );
+
/**
* offers methods for dealing with custom fields that use drop-down lists that
* allows to select one of the values
Modified: plog/branches/lifetype-2.0-autoload/class/dao/customfields/customfields.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/customfields/customfields.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/customfields/customfields.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,10 +1,10 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/dao/model.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/customfields/customfield.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/customfields/customfieldsvalues.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/daocacheconstants.properties.php" );
+
+
+
+
/**
* different custom field types available
*
@@ -37,7 +37,7 @@
*/
function getCustomField( $id )
{
- return( $this->get( "id", $id, CACHE_CUSTOMFIELDS ));
+ return( $this->get( "id", $id, DaoCacheConstants::CACHE_CUSTOMFIELDS ));
}
/**
@@ -51,8 +51,8 @@
{
$blogFields = $this->getMany( "blog_id",
$blogId,
- CACHE_CUSTOMFIELDS_BLOG,
- Array( CACHE_CUSTOMFIELDS => "getId" ),
+ DaoCacheConstants::CACHE_CUSTOMFIELDS_BLOG,
+ Array( DaoCacheConstants::CACHE_CUSTOMFIELDS => "getId" ),
Array( "field_name" => "ASC" ));
if( !$blogFields )
return false;
@@ -79,8 +79,8 @@
{
$blogFields = $this->getMany( "blog_id",
$blogId,
- CACHE_CUSTOMFIELDS_BLOG,
- Array( CACHE_CUSTOMFIELDS => "getId" ),
+ DaoCacheConstants::CACHE_CUSTOMFIELDS_BLOG,
+ Array( DaoCacheConstants::CACHE_CUSTOMFIELDS => "getId" ),
Array( "field_name" => "ASC" ),
"",
$page,
@@ -130,8 +130,8 @@
if( $result = $this->add( $field )) {
// clean the caches
- $this->_cache->removeData( $field->getId(), CACHE_CUSTOMFIELDS );
- $this->_cache->removeData( $field->getBlogId(), CACHE_CUSTOMFIELDS_BLOG );
+ $this->_cache->removeData( $field->getId(), DaoCacheConstants::CACHE_CUSTOMFIELDS );
+ $this->_cache->removeData( $field->getBlogId(), DaoCacheConstants::CACHE_CUSTOMFIELDS_BLOG );
}
return( $result );
}
@@ -157,8 +157,8 @@
return false;
// clean the caches
- $this->_cache->removeData( $field->getId(), CACHE_CUSTOMFIELDS );
- $this->_cache->removeData( $field->getBlogId(), CACHE_CUSTOMFIELDS_BLOG );
+ $this->_cache->removeData( $field->getId(), DaoCacheConstants::CACHE_CUSTOMFIELDS );
+ $this->_cache->removeData( $field->getBlogId(), DaoCacheConstants::CACHE_CUSTOMFIELDS_BLOG );
if( !$deleteValues )
return true;
@@ -178,8 +178,8 @@
{
if( ($result = $this->update( $field ))) {
// clean the caches
- $this->_cache->removeData( $field->getId(), CACHE_CUSTOMFIELDS );
- $this->_cache->removeData( $field->getBlogId(), CACHE_CUSTOMFIELDS_BLOG );
+ $this->_cache->removeData( $field->getId(), DaoCacheConstants::CACHE_CUSTOMFIELDS );
+ $this->_cache->removeData( $field->getBlogId(), DaoCacheConstants::CACHE_CUSTOMFIELDS_BLOG );
}
return( $result );
}
Modified: plog/branches/lifetype-2.0-autoload/class/dao/customfields/customfieldsvalues.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/customfields/customfieldsvalues.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/customfields/customfieldsvalues.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,9 +1,9 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/dao/model.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/customfields/customfields.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/customfields/customfieldvaluefactory.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/daocacheconstants.properties.php" );
+
+
+
+
/**
* Model for the values given to certain custom fields
@@ -25,7 +25,7 @@
*/
function getCustomFieldValue( $id )
{
- return( $this->get( "id", $id, CACHE_CUSTOMFIELDVALUES ));
+ return( $this->get( "id", $id, DaoCacheConstants::CACHE_CUSTOMFIELDVALUES ));
}
/**
@@ -83,7 +83,7 @@
$articleId,
$blogId );
if( $result = $this->add( $value )) {
- $this->_cache->removeData( $articleId, CACHE_CUSTOMFIELDVALUES_ARTICLE );
+ $this->_cache->removeData( $articleId, DaoCacheConstants::CACHE_CUSTOMFIELDVALUES_ARTICLE );
}
return( $result );
@@ -103,7 +103,7 @@
return false;
if( $result = $this->delete( "id", $id )) {
- $this->_cache->removeData( $field->getArticleId(), CACHE_CUSTOMFIELDVALUES_ARTICLE );
+ $this->_cache->removeData( $field->getArticleId(), DaoCacheConstants::CACHE_CUSTOMFIELDVALUES_ARTICLE );
}
return( $result );
}
@@ -130,7 +130,7 @@
function removeArticleCustomFields( $articleId )
{
if( $result = $this->delete( "article_id", $articleId )) {
- $this->_cache->removeData( $articleId, CACHE_CUSTOMFIELDVALUES_ARTICLE );
+ $this->_cache->removeData( $articleId, DaoCacheConstants::CACHE_CUSTOMFIELDVALUES_ARTICLE );
$result = true;
}
@@ -145,8 +145,8 @@
*/
function getSearchConditions( $searchTerms )
{
- lt_include( PLOG_CLASS_PATH."class/dao/searchengine.class.php" );
+
$query = SearchEngine::adaptSearchString($searchTerms);
$query_array = explode(' ',$query);
Modified: plog/branches/lifetype-2.0-autoload/class/dao/customfields/customfieldvalue.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/customfields/customfieldvalue.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/customfields/customfieldvalue.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/database/dbobject.class.php" );
+
/**
* Defines a value assigned to a custom field
@@ -44,7 +44,7 @@
function _loadFieldDefinition()
{
if( $this->_customField == null ) {
- lt_include( PLOG_CLASS_PATH."class/dao/customfields/customfields.class.php" );
+
$customFields = new CustomFields();
$this->_customField = $customFields->getCustomField( $this->_fieldId );
}
@@ -78,7 +78,7 @@
function getArticle()
{
if( $this->_article == null ) {
- lt_include( PLOG_CLASS_PATH."class/dao/articles.class.php" );
+
$articles = new Articles();
$this->_article = $articles->getBlogArticle( $this->_articleId, $this->_blogId );
}
@@ -98,7 +98,7 @@
function getNormalizedValue()
{
- lt_include( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
+
$filter = new Textfilter();
return( $filter->normalizeText($this->getValue()));
}
Modified: plog/branches/lifetype-2.0-autoload/class/dao/customfields/customfieldvaluefactory.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/customfields/customfieldvaluefactory.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/customfields/customfieldvaluefactory.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,11 +1,11 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/dao/customfields/customfieldvalue.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/customfields/customfielddatevalue.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/customfields/customfieldcheckboxvalue.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/customfields/customfieldlistvalue.class.php" );
+
+
+
+
/**
* Generates the right CustomFieldValue (or subclass of it)
*
@@ -76,7 +76,7 @@
function getCustomFieldValueByFieldId( $fieldId, $row )
{
// load the field definition first
- lt_include( PLOG_CLASS_PATH."class/dao/customfields/customfields.class.php" );
+
$customFields = new CustomFields();
$customField = $customFields->getCustomField( $fieldId );
if( !$customField )
Copied: plog/branches/lifetype-2.0-autoload/class/dao/daocacheconstants.class.php (from rev 5967, plog/branches/lifetype-2.0-autoload/class/dao/daocacheconstants.properties.php)
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/daocacheconstants.class.php (rev 0)
+++ plog/branches/lifetype-2.0-autoload/class/dao/daocacheconstants.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -0,0 +1,149 @@
+<?php
+
+ class DaoCacheConstants
+ {
+ /**
+ * article categories
+ */
+ const CACHE_GLOBAL = "Lifetype";
+ const CACHE_CONFIGDBSTORAGE = "config_db_storage";
+
+ /**
+ * article categories
+ */
+ const CACHE_ARTICLE_CATEGORIES = "article_categories";
+ const CACHE_ARTICLE_CATEGORIES_BYNAME = "article_categories_byname";
+ const CACHE_ARTICLE_CATEGORIES_BLOG = "article_categories_blog";
+ const CACHE_ARTICLE_CATEGORIES_LINK = "article_categories_link";
+
+ /**
+ * articles
+ */
+ const CACHE_ARTICLES = "articles";
+ const CACHE_ARTICLES_BYNAME = "articles_byname";
+ const CACHE_ARTICLETEXT = "article_text";
+ const CACHE_ARTICLESPERMONTH = "articles_per_month";
+
+ /**
+ * blog categories
+ */
+ const CACHE_BLOGCATEGORIES = "cache_blog_categories";
+ const CACHE_BLOGCATEGORIES_ALL = "cache_blog_categories_all";
+
+ /**
+ * blogs
+ */
+ const CACHE_BLOGINFOS = "bloginfo";
+ const CACHE_BLOGIDBYNAME = "bloginfo_idbyname";
+ const CACHE_BLOGIDBYDOMAIN = "bloginfo_idbydomain";
+
+ /**
+ * article comments
+ */
+ const CACHE_ARTICLE_COMMENTS = "article_comments";
+ const CACHE_ARTICLE_COMMENTS_BYARTICLE_NEWEST_TO_OLDEST = "article_comments_byarticle_newest_to_oldest";
+ const CACHE_ARTICLE_COMMENTS_BYARTICLE_OLDEST_TO_NEWEST = "article_comments_byarticle_oldest_to_newest";
+
+ /**
+ * custom fields
+ */
+ const CACHE_CUSTOMFIELDS = "customfields";
+ const CACHE_CUSTOMFIELDS_BLOG = "customfields_blog";
+ const CACHE_CUSTOMFIELDS_BY_NAME = "customfields_name";
+
+ /**
+ * custom field values
+ */
+ const CACHE_CUSTOMFIELDVALUES_ARTICLE = "customfieldvalues_article";
+
+ /**
+ * article global categories
+ */
+ const CACHE_GLOBALCATEGORIES = "cache_global_categories";
+ const CACHE_GLOBALCATEGORIES_ALL = "cache_global_categories_all";
+
+ /**
+ * links
+ */
+ const CACHE_MYLINKS_ALL = "cache_mylinks_all";
+ const CACHE_MYLINKS = "cache_mylinks";
+
+ /**
+ * recent articles
+ */
+ const CACHE_RECENT_ARTICLES_BY_BLOG = "recent_articles_by_blog";
+
+ /**
+ * link categories
+ */
+ const CACHE_MYLINKCATEGORIES_ALL = "mylinks_categories_all";
+ const CACHE_MYLINKCATEGORIES = "mylinks_categories";
+
+ /**
+ * gallery albums
+ */
+ const CACHE_USERALBUMS_NESTED = "useralbums_nested";
+ const CACHE_USERALBUMS = "useralbums";
+ const CACHE_GALLERYALBUM = "album";
+ const CACHE_GALLERYALBUMBYNAME = "album_byname";
+
+ /**
+ * gallery resources
+ */
+ const CACHE_RESOURCES = "galleryresources";
+ const CACHE_RESOURCES_BY_NAME = "galleryresources_name";
+ const CACHE_RESOURCES_USER = "galleryresources_user";
+
+ /**
+ * users
+ */
+ const CACHE_USERINFO = "userinfo";
+ const CACHE_USERIDBYNAME = "userinfo_idbyname";
+
+ /**
+ * user permissions
+ */
+ const CACHE_USER_PERMISSIONS = "user_permissions";
+
+ /**
+ * locales
+ */
+ const CACHE_LOCALES = "locales";
+ const CACHE_BLOG_LOCALES = "bloglocales";
+
+ /**
+ * permissions
+ */
+ const CACHE_PERMISSIONS_ALL = "permissions_all";
+ const CACHE_PERMISSIONS = "permissions";
+
+ /**
+ * friend groups
+ */
+ const CACHE_FRIEND_GROUPS = "friend_groups";
+ const CACHE_FRIEND_GROUPS_BY_USER = "friend_groups_by_user";
+
+ /**
+ * friends
+ */
+ const CACHE_FRIENDS = "friends";
+
+ /**
+ * private message box
+ */
+ const CACHE_PRIVATE_MESSAGE_BOXES = "cache_private_message_BOXES";
+ const CACHE_PRIVATE_MESSAGE_INBOX_BY_USERID = "cache_private_message_inbox_by_userid";
+ const CACHE_PRIVATE_MESSAGE_OUTBOX_BY_USERID = "cache_private_message_outboxbox_by_userid";
+
+ /**
+ * private messages
+ */
+ const CACHE_PRIVATE_MESSAGES = "cache_private_messages";
+ const CACHE_PRIVATE_MESSAGES_BY_BOX_ID = "cache_private_messages_by_box_id";
+
+ const CACHE_LOCATION_BY_ID ="location_by_id";
+ const CACHE_LOCATIONS_BY_BLOG = "locations_by_blog";
+
+
+ }
+?>
\ No newline at end of file
Deleted: plog/branches/lifetype-2.0-autoload/class/dao/daocacheconstants.properties.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/daocacheconstants.properties.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/daocacheconstants.properties.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,140 +0,0 @@
-<?php
- /**
- * article categories
- */
- define( "CACHE_GLOBAL", "pLog" );
- define( "CACHE_CONFIGDBSTORAGE", "config_db_storage" );
-
- /**
- * article categories
- */
- define( "CACHE_ARTICLE_CATEGORIES", "article_categories" );
- define( "CACHE_ARTICLE_CATEGORIES_BYNAME", "article_categories_byname" );
- define( "CACHE_ARTICLE_CATEGORIES_BLOG", "article_categories_blog" );
- define( "CACHE_ARTICLE_CATEGORIES_LINK", "article_categories_link" );
-
- /**
- * articles
- */
- define( "CACHE_ARTICLES", "articles" );
- define( "CACHE_ARTICLES_BYNAME", "articles_byname" );
- define( "CACHE_ARTICLETEXT", "article_text" );
- define( "CACHE_ARTICLESPERMONTH", "articles_per_month" );
-
- /**
- * blog categories
- */
- define( "CACHE_BLOGCATEGORIES", "cache_blog_categories" );
- define( "CACHE_BLOGCATEGORIES_ALL", "cache_blog_categories_all" );
-
- /**
- * blogs
- */
- define( "CACHE_BLOGINFOS", "bloginfo" );
- define( "CACHE_BLOGIDBYNAME", "bloginfo_idbyname" );
- define( "CACHE_BLOGIDBYDOMAIN","bloginfo_idbydomain" );
-
- /**
- * article comments
- */
- define( "CACHE_ARTICLE_COMMENTS", "article_comments" );
- define( "CACHE_ARTICLE_COMMENTS_BYARTICLE_NEWEST_TO_OLDEST", "article_comments_byarticle_newest_to_oldest" );
- define( "CACHE_ARTICLE_COMMENTS_BYARTICLE_OLDEST_TO_NEWEST", "article_comments_byarticle_oldest_to_newest" );
-
- /**
- * custom fields
- */
- define( "CACHE_CUSTOMFIELDS", "customfields" );
- define( "CACHE_CUSTOMFIELDS_BLOG", "customfields_blog" );
- define( "CACHE_CUSTOMFIELDS_BY_NAME", "customfields_name" );
-
- /**
- * custom field values
- */
- define( "CACHE_CUSTOMFIELDVALUES_ARTICLE", "customfieldvalues_article" );
-
- /**
- * article global categories
- */
- define( "CACHE_GLOBALCATEGORIES", "cache_global_categories" );
- define( "CACHE_GLOBALCATEGORIES_ALL", "cache_global_categories_all" );
-
- /**
- * links
- */
- define( "CACHE_MYLINKS_ALL", "cache_mylinks_all" );
- define( "CACHE_MYLINKS", "cache_mylinks" );
-
- /**
- * recent articles
- */
- define( "CACHE_RECENT_ARTICLES_BY_BLOG", "recent_articles_by_blog" );
-
- /**
- * link categories
- */
- define( "CACHE_MYLINKCATEGORIES_ALL", "mylinks_categories_all" );
- define( "CACHE_MYLINKCATEGORIES", "mylinks_categories" );
-
- /**
- * gallery albums
- */
- define( "CACHE_USERALBUMS_NESTED", "useralbums_nested" );
- define( "CACHE_USERALBUMS", "useralbums" );
- define( "CACHE_GALLERYALBUM", "album" );
- define( "CACHE_GALLERYALBUMBYNAME", "album_byname" );
-
- /**
- * gallery resources
- */
- define( "CACHE_RESOURCES", "galleryresources" );
- define( "CACHE_RESOURCES_BY_NAME", "galleryresources_name" );
- define( "CACHE_RESOURCES_USER", "galleryresources_user" );
-
- /**
- * users
- */
- define( "CACHE_USERINFO", "userinfo" );
- define( "CACHE_USERIDBYNAME", "userinfo_idbyname" );
-
- /**
- * user permissions
- */
- define( "CACHE_USER_PERMISSIONS", "user_permissions" );
-
- /**
- * locales
- */
- define( "CACHE_LOCALES", "locales" );
- define( "CACHE_BLOG_LOCALES", "bloglocales" );
-
- /**
- * permissions
- */
- define( "CACHE_PERMISSIONS_ALL", "permissions_all" );
- define( "CACHE_PERMISSIONS", "permissions" );
-
- /**
- * friend groups
- */
- define( "CACHE_FRIEND_GROUPS", "friend_groups" );
- define( "CACHE_FRIEND_GROUPS_BY_USER", "friend_groups_by_user" );
-
- /**
- * friends
- */
- define( "CACHE_FRIENDS", "friends" );
-
- /**
- * private message box
- */
- define( "CACHE_PRIVATE_MESSAGE_BOXES", "cache_private_message_BOXES" );
- define( "CACHE_PRIVATE_MESSAGE_INBOX_BY_USERID", "cache_private_message_inbox_by_userid" );
- define( "CACHE_PRIVATE_MESSAGE_OUTBOX_BY_USERID", "cache_private_message_outboxbox_by_userid" );
-
- /**
- * private messages
- */
- define( "CACHE_PRIVATE_MESSAGES", "cache_private_messages" );
- define( "CACHE_PRIVATE_MESSAGES_BY_BOX_ID", "cache_private_messages_by_box_id" );
-?>
\ No newline at end of file
Modified: plog/branches/lifetype-2.0-autoload/class/dao/friend.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/friend.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/friend.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,9 +1,9 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/database/dbobject.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/friendgroups.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/userauthorizationstatus.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/friendauthorizationstatus.class.php" );
+
+
+
+
/**
* \ingroup DAO
@@ -199,7 +199,7 @@
if( $this->_friendInfo )
return $this->_friendInfo;
else {
- lt_include( PLOG_CLASS_PATH."class/dao/users.class.php" );
+
$users =& new Users();
$friendInfo = $users->getUserInfoFromId( $this->_friendId );
if( $friendInfo ) {
Modified: plog/branches/lifetype-2.0-autoload/class/dao/friendauthorizationstatus.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/friendauthorizationstatus.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/friendauthorizationstatus.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/dao/status/genericstatuslist.class.php" );
+
define( "FRIEND_AUTHORIZATION_ALL", -1, true );
define( "FRIEND_AUTHORIZATION_APPROVED", 1, true );
Modified: plog/branches/lifetype-2.0-autoload/class/dao/friendgroup.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/friendgroup.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/friendgroup.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/database/dbobject.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/userauthorizationstatus.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/friendauthorizationstatus.class.php" );
+
+
+
/**
* \ingroup DAO
@@ -147,7 +147,7 @@
elseif( $userAuthorizationStatus == USER_AUTHORIZATION_APPROVED && $friendAuthorizationStatus == FRIEND_AUTHORIZATION_APPROVED )
return( $this->_numAuthorizedFriends );
else {
- lt_include( PLOG_CLASS_PATH."class/dao/friendgroups.class.php" );
+
$groups = new FriendGroups();
return( $groups->getNumFriendsGroup( $this->getId(), $userAuthorizationStatus, $friendAuthorizationStatus ) );
}
@@ -203,7 +203,7 @@
*/
function getFriends( $userAuthorizationStatus = -1, $friendAuthorizationStatus = -1, $searchTerms = "", $page = -1, $itemsPerPage = 15 )
{
- lt_include( PLOG_CLASS_PATH."class/dao/friens.class.php" );
+
$friends = Friends::getFriends( $this->_userId, $this->_id, $userAuthorizationStatus, $friendAuthorizationStatus, $searchTerms, $page, $itemsPerPage );
}
@@ -244,7 +244,7 @@
function getMangledName()
{
if( $this->_mangledName == "" ) {
- lt_include( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
+
$this->_mangledName = Textfilter::urlize( $this->getName() );
}
Modified: plog/branches/lifetype-2.0-autoload/class/dao/friendgroups.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/friendgroups.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/friendgroups.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/dao/model.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/friendgroup.class.php" );
- lt_include( PLOG_CLASS_PATH.'class/dao/daocacheconstants.properties.php' );
+
+
+
class FriendGroups extends Model
{
@@ -21,7 +21,7 @@
*/
function getFriendGroup( $id, $userId = -1, $onlyShownGroups = false )
{
- $group = $this->get( "id", $id, CACHE_FRIEND_GROUPS );
+ $group = $this->get( "id", $id, DaoCacheConstants::CACHE_FRIEND_GROUPS );
if( !$group )
return false;
if( $userId > -1 && $group->getUserId() != $userId )
@@ -45,8 +45,8 @@
{
$groups = $this->getMany( "user_id",
$userId,
- CACHE_FRIEND_GROUPS_BY_USER,
- Array( CACHE_FRIEND_GROUPS => "getId" ),
+ DaoCacheConstants::CACHE_FRIEND_GROUPS_BY_USER,
+ Array( DaoCacheConstants::CACHE_FRIEND_GROUPS => "getId" ),
Array( "name" => "ASC" ),
$searchTerms,
$page,
@@ -77,8 +77,8 @@
*/
function addFriendGroup( &$group )
{
- if( ($result = $this->add( $group, Array( CACHE_FRIEND_GROUPS => "getId" )))) {
- $this->_cache->removeData( $group->getUserId(), CACHE_FRIEND_GROUPS_BY_USER );
+ if( ($result = $this->add( $group, Array( DaoCacheConstants::CACHE_FRIEND_GROUPS => "getId" )))) {
+ $this->_cache->removeData( $group->getUserId(), DaoCacheConstants::CACHE_FRIEND_GROUPS_BY_USER );
}
return( $result );
@@ -99,8 +99,8 @@
return false;
if( ($result = $this->delete( "id", $id ))) {
- $this->_cache->removeData( $id, CACHE_FRIEND_GROUPS );
- $this->_cache->removeData( $group->getUserId(), CACHE_FRIEND_GROUPS_BY_USER );
+ $this->_cache->removeData( $id, DaoCacheConstants::CACHE_FRIEND_GROUPS );
+ $this->_cache->removeData( $group->getUserId(), DaoCacheConstants::CACHE_FRIEND_GROUPS_BY_USER );
}
return( $result );
@@ -117,9 +117,9 @@
if( $this->delete( "user_id", $userId )) {
foreach ( $friendGroups as $friendGroup ) {
- $this->_cache->removeData( $friendGroup->getId(), CACHE_FRIEND_GROUPS );
+ $this->_cache->removeData( $friendGroup->getId(), DaoCacheConstants::CACHE_FRIEND_GROUPS );
}
- $this->_cache->removeData( $userId, CACHE_FRIEND_GROUPS_BY_USER );
+ $this->_cache->removeData( $userId, DaoCacheConstants::CACHE_FRIEND_GROUPS_BY_USER );
return true;
}
else
@@ -135,8 +135,8 @@
function updateFriendGroup( $group )
{
if( ($result = $this->update( $group ))) {
- $this->_cache->removeData( $group->getId(), CACHE_FRIEND_GROUPS );
- $this->_cache->removeData( $group->getUserId(), CACHE_FRIEND_GROUPS_BY_USER );
+ $this->_cache->removeData( $group->getId(), DaoCacheConstants::CACHE_FRIEND_GROUPS );
+ $this->_cache->removeData( $group->getUserId(), DaoCacheConstants::CACHE_FRIEND_GROUPS_BY_USER );
}
return( $result );
Modified: plog/branches/lifetype-2.0-autoload/class/dao/friends.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/friends.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/friends.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/dao/model.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/friend.class.php" );
- lt_include( PLOG_CLASS_PATH.'class/dao/daocacheconstants.properties.php' );
+
+
+
/**
* \ingroup DAO
@@ -54,7 +54,7 @@
while( $row = $result->FetchRow()) {
// use the primary key to retrieve the items via the cache
- $friends[] = $this->get( "id", $row["id"], CACHE_FRIENDS );
+ $friends[] = $this->get( "id", $row["id"], DaoCacheConstants::CACHE_FRIENDS );
}
return $friends;
@@ -85,7 +85,7 @@
*/
function updateFriendGroupCounters( $newFriend, $oldFriend = null )
{
- lt_include( PLOG_CLASS_PATH."class/dao/friendgroups.class.php" );
+
$groups = new FriendGroups();
$newGroup = $groups->getFriendGroup( $newFriend->getGroupId() );
@@ -127,7 +127,7 @@
if( $result ) {
// clean the cache
- $this->_cache->removeData( $friend->getId(), CACHE_FRIENDS );
+ $this->_cache->removeData( $friend->getId(), DaoCacheConstants::CACHE_FRIENDS );
// update the friend group counters
$this->updateFriendGroupCounters( $friend );
}
@@ -147,7 +147,7 @@
$friend = $this->getFriend( $id, $userId );
if( $friend ) {
$this->delete( "id", $id );
- $this->_cache->removeData( $id, CACHE_FRIENDS );
+ $this->_cache->removeData( $id, DaoCacheConstants::CACHE_FRIENDS );
// update friend realtionship counters
$this->updateFriendGroupCounters( $friend );
@@ -171,7 +171,7 @@
if( $friend->getFriendId() == $friendId ) {
$id = $friend->getId();
$this->delete( "id", $id );
- $this->_cache->removeData( $id, CACHE_FRIENDS );
+ $this->_cache->removeData( $id, DaoCacheConstants::CACHE_FRIENDS );
// update friend realtionship counters
$this->updateFriendGroupCounters( $friend );
@@ -193,7 +193,7 @@
if( $this->delete( "user_id", $userId )) {
foreach ( $friends as $friend ) {
- $this->_cache->removeData( $friends->getId(), CACHE_FRIENDS );
+ $this->_cache->removeData( $friends->getId(), DaoCacheConstants::CACHE_FRIENDS );
}
return true;
}
@@ -212,7 +212,7 @@
if( $this->delete( "friend_id", $friendId )) {
foreach ( $friends as $friend ) {
- $this->_cache->removeData( $friends->getId(), CACHE_FRIENDS );
+ $this->_cache->removeData( $friends->getId(), DaoCacheConstants::CACHE_FRIENDS );
}
return true;
}
@@ -237,7 +237,7 @@
while( $row = $result->FetchRow()) {
// use the primary key to retrieve the items via the cache
- $friends[] = $this->get( "id", $row["id"], CACHE_FRIENDS );
+ $friends[] = $this->get( "id", $row["id"], DaoCacheConstants::CACHE_FRIENDS );
}
return $friends;
@@ -252,7 +252,7 @@
*/
function getFriend( $id, $userId = -1 )
{
- $friend = $this->get( "id", $id, CACHE_FRIENDS );
+ $friend = $this->get( "id", $id, DaoCacheConstants::CACHE_FRIENDS );
if( !$friend )
return false;
@@ -302,7 +302,7 @@
}
// clean the cache
- $this->_cache->removeData( $friend->getId(), CACHE_FRIENDS );
+ $this->_cache->removeData( $friend->getId(), DaoCacheConstants::CACHE_FRIENDS );
// update friend realtionship counters
$this->updateFriendGroupCounters( $friend, $prevVersion );
Modified: plog/branches/lifetype-2.0-autoload/class/dao/globalarticlecategories.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/globalarticlecategories.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/globalarticlecategories.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,9 +1,9 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/dao/model.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/globalarticlecategory.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/daocacheconstants.properties.php" );
+
+
+
/**
* \ingroup DAO
*
@@ -26,7 +26,7 @@
*/
function getGlobalArticleCategory( $id )
{
- return( $this->get( "id", $id, CACHE_GLOBALCATEGORIES ));
+ return( $this->get( "id", $id, DaoCacheConstants::CACHE_GLOBALCATEGORIES ));
}
/**
@@ -38,8 +38,8 @@
*/
function addGlobalArticleCategory( &$category )
{
- if( ($result = $this->add( $category, Array( CACHE_GLOBALCATEGORIES => "getId" )))) {
- $this->_cache->removeData( "_all_", CACHE_GLOBALCATEGORIES_ALL );
+ if( ($result = $this->add( $category, Array( DaoCacheConstants::CACHE_GLOBALCATEGORIES => "getId" )))) {
+ $this->_cache->removeData( "_all_", DaoCacheConstants::CACHE_GLOBALCATEGORIES_ALL );
}
return( $result );
@@ -56,8 +56,8 @@
function deleteGlobalArticleCategory( $id )
{
if( ($result = $this->delete( "id", $id ))) {
- $this->_cache->removeData( $id, CACHE_GLOBALCATEGORIES );
- $this->_cache->removeData( "_all_", CACHE_GLOBALCATEGORIES_ALL );
+ $this->_cache->removeData( $id, DaoCacheConstants::CACHE_GLOBALCATEGORIES );
+ $this->_cache->removeData( "_all_", DaoCacheConstants::CACHE_GLOBALCATEGORIES_ALL );
}
return( $result );
@@ -72,8 +72,8 @@
function updateGlobalArticleCategory( $category )
{
if(( $result = $this->update( $category ))) {
- $this->_cache->removeData( $category->getId(), CACHE_GLOBALCATEGORIES );
- $this->_cache->removeData( "_all_", CACHE_GLOBALCATEGORIES_ALL );
+ $this->_cache->removeData( $category->getId(), DaoCacheConstants::CACHE_GLOBALCATEGORIES );
+ $this->_cache->removeData( "_all_", DaoCacheConstants::CACHE_GLOBALCATEGORIES_ALL );
}
return( $result );
@@ -101,8 +101,8 @@
function getGlobalArticleCategories( $searchTerms = "", $page = -1, $itemsPerPage = DEFAULT_ITEMS_PER_PAGE )
{
$categories = $this->getAll( "all",
- CACHE_GLOBALCATEGORIES_ALL,
- Array( CACHE_GLOBALCATEGORIES => "getId" ),
+ DaoCacheConstants::CACHE_GLOBALCATEGORIES_ALL,
+ Array( DaoCacheConstants::CACHE_GLOBALCATEGORIES => "getId" ),
Array( "name" => "ASC" ),
$searchTerms,
$page,
Modified: plog/branches/lifetype-2.0-autoload/class/dao/globalarticlecategory.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/globalarticlecategory.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/globalarticlecategory.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/database/dbobject.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/articlestatus.class.php" );
+
+
/**
* \ingroup DAO
@@ -100,7 +100,7 @@
elseif( $status == POST_STATUS_PUBLISHED )
return( $this->_numActiveArticles );
else {
- lt_include( PLOG_CLASS_PATH."class/dao/globalarticlecategories.class.php" );
+
$categories = new GlobalArticleCategories();
return( $categories->getNumArticlesCategory( $this->getId(), $status ));
}
@@ -148,7 +148,7 @@
function getMangledName()
{
if( $this->_mangledName == "" ) {
- lt_include( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
+
$this->_mangledName = Textfilter::urlize( $this->getName() );
}
Modified: plog/branches/lifetype-2.0-autoload/class/dao/location.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/location.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/location.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/database/dbobject.class.php" );
+
class Location extends DbObject
{
Modified: plog/branches/lifetype-2.0-autoload/class/dao/locationawaredbobject.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/locationawaredbobject.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/locationawaredbobject.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/database/dbobject.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/location.class.php" );
+
+
/**
* @see DbObject
@@ -23,7 +23,7 @@
function getLocation()
{
if( $this->_location === null && $this->_locationId != 0 ) {
- lt_include( PLOG_CLASS_PATH."class/dao/locations.class.php" );
+
$locations = new Locations();
$this->_location = $locations->getLocation( $this->getLocationId());
}
Modified: plog/branches/lifetype-2.0-autoload/class/dao/locations.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/locations.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/locations.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,11 +1,5 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/dao/model.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/location.class.php" );
-
- define( "CACHE_LOCATION_BY_ID", "location_by_id" );
- define( "CACHE_LOCATIONS_BY_BLOG", "locations_by_blog" );
-
/**
* \inpackage DAO
*
@@ -32,7 +26,7 @@
*/
function getLocation( $locId )
{
- return( $this->get( "id", $locId, CACHE_LOCATION_BY_ID ));
+ return( $this->get( "id", $locId, DaoCacheConstants::CACHE_LOCATION_BY_ID ));
}
/**
@@ -43,7 +37,7 @@
*/
function getBlogLocations( $blogId )
{
- $locations = $this->getMany( "blog_id", $blogId, CACHE_LOCATIONS_BY_BLOG );
+ $locations = $this->getMany( "blog_id", $blogId, DaoCacheConstants::CACHE_LOCATIONS_BY_BLOG );
if( !$locations )
$locations = Array();
@@ -104,7 +98,7 @@
function addLocation( &$loc )
{
if(( $result = $this->add( $loc ))) {
- $this->_cache->removeData( $loc->getBlogId(), CACHE_LOCATIONS_BY_BLOG );
+ $this->_cache->removeData( $loc->getBlogId(), DaoCacheConstants::CACHE_LOCATIONS_BY_BLOG );
}
return( $result );
@@ -209,8 +203,8 @@
function updateLocation( $loc )
{
if(( $result = $this->update( $loc ))) {
- $this->_cache->removeData( $loc->getBlogId(), CACHE_LOCATIONS_BY_BLOG );
- $this->_cache->removeData( $loc->getId(), CACHE_LOCATION_BY_ID );
+ $this->_cache->removeData( $loc->getBlogId(), DaoCacheConstants::CACHE_LOCATIONS_BY_BLOG );
+ $this->_cache->removeData( $loc->getId(), DaoCacheConstants::CACHE_LOCATION_BY_ID );
}
return( $result );
Modified: plog/branches/lifetype-2.0-autoload/class/dao/misc/init.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/misc/init.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/misc/init.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -13,11 +13,11 @@
*/
static function initBlog( $blog )
{
- lt_include( PLOG_CLASS_PATH."class/dao/globalarticlecategories.class.php" );
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryalbums.class.php" );
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryalbum.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/mylinkscategories.class.php" );
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
+
+
+
+
+
$config =& Config::getConfig();
Modified: plog/branches/lifetype-2.0-autoload/class/dao/model.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/model.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/model.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -103,7 +103,7 @@
function Model( $cacheEnabled = DATA_CACHE_ENABLED )
{
// allow a cache for all dao objects
- lt_include( PLOG_CLASS_PATH . "class/cache/cachemanager.class.php" );
+
$this->_cache =& CacheManager::getCache( $cacheEnabled );
}
@@ -132,7 +132,7 @@
// error log file
if( !$result ) {
$this->_lastError = $this->_db->ErrorMsg();
- lt_include( PLOG_CLASS_PATH . "class/logger/loggermanager.class.php" );
+
$log =& LoggerManager::getLogger( "sqlerr" );
$error = $this->DbError();
@@ -143,7 +143,7 @@
}
if( true ) {
- lt_include( PLOG_CLASS_PATH . "class/logger/loggermanager.class.php" );
+
$log =& LoggerManager::getLogger();
$log->error( $query."\n----\n" );
}
@@ -390,7 +390,7 @@
*/
function update( &$dbObject )
{
- lt_include( PLOG_CLASS_PATH."class/database/ltdb.class.php" );
+
$fields = $dbObject->getFieldGetters();
$sql = "UPDATE ".$this->table." SET ";
@@ -440,7 +440,7 @@
function getPrefix()
{
if ( $this->_prefix === null ) {
- lt_include( PLOG_CLASS_PATH."class/database/ltdb.class.php" );
+
$this->_prefix = LtDb::getPrefix();
}
@@ -485,7 +485,7 @@
function _initializeDb()
{
if ( !$this->_dbInitialized ) {
- lt_include( PLOG_CLASS_PATH."class/database/ltdb.class.php" );
+
$this->_db =& LtDb::getDb();
Modified: plog/branches/lifetype-2.0-autoload/class/dao/mylink.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/mylink.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/mylink.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/database/dbobject.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/mylinkscategory.class.php" );
+
+
/**
* \ingroup DAO
@@ -43,7 +43,7 @@
$this->_id = $id;
$this->_rssFeed = $rssFeed;
if( $date == "" ) {
- lt_include( PLOG_CLASS_PATH."class/data/Date.class.php" );
+
$dateObject = new Date();
$date = $dateObject->getDate();
}
@@ -174,7 +174,7 @@
function setDate( $newDate )
{
- lt_include( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
+
$this->_date = $newDate;
$this->_timestamp = new Timestamp( $newDate );
@@ -183,7 +183,7 @@
function getMyLinkCategory()
{
if( !$this->_category ) {
- lt_include( PLOG_CLASS_PATH."class/dao/mylinkscategories.class.php" );
+
$categories = new MyLinksCategories();
$this->_category = $categories->getMyLinksCategory( $this->getCategoryId());
}
Modified: plog/branches/lifetype-2.0-autoload/class/dao/mylinks.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/mylinks.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/mylinks.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,10 +1,10 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/dao/model.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/mylink.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/mylinkscategories.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/daocacheconstants.properties.php" );
+
+
+
+
/**
* \ingroup DAO
*
@@ -33,8 +33,8 @@
{
$blogLinks = $this->getMany( "blog_id",
$blogId,
- CACHE_MYLINKS_ALL,
- Array( CACHE_MYLINKS => "getId" ),
+ DaoCacheConstants::CACHE_MYLINKS_ALL,
+ Array( DaoCacheConstants::CACHE_MYLINKS => "getId" ),
Array( "date" => "DESC" ),
$searchTerms,
$page,
@@ -82,8 +82,8 @@
if( $result ) {
// clean the cache
- $this->_cache->removeData( $myLink->getId(), CACHE_MYLINKS );
- $this->_cache->removeData( $myLink->getBlogId(), CACHE_MYLINKS_ALL );
+ $this->_cache->removeData( $myLink->getId(), DaoCacheConstants::CACHE_MYLINKS );
+ $this->_cache->removeData( $myLink->getBlogId(), DaoCacheConstants::CACHE_MYLINKS_ALL );
// mark the corresponding link categories as modified now
$linkCategories = new MyLinksCategories();
$category = $myLink->getMyLinkCategory();
@@ -107,8 +107,8 @@
$link = $this->getMyLink( $linkId, $blogId );
if( $link ) {
$this->delete( "id", $linkId );
- $this->_cache->removeData( $blogId, CACHE_MYLINKS_ALL );
- $this->_cache->removeData( $linkId, CACHE_MYLINKS );
+ $this->_cache->removeData( $blogId, DaoCacheConstants::CACHE_MYLINKS_ALL );
+ $this->_cache->removeData( $linkId, DaoCacheConstants::CACHE_MYLINKS );
$linkCategories = new MyLinksCategories();
$linkCategory = $link->getMyLinkCategory();
$linkCategory->setLastModification( Timestamp::getNowTimestamp());
@@ -128,7 +128,7 @@
function deleteBlogMyLinks( $blogId )
{
if( $this->delete( "blog_id", $blogId )) {
- return( $this->_cache->removeData( $blogId, CACHE_MYLINKS_ALL ));
+ return( $this->_cache->removeData( $blogId, DaoCacheConstants::CACHE_MYLINKS_ALL ));
}
else
return false;
@@ -143,7 +143,7 @@
*/
function getMyLink( $linkId, $blogId = -1 )
{
- $blogLink = $this->get( "id", $linkId, CACHE_MYLINKS );
+ $blogLink = $this->get( "id", $linkId, DaoCacheConstants::CACHE_MYLINKS );
if( !$blogLink )
return false;
@@ -177,10 +177,10 @@
$linkCategories = new MyLinksCategories();
$linkCategories->updateCategoryModificationDate( $myLink->getCategoryId());
// clean the cache
- $this->_cache->removeData( $myLink->getId(), CACHE_MYLINKS );
- $this->_cache->removeData( $myLink->getBlogId(), CACHE_MYLINKS_ALL );
+ $this->_cache->removeData( $myLink->getId(), DaoCacheConstants::CACHE_MYLINKS );
+ $this->_cache->removeData( $myLink->getBlogId(), DaoCacheConstants::CACHE_MYLINKS_ALL );
// and update the link category counters
- lt_include( PLOG_CLASS_PATH."class/dao/mylinkscategories.class.php" );
+
$linkCategories = new MyLinksCategories();
if( $prevVersion->getCategoryId() != $myLink->getCategoryId()) {
// add one to the new category
Modified: plog/branches/lifetype-2.0-autoload/class/dao/mylinkscategories.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/mylinkscategories.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/mylinkscategories.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,18 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/dao/model.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/mylinkscategory.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/mylinks.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/daocacheconstants.properties.php" );
+
- define( "MYLINKS_CATEGORIES_NO_ORDER", 0 );
- define( "MYLINKS_CATEGORIES_ALPHABETICAL_ORDER", 1 );
- define( "MYLINKS_CATEGORIES_REVERSE_ALPHABETICAL_ORDER", 2 );
- define( "MYLINKS_CATEGORIES_MOST_LINKS_FIRST", 3 );
- define( "MYLINKS_CATEGORIES_LESS_LINKS_FIRST", 4 );
- define( "MYLINKS_CATEGORIES_LAST_UPDATED_FIRST", 5 );
- define( "MYLINKS_CATEGORIES_LAST_UPDATED_LAST", 6 );
-
/**
* \ingroup DAO
*
@@ -20,6 +9,14 @@
*/
class MyLinksCategories extends Model
{
+ const MYLINKS_CATEGORIES_NO_ORDER = 0;
+ const MYLINKS_CATEGORIES_ALPHABETICAL_ORDER = 1;
+ const MYLINKS_CATEGORIES_REVERSE_ALPHABETICAL_ORDER = 2;
+ const MYLINKS_CATEGORIES_MOST_LINKS_FIRST = 3;
+ const MYLINKS_CATEGORIES_LESS_LINKS_FIRST = 4;
+ const MYLINKS_CATEGORIES_LAST_UPDATED_FIRST = 5;
+ const MYLINKS_CATEGORIES_LAST_UPDATED_LAST = 6;
+
function MyLinksCategories()
{
@@ -38,7 +35,7 @@
* @param itemsPerPage
*/
function getMyLinksCategories( $blogId,
- $order = MYLINKS_CATEGORIES_NO_ORDER,
+ $order = MyLinksCategories::MYLINKS_CATEGORIES_NO_ORDER,
$searchTerms = "",
$page = -1,
$itemsPerPage = DEFAULT_ITEMS_PER_PAGE )
@@ -47,25 +44,25 @@
* :TODO:
* Implement sorting here!!!
*/
- if( $order == MYLINKS_CATEGORIES_ALPHABETICAL_ORDER )
+ if( $order == MyLinksCategories::MYLINKS_CATEGORIES_ALPHABETICAL_ORDER )
$order = Array( "name" => "ASC" );
- elseif( $order == MYLINKS_CATEGORIES_REVERSE_ALPHABETICAL_ORDER )
+ elseif( $order == MyLinksCategories::MYLINKS_CATEGORIES_REVERSE_ALPHABETICAL_ORDER )
$order = Array( "name" => "DESC" );
- elseif( $order == MYLINKS_CATEGORIES_MOST_LINKS_FIRST )
+ elseif( $order == MyLinksCategories::MYLINKS_CATEGORIES_MOST_LINKS_FIRST )
$order = Array( "num_links" => "DESC" );
- elseif( $order == MYLINKS_CATEGORIES_LESS_LINKS_FIRST )
+ elseif( $order == MyLinksCategories::MYLINKS_CATEGORIES_LESS_LINKS_FIRST )
$order = Array( "num_links" => "ASC" );
- elseif( $order == MYLINKS_CATEGORIES_LAST_UPDATED_FIRST )
+ elseif( $order == MyLinksCategories::MYLINKS_CATEGORIES_LAST_UPDATED_FIRST )
$order = Array( "last_modification" => "ASC" );
- elseif( $order == MYLINKS_CATEGORIES_LAST_UPDATED_LAST )
+ elseif( $order == MyLinksCategories::MYLINKS_CATEGORIES_LAST_UPDATED_LAST )
$order = Array( "last_modification" => "ASC" );
else
$order = Array();
$blogCategories = $this->getMany( "blog_id",
$blogId,
- CACHE_MYLINKCATEGORIES_ALL,
- Array( CACHE_MYLINKCATEGORIES => "getId" ),
+ DaoCacheConstants::CACHE_MYLINKCATEGORIES_ALL,
+ Array( DaoCacheConstants::CACHE_MYLINKCATEGORIES => "getId" ),
$order,
$searchTerms );
@@ -90,8 +87,8 @@
*/
function addMyLinksCategory( &$myLinksCategory )
{
- if(( $result = $this->add( $myLinksCategory, Array( CACHE_MYLINKCATEGORIES => "getId" )))) {
- $this->_cache->removeData( $myLinksCategory->getBlogId(), CACHE_MYLINKCATEGORIES_ALL );
+ if(( $result = $this->add( $myLinksCategory, Array( DaoCacheConstants::CACHE_MYLINKCATEGORIES => "getId" )))) {
+ $this->_cache->removeData( $myLinksCategory->getBlogId(), DaoCacheConstants::CACHE_MYLINKCATEGORIES_ALL );
}
return( $result );
@@ -110,8 +107,8 @@
$category = $this->getMyLinksCategory( $categoryId, $blogId );
if( $category ) {
if( $this->delete( "id", $categoryId )) {
- $this->_cache->removeData( $category->getId(), CACHE_MYLINKCATEGORIES );
- $this->_cache->removeData( $blogId, CACHE_MYLINKCATEGORIES_ALL );
+ $this->_cache->removeData( $category->getId(), DaoCacheConstants::CACHE_MYLINKCATEGORIES );
+ $this->_cache->removeData( $blogId, DaoCacheConstants::CACHE_MYLINKCATEGORIES_ALL );
}
}
else
@@ -130,10 +127,10 @@
$res = false;
$categories = $this->getMyLinksCategories( $blogId );
if(( $res = $this->delete( "blog_id", $blogId ))) {
- $this->_cache->removeData( $blogId, CACHE_MYLINKCATEGORIES_ALL );
+ $this->_cache->removeData( $blogId, DaoCacheConstants::CACHE_MYLINKCATEGORIES_ALL );
// remove all other categories
foreach( $categories as $category ) {
- $this->_cache->removeData( $category->getId(), CACHE_MYLINKCATEGORIES );
+ $this->_cache->removeData( $category->getId(), DaoCacheConstants::CACHE_MYLINKCATEGORIES );
}
}
@@ -149,7 +146,7 @@
*/
function getMyLinksCategory( $categoryId, $blogId = 0 )
{
- $myLinksCategory = $this->get( "id", $categoryId, CACHE_MYLINKCATEGORIES );
+ $myLinksCategory = $this->get( "id", $categoryId, DaoCacheConstants::CACHE_MYLINKCATEGORIES );
if( !$myLinksCategory )
return false;
@@ -169,8 +166,8 @@
function updateMyLinksCategory( $category )
{
if( ($result = $this->update( $category ))) {
- $this->_cache->removeData( $category->getId(), CACHE_MYLINKCATEGORIES );
- $this->_cache->removeData( $category->getBlogId(), CACHE_MYLINKCATEGORIES_ALL );
+ $this->_cache->removeData( $category->getId(), DaoCacheConstants::CACHE_MYLINKCATEGORIES );
+ $this->_cache->removeData( $category->getBlogId(), DaoCacheConstants::CACHE_MYLINKCATEGORIES_ALL );
}
return( $result );
@@ -185,7 +182,7 @@
*/
function getNumMyLinksCategories( $blogId, $searchTerms = "" )
{
- return( count( $this->getMyLinksCategories( $blogId, MYLINKS_CATEGORIES_NO_ORDER, $searchTerms )));
+ return( count( $this->getMyLinksCategories( $blogId, MyLinksCategories::MYLINKS_CATEGORIES_NO_ORDER, $searchTerms )));
}
/**
@@ -197,7 +194,7 @@
*/
function updateCategoryModificationDate( $categoryId )
{
- lt_include( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
+
$category = $this->getMyLinksCategory( $categoryId );
if( $category ) {
$category->setLastModification( Timestamp::getNowTimestamp());
@@ -212,7 +209,7 @@
*/
function updateLastModification( $categoryId , $lastModification)
{
- lt_include( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
+
$category = $this->getMyLinksCategory( $categoryId );
if( $category ) {
$category->setLastModification( Timestamp::getNowTimestamp());
Modified: plog/branches/lifetype-2.0-autoload/class/dao/mylinkscategory.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/mylinkscategory.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/mylinkscategory.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/database/dbobject.class.php" );
+
/**
* \ingroup DAO
@@ -27,7 +27,7 @@
*/
function MyLinksCategory( $name, $blogId, $numLinks = 0, $properties = Array(), $id = -1 )
{
- lt_include( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
+
$this->DbObject();
Modified: plog/branches/lifetype-2.0-autoload/class/dao/permission.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/permission.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/permission.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/database/dbobject.class.php" );
+
/**
* \ingroup DAO
@@ -102,7 +102,7 @@
*/
function getNumUsersWithPermission()
{
- lt_include( PLOG_CLASS_PATH."class/dao/userpermissions.class.php" );
+
$perms = new UserPermissions();
return( $perms->getNumUsersWithPermission( $this->getId()));
}
Modified: plog/branches/lifetype-2.0-autoload/class/dao/permissions.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/permissions.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/permissions.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/dao/model.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/permission.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/daocacheconstants.properties.php" );
+
+
+
/**
* \ingroup DAO
@@ -26,8 +26,8 @@
*/
function addPermission( &$perm )
{
- if( ($result = $this->add( $perm, Array( CACHE_PERMISSIONS => "getId" )))) {
- $this->_cache->removeData( "_all_", CACHE_PERMISSIONS_ALL );
+ if( ($result = $this->add( $perm, Array( DaoCacheConstants::CACHE_PERMISSIONS => "getId" )))) {
+ $this->_cache->removeData( "_all_", DaoCacheConstants::CACHE_PERMISSIONS_ALL );
}
return( $result );
@@ -42,8 +42,8 @@
function updatePermission( &$perm )
{
if( ($result = $this->update( $perm ))) {
- $this->_cache->removeData( $perm->getId(), CACHE_PERMISSIONS );
- $this->_cache->removeData( "_all_", CACHE_PERMISSIONS_ALL );
+ $this->_cache->removeData( $perm->getId(), DaoCacheConstants::CACHE_PERMISSIONS );
+ $this->_cache->removeData( "_all_", DaoCacheConstants::CACHE_PERMISSIONS_ALL );
}
return( $result );
@@ -57,7 +57,7 @@
*/
function getPermission( $id )
{
- return( $this->get( "id", $id, CACHE_PERMISSIONS ));
+ return( $this->get( "id", $id, DaoCacheConstants::CACHE_PERMISSIONS ));
}
/**
@@ -87,8 +87,8 @@
function deletePermission( $id )
{
if( ($result = $this->delete( "id", $id ))) {
- $this->_cache->removeData( $id, CACHE_PERMISSIONS );
- $this->_cache->removeData( "_all_", CACHE_PERMISSIONS_ALL );
+ $this->_cache->removeData( $id, DaoCacheConstants::CACHE_PERMISSIONS );
+ $this->_cache->removeData( "_all_", DaoCacheConstants::CACHE_PERMISSIONS_ALL );
}
return( $result );
@@ -103,8 +103,8 @@
function getAllPermissions()
{
$permissions = $this->getAll( "all",
- CACHE_PERMISSIONS_ALL,
- Array( CACHE_PERMISSIONS => "getId" ),
+ DaoCacheConstants::CACHE_PERMISSIONS_ALL,
+ Array( DaoCacheConstants::CACHE_PERMISSIONS => "getId" ),
Array( "permission" => "ASC" ));
if( !$permissions )
return( Array());
Modified: plog/branches/lifetype-2.0-autoload/class/dao/privatemessage.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/privatemessage.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/privatemessage.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/database/dbobject.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/privatemessagereceiverreadstatus.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
+
+
+
/**
* \ingroup DAO
@@ -102,7 +102,7 @@
function getBox()
{
if( empty( $this->_box ) ){
- lt_include( PLOG_CLASS_PATH."class/dao/privatemessageboxes.class.php" );
+
$privateMessageBoxes = new PrivateMessageBoxes();
$this->_box = $privateMessageBoxes->getPrivateMessageBox( $this->_boxId );
@@ -128,7 +128,7 @@
*/
function getReceiverInfo() {
if( empty( $this->_receiverInfo ) ){
- lt_include( PLOG_CLASS_PATH."class/dao/users.class.php" );
+
$users = new Users();
$this->_receiverInfo = $users->getUserInfoFromId($this->_receiverId);
@@ -148,7 +148,7 @@
function getSenderInfo() {
if( empty( $this->_senderInfo ) ){
- lt_include( PLOG_CLASS_PATH."class/dao/users.class.php" );
+
$users = new Users();
$this->_senderInfo = $users->getUserInfoFromId($this->_senderId);
@@ -288,7 +288,7 @@
function setNormalizedSubject( $normalizedSubject )
{
// do a normalization again, just in case
- lt_include( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
+
$this->_normalizedSubject = TextFilter::normalizeText( $normalizedSubject );
}
@@ -300,7 +300,7 @@
function setNormalizedMessage( $normalizedMessage )
{
// do a normalization again, just in case
- lt_include( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
+
$this->_normalizedMessage = TextFilter::normalizeText( $normalizedMessage );
}
Modified: plog/branches/lifetype-2.0-autoload/class/dao/privatemessagebox.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/privatemessagebox.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/privatemessagebox.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/database/dbobject.class.php" );
+
/**
* whether we'd like to fetch a inbox, outbox or anything
@@ -35,7 +35,7 @@
*/
function PrivateMessageBox( $userId, $boxType, $properties = Array(), $id = -1 )
{
- lt_include( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
+
$this->DbObject();
@@ -163,7 +163,7 @@
*/
function getPrivateMessagesFromBox( $searchTerms = "", $page = -1, $itemsPerPage = 15 )
{
- lt_include( PLOG_CLASS_PATH."class/dao/privatemessages.class.php" );
+
$privateMessages = new PrivateMessages();
$mesages = $privateMessages->getPrivateMessagesFromBoxId( $this->_id, $searchTerms, $page, $itemsPerPage );
@@ -177,7 +177,7 @@
*/
function getNumPrivateMessagesFromBox( $searchTerms = "" )
{
- lt_include( PLOG_CLASS_PATH."class/dao/privatemessages.class.php" );
+
$privateMessages = new PrivateMessages();
return( $privateMessages->getNumPrivateMessagesFromBoxId( $this->_id, $searchTerms ) );
Modified: plog/branches/lifetype-2.0-autoload/class/dao/privatemessageboxes.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/privatemessageboxes.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/privatemessageboxes.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/dao/model.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/privatemessagebox.class.php" );
+
+
/**
* \ingroup DAO
@@ -25,7 +25,7 @@
*/
function getPrivateMessageBox( $id )
{
- return( $this->get( "id", $id, CACHE_PRIVATE_MESSAGE_BOXES ));
+ return( $this->get( "id", $id, DaoCacheConstants::CACHE_PRIVATE_MESSAGE_BOXES ));
}
/**
@@ -36,7 +36,7 @@
*/
function getPrivateMessageInboxFromUserId( $userId )
{
- $inbox = $this->_cache->getData( $userId, CACHE_PRIVATE_MESSAGE_INBOX_BY_USERID );
+ $inbox = $this->_cache->getData( $userId, DaoCacheConstants::CACHE_PRIVATE_MESSAGE_INBOX_BY_USERID );
if( empty( $inbox ) )
{
$query = "SELECT * FROM ".$this->table." WHERE user_id = ".$userId;
@@ -49,7 +49,7 @@
$row = $result->FetchRow();
$inbox = $this->mapRow( $row );
- $this->_cache->setData( $userId, CACHE_PRIVATE_MESSAGE_INBOX_BY_USERID, $inbox );
+ $this->_cache->setData( $userId, DaoCacheConstants::CACHE_PRIVATE_MESSAGE_INBOX_BY_USERID, $inbox );
}
return( $inbox );
@@ -63,7 +63,7 @@
*/
function getPrivateMessageOutboxFromUserId( $userId )
{
- $outbox = $this->_cache->getData( $userId, CACHE_PRIVATE_MESSAGE_OUTBOX_BY_USERID );
+ $outbox = $this->_cache->getData( $userId, DaoCacheConstants::CACHE_PRIVATE_MESSAGE_OUTBOX_BY_USERID );
if( empty( $outbox ) )
{
$query = "SELECT * FROM ".$this->table." WHERE user_id = ".$userId;
@@ -76,7 +76,7 @@
$row = $result->FetchRow();
$outbox = $this->mapRow( $row );
- $this->_cache->setData( $userId, CACHE_PRIVATE_MESSAGE_OUTBOX_BY_USERID, $outbox );
+ $this->_cache->setData( $userId, DaoCacheConstants::CACHE_PRIVATE_MESSAGE_OUTBOX_BY_USERID, $outbox );
}
return( $outbox );
@@ -91,7 +91,7 @@
*/
function addPrivateMessageBox( &$privateMessageBox )
{
- $result = $this->add( $privateMessageBox, Array( CACHE_PRIVATE_MESSAGE_BOXES => "getId" ));
+ $result = $this->add( $privateMessageBox, Array( DaoCacheConstants::CACHE_PRIVATE_MESSAGE_BOXES => "getId" ));
return( $result );
}
@@ -117,11 +117,11 @@
$boxType = $box->getBoxType();
if( ($result = $this->delete( "id", $id ))) {
- $this->_cache->removeData( $id, CACHE_PRIVATE_MESSAGE_BOXES );
+ $this->_cache->removeData( $id, DaoCacheConstants::CACHE_PRIVATE_MESSAGE_BOXES );
if( $boxType == BOX_TYPE_INBOX )
- $this->_cache->removeData( $userId, CACHE_PRIVATE_MESSAGE_INBOX_BY_USERID );
+ $this->_cache->removeData( $userId, DaoCacheConstants::CACHE_PRIVATE_MESSAGE_INBOX_BY_USERID );
elseif( $boxType == BOX_TYPE_OUTBOX )
- $this->_cache->removeData( $userId, CACHE_PRIVATE_MESSAGE_OUTBOX_BY_USERID );
+ $this->_cache->removeData( $userId, DaoCacheConstants::CACHE_PRIVATE_MESSAGE_OUTBOX_BY_USERID );
}
return( $result );
@@ -140,11 +140,11 @@
$boxType = $privateMessageBox->getBoxType();
if( ($result = $this->update( $privateMessageBox ))) {
- $this->_cache->removeData( $id, CACHE_PRIVATE_MESSAGE_BOXES );
+ $this->_cache->removeData( $id, DaoCacheConstants::CACHE_PRIVATE_MESSAGE_BOXES );
if( $boxType == BOX_TYPE_INBOX )
- $this->_cache->removeData( $userId, CACHE_PRIVATE_MESSAGE_INBOX_BY_USERID );
+ $this->_cache->removeData( $userId, DaoCacheConstants::CACHE_PRIVATE_MESSAGE_INBOX_BY_USERID );
elseif( $boxType == BOX_TYPE_OUTBOX )
- $this->_cache->removeData( $userId, CACHE_PRIVATE_MESSAGE_OUTBOX_BY_USERID );
+ $this->_cache->removeData( $userId, DaoCacheConstants::CACHE_PRIVATE_MESSAGE_OUTBOX_BY_USERID );
}
return( $result );
Modified: plog/branches/lifetype-2.0-autoload/class/dao/privatemessagereceiverreadstatus.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/privatemessagereceiverreadstatus.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/privatemessagereceiverreadstatus.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/dao/status/genericstatuslist.class.php" );
+
define( "PRIVATE_MESSAGE_RECEIVER_ALL", -1, true );
define( "PRIVATE_MESSAGE_RECEIVER_UNREAD", 1, true );
Modified: plog/branches/lifetype-2.0-autoload/class/dao/privatemessages.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/privatemessages.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/privatemessages.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/dao/model.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/privatemessage.class.php" );
+
+
/**
* \ingroup DAO
@@ -30,8 +30,8 @@
if( $result ) {
// clean the cache
- $this->_cache->removeData( $privateMessage->getId(), CACHE_PRIVATE_MESSAGES );
- $this->_cache->removeData( $privateMessage->getBoxId(), CACHE_PRIVATE_MESSAGES_BY_BOX_ID );
+ $this->_cache->removeData( $privateMessage->getId(), DaoCacheConstants::CACHE_PRIVATE_MESSAGES );
+ $this->_cache->removeData( $privateMessage->getBoxId(), DaoCacheConstants::CACHE_PRIVATE_MESSAGES_BY_BOX_ID );
// update corresponding counters
$box = $privateMessage->getBox();
$box->setNumPrivateMessages( $box->getNumPrivateMessages() + 1 );
@@ -61,8 +61,8 @@
}
// clean the cache
- $this->_cache->removeData( $privateMessage->getId(), CACHE_PRIVATE_MESSAGES );
- $this->_cache->removeData( $privateMessage->getBoxId(), CACHE_PRIVATE_MESSAGES_BY_BOX_ID );
+ $this->_cache->removeData( $privateMessage->getId(), DaoCacheConstants::CACHE_PRIVATE_MESSAGES );
+ $this->_cache->removeData( $privateMessage->getBoxId(), DaoCacheConstants::CACHE_PRIVATE_MESSAGES_BY_BOX_ID );
// update corresponding counters
$box = $prevVersion->getBox();
if( $prevVersion->getReceiverReadStatus() == PRIVATE_MESSAGE_RECEIVER_UNREAD &&
@@ -123,8 +123,8 @@
{
$privateMessages = $this->getMany( "box_id",
$boxId,
- CACHE_PRIVATE_MESSAGES_BY_BOX_ID,
- Array( CACHE_PRIVATE_MESSAGES => "getId" ),
+ DaoCacheConstants::CACHE_PRIVATE_MESSAGES_BY_BOX_ID,
+ Array( DaoCacheConstants::CACHE_PRIVATE_MESSAGES => "getId" ),
Array( "date" => "DESC" ),
$searchTerms,
$page,
@@ -149,7 +149,7 @@
*/
function getPrivateMessage( $messageId )
{
- $privateMessage = $this->get( "id", $messageId, CACHE_PRIVATE_MESSAGES );
+ $privateMessage = $this->get( "id", $messageId, DaoCacheConstants::CACHE_PRIVATE_MESSAGES );
return $privateMessage;
}
@@ -164,7 +164,7 @@
*/
function getPrivateMessageByReceiverId( $messageId, $receiverId )
{
- $privateMessage = $this->get( "id", $messageId, CACHE_PRIVATE_MESSAGES );
+ $privateMessage = $this->get( "id", $messageId, DaoCacheConstants::CACHE_PRIVATE_MESSAGES );
if( !$privateMessage )
return false;
@@ -184,7 +184,7 @@
*/
function getPrivateMessageBySenderId( $messageId, $senderId )
{
- $privateMessage = $this->get( "id", $messageId, CACHE_PRIVATE_MESSAGES );
+ $privateMessage = $this->get( "id", $messageId, DaoCacheConstants::CACHE_PRIVATE_MESSAGES );
if( !$privateMessage )
return false;
@@ -206,8 +206,8 @@
$privateMessage = $this->getPrivateMessage( $messageId, $receiverId );
if( $privateMessage ) {
$this->delete( "id", $messageId );
- $this->_cache->removeData( $privateMessage->getId(), CACHE_PRIVATE_MESSAGES );
- $this->_cache->removeData( $privateMessage->getBoxId(), CACHE_PRIVATE_MESSAGES_BY_BOX_ID );
+ $this->_cache->removeData( $privateMessage->getId(), DaoCacheConstants::CACHE_PRIVATE_MESSAGES );
+ $this->_cache->removeData( $privateMessage->getBoxId(), DaoCacheConstants::CACHE_PRIVATE_MESSAGES_BY_BOX_ID );
// update corresponding counters
$box = $privateMessage->getBox();
@@ -235,9 +235,9 @@
$privateMessages = $this->getPrivateMessagesFromBoxId( $boxId );
if( $this->delete( "box_id", $boxId )) {
foreach( $privateMessages as $privateMessage ) {
- $this->_cache->removeData( $privateMessage->getId(), CACHE_PRIVATE_MESSAGES );
+ $this->_cache->removeData( $privateMessage->getId(), DaoCacheConstants::CACHE_PRIVATE_MESSAGES );
}
- return( $this->_cache->removeData( $boxId, CACHE_PRIVATE_MESSAGES_BY_BOX_ID ));
+ return( $this->_cache->removeData( $boxId, DaoCacheConstants::CACHE_PRIVATE_MESSAGES_BY_BOX_ID ));
}
else
return false;
@@ -253,9 +253,9 @@
$privateMessages = $this->_getAllUsersPrivateMessagesBySenderId( $senderId );
if( $this->delete( "sender_id", $senderId )) {
foreach( $privateMessages as $privateMessage ) {
- $this->_cache->removeData( $privateMessage->getId(), CACHE_PRIVATE_MESSAGES );
+ $this->_cache->removeData( $privateMessage->getId(), DaoCacheConstants::CACHE_PRIVATE_MESSAGES );
}
- return( $this->_cache->removeData( $boxId, CACHE_PRIVATE_MESSAGES_BY_BOX_ID ));
+ return( $this->_cache->removeData( $boxId, DaoCacheConstants::CACHE_PRIVATE_MESSAGES_BY_BOX_ID ));
}
else
return false;
@@ -278,7 +278,7 @@
while( $row = $result->FetchRow()) {
// use the primary key to retrieve the items via the cache
- $privateMessages[] = $this->get( "id", $row["id"], CACHE_PRIVATE_MESSAGES );
+ $privateMessages[] = $this->get( "id", $row["id"], DaoCacheConstants::CACHE_PRIVATE_MESSAGES );
}
return $privateMessages;
Modified: plog/branches/lifetype-2.0-autoload/class/dao/purgedata.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/purgedata.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/purgedata.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
+
define( "DEFAULT_PURGE_AMOUNT", 15 );
/**
@@ -17,47 +17,47 @@
function deleteBlogData( $blogId )
{
// delete the article categories
- lt_include( PLOG_CLASS_PATH."class/dao/articlecategories.class.php" );
+
$cats = new ArticleCategories();
$cats->deleteBlogCategories( $blogId );
// article notifications
- lt_include( PLOG_CLASS_PATH."class/dao/articlenotifications.class.php" );
+
$notifications = new ArticleNotifications();
$notifications->deleteBlogNotifications( $blogId );
// comments
- lt_include( PLOG_CLASS_PATH."class/dao/commentscommon.class.php" );
+
$comments = new CommentsCommon();
$comments->deleteBlogComments( $blogId );
// links
- lt_include( PLOG_CLASS_PATH."class/dao/mylinks.class.php" );
+
$links = new MyLinks();
$links->deleteBlogMyLinks( $blogId );
// link categories
- lt_include( PLOG_CLASS_PATH."class/dao/mylinkscategories.class.php" );
+
$links = new MyLinksCategories();
$links->deleteBlogMyLinksCategories( $blogId );
// referers
- lt_include( PLOG_CLASS_PATH."class/dao/referers.class.php" );
+
$referers = new Referers();
$referers->deleteBlogReferers( $blogId );
// permissions
- lt_include( PLOG_CLASS_PATH."class/dao/userpermissions.class.php" );
+
$perms = new UserPermissions();
$perms->revokeBlogPermissions( $blogId );
// resources
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryresources.class.php" );
+
$albums = new GalleryResources();
$albums->deleteUserResources( $blogId );
// albums
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryalbums.class.php" );
+
$albums = new GalleryAlbums();
$albums->deleteUserAlbums( $blogId );
// articles
- lt_include( PLOG_CLASS_PATH."class/dao/articles.class.php" );
+
$articles = new Articles();
$articles->deleteBlogPosts( $blogId );
// the blog itself
- lt_include( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
+
$blogs = new Blogs();
$blogs->deleteBlog( $blogId );
@@ -91,8 +91,8 @@
*/
function purgeSpamComments( $amount = DEFAULT_PURGE_AMOUNT )
{
- lt_include( PLOG_CLASS_PATH."class/dao/commentscommon.class.php" );
+
$query = "SELECT id FROM ".$this->getPrefix()."articles_comments WHERE status = ".COMMENT_STATUS_SPAM." LIMIT 0, $amount";
$result = $this->Execute( $query );
@@ -122,8 +122,8 @@
*/
function purgePosts( $amount = DEFAULT_PURGE_AMOUNT )
{
- lt_include( PLOG_CLASS_PATH."class/dao/articles.class.php" );
+
$query = "SELECT id, user_id, blog_id FROM ".$this->getPrefix()."articles WHERE status = ".POST_STATUS_DELETED." LIMIT 0, $amount";
$result = $this->Execute( $query );
@@ -154,7 +154,7 @@
*/
function purgeUsers( $amount = DEFAULT_PURGE_AMOUNT )
{
- lt_include( PLOG_CLASS_PATH."class/dao/users.class.php" );
+
$users = new Users();
$deleted = 0;
Modified: plog/branches/lifetype-2.0-autoload/class/dao/recentarticles.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/recentarticles.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/recentarticles.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/dao/articles.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/daocacheconstants.properties.php" );
+
+
/**
* small wrapper to Articles that loads and caches recent articles. As an API user, you probably
@@ -22,9 +22,9 @@
function getRecentArticles( $blogId, $amount )
{
// check if the data is there
- $recentPosts = $this->_cache->getData( $blogId, CACHE_RECENT_ARTICLES_BY_BLOG );
+ $recentPosts = $this->_cache->getData( $blogId, DaoCacheConstants::CACHE_RECENT_ARTICLES_BY_BLOG );
if( !$recentPosts ) {
- lt_include( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
+
$t = new Timestamp();
$todayTimestamp = $t->getTimestamp();
@@ -38,7 +38,7 @@
$todayTimestamp);
// and cache it for future use
- $this->_cache->setData( $blogId, CACHE_RECENT_ARTICLES_BY_BLOG, $recentPosts );
+ $this->_cache->setData( $blogId, DaoCacheConstants::CACHE_RECENT_ARTICLES_BY_BLOG, $recentPosts );
}
return( $recentPosts );
@@ -51,7 +51,7 @@
function resetRecentArticlesCache( $blogId )
{
$cache =& CacheManager::getCache();
- $cache->removeData( $blogId, CACHE_RECENT_ARTICLES_BY_BLOG );
+ $cache->removeData( $blogId, DaoCacheConstants::CACHE_RECENT_ARTICLES_BY_BLOG );
}
}
?>
\ No newline at end of file
Modified: plog/branches/lifetype-2.0-autoload/class/dao/referer.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/referer.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/referer.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/database/dbobject.class.php" );
+
/**
* \ingroup DAO
@@ -31,7 +31,7 @@
*/
function Referer( $url, $articleId, $blogId, $date, $count = 0, $id = 0 )
{
- lt_include( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
+
$this->DbObject();
$this->_url = $url;
Modified: plog/branches/lifetype-2.0-autoload/class/dao/referers.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/referers.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/referers.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?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 )
{
- 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 )
{
- lt_include( PLOG_CLASS_PATH."class/dao/referer.class.php" );
+
$referer = new Referer( $row["url"],
$row["article_id"],
Modified: plog/branches/lifetype-2.0-autoload/class/dao/searchengine.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/searchengine.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/searchengine.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,9 +1,9 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/dao/articlestatus.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/model.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/searchresult.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/blogstatus.class.php" );
+
+
+
+
define( "SEARCH_ARTICLE", 1 );
define( "SEARCH_BLOG", 2 );
@@ -35,7 +35,7 @@
function adaptSearchString( $searchTerms )
{
// load this module only if needed...
- lt_include( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
+
$tf = new Textfilter();
$resultTerms = $tf->filterCharacters( $searchTerms, Array( '"', ';', '.' ));
$resultTerms = LtDb::qstr($resultTerms);
@@ -112,7 +112,7 @@
$result = $this->Execute( $query, $page, $itemsPerPage );
- lt_include( PLOG_CLASS_PATH."class/dao/articles.class.php" );
+
$articles = new Articles();
if( !$result )
@@ -198,10 +198,10 @@
*/
function getArticleSearchConditions( $searchTerms )
{
- 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/dao/customfields/customfieldsvalues.class.php" );
+
+
+
$prefix = $this->getPrefix();
// get the search conditions for articles
@@ -305,14 +305,14 @@
if ( $status == -1 )
$status = BLOG_STATUS_ACTIVE;
- lt_include( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
+
$blogs = new Blogs();
$result = $blogs->getNumBlogs( $status, ALL_BLOG_CATEGORIES, $searchTerms );
}
else {
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryresources.class.php" );
+
$resources = new GalleryResources();
$result = $resources->getNumUserResources( -1, // owner id
GALLERY_NO_ALBUM, // any album
@@ -336,7 +336,7 @@
*/
function searchBlogs( $searchTerms, $blogStatus = BLOG_STATUS_ACTIVE, $page = -1, $itemsPerPage = DEFAULT_ITEMS_PER_PAGE )
{
- lt_include( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
+
$blogs = new Blogs();
$blogsResult = $blogs->getAllBlogs( $blogStatus,
@@ -365,7 +365,7 @@
*/
function searchGalleryResources( $ownerId, $searchTerms, $page = -1, $itemsPerPage = DEFAULT_ITEMS_PER_PAGE )
{
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryresources.class.php" );
+
$galleryResources = new GalleryResources();
$galleryResourcesResult = $galleryResources->getUserResources( $ownerId,
Modified: plog/branches/lifetype-2.0-autoload/class/dao/sitestatistics.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/sitestatistics.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/sitestatistics.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/dao/model.class.php" );
+
/**
* This class provides some statistics about the site.
@@ -48,7 +48,7 @@
function getNumberOfPostsToday()
{
- lt_include( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
+
$today = new Timestamp();
$todayTimestamp = $today->getYear().$today->getMonth().$today->getDay();
@@ -60,7 +60,7 @@
function getNumberOfPostsThisMonth()
{
- lt_include( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
+
$today = new Timestamp();
$monthTimestamp = $today->getYear().$today->getMonth();
Modified: plog/branches/lifetype-2.0-autoload/class/dao/trackback.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/trackback.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/trackback.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/dao/usercomment.class.php" );
+
/**
* Represents a trackback item, even though in pLog 1.1 trackbacks are
Modified: plog/branches/lifetype-2.0-autoload/class/dao/trackbackclient.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/trackbackclient.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/trackbackclient.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,10 +1,10 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/net/http/httpclient.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/article.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/articles.class.php" );
- lt_include( PLOG_CLASS_PATH."class/net/requestgenerator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
+
+
+
+
+
define( "TRACKBACK_SUCCESS", 0 );
define( "TRACKBACK_FAILED", 1 );
Modified: plog/branches/lifetype-2.0-autoload/class/dao/trackbacks.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/trackbacks.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/trackbacks.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/dao/commentscommon.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/trackback.class.php" );
+
+
define( 'NO_TRACKBACKS', 'no trackbacks available' );
Modified: plog/branches/lifetype-2.0-autoload/class/dao/userauthorizationstatus.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/userauthorizationstatus.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/userauthorizationstatus.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/dao/status/genericstatuslist.class.php" );
+
define( "USER_AUTHORIZATION_ALL", -1, true );
define( "USER_AUTHORIZATION_APPROVED", 1, true );
Modified: plog/branches/lifetype-2.0-autoload/class/dao/usercomment.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/usercomment.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/usercomment.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,9 +1,9 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/database/dbobject.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/userinfo.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/article.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/articlecommentstatus.class.php" );
+
+
+
+
/**
* This class represents a comment made by a casual user to an article. Please use the getter methods
@@ -61,7 +61,7 @@
$this->_status = $status;
if( $date == null ) {
- lt_include( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
+
$t = new Timestamp();
$date = $t->getTimestamp();
@@ -260,7 +260,7 @@
function setDate( $newdate )
{
// source necessary source
- lt_include( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
+
$this->_date = $newdate;
@@ -501,7 +501,7 @@
function getBlogInfo()
{
if( $this->_blogInfo === null ) {
- lt_include( PLOG_CLASS_PATH."class/dao/bloginfo.class.php" );
+
$blogs = new Blogs();
$this->_blogInfo = $blogs->getBlogInfo( $this->getBlogId());
}
@@ -517,7 +517,7 @@
function setNormalizedText( $normalizedText )
{
// do a normalization again, just in case
- lt_include( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
+
$this->_normalizedText = TextFilter::normalizeText( $normalizedText );
}
@@ -543,7 +543,7 @@
function setNormalizedTopic( $normalizedTopic )
{
// do a normalization again, just in case
- lt_include( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
+
$this->_normalizedTopic = TextFilter::normalizeText( $normalizedTopic );
}
@@ -581,7 +581,7 @@
function getUser()
{
if( $this->_userId != 0 ) {
- lt_include( PLOG_CLASS_PATH."class/dao/users.class.php" );
+
$users = new Users();
$this->_user = $users->getUserInfoFromId( $this->_userId );
}
@@ -645,7 +645,7 @@
$commentText = $this->getText();
}
else {
- lt_include( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
+
$commentText = Textfilter::filterAllHTML( $this->getText());
}
Modified: plog/branches/lifetype-2.0-autoload/class/dao/userdata/baseuserdataprovider.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/userdata/baseuserdataprovider.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/userdata/baseuserdataprovider.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,10 +1,10 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/dao/model.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/userstatus.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/blogstatus.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/daocacheconstants.properties.php" );
+
+
+
+
/**
* This is the base class that defines the methods that all user-data providers must implement.
* It also provides some common methods that will be shared by all user-data providers and that therefore
@@ -93,7 +93,7 @@
*/
function getUsersBlogs( $userid, $status = BLOG_STATUS_ALL )
{
- lt_include( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
+
$usersBlogs = Array();
$blogs = new Blogs();
$ids = Array();
@@ -141,8 +141,8 @@
*/
function mapRow( $query_result )
{
- lt_include( PLOG_CLASS_PATH."class/dao/userinfo.class.php" );
+
isset( $query_result["properties"] ) ? $properties = unserialize( $query_result["properties"] ) : $properties = Array();
$userInfo = new UserInfo( $query_result["username"],
@@ -186,7 +186,7 @@
*/
function updateUser( $userInfo )
{
- lt_include( PLOG_CLASS_PATH."class/dao/userpermissions.class.php" );
+
return( true );
}
@@ -219,7 +219,7 @@
// get the information about the owner, if requested so
if( $includeOwner ) {
- lt_include( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
+
$blogs = new Blogs();
$blogInfo = $blogs->getBlogInfo( $blogId );
array_push( $users, $this->getUserInfoFromId( $blogInfo->getOwnerId()));
@@ -277,10 +277,10 @@
*/
function grantLoginPermission( $userInfo )
{
- lt_include( PLOG_CLASS_PATH."class/dao/permissions.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/userpermission.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/userpermissions.class.php" );
+
+
+
$perms = new Permissions();
$loginPerm = $perms->getPermissionByName( "login_perm" );
$perm = new UserPermission( $userInfo->getId(), // user id
Modified: plog/branches/lifetype-2.0-autoload/class/dao/userdata/joomlauserdataprovider.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/userdata/joomlauserdataprovider.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/userdata/joomlauserdataprovider.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/dao/userdata/baseuserdataprovider.class.php" );
- lt_include( PLOG_CLASS_PATH."class/database/ltdb.class.php" );
+
+
define( "JOOMLA_USER_IS_BLOCKED", 1);
define( "JOOMLA_USER_IS_ACTIVE", 0);
define( "JOOMLA_SITE_ADMIN", "Super Administrator");
@@ -32,7 +32,7 @@
//*** Temporarily disabled for causing a fatal error ***/
// disable all caching for userdata
- //CacheManager::disableCache( CACHE_USERINFO );
+ //CacheManager::disableCache( DaoCacheConstants::CACHE_USERINFO );
// initialize the database connection based on our parameters
$config = $this->getProviderConfiguration();
@@ -155,8 +155,8 @@
*/
function getUserInfoFromId( $userid, $extendedInfo = false )
{
- lt_include( PLOG_CLASS_PATH."class/dao/userpermissions.class.php" );
+
$query = "SELECT * FROM ".$this->_joomladbprefix."users WHERE id = '".LtDb::qstr( $userid )."'";
//print("user__id = $userid");
@@ -175,11 +175,11 @@
function JoomlaAddBlog( $row )
{
// create a new blog
- 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/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
$row["id"], // id of the owner
@@ -219,8 +219,8 @@
*/
function _mapUserInfoObject( $row, $extraInfo=false)
{
- lt_include( PLOG_CLASS_PATH."class/dao/userpermissions.class.php" );
+
$plogJoomlaData = $this->getpLogJoomlaUserData( $row["id"] );
//Data fetched from Joomla db
Modified: plog/branches/lifetype-2.0-autoload/class/dao/userdata/lifetypeuserdataprovider.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/userdata/lifetypeuserdataprovider.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/userdata/lifetypeuserdataprovider.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,10 +1,5 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/dao/userdata/baseuserdataprovider.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/userinfo.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/userstatus.class.php" );
- lt_include( PLOG_CLASS_PATH."class/database/ltdb.class.php" );
-
/**
* Model representing the users in our application. Provides the methods such as
* authentication and querying for users.
@@ -68,7 +63,7 @@
*/
function getUserInfoFromUsername( $username )
{
- $user = $this->get( "username", $username, CACHE_USERIDBYNAME, Array( CACHE_USERINFO => "getId" ));
+ $user = $this->get( "username", $username, DaoCacheConstants::CACHE_USERIDBYNAME, Array( DaoCacheConstants::CACHE_USERINFO => "getId" ));
if( $user ) {
if( $user->getUsername() != $username ) {
$user = false;
@@ -86,7 +81,7 @@
*/
function getUserInfoFromId( $userid )
{
- return( $this->get( "id", $userid, CACHE_USERINFO, Array( CACHE_USERIDBYNAME => "getUsername" )));
+ return( $this->get( "id", $userid, DaoCacheConstants::CACHE_USERINFO, Array( DaoCacheConstants::CACHE_USERIDBYNAME => "getUsername" )));
}
/**
@@ -134,8 +129,8 @@
$user = $this->mapRow( $row );
$users[] = $user;
// cache the data for later use
- $this->_cache->setData( $user->getId(), CACHE_USERINFO, $user );
- $this->_cache->setData( $user->getUsername(), CACHE_USERIDBYNAME, $user );
+ $this->_cache->setData( $user->getId(), DaoCacheConstants::CACHE_USERINFO, $user );
+ $this->_cache->setData( $user->getUsername(), DaoCacheConstants::CACHE_USERIDBYNAME, $user );
}
$result->Close();
@@ -168,8 +163,8 @@
if( $result ) {
// remove the old data
- $this->_cache->removeData( $user->getId(), CACHE_USERINFO );
- $this->_cache->removeData( $user->getUsername(), CACHE_USERIDBYNAME );
+ $this->_cache->removeData( $user->getId(), DaoCacheConstants::CACHE_USERINFO );
+ $this->_cache->removeData( $user->getUsername(), DaoCacheConstants::CACHE_USERIDBYNAME );
}
BaseUserDataProvider::updateUser( $user );
@@ -196,8 +191,8 @@
// 2. Another easy way to solve this is remove the cache code below, don't cache the UserInfo
// Object in the first time. Let it cache later.
$user->setMD5Password( $user->getPassword() );
- $this->_cache->setData( $user->getId(), CACHE_USERINFO, $user );
- $this->_cache->setData( $user->getUsername(), CACHE_USERIDBYNAME, $user );
+ $this->_cache->setData( $user->getId(), DaoCacheConstants::CACHE_USERINFO, $user );
+ $this->_cache->setData( $user->getUsername(), DaoCacheConstants::CACHE_USERIDBYNAME, $user );
}
return( $userId );
@@ -213,11 +208,11 @@
// first, delete all of his/her permissions
$user = $this->getUserInfoFromId( $userId );
if( $this->delete( "id", $userId )) {
- lt_include( PLOG_CLASS_PATH."class/dao/userpermissions.class.php" );
+
$perms = new UserPermissions();
$perms->revokeUserPermissions( $userId );
- $this->_cache->removeData( $userId, CACHE_USERINFO );
- $this->_cache->removeData( $user->getUsername(), CACHE_USERIDBYNAME );
+ $this->_cache->removeData( $userId, DaoCacheConstants::CACHE_USERINFO );
+ $this->_cache->removeData( $user->getUsername(), DaoCacheConstants::CACHE_USERIDBYNAME );
return true;
}
@@ -271,7 +266,7 @@
*/
function getSearchConditions( $searchTerms )
{
- lt_include( PLOG_CLASS_PATH."class/dao/searchengine.class.php" );
+
// prepare the query string
$searchTerms = SearchEngine::adaptSearchString( $searchTerms );
Modified: plog/branches/lifetype-2.0-autoload/class/dao/userdata/phpbb2userdataprovider.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/userdata/phpbb2userdataprovider.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/userdata/phpbb2userdataprovider.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/dao/userdata/baseuserdataprovider.class.php" );
- lt_include( PLOG_CLASS_PATH."class/database/ltdb.class.php" );
+
+
/**
* Model representing the users in our application. Provides the methods such as
* authentication and querying for users.
@@ -116,8 +116,8 @@
*/
function getUserInfoFromId( $userid, $extendedInfo = false )
{
- lt_include( PLOG_CLASS_PATH."class/dao/userpermissions.class.php" );
+
$query = "SELECT * FROM ".$this->_phpbbprefix."users WHERE user_id = '".LtDb::qstr( $userid )."'";
$result = $this->_dbc->Execute( $query );
@@ -134,11 +134,11 @@
function phpBB2AddBlog( $row )
{
// create a new blog
- 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/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
$row["id"], // id of the owner
@@ -172,8 +172,8 @@
function _mapUserInfoObject( $row, $extraInfo = false )
{
- lt_include( PLOG_CLASS_PATH."class/dao/userpermissions.class.php" );
+
$plogPhpBB2Data = $this->getpLogPHPBBUserData( $row["user_id"] );
$row["user"] = $row["username"];
Modified: plog/branches/lifetype-2.0-autoload/class/dao/userdata/simplepostnukeuserdataprovider.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/userdata/simplepostnukeuserdataprovider.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/userdata/simplepostnukeuserdataprovider.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,10 +1,10 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/dao/userdata/baseuserdataprovider.class.php" );
- lt_include( PLOG_CLASS_PATH."class/database/ltdb.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/userinfo.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/userstatus.class.php" );
+
+
+
+
/**
* Model representing the users in our application. Provides the methods such as
* authentication and querying for users.
@@ -134,11 +134,11 @@
*/
function _PostNukeAddBlog( &$username, &$userid )
{
- 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/articles.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/articlecategories.class.php" );
+
+
+
+
$config =& Config::getConfig();
$locale =& Locales::getLocale( $config->getValue( "default_locale" ));
@@ -185,7 +185,7 @@
*/
function getUserInfoFromUsername( $username )
{
- return( $this->get( "user", $username, CACHE_USERIDBYNAME, Array( CACHE_USERINFO => "getId" )));
+ return( $this->get( "user", $username, DaoCacheConstants::CACHE_USERIDBYNAME, Array( CACHE_USERINFO => "getId" )));
}
@@ -197,7 +197,7 @@
*/
function getUserInfoFromId( $userid )
{
- return( $this->get( "id", $userid, CACHE_USERINFO, Array( CACHE_USERIDBYNAME => "getUsername" )));
+ return( $this->get( "id", $userid, DaoCacheConstants::CACHE_USERINFO, Array( CACHE_USERIDBYNAME => "getUsername" )));
}
/**
@@ -241,8 +241,8 @@
$user = $this->mapRow( $row );
$users[] = $user;
// cache the data for later use
- $this->_cache->setData( $user->getId(), CACHE_USERINFO, $user );
- $this->_cache->setData( $user->getUsername(), CACHE_USERIDBYNAME, $user );
+ $this->_cache->setData( $user->getId(), DaoCacheConstants::CACHE_USERINFO, $user );
+ $this->_cache->setData( $user->getUsername(), DaoCacheConstants::CACHE_USERIDBYNAME, $user );
}
$result->Close();
@@ -275,8 +275,8 @@
if( $result ) {
// remove the old data
- $this->_cache->removeData( $user->getId(), CACHE_USERINFO );
- $this->_cache->removeData( $user->getUsername(), CACHE_USERIDBYNAME );
+ $this->_cache->removeData( $user->getId(), DaoCacheConstants::CACHE_USERINFO );
+ $this->_cache->removeData( $user->getUsername(), DaoCacheConstants::CACHE_USERIDBYNAME );
}
BaseUserDataProvider::updateUser( $user );
@@ -303,8 +303,8 @@
// 2. Another easy way to solve this is remove the cache code below, don't cache the UserInfo
// Object in the first time. Let it cache later.
$user->setMD5Password( $user->getPassword() );
- $this->_cache->setData( $user->getId(), CACHE_USERINFO, $user );
- $this->_cache->setData( $user->getUsername(), CACHE_USERIDBYNAME, $user );
+ $this->_cache->setData( $user->getId(), DaoCacheConstants::CACHE_USERINFO, $user );
+ $this->_cache->setData( $user->getUsername(), DaoCacheConstants::CACHE_USERIDBYNAME, $user );
}
return( $userId );
@@ -365,10 +365,10 @@
{
// first, delete all of his/her permissions
if( $this->delete( $userId )) {
- lt_include( PLOG_CLASS_PATH."class/dao/userpermissions.class.php" );
+
$perms = new UserPermissions();
$perms->revokeUserPermissions( $userId );
- $this->_cache->removeData( $userId, CACHE_USERINFO );
+ $this->_cache->removeData( $userId, DaoCacheConstants::CACHE_USERINFO );
}
else
return( false );
@@ -422,7 +422,7 @@
*/
function getSearchConditions( $searchTerms )
{
- lt_include( PLOG_CLASS_PATH."class/dao/searchengine.class.php" );
+
// prepare the query string
$searchTerms = SearchEngine::adaptSearchString( $searchTerms );
Modified: plog/branches/lifetype-2.0-autoload/class/dao/userdata/vbb3userdataprovider.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/userdata/vbb3userdataprovider.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/userdata/vbb3userdataprovider.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -19,9 +19,9 @@
*/
- lt_include( PLOG_CLASS_PATH."class/dao/userdata/baseuserdataprovider.class.php" );
- lt_include( PLOG_CLASS_PATH."class/database/ltdb.class.php" );
+
+
/**
* Model representing the users in our application. Provides the methods such as
* authentication and querying for users.
@@ -199,7 +199,7 @@
*/
function getUserInfoFromId( $userid, $extendedInfo = false )
{
- lt_include( PLOG_CLASS_PATH."class/dao/userpermissions.class.php" );
+
$query = "SELECT * FROM ".$this->_vbb3prefix."user WHERE userid = '".LtDb::qstr( $userid )."'";
@@ -224,11 +224,11 @@
function vbb3AddBlog( $row )
{
// create a new blog
- 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/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
$row["id"], // id of the owner
@@ -261,8 +261,8 @@
function _mapUserInfoObject( $row, $extraInfo = false )
{
- lt_include( PLOG_CLASS_PATH."class/dao/userpermissions.class.php" );
+
$plogPhpBB2Data = $this->getpLogPHPBBUserData( $row["userid"] );
$row["user"] = $row["username"];
@@ -577,7 +577,7 @@
*/
function getSearchConditions( $searchTerms )
{
- lt_include( PLOG_CLASS_PATH."class/dao/searchengine.class.php" );
+
// prepare the query string
$searchTerms = SearchEngine::adaptSearchString( $searchTerms );
Modified: plog/branches/lifetype-2.0-autoload/class/dao/userdata/wbbuserdataprovider.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/userdata/wbbuserdataprovider.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/userdata/wbbuserdataprovider.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/dao/userdata/baseuserdataprovider.class.php" );
- lt_include( PLOG_CLASS_PATH."class/database/ltdb.class.php" );
+
+
/**
* Model representing the users in our application. Provides the methods such as
* authentication and querying for users.
@@ -119,8 +119,8 @@
*/
function getUserInfoFromId( $userid, $extendedInfo = false )
{
- lt_include( PLOG_CLASS_PATH."class/dao/userpermissions.class.php" );
+
$query = "SELECT * FROM ".$this->_wbbprefix."users WHERE userid = '".LtDb::qstr( $userid )."'";
//print("user__id = $userid");
@@ -143,10 +143,10 @@
function WBB2AddBlog( $row )
{
// create a new blog
- 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/articles.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/articlecategories.class.php" );
+
+
+
+
$config =& Config::getConfig();
$locale =& Locales::getLocale( $config->getValue( "default_locale" ));
@@ -181,8 +181,8 @@
function _mapUserInfoObject( $row, $extraInfo = false )
{
- lt_include( PLOG_CLASS_PATH."class/dao/userpermissions.class.php" );
+
$plogWBB2Data = $this->getpLogWBBUserData( $row["userid"] );
$row["user"] = $row["username"];
Modified: plog/branches/lifetype-2.0-autoload/class/dao/userinfo.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/userinfo.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/userinfo.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/database/dbobject.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/userstatus.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/userpermission.class.php" );
+
+
+
/**
* Represents a user in our application. Includes information such as the username,
@@ -128,7 +128,7 @@
$text = $this->_aboutmyself;
if( $format ) {
- lt_include( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
+
$text = TextFilter::autoP( $text );
}
@@ -151,7 +151,7 @@
function getBlogs()
{
if( $this->_blogs == null ) {
- lt_include( PLOG_CLASS_PATH."class/dao/users.class.php" );
+
$users = new Users();
$this->_blogs = $users->getUsersBlogs($this->getId());
}
@@ -179,7 +179,7 @@
function setUsername( $newUsername )
{
- lt_include( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
+
$this->_username = Textfilter::filterAllHTML( $newUsername );
}
@@ -280,7 +280,7 @@
*/
function _loadPicture()
{
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryresources.class.php" );
+
$resources = new GalleryResources();
$picture = $resources->getResource( $this->_resourcePictureId );
@@ -330,7 +330,7 @@
function hasPermission( $permission, $blogId = 0 )
{
if( !isset($this->perms[$blogId] )) {
- lt_include( PLOG_CLASS_PATH."class/dao/userpermissions.class.php" );
+
$perms = new UserPermissions();
$this->perms[$blogId] = $perms->getUserPermissions( $this->getId(), $blogId );
}
@@ -343,7 +343,7 @@
$ok = false;
if( !isset($this->perms[$blogId] )) {
- lt_include( PLOG_CLASS_PATH."class/dao/userpermissions.class.php" );
+
$perms = new UserPermissions();
$this->perms[$blogId] = $perms->getUserPermissions( $this->getId(), $blogId );
}
@@ -361,7 +361,7 @@
function getPermissions( $blogId = 0 )
{
if( !isset($this->perms[$blogId] )) {
- lt_include( PLOG_CLASS_PATH."class/dao/userpermissions.class.php" );
+
$perms = new UserPermissions();
$this->perms[$blogId] = $perms->getUserPermissions( $this->getId(), $blogId );
}
Modified: plog/branches/lifetype-2.0-autoload/class/dao/userpermission.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/userpermission.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/userpermission.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/database/dbobject.class.php" );
+
/**
* represents a permission from the database
@@ -59,7 +59,7 @@
function getBlogInfo()
{
if( $this->_blog === null ) {
- lt_include( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
+
$blogs = new Blogs();
$this->_blog = $blogs->getBlogInfo( $this->getBlogId());
}
@@ -81,7 +81,7 @@
function getPermission()
{
if( $this->_perm === null ) {
- lt_include( PLOG_CLASS_PATH."class/dao/permissions.class.php" );
+
$perms = new Permissions();
$this->_perm = $perms->getPermission( $this->_permId );
}
@@ -114,7 +114,7 @@
function getUserInfo()
{
if( $this->_user === null ) {
- lt_include( PLOG_CLASS_PATH."class/dao/users.class.php" );
+
$users = new Users();
$this->_user = $users->getUserInfoFromId( $this->getUserId());
}
Modified: plog/branches/lifetype-2.0-autoload/class/dao/userpermissions.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/userpermissions.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/userpermissions.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/dao/model.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/userpermission.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/daocacheconstants.properties.php" );
+
+
+
define( "PERMISSION_BLOG_USER", 2 );
@@ -36,7 +36,7 @@
// get all the user permissions from the db table
$userPerms = $this->getMany( "user_id",
$userId,
- CACHE_USER_PERMISSIONS );
+ DaoCacheConstants::CACHE_USER_PERMISSIONS );
if( !is_array( $userPerms ))
$userPerms = Array();
@@ -78,10 +78,10 @@
// if not, grant it now
if(( $result = $this->add( $perm ))) {
if( !$doNotCleanCache ) {
- $this->_cache->removeData( $perm->getUserId(), CACHE_USER_PERMISSIONS );
- $this->_cache->removeData( $perm->getUserId(), CACHE_USERINFO );
+ $this->_cache->removeData( $perm->getUserId(), DaoCacheConstants::CACHE_USER_PERMISSIONS );
+ $this->_cache->removeData( $perm->getUserId(), DaoCacheConstants::CACHE_USERINFO );
$userInfo = $perm->getUserInfo();
- $this->_cache->removeData( $userInfo->getUserName(), CACHE_USERIDBYNAME );
+ $this->_cache->removeData( $userInfo->getUserName(), DaoCacheConstants::CACHE_USERIDBYNAME );
}
}
@@ -117,7 +117,7 @@
// and execute it
$result = $this->Execute( $query );
if( $result ) {
- $this->_cache->removeData( $userId, CACHE_USER_PERMISSIONS );
+ $this->_cache->removeData( $userId, DaoCacheConstants::CACHE_USER_PERMISSIONS );
}
return( $result );
@@ -139,7 +139,7 @@
// and execute it
$result = $this->Execute( $query );
if( $result ) {
- $this->_cache->removeData( $userId, CACHE_USER_PERMISSIONS );
+ $this->_cache->removeData( $userId, DaoCacheConstants::CACHE_USER_PERMISSIONS );
}
return( $result );
@@ -154,7 +154,7 @@
*/
function revokeBlogPermissions( $blogId )
{
- lt_include( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
+
$blogs = new Blogs();
$blogInfo = $blogs->getBlogInfo( $blogId );
@@ -164,7 +164,7 @@
if(( $result = $this->delete( "blog_id", $blogId ))) {
foreach( $blogUsers as $user ) {
- $this->_cache->removeData( $user->getId(), CACHE_USER_PERMISSIONS );
+ $this->_cache->removeData( $user->getId(), DaoCacheConstants::CACHE_USER_PERMISSIONS );
}
}
@@ -180,7 +180,7 @@
function revokeUserPermissions( $userId )
{
if( $result = $this->delete( "user_id", $userId )) {
- $this->_cache->removeData( $userId, CACHE_USER_PERMISSIONS );
+ $this->_cache->removeData( $userId, DaoCacheConstants::CACHE_USER_PERMISSIONS );
}
return( $result );
Modified: plog/branches/lifetype-2.0-autoload/class/dao/users.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/users.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/users.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -25,7 +25,7 @@
function _loadUserDataProvider()
{
// load the config file
- lt_include( PLOG_CLASS_PATH."class/config/configfilestorage.class.php" );
+
$config = new ConfigFileStorage( Array( "file" => PLOG_CLASS_PATH."config/userdata.properties.php" ));
// see which class has been configured as the user data provider
@@ -35,8 +35,8 @@
}
// try to load the class
- lt_include( PLOG_CLASS_PATH."class/dao/userdata/".strtolower( $providerClass ).".class.php" );
+
// try to check if the class has been defined at all...
if( !class_exists( $providerClass )) {
die( "ERROR: Provider class $providerClass has not been defined!" );
@@ -169,7 +169,7 @@
function deleteUser( $userId )
{
// delete friends & friend groups before delete the user
- lt_include( PLOG_CLASS_PATH."class/dao/friends.class.php" );
+
$friends = new Friends();
// delete the user's all friends
$friends->deleteUserFriends( $userId );
@@ -177,13 +177,13 @@
$friends->deleteAllUsersFriendsByFriendId( $userId );
// delete friend groups
- lt_include( PLOG_CLASS_PATH."class/dao/friendgroups.class.php" );
+
$friendGroups = new FriendGroups();
$friendGroups->deleteUserFriendGroups( $userId );
// delete private messages
- lt_include( PLOG_CLASS_PATH."class/dao/privatemessageboxes.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/privatemessages.class.php" );
+
+
$privateMessageBoxes = new PrivateMessageBoxes();
$privateMessages = new PrivateMessages();
$inbox = $privateMessageBoxes->getPrivateMessageInboxFromUserId( $userId );
Modified: plog/branches/lifetype-2.0-autoload/class/dao/userstatus.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/dao/userstatus.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/dao/userstatus.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/dao/status/genericstatuslist.class.php" );
+
define( "USER_STATUS_ALL", -1, true );
define( "USER_STATUS_ACTIVE", 1, true );
Modified: plog/branches/lifetype-2.0-autoload/class/data/Date/Span.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/data/Date/Span.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/data/Date/Span.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -19,9 +19,9 @@
// $Id: Span.php,v 1.4 2003/04/30 03:56:26 llucax Exp $
//
-lt_include(PLOG_CLASS_PATH.'class/data/Date.class.php');
-lt_include(PLOG_CLASS_PATH.'class/data/Date/Calc.class.php');
+
+
/**
*
* Non Numeric Separated Values (NNSV) Input Format.
Modified: plog/branches/lifetype-2.0-autoload/class/data/captcha/captcha.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/data/captcha/captcha.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/data/captcha/captcha.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -55,8 +55,8 @@
*/
function Captcha()
{
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
+
$config =& Config::getConfig();
$this->cacheFolder = $config->getValue( "temp_folder", CAPTCHA_CACHE_FOLDER );
/**
@@ -137,7 +137,7 @@
*/
function validate( $code )
{
- lt_include( PLOG_CLASS_PATH."class/file/file.class.php" );
+
$encrypt = $this->encrypt($code, $this->key);
$tempFile = $this->cacheFolder."/".$encrypt.".gif";
$result = File::exists( $tempFile );
@@ -151,7 +151,7 @@
*/
function purgeOld( $expireTime = CAPTCHA_DEFAULT_EXPIRATION_TIME )
{
- lt_include( PLOG_CLASS_PATH."class/misc/glob.class.php" );
+
$files = Glob::myGlob( $this->cacheFolder, "*.gif" );
if( $files ) {
foreach( $files as $file ) {
Modified: plog/branches/lifetype-2.0-autoload/class/data/filter/allowedhtmlfilter.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/data/filter/allowedhtmlfilter.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/data/filter/allowedhtmlfilter.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/data/filter/filterbase.class.php" );
+
/**
* \ingroup Filter
@@ -18,7 +18,7 @@
*/
function filter( $data )
{
- lt_include( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
+
$tf = new Textfilter();
return( parent::filter( $tf->filterHTML( $data )));
}
Modified: plog/branches/lifetype-2.0-autoload/class/data/filter/htmlentitiesfilter.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/data/filter/htmlentitiesfilter.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/data/filter/htmlentitiesfilter.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/data/filter/filterbase.class.php" );
+
/**
* \ingroup Filter
@@ -18,7 +18,7 @@
*/
function filter( $data )
{
- lt_include( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
+
return( parent::filter( Textfilter::filterHTMLEntities( $data )));
}
}
Modified: plog/branches/lifetype-2.0-autoload/class/data/filter/htmlfilter.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/data/filter/htmlfilter.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/data/filter/htmlfilter.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/data/filter/filterbase.class.php" );
+
/**
* \ingroup Filter
@@ -22,7 +22,7 @@
$this->FilterBase();
if( $filterEntities ) {
- lt_include( PLOG_CLASS_PATH."class/data/filter/htmlentitiesfilter.class.php" );
+
$this->addFilter( new HtmlEntitiesFilter());
}
}
@@ -35,7 +35,7 @@
*/
function filter( $data )
{
- lt_include( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
+
return( parent::filter( Textfilter::filterAllHTML( $data )));
}
}
Modified: plog/branches/lifetype-2.0-autoload/class/data/filter/htmlspecialcharsfilter.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/data/filter/htmlspecialcharsfilter.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/data/filter/htmlspecialcharsfilter.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/data/filter/filterbase.class.php" );
+
/**
* \ingroup Filter
Modified: plog/branches/lifetype-2.0-autoload/class/data/filter/regexpfilter.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/data/filter/regexpfilter.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/data/filter/regexpfilter.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/data/filter/filterbase.class.php" );
+
/**
* Filter that removes all characters that are matched by the given regular expression
Modified: plog/branches/lifetype-2.0-autoload/class/data/filter/trimfilter.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/data/filter/trimfilter.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/data/filter/trimfilter.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/data/filter/filterbase.class.php" );
+
/**
* \ingroup Filter
Modified: plog/branches/lifetype-2.0-autoload/class/data/filter/urlconverter.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/data/filter/urlconverter.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/data/filter/urlconverter.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/data/filter/filterbase.class.php" );
+
/**
* \ingroup Filter
Modified: plog/branches/lifetype-2.0-autoload/class/data/filter/xhtmlizefilter.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/data/filter/xhtmlizefilter.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/data/filter/xhtmlizefilter.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/data/filter/filterbase.class.php" );
+
/**
* \ingroup Filter
@@ -18,7 +18,7 @@
*/
function filter( $data )
{
- lt_include( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
+
$t = new Textfilter();
return( parent::filter( $t->xhtmlize( $data )));
}
Modified: plog/branches/lifetype-2.0-autoload/class/data/forms/formvalidator.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/data/forms/formvalidator.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/data/forms/formvalidator.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -137,7 +137,7 @@
*/
function registerField( $fieldName )
{
- lt_include( PLOG_CLASS_PATH."class/data/validator/emptyvalidator.class.php" );
+
$this->registerFieldValidator( $fieldName, new EmptyValidator());
return true;
Modified: plog/branches/lifetype-2.0-autoload/class/data/htmlcalendar.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/data/htmlcalendar.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/data/htmlcalendar.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -31,7 +31,7 @@
* and variable names.
*/
-class Calendar
+class HtmlCalendar
{
/*
Constructor for the Calendar class
Modified: plog/branches/lifetype-2.0-autoload/class/data/jalalicalendar.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/data/jalalicalendar.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/data/jalalicalendar.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
// lang file must be at the same directory
-lt_include( PLOG_CLASS_PATH."class/data/jalalicalendarstrings.properties.php" );
+
/**
* \ingroup data
*
Modified: plog/branches/lifetype-2.0-autoload/class/data/plogcalendar.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/data/plogcalendar.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/data/plogcalendar.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,13 +1,5 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/bloginfo.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/Date.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/htmlcalendar.class.php" );
- lt_include( PLOG_CLASS_PATH.'class/data/timestamp.class.php' );
- lt_include( PLOG_CLASS_PATH."class/locale/locale.class.php" );
- lt_include( PLOG_CLASS_PATH."class/locale/locales.class.php" );
- lt_include( PLOG_CLASS_PATH."class/net/requestgenerator.class.php" );
-
+
/**
* \ingroup Data
*
@@ -18,7 +10,7 @@
*
* User classes will rarely need to use this class.
*/
- class PlogCalendar extends Calendar
+ class PlogCalendar extends HtmlCalendar
{
var $_dayPosts;
Modified: plog/branches/lifetype-2.0-autoload/class/data/serialize/json/jsonserializer.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/data/serialize/json/jsonserializer.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/data/serialize/json/jsonserializer.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
-lt_include( PLOG_CLASS_PATH."class/data/serialize/serializerbase.class.php" );
+
/* vim: set expandtab tabstop=4 shiftwidth=4 softtabstop=4: */
/**
* This is an embedded version of HTML_AJAX_JSON since it has yet to have a PEAR release
Modified: plog/branches/lifetype-2.0-autoload/class/data/serialize/serializerfactory.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/data/serialize/serializerfactory.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/data/serialize/serializerfactory.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -17,7 +17,7 @@
{
$serializerClassPath = PLOG_CLASS_PATH."class/data/serialize/$format/{$format}serializer.class.php";
if( File::isReadable( $serializerClassPath )) {
- lt_include( $serializerClassPath );
+
$className = $format."serializer";
$class = new $className();
}
@@ -36,7 +36,7 @@
*/
function toJson( $data )
{
- lt_include( PLOG_CLASS_PATH."class/data/serialize/json/jsonserializer.class.php" );
+
$json = new JsonSerializer();
return( $json->encode( $data ));
}
Modified: plog/branches/lifetype-2.0-autoload/class/data/textfilter.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/data/textfilter.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/data/textfilter.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -8,8 +8,8 @@
*/
- lt_include( PLOG_CLASS_PATH."class/data/stringutils.class.php" );
+
/**
* default character used as the word separator, instead of blank spaces
* when creating permalinks and blog names (for subdomains)
@@ -39,7 +39,7 @@
{
$this->removeJavaScript = $removeJavaScript;
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
+
$config =& Config::getConfig();
$this->htmlAllowedTags = $config->getValue( "html_allowed_tags_in_comments" );
$this->_smileys = $config->getValue( "smileys" );
@@ -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.
- 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
@@ -278,7 +278,7 @@
*/
function normalizeText( $text )
{
- lt_include( PLOG_CLASS_PATH."class/dao/article.class.php" ); // because of the POST_EXTENDED_TEXT_MODIFIER constant
+ // because of the POST_EXTENDED_TEXT_MODIFIER constant
// remove all html code
$result = TextFilter::filterAllHtml( $text );
// remove the "extended post modifier"
@@ -422,7 +422,7 @@
*/
function urlize( $string, $domainize = false )
{
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
+
$config =& Config::getConfig();
$separator = $config->getValue( "urlize_word_separator", URLIZE_WORD_SEPARATOR_DEFAULT );
@@ -502,10 +502,10 @@
function xhtmlize( $string )
{
// use kses in the "xhtml converter" mode
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
+
$config =& Config::getConfig();
if( $config->getValue( "xhtml_converter_enabled" )) {
- lt_include( PLOG_CLASS_PATH."class/data/kses.class.php" );
+
$kses = new kses( true, $config->getValue( "xhtml_converter_aggresive_mode_enabled"));
$result = $kses->Parse( $string );
@@ -528,8 +528,8 @@
* @return the xhtml-ized string
*/
function slugify( $string ){
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
- lt_include( PLOG_CLASS_PATH.'class/net/linkparser.class.php' );
+
+
$config =& Config::getConfig();
$separator = $config->getValue( "urlize_word_separator", URLIZE_WORD_SEPARATOR_DEFAULT );
Modified: plog/branches/lifetype-2.0-autoload/class/data/timestamp.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/data/timestamp.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/data/timestamp.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,9 +1,9 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
- lt_include( PLOG_CLASS_PATH."class/locale/locales.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/Date.class.php" );
+
+
+
/**
* constants used to determine whether we are using dynamic time
@@ -323,7 +323,7 @@
$timeDifference = $blogSettings->getValue( "time_offset" );
}
else {
- lt_include( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
+
$blogs = new Blogs();
$blogInfo = $blogs->getBlogInfoById( $blog );
if( !$blogInfo )
Modified: plog/branches/lifetype-2.0-autoload/class/data/validator/arrayvalidator.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/data/validator/arrayvalidator.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/data/validator/arrayvalidator.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/data/validator/validator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/rules/arrayrule.class.php" );
+
+
/**
* \ingroup Validator
Modified: plog/branches/lifetype-2.0-autoload/class/data/validator/blognamevalidator.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/data/validator/blognamevalidator.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/data/validator/blognamevalidator.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,9 +1,9 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/data/validator/validator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/rules/nonemptyrule.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/rules/filteredpatternsrule.class.php" );
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
+
+
+
+
/**
* \ingroup Validator
@@ -40,7 +40,7 @@
// in addition to the other rules, the blog name won't be valid if its domainized() version
// returns empty spaces, so this is what would happen if we set a blog name of
// things like non-characters for example
- lt_include( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
+
return(( Textfilter::domainize( Textfilter::filterAllHTML( $value ))) != "" );
}
}
Modified: plog/branches/lifetype-2.0-autoload/class/data/validator/chainedvalidator.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/data/validator/chainedvalidator.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/data/validator/chainedvalidator.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/data/validator/validator.class.php" );
+
/**
* \ingroup Validator
Modified: plog/branches/lifetype-2.0-autoload/class/data/validator/domainvalidator.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/data/validator/domainvalidator.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/data/validator/domainvalidator.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,9 +1,9 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/data/validator/validator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/rules/nonemptyrule.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/rules/filteredwordsrule.class.php" );
+
+
+
/**
* \ingroup Validator
*
Modified: plog/branches/lifetype-2.0-autoload/class/data/validator/emailvalidator.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/data/validator/emailvalidator.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/data/validator/emailvalidator.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,9 +1,9 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/data/validator/validator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/rules/emailformatrule.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/rules/emaildnsrule.class.php" );
+
+
+
+
/**
* \ingroup Validator
Modified: plog/branches/lifetype-2.0-autoload/class/data/validator/emptyvalidator.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/data/validator/emptyvalidator.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/data/validator/emptyvalidator.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/data/validator/validator.class.php" );
+
/**
* \ingroup Validator
Modified: plog/branches/lifetype-2.0-autoload/class/data/validator/filenamematchvalidator.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/data/validator/filenamematchvalidator.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/data/validator/filenamematchvalidator.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/data/validator/validator.class.php" );
+
/**
* \ingroup Validator
Modified: plog/branches/lifetype-2.0-autoload/class/data/validator/floatvalidator.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/data/validator/floatvalidator.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/data/validator/floatvalidator.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/data/validator/validator.class.php" );
+
/**
* \ingroup Validator
@@ -20,7 +20,7 @@
{
$this->Validator();
- lt_include( PLOG_CLASS_PATH."class/data/validator/rules/floatrule.class.php" );
+
$this->addRule( new FloatRule());
}
}
Modified: plog/branches/lifetype-2.0-autoload/class/data/validator/httpurlvalidator.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/data/validator/httpurlvalidator.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/data/validator/httpurlvalidator.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/data/validator/validator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/rules/urlformatrule.class.php" );
+
+
/**
* \ingroup Validator
Modified: plog/branches/lifetype-2.0-autoload/class/data/validator/integervalidator.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/data/validator/integervalidator.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/data/validator/integervalidator.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/data/validator/validator.class.php" );
+
/**
* \ingroup Validator
@@ -22,11 +22,11 @@
$this->Validator();
if( $signed ) {
- lt_include( PLOG_CLASS_PATH."class/data/validator/rules/intrule.class.php" );
+
$this->addRule( new IntRule());
}
else {
- lt_include( PLOG_CLASS_PATH."class/data/validator/rules/uintrule.class.php" );
+
$this->addRule( new UIntRule());
}
}
Modified: plog/branches/lifetype-2.0-autoload/class/data/validator/ipaddressvalidator.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/data/validator/ipaddressvalidator.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/data/validator/ipaddressvalidator.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/data/validator/validator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/rules/nonemptyrule.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/rules/ipformatrule.class.php" );
+
+
+
/**
* \ingroup Validator
Modified: plog/branches/lifetype-2.0-autoload/class/data/validator/ipmatchvalidator.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/data/validator/ipmatchvalidator.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/data/validator/ipmatchvalidator.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/data/validator/validator.class.php" );
+
/**
* \ingroup Validator
Modified: plog/branches/lifetype-2.0-autoload/class/data/validator/passwordvalidator.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/data/validator/passwordvalidator.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/data/validator/passwordvalidator.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,9 +1,9 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/data/validator/validator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/rules/nonemptyrule.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/rules/stringrangerule.class.php" );
+
+
+
+
define( "MIN_PASSWORD_LENGTH_DEFAULT", 6 );
Modified: plog/branches/lifetype-2.0-autoload/class/data/validator/rules/arrayrule.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/data/validator/rules/arrayrule.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/data/validator/rules/arrayrule.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include(PLOG_CLASS_PATH."class/data/validator/rules/rule.class.php");
+
/**
* \ingroup Validator_Rules
Modified: plog/branches/lifetype-2.0-autoload/class/data/validator/rules/emaildnsrule.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/data/validator/rules/emaildnsrule.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/data/validator/rules/emaildnsrule.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,10 +1,10 @@
<?php
- lt_include(PLOG_CLASS_PATH."class/data/validator/rules/rule.class.php");
- lt_include(PLOG_CLASS_PATH."class/net/dns.class.php");
- lt_include(PLOG_CLASS_PATH."class/net/http/httpvars.class.php");
- lt_include(PLOG_CLASS_PATH."class/config/config.class.php");
- lt_include(PLOG_CLASS_PATH."class/data/textfilter.class.php");
+
+
+
+
+
define( "ERROR_RULE_EMAIL_DNS_SERVER_UNREACHABLE", "error_rule_email_dns_server_unreachable");
define( "ERROR_RULE_EMAIL_DNS_SERVER_TEMP_FAIL", "error_rule_email_dns_server_temp_fail");
Modified: plog/branches/lifetype-2.0-autoload/class/data/validator/rules/emailformatrule.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/data/validator/rules/emailformatrule.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/data/validator/rules/emailformatrule.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include(PLOG_CLASS_PATH."class/data/validator/rules/regexprule.class.php");
+
define( "ERROR_RULE_EMAIL_FORMAT_WRONG", "error_rule_email_format_wrong");
Modified: plog/branches/lifetype-2.0-autoload/class/data/validator/rules/equalrule.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/data/validator/rules/equalrule.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/data/validator/rules/equalrule.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include(PLOG_CLASS_PATH."class/data/validator/rules/rule.class.php");
+
define( "DEFAULT_RULE_CASE_SENSITIVE", true);
define( "ERROR_RULE_VALUES_NOT_EQUAL", "error_rule_values_not_equal");
Modified: plog/branches/lifetype-2.0-autoload/class/data/validator/rules/filteredpatternsrule.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/data/validator/rules/filteredpatternsrule.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/data/validator/rules/filteredpatternsrule.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/data/validator/rules/rule.class.php");
+
define( "DEFAULT_PATTERN_CASE_SENSITIVE", true);
/**
Modified: plog/branches/lifetype-2.0-autoload/class/data/validator/rules/filteredwordsrule.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/data/validator/rules/filteredwordsrule.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/data/validator/rules/filteredwordsrule.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/data/validator/rules/rule.class.php");
+
/**
* \ingroup Validator_Rules
Modified: plog/branches/lifetype-2.0-autoload/class/data/validator/rules/floatrule.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/data/validator/rules/floatrule.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/data/validator/rules/floatrule.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include(PLOG_CLASS_PATH."class/data/validator/rules/regexprule.class.php");
+
define( "FLOAT_RULE_REG_EXP", "^([+-]?[0-9][0-9.]*)|0$");
define( "ERROR_RULE_FLOAT_FORMAT_WRONG", "error_rule_float_format_wrong");
Modified: plog/branches/lifetype-2.0-autoload/class/data/validator/rules/intrangerule.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/data/validator/rules/intrangerule.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/data/validator/rules/intrangerule.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/data/validator/rules/rule.class.php");
+
define( "ERROR_RULE_INTEGER_TOO_SMALL", "error_rule_integer_too_small");
define( "ERROR_RULE_INTEGER_TOO_LARGE", "error_rule_integer_too_large");
Modified: plog/branches/lifetype-2.0-autoload/class/data/validator/rules/intrule.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/data/validator/rules/intrule.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/data/validator/rules/intrule.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include(PLOG_CLASS_PATH."class/data/validator/rules/regexprule.class.php");
+
define( "INT_RULE_REG_EXP", "^([+-]?[1-9][0-9]*)|0$");
define( "ERROR_RULE_INT_FORMAT_WRONG", "error_rule_int_format_wrong");
Modified: plog/branches/lifetype-2.0-autoload/class/data/validator/rules/ipcidrformatrule.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/data/validator/rules/ipcidrformatrule.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/data/validator/rules/ipcidrformatrule.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include(PLOG_CLASS_PATH."class/data/validator/rules/regexprule.class.php");
+
define( "IP_CIDR_FORMAT_RULE_REG_EXP", "^([0-9]{1,3})\\.([0-9]{1,3})\\.([0-9]{1,3})\\.([0-9]{1,3})/([0-9]{1,2})$");
define( "ERROR_RULE_IP_CIDR_FORMAT_WRONG", "error_rule_ip_cidr_format_wrong");
Modified: plog/branches/lifetype-2.0-autoload/class/data/validator/rules/ipformatrule.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/data/validator/rules/ipformatrule.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/data/validator/rules/ipformatrule.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include(PLOG_CLASS_PATH."class/data/validator/rules/regexprule.class.php");
+
define( "IP_FORMAT_RULE_REG_EXP", "^([0-9]{1,3})\\.([0-9]{1,3})\\.([0-9]{1,3})\\.([0-9]{1,3})$");
define( "ERROR_RULE_IP_FORMAT_WRONG", "error_rule_ip_format_wrong");
Modified: plog/branches/lifetype-2.0-autoload/class/data/validator/rules/iprangerule.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/data/validator/rules/iprangerule.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/data/validator/rules/iprangerule.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/data/validator/rules/rule.class.php");
+
define( "ERROR_RULE_IP_NOT_IN_RANGE", "error_rule_ip_not_in_range");
Modified: plog/branches/lifetype-2.0-autoload/class/data/validator/rules/nonemptyrule.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/data/validator/rules/nonemptyrule.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/data/validator/rules/nonemptyrule.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include(PLOG_CLASS_PATH."class/data/validator/rules/rule.class.php");
+
define( "ERROR_RULE_VALUE_IS_EMPTY", "error_rule_value_is_empty");
Modified: plog/branches/lifetype-2.0-autoload/class/data/validator/rules/numericrule.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/data/validator/rules/numericrule.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/data/validator/rules/numericrule.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/data/validator/rules/regexprule.class.php");
+
define( "NUMERIC_RULE_REG_EXP", "^[0-9]+$");
define( "ERROR_RULE_NUMERIC_FORMAT_WRONG", "error_rule_numeric_format_wrong");
Modified: plog/branches/lifetype-2.0-autoload/class/data/validator/rules/regexprule.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/data/validator/rules/regexprule.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/data/validator/rules/regexprule.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/data/validator/rules/rule.class.php");
+
define( "DEFAULT_RULE_CASE_SENSITIVE", true);
define( "ERROR_RULE_REGEXP_NOT_MATCH", "error_rule_regexp_not_match");
Modified: plog/branches/lifetype-2.0-autoload/class/data/validator/rules/stringrangerule.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/data/validator/rules/stringrangerule.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/data/validator/rules/stringrangerule.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/data/validator/rules/rule.class.php");
+
define( "ERROR_RULE_STRING_TOO_SMALL", "error_rule_string_too_small");
define( "ERROR_RULE_STRING_TOO_LARGE", "error_rule_string_too_large");
Modified: plog/branches/lifetype-2.0-autoload/class/data/validator/rules/uintrule.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/data/validator/rules/uintrule.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/data/validator/rules/uintrule.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include(PLOG_CLASS_PATH."class/data/validator/rules/regexprule.class.php");
+
define( "UINT_RULE_REG_EXP", "^([0-9]+)$");
define( "ERROR_RULE_UINT_FORMAT_WRONG", "error_rule_uint_format_wrong");
Modified: plog/branches/lifetype-2.0-autoload/class/data/validator/rules/urlformatrule.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/data/validator/rules/urlformatrule.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/data/validator/rules/urlformatrule.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,9 +1,9 @@
<?php
-lt_include(PLOG_CLASS_PATH."class/data/validator/rules/rule.class.php");
-lt_include(PLOG_CLASS_PATH."class/net/dns.class.php");
-lt_include(PLOG_CLASS_PATH."class/net/http/httpvars.class.php");
+
+
+
define( "EW_OK", 1 );
define( "EW_ERR_URL_INVALID_PROTOCOL", 10 );
Modified: plog/branches/lifetype-2.0-autoload/class/data/validator/stringvalidator.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/data/validator/stringvalidator.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/data/validator/stringvalidator.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/data/validator/validator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/rules/nonemptyrule.class.php" );
+
+
/**
* \ingroup Validator
Modified: plog/branches/lifetype-2.0-autoload/class/data/validator/templatenamevalidator.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/data/validator/templatenamevalidator.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/data/validator/templatenamevalidator.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/data/validator/validator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/rules/regexprule.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/rules/nonemptyrule.class.php" );
+
+
+
/**
* \ingroup Validator
Modified: plog/branches/lifetype-2.0-autoload/class/data/validator/templatesetvalidator.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/data/validator/templatesetvalidator.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/data/validator/templatesetvalidator.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH.'class/data/validator/validator.class.php' );
- lt_include( PLOG_CLASS_PATH.'class/file/file.class.php' );
+
+
define( 'ERROR_TEMPLATE_NOT_INSIDE_FOLDER', -1 );
define( 'ERROR_MISSING_BASE_FILES', -2 );
Modified: plog/branches/lifetype-2.0-autoload/class/data/validator/uploadvalidator.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/data/validator/uploadvalidator.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/data/validator/uploadvalidator.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/data/validator/validator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
- lt_include( PLOG_CLASS_PATH."class/misc/glob.class.php" );
+
+
+
define( "UPLOAD_MAX_SIZE", 2000000 );
Modified: plog/branches/lifetype-2.0-autoload/class/data/validator/usernamevalidator.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/data/validator/usernamevalidator.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/data/validator/usernamevalidator.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,12 +1,12 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/data/validator/validator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/rules/nonemptyrule.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/rules/regexprule.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/rules/stringrangerule.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/rules/filteredpatternsrule.class.php" );
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
+
+
+
+
+
+
define( "ONLY_ALPHANUMERIC_REGEXP", "^([a-z0-9]*)$" );
/**
Modified: plog/branches/lifetype-2.0-autoload/class/database/db.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/database/db.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/database/db.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/database/ltdb.class.php" );
+
/**
* \ingroup Database
Modified: plog/branches/lifetype-2.0-autoload/class/database/ltdb.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/database/ltdb.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/database/ltdb.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -23,8 +23,8 @@
* connection so there is no need to initialize a new one.</p>
*/
- lt_include( PLOG_CLASS_PATH."class/config/configfilestorage.class.php" );
- lt_include( PLOG_CLASS_PATH."class/database/pdb/pdb.class.php" );
+
+
/**
* \ingroup Database
Modified: plog/branches/lifetype-2.0-autoload/class/database/pdb/datadict/pdbmysqldatadict.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/database/pdb/datadict/pdbmysqldatadict.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/database/pdb/datadict/pdbmysqldatadict.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -7,8 +7,8 @@
the BSD license will take precedence.
*/
- lt_include( PLOG_CLASS_PATH."class/database/pdb/datadict/pdbbasedatadict.class.php" );
+
/**
* Data dictionary for MySQL, used by PDb to be able to convert a table meta-definition
* into SQL executable code for altering the db schema, adding new fields, etc.
Modified: plog/branches/lifetype-2.0-autoload/class/database/pdb/datadict/pdbpgsqldatadict.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/database/pdb/datadict/pdbpgsqldatadict.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/database/pdb/datadict/pdbpgsqldatadict.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -10,8 +10,8 @@
*/
-lt_include( PLOG_CLASS_PATH."class/database/pdb/datadict/pdbbasedatadict.class.php" );
+
class PDbPgSQLDataDict extends PDbBaseDataDict
{
Modified: plog/branches/lifetype-2.0-autoload/class/database/pdb/drivers/pdbdriverbase.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/database/pdb/drivers/pdbdriverbase.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/database/pdb/drivers/pdbdriverbase.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -229,8 +229,8 @@
//print( "Loading datadict driver $dataDictPath...<br/>" );
- lt_include( $dataDictPath );
+
$className = "PDb{$driverName}DataDict";
$class =& new $className();
@@ -321,7 +321,7 @@
*/
function &MetaColumns($table)
{
- lt_include( PLOG_CLASS_PATH."class/database/pdb/datadict/pdbfielddescobject.class.php" );
+
$rs = $this->Execute(sprintf("SHOW COLUMNS FROM %s",$table));
Modified: plog/branches/lifetype-2.0-autoload/class/database/pdb/drivers/pdbmysqldriver.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/database/pdb/drivers/pdbmysqldriver.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/database/pdb/drivers/pdbmysqldriver.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/database/pdb/drivers/pdbdriverbase.class.php" );
- lt_include( PLOG_CLASS_PATH."class/database/pdb/drivers/pdbmysqlrecordset.class.php" );
+
+
/**
* \ingroup PDb
*
Modified: plog/branches/lifetype-2.0-autoload/class/database/pdb/drivers/pdbmysqlrecordset.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/database/pdb/drivers/pdbmysqlrecordset.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/database/pdb/drivers/pdbmysqlrecordset.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/database/pdb/drivers/pdbrecordset.class.php" );
+
/**
* \ingroup PDb
Modified: plog/branches/lifetype-2.0-autoload/class/database/pdb/drivers/pdbpgsqldriver.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/database/pdb/drivers/pdbpgsqldriver.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/database/pdb/drivers/pdbpgsqldriver.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,9 +1,9 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/database/pdb/drivers/pdbdriverbase.class.php" );
- lt_include( PLOG_CLASS_PATH."class/database/pdb/drivers/pdbpgsqlrecordset.class.php" );
- lt_include( PLOG_CLASS_PATH."class/logger/loggermanager.class.php" );
+
+
+
/**
* \ingroup PDb
*
Modified: plog/branches/lifetype-2.0-autoload/class/database/pdb/drivers/pdbpgsqlrecordset.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/database/pdb/drivers/pdbpgsqlrecordset.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/database/pdb/drivers/pdbpgsqlrecordset.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/database/pdb/drivers/pdbrecordset.class.php" );
+
/**
* \ingroup PDb
Modified: plog/branches/lifetype-2.0-autoload/class/database/pdb/pdb.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/database/pdb/pdb.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/database/pdb/pdb.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -48,8 +48,8 @@
if( array_key_exists($driver, $validDrivers) ) {
// load the driver class
$driverPath = PDB_DRIVER_FOLDER.strtolower( $validDrivers[$driver] ).".class.php";
- lt_include( $driverPath );
+
// create an instance of it
$driverClass = new $validDrivers[$driver]();
Modified: plog/branches/lifetype-2.0-autoload/class/file/file.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/file/file.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/file/file.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -8,7 +8,7 @@
* functions that work with files.
*/
- lt_include( PLOG_CLASS_PATH."class/misc/glob.class.php" );
+
/**
* \ingroup File
Modified: plog/branches/lifetype-2.0-autoload/class/file/fileproperties.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/file/fileproperties.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/file/fileproperties.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/config/properties.class.php" );
- lt_include( PLOG_CLASS_PATH."class/file/file.class.php" );
+
+
/**
* \ingroup File
Modified: plog/branches/lifetype-2.0-autoload/class/file/fileuploads.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/file/fileuploads.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/file/fileuploads.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/file/fileupload.class.php" );
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
+
+
define( "FILE_UPLOADS_NOT_ENABLED", -200 );
@@ -29,7 +29,7 @@
function FileUploads( $files = null )
{
if( $files == null ) {
- lt_include( PLOG_CLASS_PATH."class/net/http/httpvars.class.php" );
+
$this->_files = HttpVars::getFiles();
}
else {
Modified: plog/branches/lifetype-2.0-autoload/class/file/filtereddirectorytreeiterator.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/file/filtereddirectorytreeiterator.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/file/filtereddirectorytreeiterator.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/file/directorytreeiterator.class.php" );
+
/**
* \ingroup File
*
@@ -53,7 +53,7 @@
}
}
else {
- lt_include( PLOG_CLASS_PATH."class/misc/glob.class.php" );
+
foreach( $this->_filter as $pattern ) {
if( Glob::myFnmatch( $pattern, $this->key()))
return( true );
Modified: plog/branches/lifetype-2.0-autoload/class/file/finder/filefinder.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/file/finder/filefinder.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/file/finder/filefinder.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -50,7 +50,7 @@
*/
function find( $currentList, $fileName = '*' )
{
- lt_include( PLOG_CLASS_PATH.'class/misc/glob.class.php' );
+
$files = Glob::myGlob( $this->_folder, $fileName );
// create an empty array if we got something else other than an array so that
Modified: plog/branches/lifetype-2.0-autoload/class/file/unpacker/rarunpacker.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/file/unpacker/rarunpacker.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/file/unpacker/rarunpacker.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/file/unpacker/baseunpacker.class.php" );
+
/**
* \ingroup File_Unpacker
Modified: plog/branches/lifetype-2.0-autoload/class/file/unpacker/tarbz2unpacker.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/file/unpacker/tarbz2unpacker.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/file/unpacker/tarbz2unpacker.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/file/unpacker/baseunpacker.class.php" );
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
+
+
/**
* \ingroup File_Unpacker
Modified: plog/branches/lifetype-2.0-autoload/class/file/unpacker/targzunpacker.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/file/unpacker/targzunpacker.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/file/unpacker/targzunpacker.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/file/unpacker/baseunpacker.class.php" );
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
+
+
/**
* \ingroup File_Unpacker
Modified: plog/branches/lifetype-2.0-autoload/class/file/unpacker/unpacker.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/file/unpacker/unpacker.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/file/unpacker/unpacker.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -11,11 +11,11 @@
*/
- lt_include( PLOG_CLASS_PATH."class/file/unpacker/baseunpacker.class.php" );
- lt_include( PLOG_CLASS_PATH."class/file/unpacker/targzunpacker.class.php" );
- lt_include( PLOG_CLASS_PATH."class/file/unpacker/zipunpacker.class.php" );
- lt_include( PLOG_CLASS_PATH."class/file/unpacker/tarbz2unpacker.class.php" );
- lt_include( PLOG_CLASS_PATH."class/file/unpacker/rarunpacker.class.php" );
+
+
+
+
+
define( "UNPACKER_AUTODETECT", "detect" );
define( "UNPACKER_TAR_GZ", "tar.gz" );
Modified: plog/branches/lifetype-2.0-autoload/class/file/unpacker/zipunpacker.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/file/unpacker/zipunpacker.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/file/unpacker/zipunpacker.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/file/unpacker/baseunpacker.class.php" );
- lt_include( PLOG_CLASS_PATH."class/file/unpacker/pclzip.lib.php" );
+
+
/**
* \ingroup File_Unpacker
Modified: plog/branches/lifetype-2.0-autoload/class/gallery/dao/galleryalbum.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/gallery/dao/galleryalbum.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/gallery/dao/galleryalbum.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/database/dbobject.class.php" );
+
/**
* \ingroup Gallery
@@ -165,7 +165,7 @@
function getParent()
{
if( $this->_parent == null ) {
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryalbums.class.php" );
+
$albums = new GalleryAlbums();
$this->_parent = $albums->getAlbum( $this->getParentId(), $this->getOwnerId());
}
@@ -195,7 +195,7 @@
*/
function getTimestamp()
{
- lt_include( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
+
return new Timestamp($this->_date);
}
@@ -385,7 +385,7 @@
function getMangledName()
{
if( $this->_mangledName == "" ) {
- lt_include( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
+
$this->_mangledName = Textfilter::urlize( $this->getName());
}
@@ -405,7 +405,7 @@
function getNormalizedName()
{
if( $this->_normalizedName == "" ) {
- lt_include( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
+
$this->_normalizedName = Textfilter::normalizeText( $this->getName());
}
@@ -430,7 +430,7 @@
function getNormalizedDescription()
{
if( $this->_normalizedDescription == "" ) {
- lt_include( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
+
$this->_normalizedDescription = Textfilter::normalizeText( $this->getDescription());
}
Modified: plog/branches/lifetype-2.0-autoload/class/gallery/dao/galleryalbums.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/gallery/dao/galleryalbums.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/gallery/dao/galleryalbums.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,10 +1,10 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/dao/model.class.php" );
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryalbum.class.php" );
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryresources.class.php" );
- lt_include( PLOG_CLASS_PATH.'class/dao/daocacheconstants.properties.php' );
+
+
+
+
/**
* \ingroup Gallery
*
@@ -52,8 +52,8 @@
{
$albums = $this->getMany( "owner_id",
$ownerId,
- CACHE_USERALBUMS,
- Array( CACHE_GALLERYALBUM => "getId" ),
+ DaoCacheConstants::CACHE_USERALBUMS,
+ Array( DaoCacheConstants::CACHE_GALLERYALBUM => "getId" ),
Array( "date" => "ASC" ),
"",
$page,
@@ -93,7 +93,7 @@
*/
function getAlbum( $id, $ownerId = -1, $fetchResources = true, $onlyShownAlbums = false )
{
- $album = $this->get( "id", $id, CACHE_GALLERYALBUM );
+ $album = $this->get( "id", $id, DaoCacheConstants::CACHE_GALLERYALBUM );
if( !$album )
return false;
if( $ownerId > -1 && $album->getOwnerId() != $ownerId )
@@ -124,7 +124,7 @@
function getAlbumByName( $name, $ownerId = -1, $fetchResources = true, $onlyShownAlbums = false )
{
// there might be more than one with the same name...
- $albums = $this->getMany( "mangled_name", $name, CACHE_GALLERYALBUMBYNAME );
+ $albums = $this->getMany( "mangled_name", $name, DaoCacheConstants::CACHE_GALLERYALBUMBYNAME );
if(!$albums){
return false;
}
@@ -206,8 +206,8 @@
function addAlbum( &$album )
{
if(( $result = $this->add( $album ))) {
- $this->_cache->removeData( $album->getOwnerId(), CACHE_USERALBUMS );
- $this->_cache->removeData( $album->getOwnerId(), CACHE_USERALBUMS_NESTED );
+ $this->_cache->removeData( $album->getOwnerId(), DaoCacheConstants::CACHE_USERALBUMS );
+ $this->_cache->removeData( $album->getOwnerId(), DaoCacheConstants::CACHE_USERALBUMS_NESTED );
if( $album->getParentId() > 0 ) {
// update the counters of the parent if there's any
$parent = $album->getParent();
@@ -248,11 +248,11 @@
$result = $this->update( $album );
if( $result ) {
// remove the album from the cache
- $this->_cache->removeData( $album->getId(), CACHE_GALLERYALBUM );
+ $this->_cache->removeData( $album->getId(), DaoCacheConstants::CACHE_GALLERYALBUM );
// remove the cached album hierarchy array
- $this->_cache->removeData( $album->getOwnerId(), CACHE_USERALBUMS );
+ $this->_cache->removeData( $album->getOwnerId(), DaoCacheConstants::CACHE_USERALBUMS );
// and the cache for nested albums too
- $this->_cache->removeData( $album->getOwnerId(), CACHE_USERALBUMS_NESTED );
+ $this->_cache->removeData( $album->getOwnerId(), DaoCacheConstants::CACHE_USERALBUMS_NESTED );
// update the counters of the parent album
if( $prevVersion->getParentId() != $album->getParentId()) {
@@ -299,8 +299,8 @@
return false;
$this->delete( "id", $albumId );
- $this->_cache->removeData( $album->getOwnerId(), CACHE_USERALBUMS );
- $this->_cache->removeData( $album->getOwnerId(), CACHE_USERALBUMS_NESTED );
+ $this->_cache->removeData( $album->getOwnerId(), DaoCacheConstants::CACHE_USERALBUMS );
+ $this->_cache->removeData( $album->getOwnerId(), DaoCacheConstants::CACHE_USERALBUMS_NESTED );
//$this->delete( "parent_id", $album->getId());
// update the counters
@@ -366,13 +366,13 @@
*/
function getNestedAlbumList( $userId )
{
- $nestedAlbums = $this->_cache->getData( $userId, CACHE_USERALBUMS_NESTED );
+ $nestedAlbums = $this->_cache->getData( $userId, DaoCacheConstants::CACHE_USERALBUMS_NESTED );
if( !$nestedAlbums ) {
// cache the data for later use... this is quite a costly operation so
// it's probably worth caching it!
$albums = $this->getUserAlbumsGroupedByParentId( $userId );
$nestedAlbums = $this->_getNestedAlbumList( $albums );
- $this->_cache->setData( $userId, CACHE_USERALBUMS_NESTED, $nestedAlbums );
+ $this->_cache->setData( $userId, DaoCacheConstants::CACHE_USERALBUMS_NESTED, $nestedAlbums );
}
return $nestedAlbums;
Modified: plog/branches/lifetype-2.0-autoload/class/gallery/dao/galleryitemslist.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/gallery/dao/galleryitemslist.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/gallery/dao/galleryitemslist.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryresources.class.php" );
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryalbums.class.php" );
+
+
/**
* obtains combined lists of albums and resources, so that it can be properly
Modified: plog/branches/lifetype-2.0-autoload/class/gallery/dao/galleryresource.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/gallery/dao/galleryresource.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/gallery/dao/galleryresource.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/dao/locationawaredbobject.class.php" );
- lt_include( PLOG_CLASS_PATH."class/gallery/galleryconstants.php" );
+
+
// Add this to avoid long file name error in windows server
define('GETID3_HELPERAPPSDIR', 'no_helper_apps_needed');
@@ -121,7 +121,7 @@
*/
function getBlogInfo()
{
- lt_include( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
+
$blogs = new Blogs();
$blogInfo = $blogs->getBlogInfo( $this->_ownerId );
return $blogInfo;
@@ -150,7 +150,7 @@
function getTimestamp()
{
// source necessary source
- lt_include( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
+
return new Timestamp($this->_date);
}
@@ -227,7 +227,7 @@
*/
function getMimeType()
{
- lt_include( PLOG_CLASS_PATH."class/data/mimetype.class.php" );
+
$mimeType = new MimeType();
return $mimeType->getType( $this->_fileName );
@@ -240,7 +240,7 @@
*/
function getThumbnailMimeType()
{
- lt_include( PLOG_CLASS_PATH."class/data/mimetype.class.php" );
+
if( $this->getThumbnailFormat() == "same" )
return $this->getMimeType();
else {
@@ -278,7 +278,7 @@
function getAlbum()
{
if( $this->_album == null ) {
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryalbums.class.php" );
+
$albums = new GalleryAlbums();
$this->_album = $albums->getAlbum( $this->getAlbumId());
}
@@ -341,10 +341,10 @@
*/
function getMetadataReader()
{
- lt_include( PLOG_CLASS_PATH."class/gallery/data/galleryresourceimagemetadatareader.class.php" );
- lt_include( PLOG_CLASS_PATH."class/gallery/data/galleryresourcesoundmetadatareader.class.php" );
- lt_include( PLOG_CLASS_PATH."class/gallery/data/galleryresourcevideometadatareader.class.php" );
- lt_include( PLOG_CLASS_PATH."class/gallery/data/galleryresourcezipmetadatareader.class.php" );
+
+
+
+
switch( $this->getResourceType()) {
case GALLERY_RESOURCE_IMAGE:
@@ -385,7 +385,7 @@
*/
function getPreviewFileName()
{
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryresourcestorage.class.php" );
+
$config =& Config::getConfig();
@@ -431,7 +431,7 @@
*/
function getMediumSizePreviewFileName()
{
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryresourcestorage.class.php" );
+
$config =& Config::getConfig();
@@ -457,7 +457,7 @@
*/
function getOriginalSizeFileName()
{
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryresourcestorage.class.php" );
+
$config =& Config::getConfig();
@@ -472,7 +472,7 @@
function getNormalizedDescription()
{
- lt_include( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
+
$tf = new Textfilter();
return( $tf->normalizeText( $this->getDescription()));
}
Modified: plog/branches/lifetype-2.0-autoload/class/gallery/dao/galleryresourcequotas.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/gallery/dao/galleryresourcequotas.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/gallery/dao/galleryresourcequotas.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -20,7 +20,7 @@
*/
function getGlobalResourceQuota()
{
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
+
$config =& Config::getConfig();
$quota = $config->getValue( "resources_quota", GLOBAL_QUOTA_DEFAULT );
@@ -73,7 +73,7 @@
function isBlogOverResourceQuota( $blogId, $fileSize )
{
// current allocated quota
- lt_include( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
+
$blogs = new Blogs();
$blog = $blogs->getBlogInfo( $blogId );
if( !$blog )
Modified: plog/branches/lifetype-2.0-autoload/class/gallery/dao/galleryresources.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/gallery/dao/galleryresources.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/gallery/dao/galleryresources.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -12,10 +12,10 @@
* via the getID3 library.
*/
- lt_include( PLOG_CLASS_PATH."class/dao/model.class.php" );
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryresource.class.php" );
- lt_include( PLOG_CLASS_PATH."class/gallery/galleryconstants.php" );
- lt_include( PLOG_CLASS_PATH.'class/dao/daocacheconstants.properties.php' );
+
+
+
+
/**
* \ingroup Gallery
@@ -84,7 +84,7 @@
*/
function getResource( $resourceId, $ownerId = -1, $albumId = -1 )
{
- $resource = $this->get( "id", $resourceId, CACHE_RESOURCES );
+ $resource = $this->get( "id", $resourceId, DaoCacheConstants::CACHE_RESOURCES );
if( !$resource )
return false;
@@ -128,8 +128,8 @@
$result->Close();
$resource = $this->mapRow( $row );
- $this->_cache->setData( $resource->getId(), CACHE_RESOURCES, $resource );
- $this->_cache->setData( $resource->getFileName(), CACHE_RESOURCES_BY_NAME, $resource );
+ $this->_cache->setData( $resource->getId(), DaoCacheConstants::CACHE_RESOURCES, $resource );
+ $this->_cache->setData( $resource->getFileName(), DaoCacheConstants::CACHE_RESOURCES_BY_NAME, $resource );
return $resource;
}
@@ -168,8 +168,8 @@
$result->Close();
$resource = $this->mapRow( $row );
- $this->_cache->setData( $resource->getId(), CACHE_RESOURCES, $resource );
- $this->_cache->setData( $resource->getFileName(), CACHE_RESOURCES_BY_NAME, $resource );
+ $this->_cache->setData( $resource->getId(), DaoCacheConstants::CACHE_RESOURCES, $resource );
+ $this->_cache->setData( $resource->getFileName(), DaoCacheConstants::CACHE_RESOURCES_BY_NAME, $resource );
return $resource;
}
@@ -221,7 +221,7 @@
while( $row = $result->FetchRow()) {
// use the primary key to retrieve the items via the cache
- $resources[] = $resource = $this->get( "id", $row["id"], CACHE_RESOURCES );
+ $resources[] = $resource = $this->get( "id", $row["id"], DaoCacheConstants::CACHE_RESOURCES );
}
return $resources;
@@ -314,11 +314,11 @@
$fileSize = $metadata["filesize"];
$serMetadata = LtDb::qstr( serialize($metadata));
// get the correct thumbnail format
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
+
$config =& Config::getConfig();
$thumbnailFormat = $config->getValue( "thumbnail_format" );
// prepare some other stuff
- lt_include( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
+
$tf = new Textfilter();
$normalizedDescription = $tf->normalizeText( $description );
$properties = serialize( array() );
@@ -359,9 +359,9 @@
}
// clear our own caches
- $this->_cache->removeData( $resourceId, CACHE_RESOURCES );
- $this->_cache->removeData( $ownerId, CACHE_RESOURCES_USER );
- $this->_cache->removeData( $fileName, CACHE_RESOURCES_BY_NAME );
+ $this->_cache->removeData( $resourceId, DaoCacheConstants::CACHE_RESOURCES );
+ $this->_cache->removeData( $ownerId, DaoCacheConstants::CACHE_RESOURCES_USER );
+ $this->_cache->removeData( $fileName, DaoCacheConstants::CACHE_RESOURCES_BY_NAME );
return $resourceId;
}
@@ -420,7 +420,7 @@
{
// check if quotas are enabled, and if this file would make us go
// over the quota
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryresourcequotas.class.php" );
+
if( GalleryResourceQuotas::isBlogOverResourceQuota( $ownerId, $upload->getSize())) {
return GALLERY_ERROR_QUOTA_EXCEEDED;
}
@@ -431,14 +431,14 @@
// or
// UPLOAD_VALIDATOR_ERROR_FORBIDDEN_EXTENSION (-2)
// in case the file is not valid.
- lt_include( PLOG_CLASS_PATH."class/data/validator/uploadvalidator.class.php" );
+
$uploadValidator = new UploadValidator();
$error = $uploadValidator->validate( $upload );
if( $error < 0 )
return $error;
// get the metadata
- lt_include( PLOG_CLASS_PATH."class/gallery/getid3/getid3.php" );
+
$getId3 = new GetID3();
$metadata = $getId3->analyze( $upload->getTmpName());
@@ -468,7 +468,7 @@
// and finally move the file to the right place in disk
// move the file to disk
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryresourcestorage.class.php" );
+
$storage = new GalleryResourceStorage();
$resFile = $storage->storeUpload( $resourceId, $ownerId, $upload );
@@ -483,7 +483,7 @@
return $resFile;
}
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryalbums.class.php" );
+
$albums = new GalleryAlbums();
$album = $albums->getAlbum( $albumId );
$album->setNumResources( $album->getNumResources() + 1 );
@@ -491,9 +491,9 @@
// and finally, we can generate the thumbnail only if the file is an image, of course :)
if( $resourceType == GALLERY_RESOURCE_IMAGE ) {
- lt_include( PLOG_CLASS_PATH."class/gallery/resizers/gallerythumbnailgenerator.class.php" );
+
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
+
$config =& Config::getConfig();
$imgWidth = $info["video"]["resolution_x"];
@@ -633,13 +633,13 @@
{
// check if quotas are enabled, and if this file would make us go
// over the quota
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryresourcequotas.class.php" );
+
if( GalleryResourceQuotas::isBlogOverResourceQuota( $ownerId, File::getSize( $fullFilePath ))) {
return GALLERY_ERROR_QUOTA_EXCEEDED;
}
// get the metadata
- lt_include( PLOG_CLASS_PATH."class/gallery/getid3/getid3.php" );
+
$getId3 = new GetID3();
$metadata = $getId3->analyze( $fullFilePath );
// nifty helper method from the getid3 package
@@ -674,7 +674,7 @@
// and finally move the file to the right place in disk
// move the file to disk
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryresourcestorage.class.php" );
+
$storage = new GalleryResourceStorage();
$resFile = $storage->storeFile( $resourceId,
$ownerId,
@@ -696,11 +696,11 @@
// and finally, we can generate the thumbnail only if the file is an image, of course :)
if( $resourceType == GALLERY_RESOURCE_IMAGE ) {
- lt_include( PLOG_CLASS_PATH."class/gallery/resizers/gallerythumbnailgenerator.class.php" );
+
GalleryThumbnailGenerator::generateResourceThumbnail( $resFile, $resourceId, $ownerId );
GalleryThumbnailGenerator::generateResourceMediumSizeThumbnail( $resFile, $resourceId, $ownerId );
// call this method only if the settings are right
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
+
$config =& Config::getConfig();
$previewHeight = $config->getValue( "final_size_thumbnail_height", 0 );
$previewWidth = $config->getValue( "final_size_thumbnail_width", 0 );
@@ -733,7 +733,7 @@
*/
function getResourceFile( $ownerId, $fileName, $albumId = -1 )
{
- $resource = $this->get( "file_name", $fileName, CACHE_RESOURCES_BY_NAME );
+ $resource = $this->get( "file_name", $fileName, DaoCacheConstants::CACHE_RESOURCES_BY_NAME );
if( !$resource )
return false;
@@ -760,9 +760,9 @@
if( $result = $this->update( $resource )) {
// if update ok, reset the caches
- $this->_cache->removeData( $resource->getId(), CACHE_RESOURCES );
- $this->_cache->removeData( $resource->getOwnerId(), CACHE_RESOURCES_USER );
- $this->_cache->removeData( $resource->getFileName(), CACHE_RESOURCES_BY_NAME );
+ $this->_cache->removeData( $resource->getId(), DaoCacheConstants::CACHE_RESOURCES );
+ $this->_cache->removeData( $resource->getOwnerId(), DaoCacheConstants::CACHE_RESOURCES_USER );
+ $this->_cache->removeData( $resource->getFileName(), DaoCacheConstants::CACHE_RESOURCES_BY_NAME );
// and update the album counters... must substract 1 from the previous album
// and must add one to the new album
$albums = new GalleryAlbums();
@@ -799,17 +799,17 @@
return false;
$this->delete( "id", $resourceId );
- $this->_cache->removeData( $resource->getId(), CACHE_RESOURCES );
- $this->_cache->removeData( $resource->getOwnerId(), CACHE_RESOURCES_USER );
- $this->_cache->removeData( $resource->getFileName(), CACHE_RESOURCES_BY_NAME );
+ $this->_cache->removeData( $resource->getId(), DaoCacheConstants::CACHE_RESOURCES );
+ $this->_cache->removeData( $resource->getOwnerId(), DaoCacheConstants::CACHE_RESOURCES_USER );
+ $this->_cache->removeData( $resource->getFileName(), DaoCacheConstants::CACHE_RESOURCES_BY_NAME );
// update the counters
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryalbums.class.php" );
+
$albums = new GalleryAlbums();
$album = $resource->getAlbum();
$album->setNumResources( $album->getNumResources() - 1 );
$albums->updateAlbum( $album );
// proceed and remove the file from disk
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryresourcestorage.class.php" );
+
$storage = new GalleryResourceStorage();
return $storage->remove( $resource );
}
Modified: plog/branches/lifetype-2.0-autoload/class/gallery/dao/galleryresourcestorage.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/gallery/dao/galleryresourcestorage.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/gallery/dao/galleryresourcestorage.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,12 +1,12 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/file/fileupload.class.php" );
- lt_include( PLOG_CLASS_PATH."class/file/file.class.php" );
- lt_include( PLOG_CLASS_PATH."class/file/fileuploads.class.php" );
-lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
- lt_include( PLOG_CLASS_PATH."class/gallery/galleryconstants.php" );
+
+
+
+
+
define( "RESOURCE_STORAGE_STORE_COPY", 1 );
define( "RESOURCE_STORAGE_STORE_MOVE", 2 );
Modified: plog/branches/lifetype-2.0-autoload/class/gallery/data/galleryresourcebasemetadatareader.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/gallery/data/galleryresourcebasemetadatareader.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/gallery/data/galleryresourcebasemetadatareader.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryresource.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/stringutils.class.php" );
+
+
/**
* \ingroup Gallery
Modified: plog/branches/lifetype-2.0-autoload/class/gallery/data/galleryresourceimagemetadatareader.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/gallery/data/galleryresourceimagemetadatareader.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/gallery/data/galleryresourceimagemetadatareader.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/gallery/data/galleryresourcebasemetadatareader.class.php" );
+
/**
* \ingroup Gallery
Modified: plog/branches/lifetype-2.0-autoload/class/gallery/data/galleryresourcesoundmetadatareader.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/gallery/data/galleryresourcesoundmetadatareader.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/gallery/data/galleryresourcesoundmetadatareader.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/gallery/data/galleryresourcebasemetadatareader.class.php" );
+
/**
* \ingroup Gallery
Modified: plog/branches/lifetype-2.0-autoload/class/gallery/data/galleryresourcevideometadatareader.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/gallery/data/galleryresourcevideometadatareader.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/gallery/data/galleryresourcevideometadatareader.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/gallery/data/galleryresourcebasemetadatareader.class.php" );
+
/**
* methods for fetching metadata from video resources
Modified: plog/branches/lifetype-2.0-autoload/class/gallery/data/galleryresourcezipmetadatareader.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/gallery/data/galleryresourcezipmetadatareader.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/gallery/data/galleryresourcezipmetadatareader.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/gallery/data/galleryresourcebasemetadatareader.class.php" );
+
/**
* \ingroup Gallery
Modified: plog/branches/lifetype-2.0-autoload/class/gallery/resizers/gallerygdresizer.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/gallery/resizers/gallerygdresizer.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/gallery/resizers/gallerygdresizer.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/gallery/resizers/galleryabstractresizer.class.php" );
- lt_include( PLOG_CLASS_PATH."class/gallery/resizers/gddetector.class.php" );
+
+
define( "GD_RESIZER_NO_SMOOTHING_MODE", 0 );
define( "GD_RESIZER_PHP_IMAGECOPYRESAMPLED", 1 );
define( "GD_RESIZER_BILINEAR_MODE", 2 );
Modified: plog/branches/lifetype-2.0-autoload/class/gallery/resizers/galleryimagemagickresizer.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/gallery/resizers/galleryimagemagickresizer.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/gallery/resizers/galleryimagemagickresizer.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/gallery/resizers/galleryabstractresizer.class.php" );
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
+
+
define( "DEFAULT_PATH_TO_CONVERT", "/usr/bin/convert" );
/**
Modified: plog/branches/lifetype-2.0-autoload/class/gallery/resizers/gallerynullresizer.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/gallery/resizers/gallerynullresizer.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/gallery/resizers/gallerynullresizer.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/gallery/resizers/galleryabstractresizer.class.php" );
+
/**
* \ingroup Gallery_resizer
Modified: plog/branches/lifetype-2.0-autoload/class/gallery/resizers/galleryresizer.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/gallery/resizers/galleryresizer.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/gallery/resizers/galleryresizer.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -19,10 +19,10 @@
* </pre>
*/
- lt_include( PLOG_CLASS_PATH."class/gallery/resizers/gallerynullresizer.class.php" );
- lt_include( PLOG_CLASS_PATH."class/gallery/resizers/galleryimagemagickresizer.class.php" );
- lt_include( PLOG_CLASS_PATH."class/gallery/resizers/gallerygdresizer.class.php" );
- lt_include( PLOG_CLASS_PATH."class/gallery/galleryconstants.php" );
+
+
+
+
/**
* \ingroup Gallery_resizer
Modified: plog/branches/lifetype-2.0-autoload/class/gallery/resizers/gallerythumbnailgenerator.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/gallery/resizers/gallerythumbnailgenerator.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/gallery/resizers/gallerythumbnailgenerator.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -19,16 +19,16 @@
{
// get some configuration settings regarding the size of the
// thumbnails, and also the default format for thumbnails
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
+
$config =& Config::getConfig();
$previewKeepAspectRatio = $config->getValue( "thumbnails_keep_aspect_ratio" );
// and start the resizing process
- lt_include( PLOG_CLASS_PATH."class/gallery/resizers/galleryresizer.class.php" );
+
$resizer = new GalleryResizer( $resFile );
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryresourcestorage.class.php" );
+
GalleryResourceStorage::checkPreviewsStorageFolder( $ownerId );
- lt_include( PLOG_CLASS_PATH."class/file/file.class.php" );
+
$outFile = GalleryResourceStorage::getPreviewsFolder( $ownerId ).File::basename($resFile);
// and finally, we can generate the preview!
@@ -53,16 +53,16 @@
{
// get some configuration settings regarding the size of the
// thumbnails, and also the default format for thumbnails
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
+
$config =& Config::getConfig();
$previewKeepAspectRatio = $config->getValue( "thumbnails_keep_aspect_ratio" );
// and start the resizing process
- lt_include( PLOG_CLASS_PATH."class/gallery/resizers/galleryresizer.class.php" );
+
$resizer = new GalleryResizer( $resFile );
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryresourcestorage.class.php" );
+
GalleryResourceStorage::checkMediumSizePreviewsStorageFolder( $ownerId );
- lt_include( PLOG_CLASS_PATH."class/file/file.class.php" );
+
$outFile = GalleryResourceStorage::getMediumSizePreviewsFolder( $ownerId ).File::basename( $resFile );
// and finally, we can generate the preview!
@@ -89,16 +89,16 @@
{
// get some configuration settings regarding the size of the
// thumbnails, and also the default format for thumbnails
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
+
$config =& Config::getConfig();
$previewKeepAspectRatio = $config->getValue( "thumbnails_keep_aspect_ratio" );
// and start the resizing process
- lt_include( PLOG_CLASS_PATH."class/gallery/resizers/galleryresizer.class.php" );
+
$resizer = new GalleryResizer( $resFile );
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryresourcestorage.class.php" );
+
GalleryResourceStorage::checkUserStorageFolder( $ownerId );
- lt_include( PLOG_CLASS_PATH."class/file/file.class.php" );
+
$outFile = GalleryResourceStorage::getUserFolder( $ownerId ).File::basename( $resFile );
// and finally, we can generate the preview!
Modified: plog/branches/lifetype-2.0-autoload/class/gallery/template/gallerytemplatetools.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/gallery/template/gallerytemplatetools.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/gallery/template/gallerytemplatetools.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/data/stringutils.class.php" );
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryalbums.class.php" );
+
+
/**
* \ingroup Gallery
Modified: plog/branches/lifetype-2.0-autoload/class/locale/bloglocale.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/locale/bloglocale.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/locale/bloglocale.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -7,7 +7,7 @@
* @see Locales
*/
- lt_include( PLOG_CLASS_PATH."class/locale/locale.class.php" );
+
class BlogLocale extends Locale
{
Modified: plog/branches/lifetype-2.0-autoload/class/locale/locale.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/locale/locale.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/locale/locale.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -23,7 +23,7 @@
*/
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
+
define( "DEFAULT_LOCALE_FOLDER", PLOG_CLASS_PATH . "locale" );
@@ -595,7 +595,7 @@
if ( $this->_code == 'fa_IR' )
{
- lt_include( PLOG_CLASS_PATH."class/data/jalalicalendar.class.php" );
+
list( $jyear, $jmonth, $jday ) = JalaliCalendar::gregorian_to_jalali(gmdate( "Y", $time ), gmdate( "m", $time ), gmdate( "d", $time ));
if( strpos( $text, "%q" ) !== FALSE ) {
@@ -764,7 +764,7 @@
if ( $this->_code == 'fa_IR' )
{
- lt_include( PLOG_CLASS_PATH."class/data/jalalicalendar.class.php" );
+
list( $jyear, $jmonth, $jday ) = JalaliCalendar::gregorian_to_jalali(gmdate( "Y", $time ), gmdate( "m", $time ), gmdate( "d", $time ));
if( strpos( $text, "%q" ) !== FALSE ) {
Modified: plog/branches/lifetype-2.0-autoload/class/locale/localefinder.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/locale/localefinder.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/locale/localefinder.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/locale/locales.class.php" );
- lt_include( PLOG_CLASS_PATH."class/file/finder/filefinder.class.php" );
+
+
/**
* \ingroup Locale
*
Modified: plog/branches/lifetype-2.0-autoload/class/locale/locales.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/locale/locales.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/locale/locales.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,10 +1,10 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
- lt_include( PLOG_CLASS_PATH."class/locale/locale.class.php" );
- lt_include( PLOG_CLASS_PATH."class/plugin/pluginmanager.class.php" );
- lt_include( PLOG_CLASS_PATH.'class/dao/daocacheconstants.properties.php' );
+
+
+
+
define("DEFAULT_LOCALE", "en_UK");
define( "REGEXP_VALID_LOCALE", "/.*locale_([a-z]{2}_[A-Z]{2}_?([a-zA-Z0-9\-]*)+)\.php$/" );
@@ -51,7 +51,7 @@
*/
function &getBlogLocale( $localeCode = null )
{
- 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,12 +69,12 @@
$locale = $loadedLocales[$localeCode];
}
else {
- lt_include( PLOG_CLASS_PATH . "class/cache/cachemanager.class.php" );
+
$cache =& CacheManager::getCache();
- $locale = $cache->getData( $localeCode, CACHE_BLOG_LOCALES );
+ $locale = $cache->getData( $localeCode, DaoCacheConstants::CACHE_BLOG_LOCALES );
if ( !$locale ) {
$locale = new BlogLocale( $localeCode );
- $cache->setData( $localeCode, CACHE_BLOG_LOCALES, $locale );
+ $cache->setData( $localeCode, DaoCacheConstants::CACHE_BLOG_LOCALES, $locale );
}
Locales::_loadPluginLocales( $locale );
@@ -148,12 +148,12 @@
$locale = $loadedLocales[$localeCode];
}
else {
- lt_include( PLOG_CLASS_PATH . "class/cache/cachemanager.class.php" );
+
$cache =& CacheManager::getCache();
- $locale = $cache->getData( $localeCode, CACHE_LOCALES );
+ $locale = $cache->getData( $localeCode, DaoCacheConstants::CACHE_LOCALES );
if ( !$locale ) {
$locale = new Locale( $localeCode );
- $cache->setData( $localeCode, CACHE_LOCALES, $locale );
+ $cache->setData( $localeCode, DaoCacheConstants::CACHE_LOCALES, $locale );
}
Locales::_loadPluginLocales( $locale );
@@ -189,7 +189,7 @@
$locale = $_plugins_loadedLocales[$pluginLocaleKey][$localeCode];
}
else {
- lt_include( PLOG_CLASS_PATH."class/locale/pluginlocale.class.php" );
+
$locale = new PluginLocale( $pluginId, $localeCode );
$_plugins_loadedLocales[$pluginLocaleKey][$localeCode] = $locale;
Modified: plog/branches/lifetype-2.0-autoload/class/locale/pluginlocale.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/locale/pluginlocale.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/locale/pluginlocale.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/locale/locale.class.php" );
+
/**
* \ingroup Locale
*
Modified: plog/branches/lifetype-2.0-autoload/class/logger/appender/fileappender.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/logger/appender/fileappender.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/logger/appender/fileappender.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/logger/appender/appender.class.php" );
+
/**
* \ingroup logger
Modified: plog/branches/lifetype-2.0-autoload/class/logger/appender/nullappender.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/logger/appender/nullappender.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/logger/appender/nullappender.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include(PLOG_CLASS_PATH."class/logger/appender/appender.class.php");
+
/**
* Dummy appender that does nothing.
Modified: plog/branches/lifetype-2.0-autoload/class/logger/appender/stdoutappender.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/logger/appender/stdoutappender.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/logger/appender/stdoutappender.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include(PLOG_CLASS_PATH."class/logger/appender/appender.class.php");
+
/**
* StdoutAppender logs a message directly to the requesting client.
Modified: plog/branches/lifetype-2.0-autoload/class/logger/config/loggerconfigloader.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/logger/config/loggerconfigloader.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/logger/config/loggerconfigloader.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -2,7 +2,7 @@
define( "LOGGER_DEFAULT_CONFIG_FILE_PATH", PLOG_CLASS_PATH."config/logging.properties.php" );
- lt_include( PLOG_CLASS_PATH."class/file/file.class.php" );
+
/**
* loads the config file of the logger. By default it uses config/logging.properties.php
Modified: plog/branches/lifetype-2.0-autoload/class/logger/layout/patternlayout.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/logger/layout/patternlayout.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/logger/layout/patternlayout.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/logger/layout/layout.class.php" );
+
/**
Modified: plog/branches/lifetype-2.0-autoload/class/logger/logger/logger.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/logger/logger/logger.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/logger/logger/logger.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/logger/logger/loggedmessage.class.php" );
+
/**
* different priorities that can be used for logging
*/
Modified: plog/branches/lifetype-2.0-autoload/class/logger/loggermanager.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/logger/loggermanager.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/logger/loggermanager.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/logger/logger/logger.class.php" );
- lt_include( PLOG_CLASS_PATH."class/logger/config/loggerconfigloader.class.php" );
- lt_include( PLOG_CLASS_PATH."class/logger/layout/patternlayout.class.php" );
+
+
+
/**
* \defgroup logger
@@ -143,7 +143,7 @@
}
// if so, load the class and create an object
- lt_include( $appenderClassFile );
+
$appender = new $appenderClassName( $layout, $properties );
return( $appender );
Modified: plog/branches/lifetype-2.0-autoload/class/mail/emailservice.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/mail/emailservice.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/mail/emailservice.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -12,9 +12,9 @@
*/
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
- lt_include( PLOG_CLASS_PATH."class/mail/emailmessage.class.php" );
- lt_include( PLOG_CLASS_PATH."class/mail/phpmailer/class.phpmailer.php" );
+
+
+
/**
* \ingroup Mail
Modified: plog/branches/lifetype-2.0-autoload/class/mail/phpmailer/class.phpmailer.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/mail/phpmailer/class.phpmailer.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/mail/phpmailer/class.phpmailer.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -457,7 +457,7 @@
* @return bool
*/
function SmtpSend($header, $body) {
- lt_include($this->PluginDir . "class.smtp.php");
+
$error = "";
$bad_rcpt = array();
Modified: plog/branches/lifetype-2.0-autoload/class/misc/info.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/misc/info.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/misc/info.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -56,10 +56,10 @@
*/
function logMetrics()
{
- lt_include( PLOG_CLASS_PATH."class/logger/loggermanager.class.php" );
- lt_include( PLOG_CLASS_PATH."class/cache/cachemanager.class.php" );
- lt_include( PLOG_CLASS_PATH."class/database/ltdb.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
+
+
+
+
global $__metrics_start_time;
Copied: plog/branches/lifetype-2.0-autoload/class/misc/installation.class.php (from rev 5967, plog/branches/lifetype-2.0-autoload/install/installation.class.php)
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/misc/installation.class.php (rev 0)
+++ plog/branches/lifetype-2.0-autoload/class/misc/installation.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -0,0 +1,18 @@
+<?php
+ class Installation
+ {
+ function check()
+ {
+ include_once( PLOG_CLASS_PATH."config/config.properties.php" );
+
+ if ( $config["db_host"] == '' || $config["db_username"] == '' || $config["db_database"] == '' ) {
+ // If those parameters are empty
+ echo 'LifeType has not been installed yet, you\'ll have to <font color="red"><b><a href="wizard.php" title="Install LifeType">Install LifeType</a></b></font> first!';
+ } else {
+ echo 'The <font color="red"><b>wizard.php</b></font> has to be removed after the installation process. Please remove it first to <font color="green"><b><a href="'.$_SERVER['PHP_SELF'].'" title="'.end( split( "/", $_SERVER['PHP_SELF'] ) ).'">continue</a></b></font>.';
+ }
+
+ die();
+ }
+ }
+?>
\ No newline at end of file
Modified: plog/branches/lifetype-2.0-autoload/class/misc/integritychecker.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/misc/integritychecker.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/misc/integritychecker.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -80,7 +80,7 @@
*/
function canIgnore( $file, $ignore )
{
- lt_include( PLOG_CLASS_PATH."class/misc/glob.class.php" );
+
$result = false;
foreach( $ignore as $pattern ) {
@@ -102,8 +102,8 @@
*/
function writeMD5ListToFile( $folders = Array( "class", "templates/admin", "templates/wizard", "templates/rss", "templates/summary", "templates/default" ), $dest = "" )
{
- lt_include( PLOG_CLASS_PATH."class/file/file.class.php" );
+
if( $dest == "" )
$dest = PLOG_CLASS_PATH."install/files.properties.php";
Modified: plog/branches/lifetype-2.0-autoload/class/misc/version.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/misc/version.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/misc/version.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -40,7 +40,7 @@
*/
function getVersion()
{
- lt_include( PLOG_CLASS_PATH."class/file/file.class.php" );
+
$versionFile = PLOG_CLASS_PATH."version.php";
$version = "undefined";
Modified: plog/branches/lifetype-2.0-autoload/class/net/baserequestgenerator.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/net/baserequestgenerator.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/net/baserequestgenerator.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -215,7 +215,7 @@
*/
function getResourcesBaseUrl()
{
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
+
$config =& Config::getConfig();
// the default value for this setting is to use a relative path that starts with './' so we have to make sure that
// that bit is not included in the URL (it wouldn't have any harmful effect, but it'd look ugly)
@@ -648,7 +648,7 @@
*/
function getAtomUniqueId( $article )
{
- lt_include( PLOG_CLASS_PATH."class/net/url.class.php" );
+
$config =& Config::getConfig();
$url = new Url($config->getValue( "base_url" ));
$articleDate = $article->getDateObject();
Modified: plog/branches/lifetype-2.0-autoload/class/net/customrequestgenerator.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/net/customrequestgenerator.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/net/customrequestgenerator.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/net/baserequestgenerator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
+
+
/**
* \ingroup Net
@@ -397,7 +397,7 @@
if ( $blogId != $ownerId ) {
$blogId = $ownerId;
- lt_include( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
+
$blogs =& new Blogs();
$blogInfo = $blogs->getBlogInfo($blogId);
$blogShortName = $blogInfo->getMangledBlog();
Modified: plog/branches/lifetype-2.0-autoload/class/net/customurlhandler.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/net/customurlhandler.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/net/customurlhandler.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -2,9 +2,9 @@
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
- lt_include( PLOG_CLASS_PATH."class/net/linkformatmatcher.class.php" );
- lt_include( PLOG_CLASS_PATH."class/net/url.class.php" );
+
+
+
/**
* \ingroup Net
Modified: plog/branches/lifetype-2.0-autoload/class/net/dns.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/net/dns.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/net/dns.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/misc/osdetect.class.php" );
+
/**
* \ingroup Net
Modified: plog/branches/lifetype-2.0-autoload/class/net/http/phpsniff/phpSniff.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/net/http/phpsniff/phpSniff.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/net/http/phpsniff/phpSniff.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -19,8 +19,8 @@
License along with this library; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*******************************************************************************/
-lt_include( PLOG_CLASS_PATH.'class/net/http/phpsniff/phpSniff.core.php');
+
//===============================================================
// the following defines are used to create the short
// browser name used throughout the script.
Modified: plog/branches/lifetype-2.0-autoload/class/net/http/session/sessioninfo.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/net/http/session/sessioninfo.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/net/http/session/sessioninfo.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/config/properties.class.php" );
+
/**
* \ingroup Net_HTTP
Modified: plog/branches/lifetype-2.0-autoload/class/net/http/session/sessionmanager.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/net/http/session/sessionmanager.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/net/http/session/sessionmanager.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,11 +1,11 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/net/url.class.php" );
- lt_include( PLOG_CLASS_PATH."class/net/http/httpvars.class.php" );
- lt_include( PLOG_CLASS_PATH."class/net/http/session/sessioninfo.class.php" );
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
+
+
+
+
$__sessionManagerInitialized = false;
/**
Modified: plog/branches/lifetype-2.0-autoload/class/net/http/subdomains.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/net/http/subdomains.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/net/http/subdomains.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
- lt_include( PLOG_CLASS_PATH."class/net/url.class.php" );
+
+
/**
* \ingroup Net_HTTP
*
@@ -20,7 +20,7 @@
*/
function getSubdomainInfoFromRequest()
{
- lt_include( PLOG_CLASS_PATH."class/net/linkparser.class.php" );
+
$config =& Config::getConfig();
$url = new Url( $config->getValue( "subdomains_base_url"));
$lp = new LinkParser( $url->getHost());
@@ -72,7 +72,7 @@
*/
function getSubdomainsEnabled()
{
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
+
$config =& Config::getConfig();
$blog_domains_enabled =
@@ -90,7 +90,7 @@
*/
function getAvailableDomains()
{
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
+
$config =& Config::getConfig();
$available_domains = $config->getValue("subdomains_available_domains", "");
@@ -126,7 +126,7 @@
// Use forbidden_usernames for domains as well, since they are related
// in that we don't want people to register www.xyz or forums.xyz
// through these subdomains either
- lt_include( PLOG_CLASS_PATH."class/data/validator/domainvalidator.class.php" );
+
$val = new DomainValidator();
return( $val->validate( $domain ));
}
@@ -139,7 +139,7 @@
*/
function domainNameExists( $domain, $ignoreBlogId=0 )
{
- 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-2.0-autoload/class/net/linkformatmatcher.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/net/linkformatmatcher.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/net/linkformatmatcher.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/net/linkparser.class.php" );
+
/**
* \ingroup Net
*
Modified: plog/branches/lifetype-2.0-autoload/class/net/modrewriterequestgenerator.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/net/modrewriterequestgenerator.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/net/modrewriterequestgenerator.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,9 +1,9 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/net/baserequestgenerator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/stringutils.class.php" );
- lt_include( PLOG_CLASS_PATH."class/database/ltdb.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
+
+
+
+
/**
* \ingroup Net
Modified: plog/branches/lifetype-2.0-autoload/class/net/prettyrequestgenerator.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/net/prettyrequestgenerator.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/net/prettyrequestgenerator.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -5,7 +5,7 @@
*/
- lt_include( PLOG_CLASS_PATH."class/net/baserequestgenerator.class.php" );
+
/**
* \ingroup Net
Modified: plog/branches/lifetype-2.0-autoload/class/net/rawrequestgenerator.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/net/rawrequestgenerator.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/net/rawrequestgenerator.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/net/baserequestgenerator.class.php" );
+
/**
* \ingroup Net
Modified: plog/branches/lifetype-2.0-autoload/class/net/request.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/net/request.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/net/request.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/config/properties.class.php" );
+
if ( !defined("CHECK_CONFIG_REQUEST_MODE") )
define( "CHECK_CONFIG_REQUEST_MODE", 0 );
Modified: plog/branches/lifetype-2.0-autoload/class/net/requestgenerator.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/net/requestgenerator.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/net/requestgenerator.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
+
if ( !defined("CHECK_CONFIG_REQUEST_MODE") )
define( "CHECK_CONFIG_REQUEST_MODE", 0 );
@@ -74,19 +74,19 @@
// load the correct generator, while doing some nice dynamic loading...
if( $this->_mode == SEARCH_ENGINE_FRIENDLY_MODE ) {
- lt_include( PLOG_CLASS_PATH."class/net/prettyrequestgenerator.class.php" );
+
$rg = new PrettyRequestGenerator( $blogInfo );
}
elseif( $this->_mode == MODREWRITE_MODE ) {
- lt_include( PLOG_CLASS_PATH."class/net/modrewriterequestgenerator.class.php" );
+
$rg = new ModRewriteRequestGenerator( $blogInfo );
}
elseif( $this->_mode == CUSTOM_REQUEST_MODE ) {
- lt_include( PLOG_CLASS_PATH."class/net/customrequestgenerator.class.php" );
+
$rg = new CustomRequestGenerator( $blogInfo );
}
else {
- lt_include( PLOG_CLASS_PATH."class/net/rawrequestgenerator.class.php" );
+
$rg = new RawRequestGenerator( $blogInfo );
}
Modified: plog/branches/lifetype-2.0-autoload/class/net/xmlrpc/xmlrpcserver.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/net/xmlrpc/xmlrpcserver.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/net/xmlrpc/xmlrpcserver.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,18 +1,18 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/net/xmlrpc/IXR_Library.lib.php" );
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
- lt_include( PLOG_CLASS_PATH."class/database/ltdb.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/users.class.php");
- lt_include( PLOG_CLASS_PATH."class/dao/article.class.php");
- lt_include( PLOG_CLASS_PATH."class/dao/articles.class.php");
- lt_include( PLOG_CLASS_PATH."class/dao/articlecategories.class.php");
- lt_include( PLOG_CLASS_PATH."class/dao/users.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/cachecontrol.class.php" );
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryalbums.class.php" );
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryresources.class.php" );
- lt_include( PLOG_CLASS_PATH."class/plugin/pluginmanager.class.php" );
+
+
+
+
+
+
+
+
+
+
+
+
+
if( !defined( "ADMIN_PERMISSION" ))
define( "ADMIN_PERMISSION", 1 );
@@ -172,8 +172,8 @@
// Add article notifcations if this is specified by the default setting.
if ($blogSettings->getValue( "default_send_notification" ))
{
- lt_include( PLOG_CLASS_PATH."class/dao/articlenotifications.class.php" );
+
$artNotifications = new ArticleNotifications();
$artNotifications->addNotification( $postid, $blogid, $userInfo->getId());
}
@@ -342,7 +342,7 @@
// Add article notifcations if this is specified by the default setting.
if ($blogSettings->getValue( "default_send_notification" ))
{
- lt_include( PLOG_CLASS_PATH."class/dao/articlenotifications.class.php" );
+
$artNotifications = new ArticleNotifications();
$artNotifications->addNotification( $postid, $blogid, $userInfo->getId());
@@ -453,7 +453,7 @@
function getPost($args)
{
- lt_include( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
+
$users = new Users();
$articles = new Articles();
@@ -518,8 +518,8 @@
return new IXR_Error(-1, 'You did not provide the correct username and/or password');
}
- lt_include( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
+
$item = $articles->getBlogArticle($postid,
-1, // blogId
true, // includeHiddenFields
@@ -879,7 +879,7 @@
foreach( $list as $item ) {
$dateObject = $item->getDateObject();
- lt_include( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
+
// Get the unix time stamp
$time = $dateObject->getTimestamp(DATE_FORMAT_UNIXTIME);
@@ -941,7 +941,7 @@
foreach($list as $item)
{
$dateObject = $item->getDateObject();
- lt_include( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
+
// Get the unix time stamp
$time = $dateObject->getTimestamp( DATE_FORMAT_UNIXTIME );
@@ -1156,7 +1156,7 @@
return new IXR_Error(-1, 'You did not provide the correct username and/or password');
}
- lt_include( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
+
$item = $articles->getBlogArticle($postid,
-1, // blogId
@@ -1206,7 +1206,7 @@
if( !$userInfo ) {
return new IXR_Error(-1, 'You did not provide the correct username and/or password');
}
- lt_include( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
+
$article = $articles->getBlogArticle($postid,
-1, // blogId
Modified: plog/branches/lifetype-2.0-autoload/class/net/xmlrpcclient.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/net/xmlrpcclient.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/net/xmlrpcclient.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/net/xmlrpc/IXR_Library.lib.php" );
+
/**
* \ingroup Net
Modified: plog/branches/lifetype-2.0-autoload/class/object/loader.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/object/loader.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/object/loader.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -7,5 +7,142 @@
include($filename);
}
}
+
+ lt_include( PLOG_CLASS_PATH."class/object/smartloader.class.php" );
+
+ /**
+ * Lifetype's own autolaoder class
+ *
+ * Please register it with spl_autoload_register instead of defining your own
+ * __autoload method so that we can have more than one autoload function. SPL
+ * will automatically take care of that for you.
+ */
+ class LTClassLoader
+ {
+ static public $folderList = Array(
+ 'action',
+ 'action/admin',
+ 'action/admin/ajax',
+ 'action/admin/chooser',
+ 'bayesian',
+ 'cache',
+ 'cache/Cache_Lite',
+ 'cache/Memcached_Client',
+ 'config',
+ 'controller',
+ 'dao',
+ 'dao/customfields',
+ 'dao/misc',
+ 'dao/status',
+ 'dao/userdata',
+ 'data',
+ 'data/captcha',
+ 'data/Date',
+ 'data/filter',
+ 'data/forms',
+ 'data/pager',
+ 'data/serialize',
+ 'data/serialize/json',
+ 'data/utf8',
+ 'data/utf8/mbstring',
+ 'data/utf8/native',
+ 'data/utf8/utils',
+ 'data/validator',
+ 'data/validator/rules',
+ 'database',
+ 'database/pdb',
+ 'database/pdb/datadict',
+ 'database/pdb/drivers',
+ 'file',
+ 'file/finder',
+ 'file/unpacker',
+ 'gallery',
+ 'gallery/dao',
+ 'gallery/data',
+ 'gallery/getid3',
+ 'gallery/helperapps',
+ 'gallery/resizers',
+ 'gallery/template',
+ 'locale',
+ 'logger',
+ 'logger/appender',
+ 'logger/config',
+ 'logger/layout',
+ 'logger/logger',
+ 'mail',
+ 'misc',
+ 'net',
+ 'net/http',
+ 'net/http/session',
+ 'net/xmlrpc',
+ 'object',
+ 'plugin',
+ 'security',
+ 'summary',
+ 'summary/action',
+ 'summary/controller',
+ 'summary/dao',
+ 'summary/data',
+ 'summary/data/validator',
+ 'summary/mail',
+ 'summary/net',
+ 'summary/view',
+ 'template',
+ 'template/editor',
+ 'template/menu',
+ 'template/smarty',
+ 'template/smarty/internals',
+ 'template/smarty/plugins',
+ 'template/templatesets',
+ 'test',
+ 'test/helpers',
+ 'test/PHPUnit',
+ 'test/PHPUnit/GUI',
+ 'test/tests',
+ 'test/tests/config',
+ 'test/tests/dao',
+ 'test/tests/data',
+ 'test/tests/data/filter',
+ 'test/tests/data/validator',
+ 'test/tests/data/validator/rules',
+ 'test/tests/extra',
+ 'test/tests/file',
+ 'test/tests/file/unpacker',
+ 'test/tests/locale',
+ 'test/tests/logger',
+ 'test/tests/mail',
+ 'test/tests/misc',
+ 'test/tests/net',
+ 'test/tests/net/http',
+ 'test/tests/net/xmlrpc',
+ 'test/tests/summary',
+ 'test/tests/summary/action',
+ 'test/tests/summary/dao',
+ 'test/tests/summary/data',
+ 'test/tests/ui',
+ 'view',
+ 'view/admin',
+ 'view/admin/ajax',
+ 'view/admin/chooser',
+ 'view/ajax',
+ 'view/renderer',
+ 'xml',
+ 'xml/parser',
+ 'xml/rssparser',
+ 'xml/rssparser/magpierss',
+ 'xml/rssparser/magpierss/extlib',
+ 'xml/tree'
+ );
+
+ static function load( $className )
+ {
+ $fileName = strtolower( $className );
+ foreach( self::$folderList as $folder ) {
+ $path = PLOG_CLASS_PATH."class/".$folder."/".$fileName.".class.php";
+ if( file_exists( $path ))
+ lt_include( $path );
+ }
+ }
+ }
?>
\ No newline at end of file
Modified: plog/branches/lifetype-2.0-autoload/class/object/loggable.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/object/loggable.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/object/loggable.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -19,7 +19,7 @@
*/
function Loggable()
{
- lt_include( PLOG_CLASS_PATH."class/logger/loggermanager.class.php" );
+
// initialize logging -- enable this only for debugging purposes
$this->log =& LoggerManager::getLogger( "default" );
Modified: plog/branches/lifetype-2.0-autoload/class/object/object.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/object/object.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/object/object.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,10 +1,10 @@
<?php
if(PHP_VERSION < 5)
- lt_include( PLOG_CLASS_PATH."class/object/exception.class.php" );
+
- lt_include( PLOG_CLASS_PATH."class/logger/loggermanager.class.php" );
+
/**
* \ingroup Core
*
Modified: plog/branches/lifetype-2.0-autoload/class/plugin/globalpluginconfig.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/plugin/globalpluginconfig.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/plugin/globalpluginconfig.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?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-2.0-autoload/class/plugin/pluginbase.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/plugin/pluginbase.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/plugin/pluginbase.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -11,6 +11,7 @@
* available in this class.
*/
+ lt_include( PLOG_CLASS_PATH."class/plugin/eventlist.properties.php" );
/**
* \ingroup Plugin
@@ -103,9 +104,6 @@
function PluginBase( $source = "" )
{
$this->source = $source;
- if($this->source == "admin")
- lt_include( PLOG_CLASS_PATH."class/template/menu/menu.class.php" );
-
}
/**
@@ -210,7 +208,7 @@
*/
function registerAdminAction( $key, $actionClass )
{
- lt_include( PLOG_CLASS_PATH."class/controller/admincontroller.class.php" );
+
AdminController::registerAction( $key, $actionClass );
@@ -226,7 +224,7 @@
*/
function registerBlogAction( $key, $actionClass )
{
- lt_include( PLOG_CLASS_PATH."class/controller/blogcontroller.class.php" );
+
BlogController::registerAction( $key, $actionClass );
@@ -254,7 +252,7 @@
*/
function registerFilter( $filterName )
{
- lt_include( PLOG_CLASS_PATH."class/security/pipeline.class.php" );
+
Pipeline::registerFilter( $filterName );
@@ -283,7 +281,7 @@
$andPerms = Array( "manage_plugins" ),
$siteAdmin = false )
{
- lt_include( PLOG_CLASS_PATH."class/template/menu/menu.class.php" );
+
// for 1.1 compatibility
if( is_bool( $orPerms ) && is_bool( $andPerms )) {
@@ -411,7 +409,7 @@
*/
function process( $eventType, $params )
{
- lt_include( PLOG_CLASS_PATH."class/object/exception.class.php" );
+
throw( new Exception( "Plugin ".$this->id." registered for event $eventType but did not provide its own process() method!" ));
die();
}
Modified: plog/branches/lifetype-2.0-autoload/class/plugin/pluginmanager.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/plugin/pluginmanager.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/plugin/pluginmanager.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,15 +1,5 @@
<?php
-
- lt_include( PLOG_CLASS_PATH."class/file/file.class.php" );
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
- lt_include( PLOG_CLASS_PATH."class/misc/glob.class.php" );
-// lt_include( PLOG_CLASS_PATH."class/controller/blogcontroller.class.php" );
-// lt_include( PLOG_CLASS_PATH."class/controller/admincontroller.class.php" );
- lt_include( PLOG_CLASS_PATH."class/plugin/eventlist.properties.php" );
-// lt_include( PLOG_CLASS_PATH."class/plugin/pluginbase.class.php" );
- lt_include( PLOG_CLASS_PATH."class/controller/resourceclassloader.class.php" );
-
/**
* other various constants
*/
@@ -244,6 +234,7 @@
if( File::isReadable( $pluginFile."/".$pluginFileName )) {
$className = "Plugin".$plugin;
lt_include( $pluginFullPath );
+
$classInstance =& new $className( $this->_source );
$classInstance->setPluginFolder( PLOG_CLASS_PATH.$pluginFile."/" );
$name = $classInstance->getId();
@@ -287,7 +278,7 @@
*/
function _loadPluginLocale( $pluginId, $locale )
{
- lt_include( PLOG_CLASS_PATH . "class/locale/locales.class.php" );
+
return( Locales::getPluginLocale( $pluginId, $locale ));
}
Modified: plog/branches/lifetype-2.0-autoload/class/security/bayesianfilter.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/security/bayesianfilter.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/security/bayesianfilter.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/security/pipelinefilter.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);
@@ -62,7 +62,7 @@
return $result;
}
- lt_include( PLOG_CLASS_PATH."class/dao/articlecomments.class.php" );
+
// if it's a trackback, the data is in another place...
$parentId = "";
@@ -137,7 +137,7 @@
if ( !$previouslyRejected )
{
// train the filter with the message, be it spam or not...
- lt_include( PLOG_CLASS_PATH."class/bayesian/bayesianfiltercore.class.php" );
+
BayesianFilterCore::train( $blogInfo->getId(), $commentTopic, $commentText, $userName, $userEmail,
$userUrl, $spam );
}
@@ -145,7 +145,7 @@
{
// This is a rejected message. If we think that this is non-spam,
// we want to untrain it and then retrain it as spam
- lt_include( PLOG_CLASS_PATH."class/bayesian/bayesianfiltercore.class.php" );
+
if ( !$spam )
{
// Un-train this non-spam
@@ -167,7 +167,7 @@
*/
function getSpamProbability($blogId, $topic, $text, $userName, $userEmail, $userUrl)
{
- lt_include( PLOG_CLASS_PATH."class/bayesian/bayesiantokenizer.class.php" );
+
$tokenizer = new BayesianTokenizer();
@@ -189,8 +189,8 @@
*/
function _getMostSignificantTokens($blogId, $tokens)
{
- lt_include( PLOG_CLASS_PATH."class/dao/bayesiantokens.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/bayesianfilterinfos.class.php" );
+
+
$config =& Config::getConfig();
Modified: plog/branches/lifetype-2.0-autoload/class/security/commentfilter.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/security/commentfilter.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/security/commentfilter.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/security/pipelinefilter.class.php" );
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
+
+
define( "COMMENT_FILTER_MAXIMUM_SIZE_EXCEEDED", 400 );
Modified: plog/branches/lifetype-2.0-autoload/class/security/nullpipelinefilter.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/security/nullpipelinefilter.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/security/nullpipelinefilter.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/security/pipelinefilter.class.php" );
+
/**
* \ingroup Security
@@ -23,7 +23,7 @@
*/
function filter()
{
- lt_include( PLOG_CLASS_PATH . 'class/security/pipelineresult.class.php' );
+
$result = new PipelineResult();
Modified: plog/branches/lifetype-2.0-autoload/class/security/pipeline.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/security/pipeline.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/security/pipeline.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -10,8 +10,8 @@
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
+
/**
* global array used to hold the list of filters that we're going to use in the pipeline.
* Now again, more than ever, wish that PHP4 had support for static attributes at the class
@@ -81,9 +81,9 @@
*/
function _registerDefaultFilters()
{
- lt_include( PLOG_CLASS_PATH."class/security/nullpipelinefilter.class.php" );
- lt_include( PLOG_CLASS_PATH."class/security/commentfilter.class.php" );
- lt_include( PLOG_CLASS_PATH."class/security/bayesianfilter.class.php" );
+
+
+
$this->registerFilter( "NullPipelineFilter" );
$this->registerFilter( "CommentFilter" );
@@ -115,8 +115,8 @@
*/
function process()
{
- 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-2.0-autoload/class/summary/action/activeaccountaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/summary/action/activeaccountaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/summary/action/activeaccountaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,11 +1,11 @@
<?php
-lt_include(PLOG_CLASS_PATH.'class/summary/action/summaryaction.class.php');
-lt_include(PLOG_CLASS_PATH.'class/data/validator/stringvalidator.class.php');
-lt_include(PLOG_CLASS_PATH.'class/dao/users.class.php');
-lt_include(PLOG_CLASS_PATH.'class/dao/blogs.class.php');
-lt_include(PLOG_CLASS_PATH.'class/summary/view/summarymessageview.class.php');
+
+
+
+
+
class ActiveAccountAction extends SummaryAction
{
Modified: plog/branches/lifetype-2.0-autoload/class/summary/action/bloglistaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/summary/action/bloglistaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/summary/action/bloglistaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/summary/action/summaryaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/summary/view/summarybloglistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
+
+
+
/**
* shows a list with all the blogs, pager included
Modified: plog/branches/lifetype-2.0-autoload/class/summary/action/blogprofileaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/summary/action/blogprofileaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/summary/action/blogprofileaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/summary/action/summaryaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
+
+
/**
* by default, how many posts show as recent from this blog
*/
@@ -43,10 +43,10 @@
return true;
}
- lt_include( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/articles.class.php" );
+
+
+
// load some information about the user
$blogs = new Blogs();
$blogInfo = $blogs->getBlogInfo( $this->_blogId, true );
Modified: plog/branches/lifetype-2.0-autoload/class/summary/action/checkusernameajaxaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/summary/action/checkusernameajaxaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/summary/action/checkusernameajaxaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,10 +1,10 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/summary/action/registeraction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
- lt_include( PLOG_CLASS_PATH."class/summary/view/summaryxmlview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/usernamevalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/users.class.php" );
+
+
+
+
+
/**
* \ingroup Action
Modified: plog/branches/lifetype-2.0-autoload/class/summary/action/chooseblogtemplateaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/summary/action/chooseblogtemplateaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/summary/action/chooseblogtemplateaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,10 +1,10 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/summary/action/registeraction.class.php" );
+
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
- lt_include( PLOG_CLASS_PATH."class/summary/view/summaryview.class.php" );
+
+
+
/**
Modified: plog/branches/lifetype-2.0-autoload/class/summary/action/doblogregistration.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/summary/action/doblogregistration.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/summary/action/doblogregistration.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,17 +1,17 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/summary/action/registeraction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/blognamevalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/articlecategories.class.php" );
- lt_include( PLOG_CLASS_PATH."class/summary/view/doblogregistrationview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/summary/view/blogtemplatechooserview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/locale/locales.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/domainvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/net/http/subdomains.class.php" );
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/filter/htmlfilter.class.php" );
+
+
+
+
+
+
+
+
+
+
+
+
/**
* registers a blog
Modified: plog/branches/lifetype-2.0-autoload/class/summary/action/dofinishregister.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/summary/action/dofinishregister.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/summary/action/dofinishregister.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,22 +1,22 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/summary/action/registeraction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/cachecontrol.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/articlecategories.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/users.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/bloginfo.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/userinfo.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/article.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/articles.class.php" );
- lt_include( PLOG_CLASS_PATH."class/summary/mail/summarymailer.class.php" );
- lt_include( PLOG_CLASS_PATH."class/summary/view/blogtemplatechooserview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/net/http/subdomains.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/permissions.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/userpermissions.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/friendgroups.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/privatemessageboxes.class.php" );
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
/**
* Finish the user and blog registration process.
@@ -188,7 +188,7 @@
$this->_blogInfo = $blogInfo;
// get the default global article category id
- lt_include( PLOG_CLASS_PATH."class/dao/globalarticlecategories.class.php" );
+
$globalArticleCategories = new GlobalArticleCategories();
$globalArticleCategoryId = $this->_config->getValue("default_global_article_category_id");
if( !empty( $globalArticleCategoryId ) ) {
@@ -225,8 +225,8 @@
$articles = new Articles();
$articles->addArticle( $article );
// add a new first album so that users can start uploading stuff right away
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryalbums.class.php" );
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryalbum.class.php" );
+
+
$t = new Timestamp();
$album = new GalleryAlbum( $this->_blogInfo->getId(), // blog id
$locale->tr( "register_default_album_name" ), // album name
@@ -240,7 +240,7 @@
$albums->addAlbum( $album );
// add a new default mylinkscategory
- lt_include( PLOG_CLASS_PATH."class/dao/mylinkscategories.class.php" );
+
$linksCategory = new MyLinksCategory( $locale->tr("register_default_category" ), $this->_blogInfo->getId() );
$linksCategories = new MyLinksCategories();
$linksCategories->addMyLinksCategory( $linksCategory );
Modified: plog/branches/lifetype-2.0-autoload/class/summary/action/doreadagreement.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/summary/action/doreadagreement.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/summary/action/doreadagreement.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/summary/action/registeraction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
- lt_include( PLOG_CLASS_PATH."class/summary/view/summaryusercreationview.class.php" );
+
+
+
/**
* shows a form so that users can register
Modified: plog/branches/lifetype-2.0-autoload/class/summary/action/dousercreation.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/summary/action/dousercreation.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/summary/action/dousercreation.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,16 +1,16 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/summary/action/registeraction.class.php" );
- lt_include( 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/filter/htmlfilter.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/filter/htmlspecialcharsfilter.class.php" );
+
+
+
+
+
+
+
- lt_include( PLOG_CLASS_PATH."class/dao/users.class.php" );
- lt_include( PLOG_CLASS_PATH."class/summary/view/doblogregistrationview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/summary/view/summaryusercreationview.class.php" );
+
+
+
/**
* starts the user and blog registration process
@@ -89,7 +89,7 @@
// check if the captcha matches
if( $this->_config->getValue( "use_captcha_auth")) {
- lt_include( PLOG_CLASS_PATH."class/data/captcha/captcha.class.php" );
+
$captcha = new Captcha();
if( !$captcha->validate( $this->captcha )) {
$this->_view = new SummaryUserCreationView();
Modified: plog/branches/lifetype-2.0-autoload/class/summary/action/douserregister.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/summary/action/douserregister.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/summary/action/douserregister.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/summary/action/registeraction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/summary/view/summaryusercreationview.class.php" );
+
+
/**
* shows a form so that users can register
Modified: plog/branches/lifetype-2.0-autoload/class/summary/action/postlistaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/summary/action/postlistaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/summary/action/postlistaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/summary/action/summaryaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/summary/view/summarypostlistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
+
+
+
/**
* shows a list with all the blogs, pager included
Modified: plog/branches/lifetype-2.0-autoload/class/summary/action/registeraction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/summary/action/registeraction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/summary/action/registeraction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,15 +1,15 @@
<?php
-lt_include( PLOG_CLASS_PATH."class/summary/action/summaryaction.class.php" );
-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" );
-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
* @package summary
@@ -36,7 +36,7 @@
// the quickest right now!
$config =& Config::getConfig();
if( $config->getValue( "summary_disable_registration" )) {
- lt_include( PLOG_CLASS_PATH."class/summary/view/summarymessageview.class.php" );
+
$this->_view = new SummaryMessageView();
$this->_view->setErrorMessage( $this->_locale->tr("error_registration_disabled"));
die($this->_view->render());
Modified: plog/branches/lifetype-2.0-autoload/class/summary/action/summaryaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/summary/action/summaryaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/summary/action/summaryaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/action/action.class.php" );
- lt_include( PLOG_CLASS_PATH."class/summary/view/summaryview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/summary/view/summarycachedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/net/http/httpvars.class.php" );
+
+
+
+
define('HTTP_ACCEPT_LANGUAGE_DETECTION', 0);
Modified: plog/branches/lifetype-2.0-autoload/class/summary/action/summarycustompageaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/summary/action/summarycustompageaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/summary/action/summarycustompageaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/summary/action/summaryaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/summary/view/summarycachedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/summary/data/validator/customsummarypagevalidator.class.php" );
+
+
+
/**
* displays custom pages in the summary.php, in case users would like
Modified: plog/branches/lifetype-2.0-autoload/class/summary/action/summarydefaultaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/summary/action/summarydefaultaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/summary/action/summarydefaultaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,9 +1,9 @@
<?php
- 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" );
- 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
@@ -40,9 +40,9 @@
return true;
}
- lt_include( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/globalarticlecategories.class.php" );
- lt_include( PLOG_CLASS_PATH."class/summary/dao/summarystats.class.php" );
+
+
+
$blogs = new Blogs();
$stats = new SummaryStats();
Modified: plog/branches/lifetype-2.0-autoload/class/summary/action/summaryregistrationaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/summary/action/summaryregistrationaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/summary/action/summaryregistrationaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/summary/action/summaryaction.class.php" );
+
/**
* a very stupid action
@@ -9,7 +9,7 @@
{
function perform()
{
- lt_include( PLOG_CLASS_PATH."register.php" );
+
die();
}
}
Modified: plog/branches/lifetype-2.0-autoload/class/summary/action/summaryrssaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/summary/action/summaryrssaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/summary/action/summaryrssaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,13 +1,13 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/summary/action/summaryaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/summary/dao/summarystats.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
- lt_include( PLOG_CLASS_PATH."class/summary/view/summaryrssview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/net/rawrequestgenerator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
+
+
+
+
+
+
+
define( "SUMMARY_RSS_TYPE_DEFAULT", "default" );
define( "SUMMARY_RSS_TYPE_MOST_COMMENTED", "mostcommented" );
define( "SUMMARY_RSS_TYPE_MOST_READ", "mostread" );
@@ -87,9 +87,9 @@
$postslist = $stats->getMostReadArticles();
}
elseif( $this->_mode == SUMMARY_RSS_TYPE_POSTS_LIST ) {
- lt_include( PLOG_CLASS_PATH."class/dao/globalarticlecategories.class.php" );
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
+
+
// get the summary_items_per_page from config
$config =& Config::getConfig();
$summaryItemsPerPage = $config->getValue( "summary_items_per_page", SUMMARY_DEFAULT_ITEMS_PER_PAGE );
@@ -105,7 +105,7 @@
$summaryItemsPerPage );
}
else {
- lt_include( PLOG_CLASS_PATH."class/dao/globalarticlecategories.class.php" );
+
$categories = new GlobalArticleCategories();
$currentGlobalArticleCategory = $categories->getGlobalArticleCategory( $globalArticleCategoryId );
@@ -149,9 +149,9 @@
$blogslist = $stats->getMostActiveBlogs();
}
elseif( $this->_mode == SUMMARY_RSS_TYPE_BLOGS_LIST ) {
- lt_include( PLOG_CLASS_PATH."class/dao/blogcategories.class.php" );
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
+
+
// get the summary_items_per_page from config
$config =& Config::getConfig();
$summaryItemsPerPage = $config->getValue( "summary_items_per_page", SUMMARY_DEFAULT_ITEMS_PER_PAGE );
Modified: plog/branches/lifetype-2.0-autoload/class/summary/action/summarysearchaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/summary/action/summarysearchaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/summary/action/summarysearchaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,10 +1,10 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/summary/action/summaryaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/summary/dao/summarystatsconstants.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
+
+
+
+
+
class SummarySearchAction extends SummaryAction
{
@@ -29,9 +29,9 @@
*/
function perform()
{
- lt_include( PLOG_CLASS_PATH."class/dao/searchengine.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/pager/pager.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
+
+
+
$tf = new Textfilter();
$this->_searchTerms = $tf->filterAllHTML( $this->_request->getValue( "searchTerms" ));
Modified: plog/branches/lifetype-2.0-autoload/class/summary/action/summarysendresetemail.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/summary/action/summarysendresetemail.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/summary/action/summarysendresetemail.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,14 +1,14 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/summary/action/summaryaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/summary/view/summarymessageview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/emailvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/filter/htmlfilter.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/filter/htmlspecialcharsfilter.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/users.class.php" );
- lt_include( PLOG_CLASS_PATH."class/summary/data/summarytools.class.php" );
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
+
+
+
+
+
+
+
+
+
/**
* sends an email to reset a password, first checking whether the username
Modified: plog/branches/lifetype-2.0-autoload/class/summary/action/summarysetnewpassword.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/summary/action/summarysetnewpassword.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/summary/action/summarysetnewpassword.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,9 +1,9 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/summary/action/summaryaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/users.class.php" );
- lt_include( PLOG_CLASS_PATH."class/summary/data/summarytools.class.php" );
+
+
+
+
/**
* verifys that the request to reset the password is ok and if so, shows the form where the user
Modified: plog/branches/lifetype-2.0-autoload/class/summary/action/summaryshowresetpasswordform.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/summary/action/summaryshowresetpasswordform.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/summary/action/summaryshowresetpasswordform.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/summary/action/summaryaction.class.php" );
+
/**
Modified: plog/branches/lifetype-2.0-autoload/class/summary/action/summaryupdatepassword.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/summary/action/summaryupdatepassword.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/summary/action/summaryupdatepassword.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,11 +1,11 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/summary/action/summaryaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/passwordvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/users.class.php" );
- lt_include( PLOG_CLASS_PATH."class/summary/data/summarytools.class.php" );
+
+
+
+
+
+
class SummaryUpdatePassword extends SummaryAction
{
Modified: plog/branches/lifetype-2.0-autoload/class/summary/action/userlistaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/summary/action/userlistaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/summary/action/userlistaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/summary/action/summaryaction.class.php" );
- lt_include( PLOG_CLASS_PATH."class/summary/view/summaryuserlistview.class.php" );
+
+
/**
* shows a list with all the users, pager included
Modified: plog/branches/lifetype-2.0-autoload/class/summary/action/userprofileaction.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/summary/action/userprofileaction.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/summary/action/userprofileaction.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- 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/view/summarycachedview.class.php" );
+
+
+
/**
* shows a user profile
@@ -36,9 +36,9 @@
}
// load the classes that we are going to need
- lt_include( PLOG_CLASS_PATH."class/dao/users.class.php" );
- lt_include( PLOG_CLASS_PATH."class/summary/dao/summarystats.class.php" );
+
+
// load some information about the user
$users = new Users();
$userInfo = $users->getUserInfoFromId( $this->_userId, true );
Modified: plog/branches/lifetype-2.0-autoload/class/summary/controller/registrationcontroller.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/summary/controller/registrationcontroller.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/summary/controller/registrationcontroller.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/controller/sequentialcontroller.class.php" );
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
+
+
/**
* \ingroup Controller
*
Modified: plog/branches/lifetype-2.0-autoload/class/summary/controller/summarycontroller.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/summary/controller/summarycontroller.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/summary/controller/summarycontroller.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/controller/controller.class.php" );
+
/**
* \ingroup Controller
*
Modified: plog/branches/lifetype-2.0-autoload/class/summary/dao/summarystats.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/summary/dao/summarystats.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/summary/dao/summarystats.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,11 +1,11 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/dao/model.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/articlecommentstatus.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/articlestatus.class.php" );
- lt_include( PLOG_CLASS_PATH."class/summary/dao/summarystatsconstants.class.php" );
+
+
+
+
+
+
/**
* This class implements a few methods that can be used to obtain the list of most recent blogs, posts, commets,
@@ -45,8 +45,8 @@
*/
function getMostCommentedArticles( $maxPosts = 0 )
{
- lt_include( PLOG_CLASS_PATH."class/dao/articles.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/commentscommon.class.php" );
+
+
$articles = new Articles();
$maxPosts > 0 ? $max = $maxPosts : $max = $this->_summaryPageShowMax;
@@ -91,8 +91,8 @@
*/
function getMostReadArticles( $maxPosts = 0 )
{
- lt_include( PLOG_CLASS_PATH."class/dao/articles.class.php" );
+
$prefix = $this->getPrefix();
$articles = new Articles();
@@ -136,7 +136,7 @@
*/
function getRecentBlogs( $maxBlogs = 0 )
{
- lt_include( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
+
$query = "SELECT *
FROM ".$this->getPrefix()."blogs
WHERE status = ".BLOG_STATUS_ACTIVE."
@@ -176,7 +176,7 @@
*/
function getMostActiveBlogs( $maxBlogs = 0 )
{
- lt_include( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
+
$prefix = $this->getPrefix();
@@ -225,7 +225,7 @@
*/
function getRecentArticles( $globaArticleCategoryId = ALL_GLOBAL_ARTICLE_CATEGORIES, $maxPosts = 0 )
{
- lt_include( PLOG_CLASS_PATH."class/dao/articles.class.php" );
+
$prefix = $this->getPrefix();
@@ -282,7 +282,7 @@
$page = -1,
$itemsPerPage = SUMMARY_DEFAULT_ITEMS_PER_PAGE )
{
- lt_include( PLOG_CLASS_PATH."class/dao/articles.class.php" );
+
$prefix = $this->getPrefix();
@@ -321,7 +321,7 @@
function getNumPostsByGlobalCategory( $globaArticleCategoryId = ALL_GLOBAL_ARTICLE_CATEGORIES )
{
- lt_include( PLOG_CLASS_PATH."class/dao/articles.class.php" );
+
$prefix = $this->getPrefix();
@@ -344,7 +344,7 @@
*/
function getNow()
{
- lt_include( PLOG_CLASS_PATH.'class/data/timestamp.class.php' );
+
$time = new Timestamp();
$now = $time->getTimestamp();
@@ -357,7 +357,7 @@
*/
function getStartTime( $duration )
{
- lt_include( PLOG_CLASS_PATH.'class/data/timestamp.class.php' );
+
$time = new Timestamp();
$time->subtractSeconds( $duration * 24 * 60 * 60 );
@@ -378,7 +378,7 @@
*/
function getUserRecentArticles( $userId, $maxPosts = 10 )
{
- lt_include( PLOG_CLASS_PATH."class/dao/articles.class.php" );
+
// query to load the data
$query = "SELECT * FROM ".$this->getPrefix()."articles WHERE user_id = ".LtDb::qstr( $userId )." AND status = ".POST_STATUS_PUBLISHED."
ORDER BY date DESC";
Modified: plog/branches/lifetype-2.0-autoload/class/summary/data/summarytools.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/summary/data/summarytools.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/summary/data/summarytools.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,9 +1,9 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/mail/emailmessage.class.php" );
- lt_include( PLOG_CLASS_PATH."class/mail/emailservice.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/users.class.php" );
+
+
+
class SummaryTools
{
@@ -53,7 +53,7 @@
function verifyRequest( $userNameHash, $requestHash )
{
// make sure that the request is correct
- lt_include( PLOG_CLASS_PATH."class/database/ltdb.class.php" );
+
$users = new Users();
$db =& LtDb::getDb();
Modified: plog/branches/lifetype-2.0-autoload/class/summary/data/validator/customsummarypagevalidator.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/summary/data/validator/customsummarypagevalidator.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/summary/data/validator/customsummarypagevalidator.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,10 +1,10 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/data/validator/validator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/rules/regexprule.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/rules/filteredwordsrule.class.php" );
- lt_include( PLOG_CLASS_PATH."class/file/file.class.php" );
+
+
+
+
+
/**
* custom summary page validator that does:
Modified: plog/branches/lifetype-2.0-autoload/class/summary/mail/confirmemailmessage.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/summary/mail/confirmemailmessage.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/summary/mail/confirmemailmessage.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,9 +1,9 @@
<?php
-lt_include(PLOG_CLASS_PATH.'class/mail/emailmessage.class.php');
-lt_include(PLOG_CLASS_PATH.'class/locale/locales.class.php');
-lt_include(PLOG_CLASS_PATH.'class/template/templateservice.class.php');
+
+
+
define( "CONFIRM_MAIL_TEMPLATE", "email_confirm" );
/**
Modified: plog/branches/lifetype-2.0-autoload/class/summary/mail/summarymailer.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/summary/mail/summarymailer.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/summary/mail/summarymailer.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -10,10 +10,10 @@
*/
function sendConfirmationEmail( $userName )
{
- lt_include( PLOG_CLASS_PATH."class/summary/mail/confirmemailmessage.class.php" );
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
- lt_include( PLOG_CLASS_PATH."class/mail/emailservice.class.php" );
- lt_include( PLOG_CLASS_PATH."class/locale/locales.class.php" );
+
+
+
+
$activeCode = SummaryMailer::generateActiveCode();
Modified: plog/branches/lifetype-2.0-autoload/class/summary/net/summaryrequestgenerator.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/summary/net/summaryrequestgenerator.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/summary/net/summaryrequestgenerator.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?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-2.0-autoload/class/summary/view/blogtemplatechooserview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/summary/view/blogtemplatechooserview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/summary/view/blogtemplatechooserview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/summary/view/summaryview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/templatesets/templatesets.class.php" );
+
+
/**
* shows the final view of the registration process where users get to choose
* a template set for their blog
Modified: plog/branches/lifetype-2.0-autoload/class/summary/view/doblogregistrationview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/summary/view/doblogregistrationview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/summary/view/doblogregistrationview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,10 +1,10 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/summary/view/summaryview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/locale/locales.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/blogcategories.class.php" );
- lt_include( PLOG_CLASS_PATH."class/net/http/subdomains.class.php" );
+
+
+
+
/**
* shows a list with all the locales so that users can choose, too
*/
Modified: plog/branches/lifetype-2.0-autoload/class/summary/view/summarybloglistview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/summary/view/summarybloglistview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/summary/view/summarybloglistview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,12 +1,12 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/summary/view/summarycachedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/pager/pager.class.php" );
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
- lt_include( PLOG_CLASS_PATH."class/summary/dao/summarystats.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/blogcategories.class.php" );
+
+
+
+
+
+
/**
* shows a paged list of blogs
*/
Modified: plog/branches/lifetype-2.0-autoload/class/summary/view/summarycachedview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/summary/view/summarycachedview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/summary/view/summarycachedview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/view.class.php" );
+
/**
* This class should extended SmartyView but SmartyView was designed to work with BlogInfo
@@ -27,13 +27,13 @@
function generateTemplate()
{
- lt_include( PLOG_CLASS_PATH."class/template/templateservice.class.php" );
+
$templateService = new TemplateService();
$this->_template = $templateService->customTemplate( $this->_templateName, "summary", true );
// set the summary custom time
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
+
$config =& Config::getConfig();
// set the summary cache lifetime, or zero if none
$summaryTemplateLifetime = $config->getValue( "summary_template_cache_lifetime", 0 );
@@ -86,7 +86,7 @@
function sendUncachedOutput()
{
- lt_include( PLOG_CLASS_PATH."class/xml/rssparser/rssparser.class.php" );
+
$config =& Config::getConfig();
$baseurl = $config->getValue( "base_url" );
@@ -98,7 +98,7 @@
$this->_params->setValue( "baseurl", $baseurl);
$this->_params->setValue( "serviceName", $config->getValue( "summary_service_name" ));
- lt_include( PLOG_CLASS_PATH."class/summary/net/summaryrequestgenerator.class.php" );
+
$this->_params->setValue( "url", new SummaryRequestGenerator());
$this->_template->assign( $this->_params->getAsArray());
@@ -123,8 +123,8 @@
function render()
{
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
- lt_include( PLOG_CLASS_PATH."class/locale/locales.class.php" );
+
+
// set the view character set based on the default locale
$this->_getLocale();
@@ -135,7 +135,7 @@
// check if support for conditional HTTP requests is enabled
$config =& Config::getConfig();
if( $config->getValue( "template_http_cache_enabled" )) {
- lt_include( PLOG_CLASS_PATH."class/net/http/httpcache.class.php" );
+
// some debug information
$timestamp = $this->_template->getCreationTimestamp();
// and now send the correct headers
Modified: plog/branches/lifetype-2.0-autoload/class/summary/view/summarymessageview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/summary/view/summarymessageview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/summary/view/summarymessageview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/summary/view/summaryview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/locale/locales.class.php" );
+
+
/**
* shows a feedback (or error) message
Modified: plog/branches/lifetype-2.0-autoload/class/summary/view/summarypostlistview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/summary/view/summarypostlistview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/summary/view/summarypostlistview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,12 +1,12 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/summary/view/summarycachedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/articles.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/globalarticlecategories.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/pager/pager.class.php" );
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
- lt_include( PLOG_CLASS_PATH."class/summary/dao/summarystats.class.php" );
+
+
+
+
+
+
/**
* shows a paged list of blogs
*/
Modified: plog/branches/lifetype-2.0-autoload/class/summary/view/summaryrssview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/summary/view/summaryrssview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/summary/view/summaryrssview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,9 +1,9 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/summary/view/summarycachedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/templateservice.class.php" );
- lt_include( PLOG_CLASS_PATH."class/locale/locales.class.php" );
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
+
+
+
+
class SummaryRssView extends SummaryCachedView
{
@@ -37,7 +37,7 @@
$this->_template->compile_dir = $templateTmpFolder;
// set the summary custom time
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
+
$config =& Config::getConfig();
// set the summary cache lifetime, or zero if none
$summaryTemplateLifetime = $config->getValue( "summary_template_cache_lifetime", 0 );
Modified: plog/branches/lifetype-2.0-autoload/class/summary/view/summaryusercreationview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/summary/view/summaryusercreationview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/summary/view/summaryusercreationview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,5 +1,5 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
+
class SummaryUserCreationView extends SummaryView
{
@@ -14,7 +14,7 @@
// check whether we should also display one of those authentication images
if( $config->getValue( "use_captcha_auth" )) {
// generate a file with the captcha class
- lt_include( PLOG_CLASS_PATH."class/data/captcha/captcha.class.php" );
+
$captcha = new Captcha();
$captchaFile = $captcha->generate();
// and then build a full url based on it...
Modified: plog/branches/lifetype-2.0-autoload/class/summary/view/summaryuserlistview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/summary/view/summaryuserlistview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/summary/view/summaryuserlistview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/summary/view/summarycachedview.class.php" );
+
/**
* shows a paged list of users
*/
@@ -26,10 +26,10 @@
return true;
}
- lt_include( PLOG_CLASS_PATH."class/summary/dao/summarystats.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/users.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/pager/pager.class.php" );
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
+
+
+
+
// items per page
$config =& Config::getConfig();
Modified: plog/branches/lifetype-2.0-autoload/class/summary/view/summaryview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/summary/view/summaryview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/summary/view/summaryview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,9 +1,9 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/view.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/templateservice.class.php" );
- lt_include( PLOG_CLASS_PATH."class/locale/locales.class.php" );
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
+
+
+
+
class SummaryView extends View
{
@@ -53,7 +53,7 @@
$this->_params->setValue( "locale", $this->_locale );
$this->_params->setValue( "baseurl", $baseurl);
$this->_params->setValue( "serviceName", $config->getValue( "summary_service_name" ));
- lt_include( PLOG_CLASS_PATH."class/summary/net/summaryrequestgenerator.class.php" );
+
$this->_params->setValue( "url", new SummaryRequestGenerator());
$template->assign( $this->_params->getAsArray());
Modified: plog/branches/lifetype-2.0-autoload/class/summary/view/summaryxmlview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/summary/view/summaryxmlview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/summary/view/summaryxmlview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/summary/view/summaryview.class.php" );
+
/**
* \ingroup View
* @private
Modified: plog/branches/lifetype-2.0-autoload/class/template/cachecontrol.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/template/cachecontrol.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/template/cachecontrol.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -18,7 +18,7 @@
function resetAllCaches()
{
// get a list of all the blogs
- lt_include( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
+
$blogs = new Blogs();
$siteBlogs = $blogs->getAllBlogIds();
@@ -54,7 +54,7 @@
return true;
// if not then continue...
- lt_include( PLOG_CLASS_PATH."class/template/cachedtemplate.class.php" );
+
$t = new CachedTemplate( null );
$tmpFolder = $config->getValue( "temp_folder" );
$summaryTmpFolder = $tmpFolder."/summary";
Modified: plog/branches/lifetype-2.0-autoload/class/template/cachedtemplate.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/template/cachedtemplate.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/template/cachedtemplate.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/template/template.class.php" );
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
+
+
/**
* \ingroup Template
*
Modified: plog/branches/lifetype-2.0-autoload/class/template/editor/templatetools.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/template/editor/templatetools.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/template/editor/templatetools.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -4,8 +4,8 @@
{
static function isValidExtension( $name )
{
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/filenamematchvalidator.class.php" );
+
+
$config =& Config::getConfig();
$allowedExtensions = $config->getValue( "template_editor_editable_extensions" );
@@ -32,10 +32,10 @@
static function getTemplateFiles( $template, $path = "", $blogId = 0 )
{
- lt_include( PLOG_CLASS_PATH."class/file/file.class.php" );
- lt_include( PLOG_CLASS_PATH."class/misc/glob.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/templatesets/templatesetstorage.class.php" );
+
+
+
$folder = TemplateSetStorage::getTemplateFolder( $template, $blogId ) . $path;
$templateFiles = Array();
@@ -85,7 +85,7 @@
static function isValidTemplatePath( $template, $path = "", $blogId = 0 )
{
- lt_include( PLOG_CLASS_PATH."class/template/templatesets/templatesetstorage.class.php" );
+
$templatePath = TemplateSetStorage::getTemplateFolder( $template, $blogId ) . $path;
return( File::isDir( $templatePath ));
@@ -96,7 +96,7 @@
if( !TemplateTools::isValidTemplatePath( $template, $path, $blogId ))
return( false );
- lt_include( PLOG_CLASS_PATH."class/template/templatesets/templatesetstorage.class.php" );
+
$filePath = TemplateSetStorage::getTemplateFolder( $template, $blogId ) . $path . "/" . $file;
return( File::isReadable( $filePath ));
@@ -133,7 +133,7 @@
*/
static function getTemplateNameFilter()
{
- lt_include( PLOG_CLASS_PATH."class/data/filter/regexpfilter.class.php" );
+
return( new RegexpFilter( "/[^A-Za-z0-9_\-]/" ));
}
@@ -147,7 +147,7 @@
*/
static function getTemplatePathFilter()
{
- lt_include( PLOG_CLASS_PATH."class/data/filter/regexpfilter.class.php" );
+
return( new RegexpFilter( "/[^A-Za-z0-9_\/\-]/" ));
}
@@ -161,7 +161,7 @@
*/
static function getTemplateFileNameFilter()
{
- lt_include( PLOG_CLASS_PATH."class/data/filter/regexpfilter.class.php" );
+
return( new RegexpFilter( "/[^A-Za-z0-9_\/\-\.]/" ));
}
}
Modified: plog/branches/lifetype-2.0-autoload/class/template/menu/menu.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/template/menu/menu.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/template/menu/menu.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/xml/tree/Tree.php" );
- lt_include( PLOG_CLASS_PATH."class/template/menu/menuentry.class.php" );
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/xml/tree/Tree.php" );
define( "DEFAULT_MENU_FILE", "/admin/menus.xml" );
Modified: plog/branches/lifetype-2.0-autoload/class/template/menu/menuentry.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/template/menu/menuentry.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/template/menu/menuentry.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/xml/tree/Node.php" );
+
/**
* \ingroup Template
Modified: plog/branches/lifetype-2.0-autoload/class/template/menu/menurenderer.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/template/menu/menurenderer.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/template/menu/menurenderer.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,12 +1,12 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/locale/locales.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/templateservice.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/menu/menu.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/menu/menuentry.class.php" );
- lt_include( PLOG_CLASS_PATH."class/locale/locales.class.php" );
+
+
+
+
+
/**
* \ingroup Template
*
Modified: plog/branches/lifetype-2.0-autoload/class/template/smarty/plugins/function.adminpager.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/template/smarty/plugins/function.adminpager.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/template/smarty/plugins/function.adminpager.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -5,7 +5,7 @@
*/
function smarty_function_adminpager($params, &$smarty)
{
- 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-2.0-autoload/class/template/smarty/plugins/function.adminpagerajax.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/template/smarty/plugins/function.adminpagerajax.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/template/smarty/plugins/function.adminpagerajax.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -5,7 +5,7 @@
*/
function smarty_function_adminpagerajax($params, &$smarty)
{
- 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-2.0-autoload/class/template/smarty/plugins/function.location_chooser.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/template/smarty/plugins/function.location_chooser.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/template/smarty/plugins/function.location_chooser.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -21,7 +21,7 @@
}
else {
// load the locations if none is available
- lt_include( PLOG_CLASS_PATH."class/dao/locations.class.php" );
+
$locations = new Locations();
if( isset( $params["blogId"] ))
$blogId = $params["blogId"];
@@ -42,7 +42,7 @@
$locale = $blog->getLocale();
}
else {
- lt_include( PLOG_CLASS_PATH."class/locale/locales.class.php" );
+
$locale =& Locales::getLocale();
}
Modified: plog/branches/lifetype-2.0-autoload/class/template/smarty/plugins/function.pager.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/template/smarty/plugins/function.pager.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/template/smarty/plugins/function.pager.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -48,7 +48,7 @@
$locale = $smarty->_tpl_vars["locale"];
}
else {
- 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 {
- lt_include( PLOG_CLASS_PATH."class/locale/locales.class.php" );
+
$locale =& Locales::getLocale();
}
$prevText = "«".$locale->tr( "previous_post" );
Modified: plog/branches/lifetype-2.0-autoload/class/template/smarty/plugins/modifier.round.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/template/smarty/plugins/modifier.round.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/template/smarty/plugins/modifier.round.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -9,7 +9,7 @@
{
// load the default locale if none provided
if( $locale == null ) {
- lt_include( PLOG_CLASS_PATH."class/locale/locales.class.php" );
+
$locale =& Locales::getLocale();
}
Modified: plog/branches/lifetype-2.0-autoload/class/template/smarty/plugins/modifier.utf8_truncate.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/template/smarty/plugins/modifier.utf8_truncate.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/template/smarty/plugins/modifier.utf8_truncate.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
-lt_include(PLOG_CLASS_PATH.'class/data/utf8/utf8_funcs.php');
+
/**
* Smarty truncate modifier plugin
*
Modified: plog/branches/lifetype-2.0-autoload/class/template/template.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/template/template.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/template/template.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -16,9 +16,9 @@
* @see MenuRenderer
*/
- lt_include( PLOG_CLASS_PATH.'class/template/smarty/Smarty.class.php' );
- lt_include( PLOG_CLASS_PATH.'class/config/config.class.php' );
- lt_include( PLOG_CLASS_PATH.'class/file/file.class.php' );
+
+
+
// template load order constants
define( "TEMPLATE_LOAD_ORDER_DEFAULT_FIRST", 1 );
Modified: plog/branches/lifetype-2.0-autoload/class/template/templatesandbox.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/template/templatesandbox.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/template/templatesandbox.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH.'class/config/config.class.php' );
- lt_include( PLOG_CLASS_PATH.'class/data/validator/templatesetvalidator.class.php' );
+
+
define( 'TEMPLATE_SANDBOX_ERROR_UNPACKING', -100 );
define( 'TEMPLATE_SANDBOX_ERROR_FORBIDDEN_EXTENSIONS', -101 );
@@ -46,7 +46,7 @@
return true;
// otherwise, turn the thing into an array and go through all of them
- lt_include( PLOG_CLASS_PATH.'class/misc/glob.class.php' );
+
foreach( explode( " ", $forbiddenFilesStr ) as $file ) {
$files = Glob::myGlob( $folder, $file );
if( count($files) > 0 )
Modified: plog/branches/lifetype-2.0-autoload/class/template/templateservice.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/template/templateservice.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/template/templateservice.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH.'class/config/config.class.php' );
- lt_include( PLOG_CLASS_PATH.'class/file/file.class.php' );
+
+
/**
* default permissions used to create temporary template folders. Seems like
@@ -65,7 +65,7 @@
*/
function Template( $templateName, $layout, $blogInfo = null )
{
- lt_include( PLOG_CLASS_PATH . 'class/template/template.class.php' );
+
// get some information about the folder where the template is and the template file
$templateInfo = $this->_getTemplateFileInfo( $templateName, $layout, $blogInfo );
@@ -102,7 +102,7 @@
*/
function customTemplate( $templateName, $layout, $cached = false )
{
- lt_include( PLOG_CLASS_PATH.'class/template/cachedtemplate.class.php' );
+
// get a nice Template object
$config =& Config::getConfig();
@@ -139,7 +139,7 @@
*/
function AdminTemplate( $templateName, $blogInfo = null )
{
- lt_include( PLOG_CLASS_PATH.'class/template/templatesets/templatesetstorage.class.php' );
+
$t = $this->Template( $templateName, 'admin', $blogInfo );
$t->assign( 'admintemplatepath', TemplateSetStorage::getAdminTemplateFolder());
@@ -163,7 +163,7 @@
*/
function CachedTemplate( $templateName, $layout, $blogInfo = null )
{
- lt_include( PLOG_CLASS_PATH.'class/template/cachedtemplate.class.php' );
+
// get some information about the folder where the template is and the template file
$templateInfo = $this->_getTemplateFileInfo( $templateName, $layout, $blogInfo );
@@ -194,7 +194,7 @@
*/
function _getTemplateFileInfo( $templateName, $layout, $blogInfo )
{
- lt_include( PLOG_CLASS_PATH.'class/template/templatesets/templatesetstorage.class.php' );
+
// build the file name
if( $blogInfo == null ) {
@@ -241,8 +241,8 @@
*/
function PluginTemplate( $pluginId, $templateName, $blogInfo = null )
{
- 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
$templateFolder = TemplateSetStorage::getPluginTemplateFolder( $pluginId );
@@ -275,7 +275,7 @@
*/
function PluginCachedTemplate( $pluginId, $templateName, $blogInfo = null )
{
- lt_include( PLOG_CLASS_PATH.'class/template/cachedtemplate.class.php' );
+
// define the template file name
$templateFolder = TemplateSetStorage::getPluginTemplateFolder( $pluginId );
Modified: plog/branches/lifetype-2.0-autoload/class/template/templatesets/templatefinder.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/template/templatesets/templatefinder.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/template/templatesets/templatefinder.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,9 +1,9 @@
<?php
- lt_include( PLOG_CLASS_PATH.'class/file/finder/filefinder.class.php' );
- lt_include( PLOG_CLASS_PATH.'class/template/templatesets/templatesetstorage.class.php' );
- lt_include( PLOG_CLASS_PATH.'class/template/templatesets/templatesets.class.php' );
+
+
+
/**
* \ingroup Template
*
Modified: plog/branches/lifetype-2.0-autoload/class/template/templatesets/templateset.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/template/templatesets/templateset.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/template/templatesets/templateset.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/file/file.class.php" );
+
define( "TEMPLATE_SET_GLOBAL", 1 );
define( "TEMPLATE_SET_BLOG_SPECIFIC", 2 );
Modified: plog/branches/lifetype-2.0-autoload/class/template/templatesets/templatesets.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/template/templatesets/templatesets.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/template/templatesets/templatesets.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,9 +1,9 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/template/templatesets/templateset.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/templatesets/templatesetstorage.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/templateservice.class.php" );
+
+
+
/**
* \ingroup Template
@@ -103,7 +103,7 @@
*/
static function getBlogTemplates( $blogId )
{
- lt_include( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
+
$blogs = new Blogs();
$blogInfo = $blogs->getBlogInfo( $blogId );
$blogSettings = $blogInfo->getSettings();
@@ -187,7 +187,7 @@
*/
static function isBlogTemplate( $templateName, $blogId )
{
- lt_include( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
+
$blogs = new Blogs();
$blog = $blogs->getBlogInfo( $blogId );
$blogSettings = $blog->getSettings( $blogId );
Modified: plog/branches/lifetype-2.0-autoload/class/template/templatesets/templatesetstorage.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/template/templatesets/templatesetstorage.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/template/templatesets/templatesetstorage.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,10 +1,10 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
- lt_include( PLOG_CLASS_PATH."class/misc/glob.class.php" );
- lt_include( PLOG_CLASS_PATH."class/file/file.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/templatesets/templatesets.class.php" );
+
+
+
+
define( "BLOG_BASE_TEMPLATE_FOLDER", "blog_" );
Modified: plog/branches/lifetype-2.0-autoload/class/test/PHPUnit/GUI/Gtk.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/test/PHPUnit/GUI/Gtk.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/test/PHPUnit/GUI/Gtk.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -47,7 +47,7 @@
*/
if (!function_exists('is_a')) {
- lt_include('PHP/Compat/Function/is_a.php');
+
}
/**
@@ -522,7 +522,7 @@
if (is_a($file, 'PHPUnit_TestSuite')) {
return $file;
} elseif (class_exists($file)) {
- lt_include('PHPUnit/TestSuite.php');
+
return new PHPUnit_TestSuite($file);
}
@@ -537,11 +537,11 @@
// Instantiate the class.
// If the path is /path/to/test/TestClass.php
// the class name should be test_TestClass
- lt_include($file);
+
$className = str_replace(DIRECTORY_SEPARATOR, '_', $file);
$className = substr($className, 0, strpos($className, '.'));
- lt_include('PHPUnit/TestSuite.php');
+
return new PHPUnit_TestSuite($className);
}
Modified: plog/branches/lifetype-2.0-autoload/class/test/PHPUnit/GUI/SetupDecorator.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/test/PHPUnit/GUI/SetupDecorator.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/test/PHPUnit/GUI/SetupDecorator.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -126,7 +126,7 @@
asort($files);
foreach ($files as $className => $aFile) {
- lt_include($aFile);
+
if (class_exists($className)) {
$suites[] =& new PHPUnit_TestSuite($className);
Modified: plog/branches/lifetype-2.0-autoload/class/test/PHPUnit/RepeatedTest.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/test/PHPUnit/RepeatedTest.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/test/PHPUnit/RepeatedTest.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -46,8 +46,8 @@
* @since File available since Release 1.0.0
*/
-lt_include(PHPUNIT_CLASS_PATH.'PHPUnit/TestDecorator.php');
+
/**
* A Decorator that runs a test repeatedly.
*
Modified: plog/branches/lifetype-2.0-autoload/class/test/PHPUnit/Skeleton.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/test/PHPUnit/Skeleton.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/test/PHPUnit/Skeleton.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -178,10 +178,10 @@
function createTestClass() {
// Instantiate the object.
if (isset($this->configFile)) {
- lt_include($this->configFile);
+
}
- lt_include($this->classPath);
+
// Get the methods.
$classMethods = get_class_methods($this->className);
@@ -247,7 +247,7 @@
" */\n";
// Add the require statements.
- $this->testClass .= "lt_include('PHPUnit.php');\n";
+ $this->testClass .= "
// Add the class definition and variable definition.
$this->testClass .=
@@ -299,11 +299,11 @@
if (isset($this->configFile)) {
$this->testClass .=
- " lt_include('" . $this->configFile . ")';\n";
+ "
}
$this->testClass .=
- " lt_include('" . $this->classPath . ")';\n" .
+ " \n" .
" \$this->" . $this->className . " =& new " . $this->className . "(PARAM);\n" .
" }\n\n";
Modified: plog/branches/lifetype-2.0-autoload/class/test/PHPUnit/TestCase.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/test/PHPUnit/TestCase.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/test/PHPUnit/TestCase.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -46,10 +46,10 @@
* @since File available since Release 1.0.0
*/
-lt_include(PHPUNIT_CLASS_PATH.'PHPUnit/Assert.php');
-lt_include(PHPUNIT_CLASS_PATH.'PHPUnit/TestResult.php');
-//lt_include( PLOG_CLASS_PATH."class/test/helpers/lifetypeassert.class.php" );
+
+//
+
/**
* A TestCase defines the fixture to run multiple tests.
*
Modified: plog/branches/lifetype-2.0-autoload/class/test/PHPUnit/TestDecorator.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/test/PHPUnit/TestDecorator.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/test/PHPUnit/TestDecorator.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -46,11 +46,11 @@
* @since File available since Release 1.0.0
*/
-lt_include(PHPUNIT_CLASS_PATH.'PHPUnit/TestCase.php');
-lt_include(PHPUNIT_CLASS_PATH.'PHPUnit/TestSuite.php');
+
+
if (!function_exists('is_a')) {
- lt_include('PHP/Compat/Function/is_a.php');
+
}
/**
Modified: plog/branches/lifetype-2.0-autoload/class/test/PHPUnit/TestResult.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/test/PHPUnit/TestResult.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/test/PHPUnit/TestResult.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -46,11 +46,11 @@
* @since File available since Release 1.0.0
*/
-lt_include(PHPUNIT_CLASS_PATH.'PHPUnit/TestFailure.php');
-lt_include(PHPUNIT_CLASS_PATH.'PHPUnit/TestListener.php');
+
+
if (!function_exists('is_a')) {
- lt_include('PHP/Compat/Function/is_a.php');
+
}
/**
Modified: plog/branches/lifetype-2.0-autoload/class/test/PHPUnit/TestSuite.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/test/PHPUnit/TestSuite.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/test/PHPUnit/TestSuite.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -46,8 +46,8 @@
* @since File available since Release 1.0.0
*/
-lt_include(PHPUNIT_CLASS_PATH.'PHPUnit/TestCase.php');
+
/**
* A TestSuite is a Composite of Tests. It runs a collection of test cases.
*
Modified: plog/branches/lifetype-2.0-autoload/class/test/PHPUnit.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/test/PHPUnit.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/test/PHPUnit.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -48,10 +48,10 @@
define( "PHPUNIT_CLASS_PATH", PLOG_CLASS_PATH."class/test/" );
-lt_include(PHPUNIT_CLASS_PATH.'PHPUnit/TestCase.php');
-lt_include(PHPUNIT_CLASS_PATH.'PHPUnit/TestResult.php');
-lt_include(PHPUNIT_CLASS_PATH.'PHPUnit/TestSuite.php');
+
+
+
/**
* PHPUnit runs a TestSuite and returns a TestResult object.
*
Modified: plog/branches/lifetype-2.0-autoload/class/test/helpers/consolereporter.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/test/helpers/consolereporter.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/test/helpers/consolereporter.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?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-2.0-autoload/class/test/helpers/htmlreporter.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/test/helpers/htmlreporter.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/test/helpers/htmlreporter.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/test/PHPUnit/TestResult.php" );
+
/**
* \ingroup Test
Modified: plog/branches/lifetype-2.0-autoload/class/test/helpers/lifetypetestcase.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/test/helpers/lifetypetestcase.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/test/helpers/lifetypetestcase.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,9 +1,9 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/test/PHPUnit/TestCase.php");
- lt_include( PLOG_CLASS_PATH."class/test/helpers/uiscriptrunner.class.php");
- lt_include( PLOG_CLASS_PATH."class/net/http/httpclient.class.php" );
+
+
+
/**
* \ingroup Test
*
Modified: plog/branches/lifetype-2.0-autoload/class/test/helpers/testtools.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/test/helpers/testtools.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/test/helpers/testtools.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,13 +1,13 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/bloginfo.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/articles.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/article.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/articlecategories.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/articlecategory.class.php" );
+
+
+
+
+
+
+
+
/**
* \ingroup Test
Modified: plog/branches/lifetype-2.0-autoload/class/test/helpers/uiscriptrunner.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/test/helpers/uiscriptrunner.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/test/helpers/uiscriptrunner.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/net/http/httpclient.class.php" );
+
/**
* \ingroup Test
Modified: plog/branches/lifetype-2.0-autoload/class/test/testrunner.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/test/testrunner.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/test/testrunner.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -13,10 +13,10 @@
* is not included in final releases as it is only meaningful for developers)
*/
- lt_include( PLOG_CLASS_PATH."class/misc/glob.class.php" );
- lt_include( PLOG_CLASS_PATH."class/file/file.class.php" );
- lt_include( PLOG_CLASS_PATH."class/test/PHPUnit.php" );
+
+
+
/**
* base folder where all test cases are located
*/
@@ -116,7 +116,7 @@
if( in_array( "all", $suite ) || in_array( $className, $suite ) || in_array( str_replace( "_test", "", $className ), $suite )) {
// add the current suite only if we're either loading them all or if
// the current one is the one we want to load
- lt_include( $file );
+
// and create an instance of it
$this->suite->addTestSuite( $className );
}
@@ -146,7 +146,7 @@
//$suites[] = str_replace( "_test.class.php", "", basename( $file ));
// load the class file and create a new instance
- lt_include( $file );
+
$className = str_replace( ".class.php", "", basename( $file ));
$instance = new $className();
Modified: plog/branches/lifetype-2.0-autoload/class/test/tests/config/configdbstorage_test.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/test/tests/config/configdbstorage_test.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/test/tests/config/configdbstorage_test.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/test/helpers/lifetypetestcase.class.php" );
- lt_include( PLOG_CLASS_PATH."class/config/configdbstorage.class.php" );
+
+
/**
* \ingroup Test
Modified: plog/branches/lifetype-2.0-autoload/class/test/tests/config/configfilestorage_test.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/test/tests/config/configfilestorage_test.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/test/tests/config/configfilestorage_test.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/test/helpers/lifetypetestcase.class.php" );
- lt_include( PLOG_CLASS_PATH."class/config/configfilestorage.class.php" );
+
+
/**
* \ingroup Test
@@ -18,9 +18,9 @@
*/
function setUp()
{
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
+
$config =& Config::getConfig();
$tmpFolder = $config->getValue( "temp_folder" );
@@ -53,7 +53,7 @@
*/
function tearDown()
{
- lt_include( PLOG_CLASS_PATH."class/file/file.class.php" );
+
File::delete( $this->file1 );
}
@@ -62,7 +62,7 @@
*/
function createFile( $file, $data )
{
- lt_include( PLOG_CLASS_PATH."class/file/file.class.php" );
+
$file = new File( $file );
$writable = $file->open( 'w' );
if ($writable) {
@@ -122,7 +122,7 @@
*/
function testSaveValue()
{
- lt_include( PLOG_CLASS_PATH."class/file/file.class.php" );
+
// open and load the file
$cf = new ConfigFileStorage( Array( "file" => $this->file1 ));
Modified: plog/branches/lifetype-2.0-autoload/class/test/tests/config/properties_test.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/test/tests/config/properties_test.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/test/tests/config/properties_test.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/test/helpers/lifetypetestcase.class.php" );
- lt_include( PLOG_CLASS_PATH."class/config/properties.class.php" );
+
+
/**
* \ingroup Test
@@ -28,7 +28,7 @@
$this->assertEquals( "<b>this</b> has some <h1>HTML</h1> in it!", $this->p->getValue( "test" ));
// when using a filter class, the value should be returned filtered
- lt_include( PLOG_CLASS_PATH."class/data/filter/htmlfilter.class.php" );
+
$this->assertEquals( "this has some HTML in it!", $this->p->getValue( "test", null, new HtmlFilter()));
}
Modified: plog/branches/lifetype-2.0-autoload/class/test/tests/dao/article_test.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/test/tests/dao/article_test.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/test/tests/dao/article_test.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,9 +1,9 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/test/helpers/lifetypetestcase.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/article.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/articlecomments.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/usercomment.class.php" );
+
+
+
+
/**
* \ingroup Test
Modified: plog/branches/lifetype-2.0-autoload/class/test/tests/dao/articlecategories_test.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/test/tests/dao/articlecategories_test.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/test/tests/dao/articlecategories_test.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,9 +1,9 @@
<?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
@@ -37,7 +37,7 @@
"articles_categories SET num_published_articles = 234234, num_articles = 2342 ".
"WHERE id = ".$data["categories"][1]->getId());
// trigger a cache reset
- $articleCategories->_cache->removeData( $data["categories"][1]->getId(), CACHE_ARTICLE_CATEGORIES );
+ $articleCategories->_cache->removeData( $data["categories"][1]->getId(), DaoCacheConstants::CACHE_ARTICLE_CATEGORIES );
// update the category, relaod it and check that the counters are correct again
$tmp = $data["categories"][1];
$articleCategories->updateCategory( $tmp );
Modified: plog/branches/lifetype-2.0-autoload/class/test/tests/dao/bloginfo_test.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/test/tests/dao/bloginfo_test.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/test/tests/dao/bloginfo_test.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,9 +1,9 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/test/helpers/lifetypetestcase.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/data/timestamp.class.php" );
+
+
+
+
/**
* \ingroup Test
@@ -37,7 +37,7 @@
*/
function testSetBlogNoHtmlAllowed()
{
- lt_include( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
+
$blogNameHtml = "<h1>This is</h1>some <script type=\"text/javascript\">window.alert('hello!');</script>HTML!";
$blog = new BlogInfo( "blah", 1, "blah blah", new BlogSettings());
Modified: plog/branches/lifetype-2.0-autoload/class/test/tests/dao/blogs_test.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/test/tests/dao/blogs_test.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/test/tests/dao/blogs_test.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/test/helpers/lifetypetestcase.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/bloginfo.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
+
+
+
/**
* \ingroup Test
Modified: plog/branches/lifetype-2.0-autoload/class/test/tests/dao/commentscommon_test.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/test/tests/dao/commentscommon_test.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/test/tests/dao/commentscommon_test.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,19 +1,19 @@
<?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-2.0-autoload/class/test/tests/dao/permissions_test.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/test/tests/dao/permissions_test.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/test/tests/dao/permissions_test.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/test/helpers/lifetypetestcase.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/permission.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/permissions.class.php" );
+
+
+
/**
* \ingroup Test
Modified: plog/branches/lifetype-2.0-autoload/class/test/tests/dao/searchengine_test.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/test/tests/dao/searchengine_test.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/test/tests/dao/searchengine_test.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?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/searchengine.class.php" );
+
+
+
/**
* \ingroup Test
Modified: plog/branches/lifetype-2.0-autoload/class/test/tests/dao/trackbackclient_test.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/test/tests/dao/trackbackclient_test.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/test/tests/dao/trackbackclient_test.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/test/helpers/lifetypetestcase.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/trackbackclient.class.php" );
+
+
/**
* \ingroup Test
Modified: plog/branches/lifetype-2.0-autoload/class/test/tests/dao/userinfo_test.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/test/tests/dao/userinfo_test.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/test/tests/dao/userinfo_test.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,9 +1,9 @@
<?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-2.0-autoload/class/test/tests/data/filter/filterbase_test.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/test/tests/data/filter/filterbase_test.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/test/tests/data/filter/filterbase_test.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/test/helpers/lifetypetestcase.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/filter/filterbase.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/filter/htmlfilter.class.php" );
+
+
+
/**
* \ingroup Test
Modified: plog/branches/lifetype-2.0-autoload/class/test/tests/data/filter/htmlfilter_test.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/test/tests/data/filter/htmlfilter_test.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/test/tests/data/filter/htmlfilter_test.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/test/helpers/lifetypetestcase.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/filter/htmlfilter.class.php" );
+
+
/**
* \ingroup Test
Modified: plog/branches/lifetype-2.0-autoload/class/test/tests/data/filter/regexpfilter_test.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/test/tests/data/filter/regexpfilter_test.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/test/tests/data/filter/regexpfilter_test.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/test/helpers/lifetypetestcase.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/filter/regexpfilter.class.php" );
+
+
/**
* \ingroup Test
Modified: plog/branches/lifetype-2.0-autoload/class/test/tests/data/textfilter_test.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/test/tests/data/textfilter_test.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/test/tests/data/textfilter_test.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/test/helpers/lifetypetestcase.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
+
+
+
/**
* \ingroup Test
Modified: plog/branches/lifetype-2.0-autoload/class/test/tests/data/validator/arrayvalidator_test.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/test/tests/data/validator/arrayvalidator_test.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/test/tests/data/validator/arrayvalidator_test.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/test/helpers/lifetypetestcase.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/arrayvalidator.class.php" );
+
+
/**
* \ingroup Test
@@ -32,9 +32,9 @@
*/
function testElementValidator()
{
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/emailvalidator.class.php" );
+
+
// valid array with integers
$intArrayValid = Array( 1, 2, 6, 10, 44 );
$v = new ArrayValidator( new IntegerValidator());
Modified: plog/branches/lifetype-2.0-autoload/class/test/tests/data/validator/blognamevalidator_test.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/test/tests/data/validator/blognamevalidator_test.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/test/tests/data/validator/blognamevalidator_test.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/test/helpers/lifetypetestcase.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/blognamevalidator.class.php" );
+
+
/**
* \ingroup Test
@@ -30,7 +30,7 @@
function testForbiddenBlognameRegexps()
{
// get the list of forbidden words, based on our configuration settings
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
+
$config =& Config::getConfig();
// blog names starting with 'a' and ending with 'b'
Modified: plog/branches/lifetype-2.0-autoload/class/test/tests/data/validator/emailvalidator_test.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/test/tests/data/validator/emailvalidator_test.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/test/tests/data/validator/emailvalidator_test.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/test/helpers/lifetypetestcase.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/emailvalidator.class.php" );
+
+
/**
* \ingroup Test
Modified: plog/branches/lifetype-2.0-autoload/class/test/tests/data/validator/filenamematchvalidator_test.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/test/tests/data/validator/filenamematchvalidator_test.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/test/tests/data/validator/filenamematchvalidator_test.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/test/helpers/lifetypetestcase.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/filenamematchvalidator.class.php" );
+
+
/**
* \ingroup Test
Modified: plog/branches/lifetype-2.0-autoload/class/test/tests/data/validator/httpurlvalidator_test.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/test/tests/data/validator/httpurlvalidator_test.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/test/tests/data/validator/httpurlvalidator_test.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/test/helpers/lifetypetestcase.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/httpurlvalidator.class.php" );
+
+
/**
* \ingroup Test
Modified: plog/branches/lifetype-2.0-autoload/class/test/tests/data/validator/integervalidator_test.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/test/tests/data/validator/integervalidator_test.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/test/tests/data/validator/integervalidator_test.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/test/helpers/lifetypetestcase.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
+
+
/**
* \ingroup Test
Modified: plog/branches/lifetype-2.0-autoload/class/test/tests/data/validator/rules/ipformatrule_test.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/test/tests/data/validator/rules/ipformatrule_test.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/test/tests/data/validator/rules/ipformatrule_test.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/test/helpers/lifetypetestcase.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/rules/ipformatrule.class.php" );
+
+
/**
* \ingroup Test
Modified: plog/branches/lifetype-2.0-autoload/class/test/tests/data/validator/rules/stringrangerule_test.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/test/tests/data/validator/rules/stringrangerule_test.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/test/tests/data/validator/rules/stringrangerule_test.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/test/helpers/lifetypetestcase.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/rules/stringrangerule.class.php" );
+
+
/**
* \ingroup Test
Modified: plog/branches/lifetype-2.0-autoload/class/test/tests/data/validator/usernamevalidator_test.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/test/tests/data/validator/usernamevalidator_test.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/test/tests/data/validator/usernamevalidator_test.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/test/helpers/lifetypetestcase.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/usernamevalidator.class.php" );
+
+
/**
* \ingroup Test
@@ -38,7 +38,7 @@
function testForbiddenUsername()
{
// get the list of forbidden words, based on our configuration settings
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
+
$config =& Config::getConfig();
$forbiddenUsernames = $config->getValue( "forbidden_usernames" );
Modified: plog/branches/lifetype-2.0-autoload/class/test/tests/extra/sqlinjection_test.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/test/tests/extra/sqlinjection_test.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/test/tests/extra/sqlinjection_test.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/test/helpers/lifetypetestcase.class.php" );
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
+
+
/**
* \ingroup Test
Modified: plog/branches/lifetype-2.0-autoload/class/test/tests/file/file_test.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/test/tests/file/file_test.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/test/tests/file/file_test.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/test/helpers/lifetypetestcase.class.php" );
- lt_include( PLOG_CLASS_PATH."class/file/file.class.php" );
+
+
/**
* \ingroup Test
Modified: plog/branches/lifetype-2.0-autoload/class/test/tests/file/unpacker/zipunpacker_test.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/test/tests/file/unpacker/zipunpacker_test.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/test/tests/file/unpacker/zipunpacker_test.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,9 +1,9 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/test/helpers/lifetypetestcase.class.php" );
- lt_include( PLOG_CLASS_PATH."class/file/unpacker/zipunpacker.class.php" );
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
+
+
+
define( "PCLZIP_TEST_FILE", PLOG_CLASS_PATH."class/test/tests/file/unpacker/pclziptest.zip" );
/**
Modified: plog/branches/lifetype-2.0-autoload/class/test/tests/locale/locale_test.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/test/tests/locale/locale_test.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/test/tests/locale/locale_test.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,9 +1,9 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/test/helpers/lifetypetestcase.class.php" );
- lt_include( PLOG_CLASS_PATH."class/locale/locales.class.php" );
- lt_include( PLOG_CLASS_PATH."class/locale/locale.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
+
+
+
+
/**
* \ingroup Test
Modified: plog/branches/lifetype-2.0-autoload/class/test/tests/logger/loggerutil_test.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/test/tests/logger/loggerutil_test.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/test/tests/logger/loggerutil_test.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/logger/LogUtil.php" );
- lt_include( PLOG_CLASS_PATH."class/test/helpers/lifetypetestcase.class.php" );
+
+
class LoggerUtil_Test extends LifeTypeTestCase
{
Modified: plog/branches/lifetype-2.0-autoload/class/test/tests/mail/emailservice_test.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/test/tests/mail/emailservice_test.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/test/tests/mail/emailservice_test.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/test/helpers/lifetypetestcase.class.php" );
- lt_include( PLOG_CLASS_PATH."class/mail/emailservice.class.php" );
+
+
/**
* \ingroup Test
Modified: plog/branches/lifetype-2.0-autoload/class/test/tests/mail/phpmailer/phpmailer_test.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/test/tests/mail/phpmailer/phpmailer_test.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/test/tests/mail/phpmailer/phpmailer_test.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -4,9 +4,9 @@
Type: phpmailer class
********************/
-lt_include( PLOG_CLASS_PATH."class/test/helpers/lifetypetestcase.class.php" );
-lt_include( PLOG_CLASS_PATH."class/mail/phpmailer/class.phpmailer.php" );
+
+
/**
* these were not part of the original test suite but had to be added to avoid plenty of issues with files,
* folders, paths and mail servers. Please modify them to suit your needs
Modified: plog/branches/lifetype-2.0-autoload/class/test/tests/misc/glob_test.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/test/tests/misc/glob_test.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/test/tests/misc/glob_test.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/test/helpers/lifetypetestcase.class.php" );
- lt_include( PLOG_CLASS_PATH."class/misc/glob.class.php" );
+
+
/**
* \ingroup Test
Modified: plog/branches/lifetype-2.0-autoload/class/test/tests/misc/version_test.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/test/tests/misc/version_test.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/test/tests/misc/version_test.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/test/helpers/lifetypetestcase.class.php" );
- lt_include( PLOG_CLASS_PATH."class/misc/version.class.php" );
+
+
/**
* \ingroup Test
Modified: plog/branches/lifetype-2.0-autoload/class/test/tests/net/http/httpclient_test.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/test/tests/net/http/httpclient_test.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/test/tests/net/http/httpclient_test.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/test/helpers/lifetypetestcase.class.php" );
- lt_include( PLOG_CLASS_PATH."class/net/http/httpclient.class.php" );
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
+
+
+
/**
* \ingroup Test
Modified: plog/branches/lifetype-2.0-autoload/class/test/tests/net/url_test.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/test/tests/net/url_test.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/test/tests/net/url_test.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/test/helpers/lifetypetestcase.class.php" );
- lt_include( PLOG_CLASS_PATH."class/net/url.class.php" );
+
+
/**
* \ingroup Test
Modified: plog/branches/lifetype-2.0-autoload/class/test/tests/net/xmlrpc/xmlrpcserver_test.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/test/tests/net/xmlrpc/xmlrpcserver_test.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/test/tests/net/xmlrpc/xmlrpcserver_test.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,19 +1,19 @@
<?php
- lt_include( 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/config/config.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/bloginfo.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/articlecategories.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/articlecategory.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/articles.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/userstatus.class.php" );
- lt_include( PLOG_CLASS_PATH."class/net/xmlrpc/IXR_Library.lib.php" );
- lt_include( PLOG_CLASS_PATH."class/net/url.class.php" );
- lt_include( PLOG_CLASS_PATH."class/locale/locales.class.php" );
+
+
+
+
+
+
+
+
+
+
+
+
+
+
/**
* Unit test cases for xmlrpc.php
Modified: plog/branches/lifetype-2.0-autoload/class/test/tests/summary/action/summaryaction_test.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/test/tests/summary/action/summaryaction_test.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/test/tests/summary/action/summaryaction_test.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/test/helpers/lifetypetestcase.class.php" );
+
/**
* \ingroup Test
@@ -19,7 +19,7 @@
*/
function testLanguageChangeViaLangParameterInRequest()
{
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
+
$config =& Config::getConfig();
$url = $config->getValue( "base_url" )."/summary.php";
Modified: plog/branches/lifetype-2.0-autoload/class/test/tests/summary/dao/summarystats_test.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/test/tests/summary/dao/summarystats_test.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/test/tests/summary/dao/summarystats_test.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,16 +1,16 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/test/helpers/lifetypetestcase.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/article.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/bloginfo.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/articlecategories.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/articlecategory.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/articles.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/userstatus.class.php" );
- lt_include( PLOG_CLASS_PATH."class/summary/dao/summarystats.class.php" );
+
+
+
+
+
+
+
+
+
+
+
/**
* Unit test cases for the SummaryStats class
Modified: plog/branches/lifetype-2.0-autoload/class/test/tests/summary/data/summarytools_test.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/test/tests/summary/data/summarytools_test.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/test/tests/summary/data/summarytools_test.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,10 +1,10 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/test/helpers/lifetypetestcase.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/userinfo.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/users.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/userstatus.class.php" );
- lt_include( PLOG_CLASS_PATH."class/summary/data/summarytools.class.php" );
+
+
+
+
+
/**
* \ingroup Test
Modified: plog/branches/lifetype-2.0-autoload/class/test/tests/ui/articlecategoriesui_test.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/test/tests/ui/articlecategoriesui_test.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/test/tests/ui/articlecategoriesui_test.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,9 +1,9 @@
<?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-2.0-autoload/class/test/tests/ui/login_test.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/test/tests/ui/login_test.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/test/tests/ui/login_test.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?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-2.0-autoload/class/test/tests/ui/permissionsui_test.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/test/tests/ui/permissionsui_test.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/test/tests/ui/permissionsui_test.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,9 +1,9 @@
<?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-2.0-autoload/class/view/admin/adminadduserview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/admin/adminadduserview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/admin/adminadduserview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,10 +1,10 @@
<?php
- lt_include( PLOG_CLASS_PATH.'class/view/admin/admintemplatedview.class.php' );
- lt_include( PLOG_CLASS_PATH.'class/dao/blogs.class.php' );
- lt_include( PLOG_CLASS_PATH.'class/dao/userstatus.class.php' );
- lt_include( PLOG_CLASS_PATH.'class/dao/permissions.class.php' );
+
+
+
+
/**
* \ingroup View
Modified: plog/branches/lifetype-2.0-autoload/class/view/admin/adminarticlecategorieslistview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/admin/adminarticlecategorieslistview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/admin/adminarticlecategorieslistview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,9 +1,9 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/articlecategories.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/pager/pager.class.php" );
+
+
+
/**
* \ingroup View
* @private
Modified: plog/branches/lifetype-2.0-autoload/class/view/admin/adminarticlecommentslistview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/admin/adminarticlecommentslistview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/admin/adminarticlecommentslistview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,10 +1,10 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/commentscommon.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/articlecommentstatus.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/articles.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/pager/pager.class.php" );
+
+
+
+
+
/**
* \ingroup View
Modified: plog/branches/lifetype-2.0-autoload/class/view/admin/adminarticlereferrersview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/admin/adminarticlereferrersview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/admin/adminarticlereferrersview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,9 +1,9 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/referers.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/pager/pager.class.php" );
+
+
+
/**
* \ingroup View
* @private
Modified: plog/branches/lifetype-2.0-autoload/class/view/admin/adminbasetemplateeditorview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/admin/adminbasetemplateeditorview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/admin/adminbasetemplateeditorview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
+
abstract class AdminBaseTemplateEditorView extends AdminTemplatedView
{
Modified: plog/branches/lifetype-2.0-autoload/class/view/admin/adminblogcategorieslistview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/admin/adminblogcategorieslistview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/admin/adminblogcategorieslistview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,9 +1,9 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/blogcategories.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/pager/pager.class.php" );
+
+
+
/**
* \ingroup View
* @private
Modified: plog/branches/lifetype-2.0-autoload/class/view/admin/adminbloglocationsview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/admin/adminbloglocationsview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/admin/adminbloglocationsview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
+
class AdminBlogLocationsView extends AdminTemplatedView
{
var $_locations;
Modified: plog/branches/lifetype-2.0-autoload/class/view/admin/adminblogsettingsview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/admin/adminblogsettingsview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/admin/adminblogsettingsview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,11 +1,11 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/templatesets/templatesets.class.php" );
- lt_include( PLOG_CLASS_PATH."class/locale/locales.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/blogcategories.class.php" );
- lt_include( PLOG_CLASS_PATH."class/net/http/subdomains.class.php" );
+
+
+
+
+
/**
* \ingroup View
* @private
Modified: plog/branches/lifetype-2.0-autoload/class/view/admin/adminblogtemplatechooserview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/admin/adminblogtemplatechooserview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/admin/adminblogtemplatechooserview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/templatesets/templatesets.class.php" );
+
+
/**
* \ingroup View
* @private
Modified: plog/branches/lifetype-2.0-autoload/class/view/admin/adminblogtemplatesetslistview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/admin/adminblogtemplatesetslistview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/admin/adminblogtemplatesetslistview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/templatesets/templatesets.class.php" );
+
+
/**
* \ingroup View
* @private
Modified: plog/branches/lifetype-2.0-autoload/class/view/admin/adminbloguserslistview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/admin/adminbloguserslistview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/admin/adminbloguserslistview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/users.class.php" );
+
+
/**
* \ingroup View
* @private
Modified: plog/branches/lifetype-2.0-autoload/class/view/admin/admincreateblogview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/admin/admincreateblogview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/admin/admincreateblogview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,9 +1,9 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/blogcategories.class.php" );
- lt_include( PLOG_CLASS_PATH."class/net/http/subdomains.class.php" );
+
+
+
/**
* \ingroup View
* @private
Modified: plog/branches/lifetype-2.0-autoload/class/view/admin/admincustomfieldslistview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/admin/admincustomfieldslistview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/admin/admincustomfieldslistview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/customfields/customfields.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/pager/pager.class.php" );
+
+
+
/**
* \ingroup View
Modified: plog/branches/lifetype-2.0-autoload/class/view/admin/admindashboardview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/admin/admindashboardview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/admin/admindashboardview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,13 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/view.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/templateservice.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/menu/menurenderer.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/dao/trackbacks.class.php" );
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
-// lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryresources.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/articlestatus.class.php" );
/**
* maximum number of recent items that we will show in the statistics
Modified: plog/branches/lifetype-2.0-autoload/class/view/admin/admindefaultview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/admin/admindefaultview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/admin/admindefaultview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -5,11 +5,11 @@
*/
- lt_include( PLOG_CLASS_PATH."class/view/view.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/templateservice.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/template.class.php" );
- lt_include( PLOG_CLASS_PATH."class/locale/locales.class.php" );
- lt_include( PLOG_CLASS_PATH."class/misc/version.class.php" );
+
+
+
+
+
// name of the template we are going to use for this view
define( "DEFAULTADMIN_TEMPLATE", "default" );
Modified: plog/branches/lifetype-2.0-autoload/class/view/admin/admineditblogtemplateview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/admin/admineditblogtemplateview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/admin/admineditblogtemplateview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminedittemplateview.class.php" );
+
class AdminEditBlogTemplateView extends AdminEditTemplateView
{
Modified: plog/branches/lifetype-2.0-autoload/class/view/admin/admineditfriendview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/admin/admineditfriendview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/admin/admineditfriendview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -4,9 +4,9 @@
* Friend
*/
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/friendgroups.class.php" );
+
+
/**
* \ingroup View
* @private
Modified: plog/branches/lifetype-2.0-autoload/class/view/admin/admineditlinkview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/admin/admineditlinkview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/admin/admineditlinkview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/mylinkscategories.class.php" );
+
+
/**
* \ingroup View
* @private
@@ -25,7 +25,7 @@
{
// get all the link categories but we have to respect the order that the user asked
$blogSettings = $this->_blogInfo->getSettings();
- $order = $blogSettings->getValue( 'link_categories_order', MYLINKS_CATEGORIES_NO_ORDER );
+ $order = $blogSettings->getValue( 'link_categories_order', MyLinksCategories::MYLINKS_CATEGORIES_NO_ORDER );
$linkCategories = new MyLinksCategories();
$blogLinkCategories = $linkCategories->getMyLinksCategories( $this->_blogInfo->getId(), $order );
$this->notifyEvent( EVENT_LINK_CATEGORIES_LOADED, Array( "linkcategories" => &$blogLinkCategories ));
Modified: plog/branches/lifetype-2.0-autoload/class/view/admin/admineditpostview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/admin/admineditpostview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/admin/admineditpostview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminnewpostview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/articlenotifications.class.php" );
+
+
/**
* \ingroup View
* @private
Modified: plog/branches/lifetype-2.0-autoload/class/view/admin/admineditresourcealbumview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/admin/admineditresourcealbumview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/admin/admineditresourcealbumview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryalbums.class.php" );
+
+
/**
* \ingroup View
* @private
Modified: plog/branches/lifetype-2.0-autoload/class/view/admin/admineditresourceview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/admin/admineditresourceview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/admin/admineditresourceview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,9 +1,9 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryalbums.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminresourceslistview.class.php" );
+
+
+
/**
* \ingroup View
* @private
Modified: plog/branches/lifetype-2.0-autoload/class/view/admin/admineditsiteblogview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/admin/admineditsiteblogview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/admin/admineditsiteblogview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,12 +1,12 @@
<?php
- lt_include( PLOG_CLASS_PATH.'class/view/admin/admintemplatedview.class.php' );
- lt_include( PLOG_CLASS_PATH.'class/locale/locales.class.php' );
- lt_include( PLOG_CLASS_PATH.'class/template/templatesets/templatesets.class.php' );
- lt_include( PLOG_CLASS_PATH.'class/dao/blogstatus.class.php' );
- lt_include( PLOG_CLASS_PATH."class/net/http/subdomains.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/blogcategories.class.php" );
+
+
+
+
+
+
/**
* \ingroup View
* @private
Modified: plog/branches/lifetype-2.0-autoload/class/view/admin/admineditsiteuserview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/admin/admineditsiteuserview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/admin/admineditsiteuserview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,11 +1,11 @@
<?php
- lt_include( PLOG_CLASS_PATH.'class/view/admin/admintemplatedview.class.php' );
- lt_include( PLOG_CLASS_PATH.'class/view/admin/adminerrorview.class.php' );
- lt_include( PLOG_CLASS_PATH.'class/dao/users.class.php' );
- lt_include( PLOG_CLASS_PATH.'class/dao/userstatus.class.php' );
- lt_include( PLOG_CLASS_PATH.'class/dao/permissions.class.php' );
+
+
+
+
+
/**
* \ingroup View
* @private
Modified: plog/branches/lifetype-2.0-autoload/class/view/admin/adminedittemplatefileview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/admin/adminedittemplatefileview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/admin/adminedittemplatefileview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
+
class AdminEditTemplateFileView extends AdminTemplatedView
{
Modified: plog/branches/lifetype-2.0-autoload/class/view/admin/adminedittemplateview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/admin/adminedittemplateview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/admin/adminedittemplateview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminbasetemplateeditorview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/editor/templatetools.class.php" );
+
+
class AdminEditTemplateView extends AdminBaseTemplateEditorView
{
private $_templateId;
Modified: plog/branches/lifetype-2.0-autoload/class/view/admin/adminerrordialogview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/admin/adminerrordialogview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/admin/adminerrordialogview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
+
/**
* \ingroup View
* @private
Modified: plog/branches/lifetype-2.0-autoload/class/view/admin/adminerrorview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/admin/adminerrorview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/admin/adminerrorview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
+
/**
* \ingroup View
Modified: plog/branches/lifetype-2.0-autoload/class/view/admin/adminfriendgroupslistview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/admin/adminfriendgroupslistview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/admin/adminfriendgroupslistview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/friendgroups.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/pager/pager.class.php" );
+
+
+
/**
* \ingroup View
Modified: plog/branches/lifetype-2.0-autoload/class/view/admin/adminfriendslistview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/admin/adminfriendslistview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/admin/adminfriendslistview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -4,10 +4,10 @@
* Friend
*/
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/friends.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/pager/pager.class.php" );
+
+
+
/**
* \ingroup View
* @private
Modified: plog/branches/lifetype-2.0-autoload/class/view/admin/adminglobalarticlecategorieslistview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/admin/adminglobalarticlecategorieslistview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/admin/adminglobalarticlecategorieslistview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -6,10 +6,10 @@
* Changed from original article category.
*/
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/globalarticlecategories.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/pager/pager.class.php" );
+
+
+
/**
* \ingroup View
* @private
Modified: plog/branches/lifetype-2.0-autoload/class/view/admin/adminglobalsettingslistview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/admin/adminglobalsettingslistview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/admin/adminglobalsettingslistview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,9 +1,9 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
+
+
+
define( "ADMINISTRATOR_BLOG", 1 );
/**
Modified: plog/branches/lifetype-2.0-autoload/class/view/admin/admininboxprivatemessageslistview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/admin/admininboxprivatemessageslistview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/admin/admininboxprivatemessageslistview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/pager/pager.class.php" );
+
+
/**
* \ingroup View
@@ -29,7 +29,7 @@
$searchTerms = $this->getValue( "searchTerms" );
$blogSettings = $this->_blogInfo->getSettings();
// get the private messages
- lt_include( PLOG_CLASS_PATH."class/dao/privatemessageboxes.class.php" );
+
$privateMessageBoxes = new PrivateMessageBoxes();
$privateMessageInbox = $privateMessageBoxes->getPrivateMessageInboxFromUserId( $this->_userInfo->getId() );
$inboxPrivateMessages = $privateMessageInbox->getPrivateMessagesFromBox( $searchTerms,
Modified: plog/branches/lifetype-2.0-autoload/class/view/admin/adminlinkcategorieslistview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/admin/adminlinkcategorieslistview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/admin/adminlinkcategorieslistview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/mylinkscategories.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/pager/pager.class.php" );
+
+
+
/**
* \ingroup View
@@ -32,7 +32,7 @@
// get all the link categories
$searchTerms = $this->getValue( "searchTerms" );
$blogSettings = $this->_blogInfo->getSettings();
- $linkCategoriesOrder = $blogSettings->getValue( "link_categories_order", MYLINKS_CATEGORIES_NO_ORDER );
+ $linkCategoriesOrder = $blogSettings->getValue( "link_categories_order", MyLinksCategories::MYLINKS_CATEGORIES_NO_ORDER );
// get the link categories
$linkCategories = new MyLinksCategories();
Modified: plog/branches/lifetype-2.0-autoload/class/view/admin/adminlinkslistview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/admin/adminlinkslistview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/admin/adminlinkslistview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,9 +1,9 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/mylinks.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/mylinkscategories.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/pager/pager.class.php" );
+
+
+
+
/**
* \ingroup View
@@ -27,7 +27,7 @@
$this->AdminTemplatedView( $blogInfo, "editlinks" );
// save the parameters and put them in a nicer place after checking them
- if( !isset( $params["showOrder"] ) ) $params["showOrder"] = MYLINKS_CATEGORIES_NO_ORDER;
+ if( !isset( $params["showOrder"] ) ) $params["showOrder"] = MyLinksCategories::MYLINKS_CATEGORIES_NO_ORDER;
if( !isset( $params["showCategory"] ) ) $params["showCategory"] = 0;
if( !isset( $params["searchTerms"] ) ) $params["searchTerms"] = "";
Modified: plog/branches/lifetype-2.0-autoload/class/view/admin/adminloginview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/admin/adminloginview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/admin/adminloginview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,9 +1,9 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/view.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/templateservice.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/template.class.php" );
- lt_include( PLOG_CLASS_PATH."class/locale/locales.class.php" );
+
+
+
+
define( "ADMINLOGIN_TEMPLATE", "chooseblog" );
Modified: plog/branches/lifetype-2.0-autoload/class/view/admin/adminmessageview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/admin/adminmessageview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/admin/adminmessageview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
+
/**
* \ingroup View
Modified: plog/branches/lifetype-2.0-autoload/class/view/admin/adminnewalbumview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/admin/adminnewalbumview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/admin/adminnewalbumview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryalbums.class.php" );
+
+
/**
* \ingroup View
* @private
Modified: plog/branches/lifetype-2.0-autoload/class/view/admin/adminnewbloguserview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/admin/adminnewbloguserview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/admin/adminnewbloguserview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/permissions.class.php" );
+
+
/**
* \ingroup View
Modified: plog/branches/lifetype-2.0-autoload/class/view/admin/adminnewfriendview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/admin/adminnewfriendview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/admin/adminnewfriendview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -4,9 +4,9 @@
* Friend
*/
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/friendgroups.class.php" );
+
+
/**
* \ingroup View
* @private
Modified: plog/branches/lifetype-2.0-autoload/class/view/admin/adminnewglobalarticlecategoryview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/admin/adminnewglobalarticlecategoryview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/admin/adminnewglobalarticlecategoryview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/globalarticlecategories.class.php" );
+
+
/**
* \ingroup View
Modified: plog/branches/lifetype-2.0-autoload/class/view/admin/adminnewlinkview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/admin/adminnewlinkview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/admin/adminnewlinkview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/mylinkscategories.class.php" );
+
+
/**
@@ -33,7 +33,7 @@
{
// get all the link categories but we have to respect the order that the user asked
$blogSettings = $this->_blogInfo->getSettings();
- $order = $blogSettings->getValue( 'link_categories_order', MYLINKS_CATEGORIES_NO_ORDER );
+ $order = $blogSettings->getValue( 'link_categories_order', MyLinksCategories::MYLINKS_CATEGORIES_NO_ORDER );
$linkCategories = new MyLinksCategories();
$blogLinkCategories = $linkCategories->getMyLinksCategories( $this->_blogInfo->getId(), $order );
$this->notifyEvent( EVENT_LINK_CATEGORIES_LOADED, Array( "linkcategories" => &$blogLinkCategories ));
Modified: plog/branches/lifetype-2.0-autoload/class/view/admin/adminnewpostview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/admin/adminnewpostview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/admin/adminnewpostview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,13 +1,13 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/articlecategories.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/globalarticlecategories.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/customfields/customfields.class.php" );
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
+
+
+
+
+
+
+
/**
* \ingroup View
* @private
@@ -22,7 +22,7 @@
function render()
{
- lt_include( PLOG_CLASS_PATH."class/dao/articlestatus.class.php" );
+
// fetch the categories
$categories = new ArticleCategories();
Modified: plog/branches/lifetype-2.0-autoload/class/view/admin/adminnewresourceview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/admin/adminnewresourceview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/admin/adminnewresourceview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryalbums.class.php" );
+
+
/**
* \ingroup View
* @private
Modified: plog/branches/lifetype-2.0-autoload/class/view/admin/adminoutboxprivatemessageslistview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/admin/adminoutboxprivatemessageslistview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/admin/adminoutboxprivatemessageslistview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/pager/pager.class.php" );
+
+
/**
* \ingroup View
@@ -29,7 +29,7 @@
$searchTerms = $this->getValue( "searchTerms" );
$blogSettings = $this->_blogInfo->getSettings();
// get the private messages
- lt_include( PLOG_CLASS_PATH."class/dao/privatemessageboxes.class.php" );
+
$privateMessageBoxes = new PrivateMessageBoxes();
$privateMessageOutbox = $privateMessageBoxes->getPrivateMessageOutboxFromUserId( $this->_userInfo->getId() );
$outboxPrivateMessages = $privateMessageOutbox->getPrivateMessagesFromBox( $searchTerms,
Modified: plog/branches/lifetype-2.0-autoload/class/view/admin/adminpermissionslistview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/admin/adminpermissionslistview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/admin/adminpermissionslistview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/permissions.class.php" );
+
+
/**
* \ingroup View
* @private
Modified: plog/branches/lifetype-2.0-autoload/class/view/admin/adminplainview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/admin/adminplainview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/admin/adminplainview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminplainview.class.php" );
+
/**
* \ingroup View
Modified: plog/branches/lifetype-2.0-autoload/class/view/admin/adminpluginsettingsview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/admin/adminpluginsettingsview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/admin/adminpluginsettingsview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/plugin/pluginmanager.class.php" );
- lt_include( PLOG_CLASS_PATH."class/plugin/globalpluginconfig.class.php" );
+
+
+
class AdminPluginSettingsView extends AdminTemplatedView
{
Modified: plog/branches/lifetype-2.0-autoload/class/view/admin/adminplugintemplatedview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/admin/adminplugintemplatedview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/admin/adminplugintemplatedview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH.'class/view/admin/adminview.class.php' );
- lt_include( PLOG_CLASS_PATH.'class/template/templateservice.class.php' );
+
+
/**
* \ingroup View
Modified: plog/branches/lifetype-2.0-autoload/class/view/admin/adminpostslistview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/admin/adminpostslistview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/admin/adminpostslistview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,17 +1,17 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/locale/locales.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/articles.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/articlecategories.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/locations.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/articlestatus.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/pager/pager.class.php" );
- lt_include( PLOG_CLASS_PATH.'class/data/timestamp.class.php' );
- lt_include( PLOG_CLASS_PATH."class/dao/users.class.php" );
- lt_include( PLOG_CLASS_PATH."class/config/siteconfig.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
+
+
+
+
+
+
+
+
+
+
+
/**
* \ingroup View
* @private
Modified: plog/branches/lifetype-2.0-autoload/class/view/admin/adminreferrersview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/admin/adminreferrersview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/admin/adminreferrersview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,9 +1,9 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/referers.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/pager/pager.class.php" );
+
+
+
/**
* shows a list of the referrers collected by this site
*/
Modified: plog/branches/lifetype-2.0-autoload/class/view/admin/adminregisterblogview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/admin/adminregisterblogview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/admin/adminregisterblogview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,12 +1,12 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/view.class.php" );
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
- lt_include( PLOG_CLASS_PATH."class/locale/locales.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/templatesets/templatesets.class.php" );
- lt_include( PLOG_CLASS_PATH."class/net/http/subdomains.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/blogcategories.class.php" );
+
+
+
+
+
+
class AdminRegisterBlogView extends View
{
var $_userInfo;
Modified: plog/branches/lifetype-2.0-autoload/class/view/admin/adminresourcealbumslistview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/admin/adminresourcealbumslistview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/admin/adminresourcealbumslistview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryalbums.class.php" );
+
+
/**
* \ingroup View
* @private
Modified: plog/branches/lifetype-2.0-autoload/class/view/admin/adminresourceslistview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/admin/adminresourceslistview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/admin/adminresourceslistview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,12 +1,12 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryalbums.class.php" );
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryresources.class.php" );
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryresourcequotas.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/pager/pager.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/locations.class.php" );
+
+
+
+
+
+
define( "ROOT_ALBUM_ID", 0 );
define( "DEFAULT_RESOURCES_PER_PAGE", 30 );
Modified: plog/branches/lifetype-2.0-autoload/class/view/admin/adminsimpleerrorview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/admin/adminsimpleerrorview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/admin/adminsimpleerrorview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/view.class.php" );
- lt_include( PLOG_CLASS_PATH."class/locale/locales.class.php" );
+
+
define( "ADMINSIMPLEERROR_TEMPLATE", "simpleerror" );
Modified: plog/branches/lifetype-2.0-autoload/class/view/admin/adminsimplemessageview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/admin/adminsimplemessageview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/admin/adminsimplemessageview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/view.class.php" );
- lt_include( PLOG_CLASS_PATH."class/locale/locales.class.php" );
+
+
define( "ADMINSIMPLEMESSAGE_TEMPLATE", "simplemessage" );
Modified: plog/branches/lifetype-2.0-autoload/class/view/admin/adminsiteblogslistview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/admin/adminsiteblogslistview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/admin/adminsiteblogslistview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/pager/pager.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
+
+
+
/**
* \ingroup View
Modified: plog/branches/lifetype-2.0-autoload/class/view/admin/adminsitelocaleslistview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/admin/adminsitelocaleslistview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/admin/adminsitelocaleslistview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/locale/locales.class.php" );
+
+
/**
* \ingroup View
* @private
Modified: plog/branches/lifetype-2.0-autoload/class/view/admin/adminsitetemplateslistview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/admin/adminsitetemplateslistview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/admin/adminsitetemplateslistview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/templatesets/templatesets.class.php" );
+
+
/**
* \ingroup View
* @private
Modified: plog/branches/lifetype-2.0-autoload/class/view/admin/adminsiteuserslistview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/admin/adminsiteuserslistview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/admin/adminsiteuserslistview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,10 +1,10 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/users.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/pager/pager.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/userstatus.class.php" );
+
+
+
+
/**
* \ingroup View
* @private
Modified: plog/branches/lifetype-2.0-autoload/class/view/admin/admintemplatedview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/admin/admintemplatedview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/admin/admintemplatedview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminview.class.php" );
+
/**
Modified: plog/branches/lifetype-2.0-autoload/class/view/admin/adminuserprofileview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/admin/adminuserprofileview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/admin/adminuserprofileview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/admin/admintemplatedview.class.php" );
+
/**
* \ingroup View
* @private
Modified: plog/branches/lifetype-2.0-autoload/class/view/admin/adminview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/admin/adminview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/admin/adminview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,9 +1,9 @@
<?php
- lt_include( PLOG_CLASS_PATH.'class/view/view.class.php' );
- lt_include( PLOG_CLASS_PATH.'class/template/templateservice.class.php' );
- lt_include( PLOG_CLASS_PATH.'class/net/requestgenerator.class.php' );
+
+
+
/**
* \ingroup View
*
@@ -86,13 +86,13 @@
*/
function render()
{
- lt_include( PLOG_CLASS_PATH.'class/template/menu/menu.class.php' );
- lt_include( PLOG_CLASS_PATH.'class/template/menu/menurenderer.class.php' );
+
+
// set a few common parametres...
$config =& Config::getConfig();
$this->setValue( 'baseurl', $config->getValue( 'base_url'));
- lt_include( PLOG_CLASS_PATH."class/misc/version.class.php" );
+
$this->setValue( 'version', Version::getVersion());
$this->setValue( 'uploads_enabled', $config->getValue( 'uploads_enabled' ));
$this->setValue( 'bayesian_filter_enabled', $config->getValue( 'bayesian_filter_enabled' ));
Modified: plog/branches/lifetype-2.0-autoload/class/view/admin/adminxmlview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/admin/adminxmlview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/admin/adminxmlview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminview.class.php" );
+
/**
* \ingroup View
* @private
Modified: plog/branches/lifetype-2.0-autoload/class/view/admin/ajax/adminajaxview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/admin/ajax/adminajaxview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/admin/ajax/adminajaxview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/ajax/ajaxview.class.php" );
+
class AdminAjaxView extends AjaxView
{
@@ -20,8 +20,8 @@
function render()
{
// simply serialize the array with the parameters as json stream and send it to the client
- lt_include( PLOG_CLASS_PATH."class/data/serialize/serializerfactory.class.php" );
+
$data = $this->_params->getAsArray();
if( isset( $data["blog"] )) unset( $data["blog"] );
if( isset( $data["locale"] )) unset( $data["locale"] );
Modified: plog/branches/lifetype-2.0-autoload/class/view/admin/chooser/adminblogchooserview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/admin/chooser/adminblogchooserview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/admin/chooser/adminblogchooserview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminsiteblogslistview.class.php" );
+
/**
* \ingroup View
* @private
Modified: plog/branches/lifetype-2.0-autoload/class/view/admin/chooser/adminlocationchooserview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/admin/chooser/adminlocationchooserview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/admin/chooser/adminlocationchooserview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminsiteblogslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/locations.class.php" );
+
+
define( "LOCATION_POPUP_CHOOSER_MODE", 1 );
define( "LOCATION_POPUP_VIEWER_MODE", 2 );
Modified: plog/branches/lifetype-2.0-autoload/class/view/admin/chooser/adminsimpleresourceslistview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/admin/chooser/adminsimpleresourceslistview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/admin/chooser/adminsimpleresourceslistview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,9 +1,9 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminresourceslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/stringutils.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
+
+
+
/**
* \ingroup View
* @private
Modified: plog/branches/lifetype-2.0-autoload/class/view/admin/chooser/adminuserchooserview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/admin/chooser/adminuserchooserview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/admin/chooser/adminuserchooserview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminsiteuserslistview.class.php" );
+
/**
* \ingroup View
* @private
Modified: plog/branches/lifetype-2.0-autoload/class/view/admin/chooser/adminuserpictureselectview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/admin/chooser/adminuserpictureselectview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/admin/chooser/adminuserpictureselectview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/admin/adminresourceslistview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryresource.class.php" );
- lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryalbums.class.php" );
+
+
+
/**
* \ingroup View
Modified: plog/branches/lifetype-2.0-autoload/class/view/ajax/ajaxview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/ajax/ajaxview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/ajax/ajaxview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/view.class.php" );
+
class AjaxView extends View
{
@@ -40,8 +40,8 @@
function render()
{
// simply serialize the array with the parameters as json stream and send it to the client
- lt_include( PLOG_CLASS_PATH."class/data/serialize/serializerfactory.class.php" );
+
$data = $this->_params->getAsArray();
print( SerializerFactory::toJson( $data ));
}
Modified: plog/branches/lifetype-2.0-autoload/class/view/blogtemplatedview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/blogtemplatedview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/blogtemplatedview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/blogview.class.php" );
+
/**
* \ingroup View
Modified: plog/branches/lifetype-2.0-autoload/class/view/blogview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/blogview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/blogview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH.'class/view/smartyview.class.php' );
- lt_include( PLOG_CLASS_PATH.'class/plugin/pluginmanager.class.php' );
+
+
/**
* default date format used for the archive links
*/
@@ -50,7 +50,7 @@
*/
function generateCalendar( $year = null, $month = null )
{
- lt_include( PLOG_CLASS_PATH.'class/data/plogcalendar.class.php' );
+
$monthPosts = $this->getValue( 'monthposts' );
@@ -79,10 +79,10 @@
*/
function _getArchives()
{
- lt_include( PLOG_CLASS_PATH.'class/dao/archivelink.class.php' );
- lt_include( PLOG_CLASS_PATH.'class/data/timestamp.class.php' );
+
+
- lt_include( PLOG_CLASS_PATH."class/dao/articles.class.php" );
+
$articles = new Articles();
$archiveStats = $articles->getNumberPostsPerMonth( $this->_blogInfo->getId());
@@ -121,8 +121,8 @@
*/
function _getRecentPosts()
{
- lt_include( PLOG_CLASS_PATH.'class/dao/recentarticles.class.php' );
- lt_include( PLOG_CLASS_PATH."class/config/siteconfig.class.php" );
+
+
$blogSettings = $this->_blogInfo->getSettings();
@@ -144,7 +144,7 @@
*/
function _getMonthPosts()
{
- lt_include( PLOG_CLASS_PATH.'class/data/timestamp.class.php' );
+
$t = new Timestamp();
$blogSettings = $this->_blogInfo->getSettings();
@@ -152,7 +152,7 @@
$month = $this->getValue( 'Month' );
$year = $this->getValue( 'Year' );
- lt_include( PLOG_CLASS_PATH."class/dao/articles.class.php" );
+
$articles = new Articles();
return( $articles->getDaysWithPosts( $this->_blogInfo->getId(), $year, $month ));
}
@@ -164,10 +164,10 @@
*/
function _getLinkCategories()
{
- lt_include( PLOG_CLASS_PATH.'class/dao/mylinkscategories.class.php' );
+
$blogSettings = $this->_blogInfo->getSettings();
- $linkCategoriesOrder = $blogSettings->getValue( 'link_categories_order', MYLINKS_CATEGORIES_NO_ORDER );
+ $linkCategoriesOrder = $blogSettings->getValue( 'link_categories_order', MyLinksCategories::MYLINKS_CATEGORIES_NO_ORDER );
$myLinksCategories = new MyLinksCategories();
$blogLinksCategories = $myLinksCategories->getMyLinksCategories( $this->_blogInfo->getId(), $linkCategoriesOrder);
$this->notifyEvent( EVENT_LINK_CATEGORIES_LOADED, Array( 'linkcategories' => &$blogLinksCategories ));
@@ -182,7 +182,7 @@
*/
function _getArticleCategories()
{
- lt_include( PLOG_CLASS_PATH.'class/dao/articlecategories.class.php' );
+
$blogSettings = $this->_blogInfo->getSettings();
$categoryOrder = $blogSettings->getValue( 'categories_order' );
@@ -243,10 +243,10 @@
function render()
{
if( !$this->isCached() ) {
- lt_include( PLOG_CLASS_PATH.'class/data/plogcalendar.class.php' );
- lt_include( PLOG_CLASS_PATH.'class/misc/version.class.php' );
- lt_include( PLOG_CLASS_PATH.'class/xml/rssparser/rssparser.class.php' );
- lt_include( PLOG_CLASS_PATH.'class/data/timestamp.class.php' );
+
+
+
+
// and then add our stuff to the view...
$this->setValue( 'archives', $this->_getArchives());
Modified: plog/branches/lifetype-2.0-autoload/class/view/defaultview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/defaultview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/defaultview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/blogview.class.php" );
+
define( "MAIN_TEMPLATE", "main" );
@@ -34,7 +34,7 @@
{
$posts = $this->_params->getValue( 'posts' );
- //lt_include( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
+ //
//$textFilter = new TextFilter();
$modifPosts = Array();
$rg = $this->_blogInfo->getBlogRequestGenerator();
Modified: plog/branches/lifetype-2.0-autoload/class/view/errorview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/errorview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/errorview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/blogview.class.php" );
- lt_include( PLOG_CLASS_PATH.'class/data/timestamp.class.php' );
+
+
define( "ERROR_TEMPLATE", "error" );
Modified: plog/branches/lifetype-2.0-autoload/class/view/locationview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/locationview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/locationview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/blogtemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH.'class/template/templateservice.class.php' );
+
+
class LocationView extends BlogTemplatedView
{
Modified: plog/branches/lifetype-2.0-autoload/class/view/plugintemplatedview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/plugintemplatedview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/plugintemplatedview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,9 +1,9 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/blogview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/templateservice.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/templatesets/templatesets.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/templatesets/templatesetstorage.class.php" );
+
+
+
+
/**
* \ingroup View
Modified: plog/branches/lifetype-2.0-autoload/class/view/redirectview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/redirectview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/redirectview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/view.class.php" );
+
/**
* This view returns no content, it just sends a
Modified: plog/branches/lifetype-2.0-autoload/class/view/renderer/ajaxviewrenderer.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/renderer/ajaxviewrenderer.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/renderer/ajaxviewrenderer.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/ajax/ajaxview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/serialize/serializerfactory.class.php" );
+
+
class AjaxViewRenderer extends AjaxView
{
@@ -24,8 +24,8 @@
function render()
{
// simply serialize the array with the parameters as json stream and send it to the client
- lt_include( PLOG_CLASS_PATH."class/data/serialize/serializerfactory.class.php" );
+
$data = $this->_view->_params->getAsArray();
// some stuff that should not be serialized
Modified: plog/branches/lifetype-2.0-autoload/class/view/rssview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/rssview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/rssview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,9 +1,9 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/blogview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/templatesets/templatesetstorage.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/templateservice.class.php" );
+
+
+
/**
* default profile used if none specified
*/
Modified: plog/branches/lifetype-2.0-autoload/class/view/smartyview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/smartyview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/smartyview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH.'class/view/view.class.php' );
- lt_include( PLOG_CLASS_PATH.'class/template/templateservice.class.php' );
+
+
/**
* different smarty cache modes that we can use
*/
@@ -74,7 +74,7 @@
$this->_templateSetName = $config->getValue( "default_template" );
$this->_blogInfo->setTemplate( $this->_templateSetName );
- lt_include( PLOG_CLASS_PATH.'class/dao/blogs.class.php' );
+
$blogs = new Blogs();
$blogs->updateBlog( $this->_blogInfo );
}
@@ -129,7 +129,7 @@
*/
function isTemplateSetExist( $templateSetName )
{
- 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;
@@ -237,7 +237,7 @@
$timestamp = $this->_template->getCreationTimestamp();
// and now send the correct headers
- lt_include( PLOG_CLASS_PATH.'class/net/http/httpcache.class.php' );
+
if( HttpCache::httpConditional( $timestamp, $this->getCacheTimeSeconds()))
$sendOutput = false;
Modified: plog/branches/lifetype-2.0-autoload/class/view/templateview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/templateview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/templateview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/blogview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/templatesets/templatesets.class.php" );
+
+
/**
* \ingroup View
* @private
Modified: plog/branches/lifetype-2.0-autoload/class/view/trackbackview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/trackbackview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/trackbackview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,9 +1,9 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/view.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/templatesets/templatesetstorage.class.php" );
- lt_include( PLOG_CLASS_PATH."class/template/templateservice.class.php" );
+
+
+
/**
* \ingroup View
* @private
Modified: plog/branches/lifetype-2.0-autoload/class/view/view.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/view.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/view.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -16,7 +16,7 @@
*/
- lt_include( PLOG_CLASS_PATH."class/config/properties.class.php" );
+
/**
* constants that can be used for content types
@@ -297,7 +297,7 @@
*/
function getCurrentPageFromRequest()
{
- lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php");
+
// get the value from the request
$page = HttpVars::getRequestValue( VIEW_DEFAULT_PAGE_PARAMETER );
// but first of all, validate it
Modified: plog/branches/lifetype-2.0-autoload/class/view/viewarticleview.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/view/viewarticleview.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/view/viewarticleview.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,6 +1,6 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/blogview.class.php" );
+
define( "VIEW_ARTICLE_TEMPLATE", "postandcomments" );
Modified: plog/branches/lifetype-2.0-autoload/class/xml/rssparser/magpierss/rss_fetch.inc
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/xml/rssparser/magpierss/rss_fetch.inc 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/xml/rssparser/magpierss/rss_fetch.inc 2007-10-06 19:08:42 UTC (rev 5968)
@@ -27,14 +27,14 @@
define('MAGPIE_DIR', PLOG_CLASS_PATH.'class/xml/rssparser/magpierss/');
}
-lt_include( MAGPIE_DIR . 'rss_parse.inc' );
-lt_include( MAGPIE_DIR . 'rss_cache.inc' );
+
+
// for including 3rd party libraries
define('MAGPIE_EXTLIB', MAGPIE_DIR . 'extlib/' );
-lt_include( MAGPIE_EXTLIB . 'Snoopy.class.inc');
+
/*
* CONSTANTS - redefine these in your script to change the
* behaviour of fetch_rss() currently, most options effect the cache
Modified: plog/branches/lifetype-2.0-autoload/class/xml/rssparser/magpierss/rss_parse.inc
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/xml/rssparser/magpierss/rss_parse.inc 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/xml/rssparser/magpierss/rss_parse.inc 2007-10-06 19:08:42 UTC (rev 5968)
@@ -23,8 +23,8 @@
define('RSS', 'RSS');
define('ATOM', 'Atom');
-lt_include (MAGPIE_DIR . 'rss_utils.inc');
+
/**
* Hybrid parser, and object, takes RSS as a string and returns a simple object.
*
Modified: plog/branches/lifetype-2.0-autoload/class/xml/rssparser/rssitem.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/xml/rssparser/rssitem.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/xml/rssparser/rssitem.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,7 +1,7 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/xml/rssparser/rssenclosure.class.php" );
+
/**
* \ingroup XML
Modified: plog/branches/lifetype-2.0-autoload/class/xml/rssparser/rssparser.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/class/xml/rssparser/rssparser.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/class/xml/rssparser/rssparser.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -55,12 +55,12 @@
*/
function parse( $rssFeed )
{
- lt_include( PLOG_CLASS_PATH."class/xml/rssparser/rsschannel.class.php" );
- lt_include( PLOG_CLASS_PATH."class/xml/rssparser/magpierss/rss_fetch.inc" );
- lt_include( PLOG_CLASS_PATH."class/xml/rssparser/magpierss/rss_cache.inc" );
- lt_include( PLOG_CLASS_PATH."class/xml/rssparser/magpierss/rss_parse.inc" );
- lt_include( PLOG_CLASS_PATH."class/xml/rssparser/magpierss/rss_utils.inc" );
- lt_include( PLOG_CLASS_PATH."class/xml/rssparser/rssitem.class.php" );
+
+
+
+
+
+
$rss = fetch_rss( $rssFeed );
Modified: plog/branches/lifetype-2.0-autoload/comment
===================================================================
--- plog/branches/lifetype-2.0-autoload/comment 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/comment 2007-10-06 19:08:42 UTC (rev 5968)
@@ -4,10 +4,10 @@
}
include_once( PLOG_CLASS_PATH."class/bootstrap.php" );
- lt_include( PLOG_CLASS_PATH."class/net/http/httpvars.class.php" );
- lt_include( PLOG_CLASS_PATH."class/net/prettyrequestparser.class.php" );
- lt_include( PLOG_CLASS_PATH."class/net/requestgenerator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
+
+
+
+
// get the configuration data
$config =& Config::getConfig();
@@ -19,9 +19,9 @@
$parser = new PrettyRequestParser( "comment", $server["PATH_INFO"]);
$result = $parser->parse();
HttpVars::setRequest( $result );
- lt_include( "index.php" );
+
}
else {
- lt_include( PLOG_CLASS_PATH."blog.php" );
+
}
?>
Modified: plog/branches/lifetype-2.0-autoload/config/config.properties.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/config/config.properties.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/config/config.properties.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -26,13 +26,13 @@
# (note, if upgrading between minor releases:
# 1.0 to 1.0.1, etc. you shouldn't run the wizard)
-$config['db_host'] = '';
-$config['db_username'] = '';
+$config['db_host'] = 'localhost';
+$config['db_username'] = 'root';
$config['db_password'] = '';
-$config['db_database'] = '';
-$config['db_driver'] = '';
+$config['db_database'] = 'lt_utf8';
+$config['db_driver'] = 'mysql';
$config["db_persistent"] = true;
-$config['db_character_set'] = '';
+$config['db_character_set'] = 'utf8';
#
# the database prefix will be appended to the name of each database tables in case you want
@@ -41,7 +41,7 @@
# coexist in the same unique database. If you change this after the initial configuration done
# with the installation wizard, please make sure that you also rename the tables.
#
-$config['db_prefix'] = '';
+$config['db_prefix'] = 'lt_';
#
# This array is used to pass driver-specific parameters. Currently the only supported
@@ -50,5 +50,5 @@
# languages such as Chinese or Japanese. In all other cases, you probably want to enable
# this for performance reasons (searches are lot faster if using the FULLTEXT indexes)
#
-$config["db_options"] = Array( "enable_mysql_fulltext_search" => false );
+$config["db_options"] = Array( "enable_mysql_fulltext_search" => true );
?>
\ No newline at end of file
Modified: plog/branches/lifetype-2.0-autoload/error.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/error.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/error.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -5,10 +5,10 @@
}
include_once( PLOG_CLASS_PATH."class/bootstrap.php" );
- lt_include( PLOG_CLASS_PATH."class/net/http/httpvars.class.php" );
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
- lt_include( PLOG_CLASS_PATH."class/net/request.class.php" );
- lt_include( PLOG_CLASS_PATH."class/net/baserequestgenerator.class.php" );
+
+
+
+
/**
* Implements an error handler for 401, 403 and 404 errors so that
@@ -32,14 +32,14 @@
$config =& Config::getConfig();
if( $config->getValue( "request_format_mode" ) == SEARCH_ENGINE_FRIENDLY_MODE ) {
- lt_include( PLOG_CLASS_PATH."class/net/prettyrequestparser.class.php" );
+
$server = HttpVars::getServer();
$parser = new PrettyRequestParser( "default", $server["REQUEST_URI"]);
$result = $parser->parse();
HttpVars::setRequest( $result );
- lt_include( PLOG_CLASS_PATH."index.php" );
+
}
else {
- lt_include( PLOG_CLASS_PATH."blog.php" );
+
}
?>
Modified: plog/branches/lifetype-2.0-autoload/get
===================================================================
--- plog/branches/lifetype-2.0-autoload/get 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/get 2007-10-06 19:08:42 UTC (rev 5968)
@@ -4,10 +4,10 @@
}
include_once( PLOG_CLASS_PATH."class/bootstrap.php" );
- lt_include( PLOG_CLASS_PATH."class/net/http/httpvars.class.php" );
- lt_include( PLOG_CLASS_PATH."class/net/prettyrequestparser.class.php" );
- lt_include( PLOG_CLASS_PATH."class/net/requestgenerator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
+
+
+
+
// get the configuration data
@@ -20,9 +20,9 @@
$parser = new PrettyRequestParser( "get", $server["PATH_INFO"]);
$result = $parser->parse();
HttpVars::setRequest( $result );
- lt_include( "resserver.php" );
+
}
else {
- lt_include( PLOG_CLASS_PATH."blog.php" );
+
}
?>
Modified: plog/branches/lifetype-2.0-autoload/index.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/index.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/index.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -6,8 +6,7 @@
define( "PLOG_CLASS_PATH", dirname(__FILE__)."/");
}
- include_once( PLOG_CLASS_PATH."class/bootstrap.php" );
- lt_include( PLOG_CLASS_PATH."class/file/file.class.php" );
+ include_once( PLOG_CLASS_PATH."class/bootstrap.php" );
// start gathering statistics
//Info::startMetrics();
@@ -20,22 +19,10 @@
//
// a security check, or else people might forget to remove the wizard.php script
//
- if( File::isReadable( "wizard.php")) {
- lt_include( PLOG_CLASS_PATH."install/installation.class.php" );
+ if( File::isReadable( "wizard.php")) {
Installation::check();
}
-
- lt_include( PLOG_CLASS_PATH."plugins/badbehavior/index.inc.php" );
- lt_include( PLOG_CLASS_PATH."class/controller/blogcontroller.class.php" );
- lt_include( PLOG_CLASS_PATH."class/net/http/session/sessionmanager.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/userinfo.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/bloginfo.class.php" );
- lt_include( PLOG_CLASS_PATH."class/plugin/pluginmanager.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
-
-
-
// initialize the session
SessionManager::init();
Deleted: plog/branches/lifetype-2.0-autoload/install/installation.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/install/installation.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/install/installation.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,18 +0,0 @@
-<?php
- class Installation
- {
- function check()
- {
- include_once( PLOG_CLASS_PATH."config/config.properties.php" );
-
- if ( $config["db_host"] == '' || $config["db_username"] == '' || $config["db_database"] == '' ) {
- // If those parameters are empty
- echo 'LifeType has not been installed yet, you\'ll have to <font color="red"><b><a href="wizard.php" title="Install LifeType">Install LifeType</a></b></font> first!';
- } else {
- echo 'The <font color="red"><b>wizard.php</b></font> has to be removed after the installation process. Please remove it first to <font color="green"><b><a href="'.$_SERVER['PHP_SELF'].'" title="'.end( split( "/", $_SERVER['PHP_SELF'] ) ).'">continue</a></b></font>.';
- }
-
- die();
- }
- }
-?>
\ No newline at end of file
Modified: plog/branches/lifetype-2.0-autoload/page
===================================================================
--- plog/branches/lifetype-2.0-autoload/page 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/page 2007-10-06 19:08:42 UTC (rev 5968)
@@ -4,10 +4,10 @@
}
include_once( PLOG_CLASS_PATH."class/bootstrap.php" );
- lt_include( PLOG_CLASS_PATH."class/net/http/httpvars.class.php" );
- lt_include( PLOG_CLASS_PATH."class/net/prettyrequestparser.class.php" );
- lt_include( PLOG_CLASS_PATH."class/net/requestgenerator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
+
+
+
+
// get the configuration data
$config =& Config::getConfig();
@@ -19,9 +19,9 @@
$parser = new PrettyRequestParser( "page", $server["PATH_INFO"]);
$result = $parser->parse();
HttpVars::setRequest( $result );
- lt_include( "index.php" );
+
}
else {
- lt_include( PLOG_CLASS_PATH."blog.php" );
+
}
?>
Modified: plog/branches/lifetype-2.0-autoload/plugins/badbehavior/index.inc.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/plugins/badbehavior/index.inc.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/plugins/badbehavior/index.inc.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -41,7 +41,7 @@
// Return affected rows from most recent query.
function bb2_db_affected_rows() {
- 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) {
- 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) {
- 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() {
- 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) {
- 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() {
- 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
- lt_include(BB2_CWD . "bad-behavior/core.inc.php");
+
bb2_install();
$settings = bb2_read_settings();
bb2_start($settings);
Modified: plog/branches/lifetype-2.0-autoload/plugins/badbehavior/pluginbadbehavior.class.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/plugins/badbehavior/pluginbadbehavior.class.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/plugins/badbehavior/pluginbadbehavior.class.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -1,8 +1,8 @@
<?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
* TODO: some useful documentation here
Modified: plog/branches/lifetype-2.0-autoload/post
===================================================================
--- plog/branches/lifetype-2.0-autoload/post 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/post 2007-10-06 19:08:42 UTC (rev 5968)
@@ -4,10 +4,10 @@
}
include_once( PLOG_CLASS_PATH."class/bootstrap.php" );
- lt_include( PLOG_CLASS_PATH."class/net/http/httpvars.class.php" );
- lt_include( PLOG_CLASS_PATH."class/net/prettyrequestparser.class.php" );
- lt_include( PLOG_CLASS_PATH."class/net/requestgenerator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
+
+
+
+
// get the configuration data
$config =& Config::getConfig();
@@ -19,9 +19,9 @@
$parser = new PrettyRequestParser( "post", $server["PATH_INFO"]);
$result = $parser->parse();
HttpVars::setRequest( $result );
- lt_include( "index.php" );
+
}
else {
- lt_include( PLOG_CLASS_PATH."blog.php" );
+
}
?>
Modified: plog/branches/lifetype-2.0-autoload/register.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/register.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/register.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -9,10 +9,10 @@
}
include_once( PLOG_CLASS_PATH."class/bootstrap.php" );
- lt_include( PLOG_CLASS_PATH."class/summary/controller/registrationcontroller.class.php" );
- lt_include( PLOG_CLASS_PATH."class/misc/version.class.php" );
- lt_include( PLOG_CLASS_PATH."class/net/http/httpvars.class.php" );
+
+
+
// initialiaze the session
SessionManager::init();
Modified: plog/branches/lifetype-2.0-autoload/resource
===================================================================
--- plog/branches/lifetype-2.0-autoload/resource 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/resource 2007-10-06 19:08:42 UTC (rev 5968)
@@ -4,10 +4,10 @@
}
include_once( PLOG_CLASS_PATH."class/bootstrap.php" );
- lt_include( PLOG_CLASS_PATH."class/net/http/httpvars.class.php" );
- lt_include( PLOG_CLASS_PATH."class/net/prettyrequestparser.class.php" );
- lt_include( PLOG_CLASS_PATH."class/net/requestgenerator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
+
+
+
+
// get the configuration data
@@ -20,9 +20,9 @@
$parser = new PrettyRequestParser( "resource", $server["PATH_INFO"]);
$result = $parser->parse();
HttpVars::setRequest( $result );
- lt_include( "index.php" );
+
}
else {
- lt_include( PLOG_CLASS_PATH."blog.php" );
+
}
?>
Modified: plog/branches/lifetype-2.0-autoload/resserver.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/resserver.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/resserver.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -13,7 +13,7 @@
}
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
// to the action ResourceServerAction and ResourceServerView for better
@@ -25,5 +25,5 @@
$config =& Config::getConfig();
$indexPage = $config->getValue( "script_name", "index.php" );
- lt_include( PLOG_CLASS_PATH.$indexPage );
+
?>
Modified: plog/branches/lifetype-2.0-autoload/rss
===================================================================
--- plog/branches/lifetype-2.0-autoload/rss 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/rss 2007-10-06 19:08:42 UTC (rev 5968)
@@ -4,8 +4,8 @@
}
include_once( PLOG_CLASS_PATH."class/bootstrap.php" );
- lt_include( PLOG_CLASS_PATH."class/net/http/httpvars.class.php" );
- lt_include( PLOG_CLASS_PATH."class/net/prettyrequestparser.class.php" );
+
+
$server = HttpVars::getServer();
@@ -15,5 +15,5 @@
$result = $parser->parse();
HttpVars::setRequest( $result );
- lt_include( "rss.php" );
+
?>
Modified: plog/branches/lifetype-2.0-autoload/rss.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/rss.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/rss.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -5,11 +5,11 @@
}
include_once( PLOG_CLASS_PATH."class/bootstrap.php" );
- lt_include( PLOG_CLASS_PATH."class/controller/controller.class.php" );
- lt_include( PLOG_CLASS_PATH."class/net/http/session/sessioninfo.class.php" );
- lt_include( PLOG_CLASS_PATH."class/net/http/session/sessionmanager.class.php" );
- lt_include( PLOG_CLASS_PATH."class/net/http/httpvars.class.php" );
- lt_include( PLOG_CLASS_PATH."class/plugin/pluginmanager.class.php" );
+
+
+
+
+
// create our own action map
$actionMap = Array( "Default" => "RssAction" );
@@ -19,7 +19,7 @@
if( isset($request["summary"])) {
$request["op"] = "rss";
HttpVars::setRequest( $request );
- lt_include( PLOG_CLASS_PATH."summary.php" );
+
die();
}
Modified: plog/branches/lifetype-2.0-autoload/runtests.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/runtests.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/runtests.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -14,15 +14,15 @@
}
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" );
- lt_include( PLOG_CLASS_PATH."class/net/http/httpvars.class.php" );
+
+
+
+
// if plugins should also be included when testing, let's load them now
$folders = Array( TEST_CLASS_FOLDER );
if( INCLUDE_PLUGIN_TESTS ) {
- lt_include( PLOG_CLASS_PATH."class/plugin/pluginmanager.class.php" );
+
$pm =& PluginManager::getPluginManager();
$plugins = $pm->getPluginListFromFolder();
Modified: plog/branches/lifetype-2.0-autoload/static
===================================================================
--- plog/branches/lifetype-2.0-autoload/static 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/static 2007-10-06 19:08:42 UTC (rev 5968)
@@ -4,10 +4,10 @@
}
include_once( PLOG_CLASS_PATH."class/bootstrap.php" );
- lt_include( PLOG_CLASS_PATH."class/net/http/httpvars.class.php" );
- lt_include( PLOG_CLASS_PATH."class/net/prettyrequestparser.class.php" );
- lt_include( PLOG_CLASS_PATH."class/net/requestgenerator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
+
+
+
+
// get the configuration data
$config =& Config::getConfig();
@@ -19,9 +19,9 @@
$parser = new PrettyRequestParser( "static", $server["PATH_INFO"]);
$result = $parser->parse();
HttpVars::setRequest( $result );
- lt_include( "index.php" );
+
}
else {
- lt_include( PLOG_CLASS_PATH."blog.php" );
+
}
?>
Modified: plog/branches/lifetype-2.0-autoload/summary.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/summary.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/summary.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -5,13 +5,13 @@
}
include_once( PLOG_CLASS_PATH."class/bootstrap.php" );
- lt_include( PLOG_CLASS_PATH."class/summary/controller/summarycontroller.class.php" );
- lt_include( PLOG_CLASS_PATH."class/net/http/httpvars.class.php" );
- lt_include( PLOG_CLASS_PATH."class/misc/version.class.php" );
- lt_include( PLOG_CLASS_PATH."class/data/validator/usernamevalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/net/http/subdomains.class.php" );
- lt_include( PLOG_CLASS_PATH."class/net/http/session/sessionmanager.class.php" );
- lt_include( PLOG_CLASS_PATH."class/dao/userinfo.class.php" );
+
+
+
+
+
+
+
// start gathering statistics
Info::startMetrics();
@@ -22,7 +22,7 @@
// a security check, or else people might forget to remove the wizard.php script
//
if( is_readable( "wizard.php")) {
- lt_include( PLOG_CLASS_PATH."install/installation.class.php" );
+
Installation::check();
}
@@ -31,7 +31,7 @@
$config =& Config::getConfig();
if( $config->getValue( "subdomains_enabled") && Subdomains::isSubdomainUrl()) {
$indexPage = $config->getValue( "script_name", "index.php" );
- lt_include( PLOG_CLASS_PATH.$indexPage );
+
die();
}
Modified: plog/branches/lifetype-2.0-autoload/tools/generateData.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/tools/generateData.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/tools/generateData.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -5,20 +5,20 @@
}
include_once( PLOG_CLASS_PATH."class/object/loader.class.php" );
-lt_include( PLOG_CLASS_PATH."class/config/configfilestorage.class.php" );
-lt_include( PLOG_CLASS_PATH."class/dao/userpermissions.class.php" );
-lt_include( PLOG_CLASS_PATH."class/dao/users.class.php" );
-lt_include( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
-lt_include( PLOG_CLASS_PATH."class/dao/bloginfo.class.php" );
-lt_include( PLOG_CLASS_PATH."class/dao/blogsettings.class.php" );
-lt_include( PLOG_CLASS_PATH."class/dao/articlecategories.class.php" );
-lt_include( PLOG_CLASS_PATH."class/dao/articles.class.php" );
-lt_include( PLOG_CLASS_PATH."class/dao/article.class.php" );
-lt_include( PLOG_CLASS_PATH."class/dao/articlecomments.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/trackback.class.php" );
+
+
+
+
+
+
+
+
+
+
+
+
+
// check whether we're being run from the command line
$commandLine = is_array( $argv );
if( $commandLine )
Modified: plog/branches/lifetype-2.0-autoload/tools/tbgen.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/tools/tbgen.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/tools/tbgen.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -5,8 +5,8 @@
}
include_once( PLOG_CLASS_PATH."class/bootstrap.php" );
-lt_include( PLOG_CLASS_PATH."class/net/http/httpclient.class.php" );
+
if( isset( $_POST["sendTb"] )) {
// get the information from the request and send the trackback
$tbUrl = $_POST["tbUrl"];
Modified: plog/branches/lifetype-2.0-autoload/tools/updatedbschema.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/tools/updatedbschema.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/tools/updatedbschema.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -10,10 +10,10 @@
}
include_once( PLOG_CLASS_PATH."class/bootstrap.php" );
-lt_include( PLOG_CLASS_PATH."class/database/db.class.php" );
-lt_include( PLOG_CLASS_PATH."class/config/configfilestorage.class.php" );
-lt_include( PLOG_CLASS_PATH."install/dbschemas.properties.php" );
+
+
+
$config = new ConfigFileStorage();
// open a connection to the database
$db = PDb::getDriver('mysql');
Modified: plog/branches/lifetype-2.0-autoload/trackback.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/trackback.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/trackback.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -5,7 +5,7 @@
}
include_once( PLOG_CLASS_PATH."class/bootstrap.php" );
- lt_include( PLOG_CLASS_PATH."class/net/http/httpvars.class.php" );
+
//
// set appender for the "trackback" logger to "file" in
@@ -17,6 +17,6 @@
$request["op"] = "AddTrackback";
HttpVars::setRequest( $request );
- lt_include( PLOG_CLASS_PATH."index.php" );
+
?>
Modified: plog/branches/lifetype-2.0-autoload/trackbacks
===================================================================
--- plog/branches/lifetype-2.0-autoload/trackbacks 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/trackbacks 2007-10-06 19:08:42 UTC (rev 5968)
@@ -4,10 +4,10 @@
}
include_once( PLOG_CLASS_PATH."class/bootstrap.php" );
- lt_include( PLOG_CLASS_PATH."class/net/http/httpvars.class.php" );
- lt_include( PLOG_CLASS_PATH."class/net/prettyrequestparser.class.php" );
- lt_include( PLOG_CLASS_PATH."class/net/requestgenerator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
+
+
+
+
// get the configuration data
$config =& Config::getConfig();
@@ -19,9 +19,9 @@
$parser = new PrettyRequestParser( "trackbacks", $server["PATH_INFO"]);
$result = $parser->parse();
HttpVars::setRequest( $result );
- lt_include( "index.php" );
+
}
else {
- lt_include( PLOG_CLASS_PATH."blog.php" );
+
}
?>
Modified: plog/branches/lifetype-2.0-autoload/user
===================================================================
--- plog/branches/lifetype-2.0-autoload/user 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/user 2007-10-06 19:08:42 UTC (rev 5968)
@@ -4,10 +4,10 @@
}
include_once( PLOG_CLASS_PATH."class/bootstrap.php" );
- lt_include( PLOG_CLASS_PATH."class/net/http/httpvars.class.php" );
- lt_include( PLOG_CLASS_PATH."class/net/prettyrequestparser.class.php" );
- lt_include( PLOG_CLASS_PATH."class/net/requestgenerator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
+
+
+
+
// get the configuration data
$config =& Config::getConfig();
@@ -19,9 +19,9 @@
$parser = new PrettyRequestParser( "user", $server["PATH_INFO"]);
$result = $parser->parse();
HttpVars::setRequest( $result );
- lt_include( "index.php" );
+
}
else {
- lt_include( PLOG_CLASS_PATH."blog.php" );
+
}
?>
Modified: plog/branches/lifetype-2.0-autoload/xmlrpc.php
===================================================================
--- plog/branches/lifetype-2.0-autoload/xmlrpc.php 2007-10-06 11:48:17 UTC (rev 5967)
+++ plog/branches/lifetype-2.0-autoload/xmlrpc.php 2007-10-06 19:08:42 UTC (rev 5968)
@@ -5,8 +5,8 @@
}
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