[pLog-svn] r4488 - in plugins/trunk: . adminnotifier atom
atom/class/action atom/class/dao atom/class/logger
atom/class/net atom/class/template atom/class/view
atom/class/xml/atom ayearago ayearago/class
ayearago/class/action ayearago/class/view ayearago/locale
ayearago/templates badbehavior badbehavior/bad-behavior bin
categorycloud categorycloud/class categorycloud/class/action
categorycloud/class/view categorycloud/locale
categorycloud/templates contentfilter/class/action
contentfilter/locale dnsantispam ectocustom ectocustom/class
ectocustom/class/action ectocustom/class/view
ectocustom/locale ectocustom/templates editcomments
editcomments/class editcomments/class/action
editcomments/class/view editcomments/locale
editcomments/templates gallery gallery/class
gallery/class/action gallery/class/gallery gallery/class/view
gallery/locale gallery/templates galleryimages
googleanalytics/locale gravatar gravatar/locale
hostblock/locale hotlinkprevention hotlinkprevention/class
hotlinkprevention/class/action
hotlinkprevention/class/security hotlinkprevention/class/view
hotlinkprevention/locale hotlinkprevention/templates
linkcounter linkcounter/class linkcounter/class/action
linkcounter/class/view linkcounter/locale
linkcounter/templates mailcentre/templates mobile
mobile/class/action mobile/class/controller mobile/class/net
mobile/class/view moderate moderate/locale movabletype
movabletype/class movabletype/class/action
movabletype/class/view movabletype/locale
movabletype/templates nestedcomments openid openid/class
openid/class/action openid/class/view openid/locale
openid/templates plogeshi plogeshi/class/action
plogeshi/class/view plogeshi/inc/geshi plogpoll
plogpoll/class plogpoll/class/action plogpoll/class/dao
plogpoll/class/view plogpoll/locale plogpoll/templates print
randomimage recentcomments recentcomments/class/action
recentcomments/class/view recentcomments/templates
recommended recommended/class recommended/class/action
recommended/class/view recommended/locale
recommended/templates remembercommentdata
remembercommentdata/class remembercommentdata/class/action
remembercommentdata/class/view remembercommentdata/js
remembercommentdata/locale remembercommentdata/templates
secret secret/class secret/class/action secret/class/dao
secret/class/security secret/class/view secret/locale
secret/templates secretblog secretblog/class
secretblog/class/action secretblog/class/security
secretblog/class/view secretblog/locale secretblog/templates
shoutbox shoutbox/class shoutbox/class/action
shoutbox/class/dao shoutbox/locale shoutbox/templates
shoutbox/templates-sample shoutbox/templates-sample/standard
sitemap smileys sociable stickyposts stickyposts/class
stickyposts/class/action stickyposts/class/view
stickyposts/locale stickyposts/templates tagcloud
tagcloud/class/action tagcloud/class/view tagcloud/locale
tagcloud/templates technorati technorati/_notes
technorati/class technorati/class/action
technorati/class/action/_notes technorati/class/tests
technorati/class/view technorati/class/view/_notes
technorati/locale technorati/locale/_notes
technorati/templates technorati/templates/_notes
templateeditor/class/action templateeditor/js/editor
templatefilter topcommentposts topcommentposts/class
topcommentposts/class/action topcommentposts/class/view
topcommentposts/locale topcommentposts/templates
topcommentvisitors topcommentvisitors/class
topcommentvisitors/class/action topcommentvisitors/class/view
topcommentvisitors/locale topcommentvisitors/templates
topreadposts topreadposts/class topreadposts/class/action
topreadposts/class/view topreadposts/locale
topreadposts/templates toptrackbackposts
toptrackbackposts/class toptrackbackposts/class/action
toptrackbackposts/class/view toptrackbackposts/locale
toptrackbackposts/templates unported unported/currentlyaddictedto
unported/currentlyaddictedto/class
unported/currentlyaddictedto/class/action
unported/currentlyaddictedto/class/dao
unported/currentlyaddictedto/template-example
unported/currentlyaddictedto/template-example/grey
unported/currentlyaddictedto/templates validatetrackback/locale
oscar at devel.lifetype.net
oscar at devel.lifetype.net
Thu Jan 4 19:10:59 GMT 2007
Author: oscar
Date: 2007-01-04 19:10:56 +0000 (Thu, 04 Jan 2007)
New Revision: 4488
Added:
plugins/trunk/ayearago/
plugins/trunk/ayearago/class/
plugins/trunk/ayearago/class/action/
plugins/trunk/ayearago/class/action/pluginayearagoconfigaction.class.php
plugins/trunk/ayearago/class/action/pluginayearagoupdateconfigaction.class.php
plugins/trunk/ayearago/class/view/
plugins/trunk/ayearago/class/view/pluginayearagoconfigview.class.php
plugins/trunk/ayearago/locale/
plugins/trunk/ayearago/locale/locale_en_UK.php
plugins/trunk/ayearago/locale/locale_es_ES.php
plugins/trunk/ayearago/pluginayearago.class.php
plugins/trunk/ayearago/readme.txt
plugins/trunk/ayearago/templates/
plugins/trunk/ayearago/templates/ayearago.template
plugins/trunk/badbehavior/bad-behavior/blackhole.inc.php
plugins/trunk/categorycloud/
plugins/trunk/categorycloud/class/
plugins/trunk/categorycloud/class/action/
plugins/trunk/categorycloud/class/action/plugincategorycloudconfigaction.class.php
plugins/trunk/categorycloud/class/action/plugincategorycloudupdateconfigaction.class.php
plugins/trunk/categorycloud/class/view/
plugins/trunk/categorycloud/class/view/plugincategorycloudconfigview.class.php
plugins/trunk/categorycloud/locale/
plugins/trunk/categorycloud/locale/locale_en_UK.php
plugins/trunk/categorycloud/locale/locale_es_ES.php
plugins/trunk/categorycloud/plugincategorycloud.class.php
plugins/trunk/categorycloud/readme.txt
plugins/trunk/categorycloud/templates/
plugins/trunk/categorycloud/templates/categorycloud.template
plugins/trunk/contentfilter/locale/locale_ca_ES.php
plugins/trunk/ectocustom/
plugins/trunk/ectocustom/README.txt
plugins/trunk/ectocustom/class/
plugins/trunk/ectocustom/class/action/
plugins/trunk/ectocustom/class/action/pluginectocustomconfigaction.class.php
plugins/trunk/ectocustom/class/action/pluginectocustomupdateconfigaction.class.php
plugins/trunk/ectocustom/class/view/
plugins/trunk/ectocustom/class/view/pluginectocustomconfigview.class.php
plugins/trunk/ectocustom/locale/
plugins/trunk/ectocustom/locale/locale_en_UK.php
plugins/trunk/ectocustom/pluginectocustom.class.php
plugins/trunk/ectocustom/templates/
plugins/trunk/ectocustom/templates/ectocustom.template
plugins/trunk/editcomments/
plugins/trunk/editcomments/class/
plugins/trunk/editcomments/class/action/
plugins/trunk/editcomments/class/action/admineditcommentaction.class.php
plugins/trunk/editcomments/class/action/adminedittrackbackaction.class.php
plugins/trunk/editcomments/class/action/adminplugineditcommentsaction.class.php
plugins/trunk/editcomments/class/action/adminpluginedittrackbacksaction.class.php
plugins/trunk/editcomments/class/action/adminupdatecommentaction.class.php
plugins/trunk/editcomments/class/action/adminupdatetrackbackaction.class.php
plugins/trunk/editcomments/class/view/
plugins/trunk/editcomments/class/view/admineditcommentsview.class.php
plugins/trunk/editcomments/class/view/admineditcommentview.class.php
plugins/trunk/editcomments/class/view/adminedittrackbacksview.class.php
plugins/trunk/editcomments/class/view/adminedittrackbackview.class.php
plugins/trunk/editcomments/locale/
plugins/trunk/editcomments/locale/locale_en_UK.php
plugins/trunk/editcomments/plugineditcomments.class.php
plugins/trunk/editcomments/readme.txt
plugins/trunk/editcomments/templates/
plugins/trunk/editcomments/templates/editcomment.template
plugins/trunk/editcomments/templates/editcomments.template
plugins/trunk/editcomments/templates/edittrackback.template
plugins/trunk/editcomments/templates/edittrackbacks.template
plugins/trunk/gallery/
plugins/trunk/gallery/README
plugins/trunk/gallery/class/
plugins/trunk/gallery/class/action/
plugins/trunk/gallery/class/action/plugingalleryconfigaction.class.php
plugins/trunk/gallery/class/action/plugingalleryshowaction.class.php
plugins/trunk/gallery/class/action/plugingalleryupdateconfigaction.class.php
plugins/trunk/gallery/class/gallery/
plugins/trunk/gallery/class/gallery/galleryhelper.class.php
plugins/trunk/gallery/class/view/
plugins/trunk/gallery/class/view/plugingalleryconfigview.class.php
plugins/trunk/gallery/class/view/plugingalleryshowview.class.php
plugins/trunk/gallery/locale/
plugins/trunk/gallery/locale/locale_en_UK.php
plugins/trunk/gallery/locale/locale_zh_TW.php
plugins/trunk/gallery/plugingallery.class.php
plugins/trunk/gallery/templates/
plugins/trunk/gallery/templates/galleryAdmin.template
plugins/trunk/gallery/templates/galleryShow.template
plugins/trunk/googleanalytics/locale/locale_ca_ES.php
plugins/trunk/gravatar/locale/locale_ca_ES.php
plugins/trunk/gravatar/locale/locale_es_ES.php
plugins/trunk/hostblock/locale/locale_ca_ES.php
plugins/trunk/hotlinkprevention/
plugins/trunk/hotlinkprevention/class/
plugins/trunk/hotlinkprevention/class/action/
plugins/trunk/hotlinkprevention/class/action/pluginglobalhotlinkpreventionconfigaction.class.php
plugins/trunk/hotlinkprevention/class/action/pluginglobalhotlinkpreventionupdateconfigaction.class.php
plugins/trunk/hotlinkprevention/class/action/pluginhotlinkpreventionconfigaction.class.php
plugins/trunk/hotlinkprevention/class/action/pluginhotlinkpreventionupdateconfigaction.class.php
plugins/trunk/hotlinkprevention/class/security/
plugins/trunk/hotlinkprevention/class/security/hotlinkpreventionfilter.class.php
plugins/trunk/hotlinkprevention/class/view/
plugins/trunk/hotlinkprevention/class/view/pluginglobalhotlinkpreventionconfigview.class.php
plugins/trunk/hotlinkprevention/class/view/pluginhotlinkpreventionconfigview.class.php
plugins/trunk/hotlinkprevention/locale/
plugins/trunk/hotlinkprevention/locale/locale_en_UK.php
plugins/trunk/hotlinkprevention/locale/locale_zh_TW.php
plugins/trunk/hotlinkprevention/pluginhotlinkprevention.class.php
plugins/trunk/hotlinkprevention/readme.txt
plugins/trunk/hotlinkprevention/templates/
plugins/trunk/hotlinkprevention/templates/globalhotlinkprevention.template
plugins/trunk/hotlinkprevention/templates/hotlinkprevention.template
plugins/trunk/linkcounter/
plugins/trunk/linkcounter/class/
plugins/trunk/linkcounter/class/action/
plugins/trunk/linkcounter/class/action/pluginlinkcounterconfigaction.class.php
plugins/trunk/linkcounter/class/action/pluginlinkcounterupdateconfigaction.class.php
plugins/trunk/linkcounter/class/view/
plugins/trunk/linkcounter/class/view/pluginlinkcounterconfigview.class.php
plugins/trunk/linkcounter/locale/
plugins/trunk/linkcounter/locale/locale_en_UK.php
plugins/trunk/linkcounter/pluginlinkcounter.class.php
plugins/trunk/linkcounter/readme.txt
plugins/trunk/linkcounter/templates/
plugins/trunk/linkcounter/templates/linkcounter.template
plugins/trunk/moderate/locale/locale_ca_ES.php
plugins/trunk/movabletype/
plugins/trunk/movabletype/class/
plugins/trunk/movabletype/class/action/
plugins/trunk/movabletype/class/action/pluginmovabletypeconfigaction.class.php
plugins/trunk/movabletype/class/action/pluginmovabletypeupdateconfigaction.class.php
plugins/trunk/movabletype/class/view/
plugins/trunk/movabletype/class/view/pluginmovabletypeconfigview.class.php
plugins/trunk/movabletype/locale/
plugins/trunk/movabletype/locale/locale_en_UK.php
plugins/trunk/movabletype/pluginmovabletype.class.php
plugins/trunk/movabletype/readme.txt
plugins/trunk/movabletype/templates/
plugins/trunk/movabletype/templates/movabletype.template
plugins/trunk/openid/
plugins/trunk/openid/OpenID.php
plugins/trunk/openid/README.txt
plugins/trunk/openid/class/
plugins/trunk/openid/class/action/
plugins/trunk/openid/class/action/pluginopenidconfigaction.class.php
plugins/trunk/openid/class/action/pluginopenidupdateconfigaction.class.php
plugins/trunk/openid/class/view/
plugins/trunk/openid/class/view/pluginopenidconfigview.class.php
plugins/trunk/openid/locale/
plugins/trunk/openid/locale/locale_en_UK.php
plugins/trunk/openid/pluginopenid.class.php
plugins/trunk/openid/templates/
plugins/trunk/openid/templates/openid.template
plugins/trunk/plogpoll/
plugins/trunk/plogpoll/LICENSE
plugins/trunk/plogpoll/README
plugins/trunk/plogpoll/class/
plugins/trunk/plogpoll/class/action/
plugins/trunk/plogpoll/class/action/adminplogpolladdpollaction.class.php
plugins/trunk/plogpoll/class/action/adminplogpolldeletepollaction.class.php
plugins/trunk/plogpoll/class/action/adminplogpolllistviewaction.class.php
plugins/trunk/plogpoll/class/action/adminplogpollnewpollviewaction.class.php
plugins/trunk/plogpoll/class/action/plogpollregistervoteaction.class.php
plugins/trunk/plogpoll/class/dao/
plugins/trunk/plogpoll/class/dao/plogpollpoll.class.php
plugins/trunk/plogpoll/class/dao/plogpollpolls.class.php
plugins/trunk/plogpoll/class/view/
plugins/trunk/plogpoll/class/view/adminplogpolllistview.class.php
plugins/trunk/plogpoll/class/view/adminplogpollnewpollview.class.php
plugins/trunk/plogpoll/locale/
plugins/trunk/plogpoll/locale/locale_ca_ES.php
plugins/trunk/plogpoll/locale/locale_en_UK.php
plugins/trunk/plogpoll/pluginplogpoll.class.php
plugins/trunk/plogpoll/templates/
plugins/trunk/plogpoll/templates/adminnewpoll.template
plugins/trunk/plogpoll/templates/adminpollview.template
plugins/trunk/randomimage/
plugins/trunk/randomimage/pluginrandomimage.class.php
plugins/trunk/randomimage/readme.txt
plugins/trunk/recentcomments/class/action/pluginrecentcommentsrssaction.class.php
plugins/trunk/recentcomments/class/view/pluginrecentcommentsrssview.class.php
plugins/trunk/recentcomments/templates/rss20.template
plugins/trunk/recommended/
plugins/trunk/recommended/class/
plugins/trunk/recommended/class/action/
plugins/trunk/recommended/class/action/pluginrecommendedconfigaction.class.php
plugins/trunk/recommended/class/action/pluginrecommendedupdateconfigaction.class.php
plugins/trunk/recommended/class/view/
plugins/trunk/recommended/class/view/pluginrecommendedconfigview.class.php
plugins/trunk/recommended/locale/
plugins/trunk/recommended/locale/locale_en_UK.php
plugins/trunk/recommended/pluginrecommended.class.php
plugins/trunk/recommended/readme.txt
plugins/trunk/recommended/templates/
plugins/trunk/recommended/templates/recommended.template
plugins/trunk/remembercommentdata/
plugins/trunk/remembercommentdata/class/
plugins/trunk/remembercommentdata/class/action/
plugins/trunk/remembercommentdata/class/action/pluginremembercommentdataconfigaction.class.php
plugins/trunk/remembercommentdata/class/action/pluginremembercommentdataupdateconfigaction.class.php
plugins/trunk/remembercommentdata/class/view/
plugins/trunk/remembercommentdata/class/view/pluginremembercommentdataconfigview.class.php
plugins/trunk/remembercommentdata/js/
plugins/trunk/remembercommentdata/js/remembercommentdata.js
plugins/trunk/remembercommentdata/locale/
plugins/trunk/remembercommentdata/locale/locale_en_UK.php
plugins/trunk/remembercommentdata/locale/locale_es_ES.php
plugins/trunk/remembercommentdata/pluginremembercommentdata.class.php
plugins/trunk/remembercommentdata/readme.txt
plugins/trunk/remembercommentdata/templates/
plugins/trunk/remembercommentdata/templates/remembercommentdata.template
plugins/trunk/secret/
plugins/trunk/secret/class/
plugins/trunk/secret/class/action/
plugins/trunk/secret/class/action/adminsecretpluginsettingsaction.class.php
plugins/trunk/secret/class/action/adminsecretpluginupdatesettingsaction.class.php
plugins/trunk/secret/class/action/submitsecretitempasswordaction.class.php
plugins/trunk/secret/class/dao/
plugins/trunk/secret/class/dao/secretitems.class.php
plugins/trunk/secret/class/security/
plugins/trunk/secret/class/security/secretitemfilter.class.php
plugins/trunk/secret/class/view/
plugins/trunk/secret/class/view/adminsecretpluginsettingsview.class.php
plugins/trunk/secret/locale/
plugins/trunk/secret/locale/locale_en_UK.php
plugins/trunk/secret/locale/locale_zh_CN.php
plugins/trunk/secret/locale/locale_zh_TW.php
plugins/trunk/secret/pluginsecret.class.php
plugins/trunk/secret/readme.txt
plugins/trunk/secret/templates/
plugins/trunk/secret/templates/passwordform.template
plugins/trunk/secret/templates/pluginsettings.template
plugins/trunk/secretblog/
plugins/trunk/secretblog/class/
plugins/trunk/secretblog/class/action/
plugins/trunk/secretblog/class/action/adminsecretblogpluginsettingsaction.class.php
plugins/trunk/secretblog/class/action/adminsecretblogpluginupdatesettingsaction.class.php
plugins/trunk/secretblog/class/security/
plugins/trunk/secretblog/class/security/secretblogfilter.class.php
plugins/trunk/secretblog/class/view/
plugins/trunk/secretblog/class/view/adminsecretblogpluginsettingsview.class.php
plugins/trunk/secretblog/locale/
plugins/trunk/secretblog/locale/locale_en_UK.php
plugins/trunk/secretblog/pluginsecretblog.class.php
plugins/trunk/secretblog/templates/
plugins/trunk/secretblog/templates/passwordform.template
plugins/trunk/secretblog/templates/pluginsettings.template
plugins/trunk/shoutbox/
plugins/trunk/shoutbox/README.txt
plugins/trunk/shoutbox/class/
plugins/trunk/shoutbox/class/action/
plugins/trunk/shoutbox/class/action/pluginshoutboxaction.class.php
plugins/trunk/shoutbox/class/action/pluginshoutboxconfigaction.class.php
plugins/trunk/shoutbox/class/action/pluginshoutboxdeleteshoutsaction.class.php
plugins/trunk/shoutbox/class/action/pluginshoutboxhistoryaction.class.php
plugins/trunk/shoutbox/class/action/pluginshoutboxnewshoutaction.class.php
plugins/trunk/shoutbox/class/action/pluginshoutboxquickdeleteaction.class.php
plugins/trunk/shoutbox/class/action/pluginshoutboxsetupaction.class.php
plugins/trunk/shoutbox/class/action/pluginshoutboxupdateconfigaction.class.php
plugins/trunk/shoutbox/class/dao/
plugins/trunk/shoutbox/class/dao/shoutbox.class.php
plugins/trunk/shoutbox/class/dao/shoutboxInstaller.class.php
plugins/trunk/shoutbox/locale/
plugins/trunk/shoutbox/locale/locale_en_UK.php
plugins/trunk/shoutbox/locale/locale_it_IT.php
plugins/trunk/shoutbox/pluginshoutbox.class.php
plugins/trunk/shoutbox/templates-sample/
plugins/trunk/shoutbox/templates-sample/.htaccess
plugins/trunk/shoutbox/templates-sample/standard/
plugins/trunk/shoutbox/templates-sample/standard/footer.template
plugins/trunk/shoutbox/templates-sample/standard/info.template
plugins/trunk/shoutbox/templates-sample/standard/shoutbox.template
plugins/trunk/shoutbox/templates-sample/standard/shoutbox_history.template
plugins/trunk/shoutbox/templates/
plugins/trunk/shoutbox/templates/shoutbox.template
plugins/trunk/shoutbox/templates/shoutboxConfig.template
plugins/trunk/shoutbox/templates/shoutbox_newshout.template
plugins/trunk/stickyposts/
plugins/trunk/stickyposts/class/
plugins/trunk/stickyposts/class/action/
plugins/trunk/stickyposts/class/action/pluginstickypostsconfigaction.class.php
plugins/trunk/stickyposts/class/action/pluginstickypostsupdateconfigaction.class.php
plugins/trunk/stickyposts/class/view/
plugins/trunk/stickyposts/class/view/pluginstickypostsconfigview.class.php
plugins/trunk/stickyposts/locale/
plugins/trunk/stickyposts/locale/locale_en_UK.php
plugins/trunk/stickyposts/locale/locale_es_ES.php
plugins/trunk/stickyposts/locale/locale_zh_CN.php
plugins/trunk/stickyposts/locale/locale_zh_TW.php
plugins/trunk/stickyposts/pluginstickyposts.class.php
plugins/trunk/stickyposts/readme-zh_CN.txt
plugins/trunk/stickyposts/readme-zh_TW.txt
plugins/trunk/stickyposts/readme.txt
plugins/trunk/stickyposts/templates/
plugins/trunk/stickyposts/templates/stickyposts.template
plugins/trunk/technorati/
plugins/trunk/technorati/_notes/
plugins/trunk/technorati/_notes/dwsync.xml
plugins/trunk/technorati/class/
plugins/trunk/technorati/class/action/
plugins/trunk/technorati/class/action/_notes/
plugins/trunk/technorati/class/action/_notes/dwsync.xml
plugins/trunk/technorati/class/action/admintechnoratipluginsettingsaction.class.php
plugins/trunk/technorati/class/action/admintechnoratipluginupdatesettingsaction.class.php
plugins/trunk/technorati/class/tests/
plugins/trunk/technorati/class/tests/plugintechnorati_test.class.php
plugins/trunk/technorati/class/view/
plugins/trunk/technorati/class/view/_notes/
plugins/trunk/technorati/class/view/_notes/dwsync.xml
plugins/trunk/technorati/class/view/admintechnoratipluginsettingsview.class.php
plugins/trunk/technorati/locale/
plugins/trunk/technorati/locale/_notes/
plugins/trunk/technorati/locale/_notes/dwsync.xml
plugins/trunk/technorati/locale/locale_en_UK.php
plugins/trunk/technorati/plugintechnorati.class.php
plugins/trunk/technorati/templates/
plugins/trunk/technorati/templates/_notes/
plugins/trunk/technorati/templates/_notes/dwsync.xml
plugins/trunk/technorati/templates/pluginsettings.template
plugins/trunk/templatefilter/
plugins/trunk/templatefilter/plugintemplatefilter.class.php
plugins/trunk/templatefilter/readme.txt
plugins/trunk/topcommentposts/
plugins/trunk/topcommentposts/class/
plugins/trunk/topcommentposts/class/action/
plugins/trunk/topcommentposts/class/action/plugintopcommentpostsconfigaction.class.php
plugins/trunk/topcommentposts/class/action/plugintopcommentpostsupdateconfigaction.class.php
plugins/trunk/topcommentposts/class/view/
plugins/trunk/topcommentposts/class/view/plugintopcommentpostsconfigview.class.php
plugins/trunk/topcommentposts/locale/
plugins/trunk/topcommentposts/locale/locale_en_UK.php
plugins/trunk/topcommentposts/locale/locale_zh_CN.php
plugins/trunk/topcommentposts/locale/locale_zh_TW.php
plugins/trunk/topcommentposts/plugintopcommentposts.class.php
plugins/trunk/topcommentposts/readme.txt
plugins/trunk/topcommentposts/templates/
plugins/trunk/topcommentposts/templates/topcommentposts.template
plugins/trunk/topcommentvisitors/
plugins/trunk/topcommentvisitors/class/
plugins/trunk/topcommentvisitors/class/action/
plugins/trunk/topcommentvisitors/class/action/plugintopcommentvisitorsconfigaction.class.php
plugins/trunk/topcommentvisitors/class/action/plugintopcommentvisitorsupdateconfigaction.class.php
plugins/trunk/topcommentvisitors/class/view/
plugins/trunk/topcommentvisitors/class/view/plugintopcommentvisitorsconfigview.class.php
plugins/trunk/topcommentvisitors/locale/
plugins/trunk/topcommentvisitors/locale/locale_en_UK.php
plugins/trunk/topcommentvisitors/locale/locale_zh_CN.php
plugins/trunk/topcommentvisitors/locale/locale_zh_TW.php
plugins/trunk/topcommentvisitors/plugintopcommentvisitors.class.php
plugins/trunk/topcommentvisitors/readme.txt
plugins/trunk/topcommentvisitors/templates/
plugins/trunk/topcommentvisitors/templates/topcommentvisitors.template
plugins/trunk/topreadposts/
plugins/trunk/topreadposts/class/
plugins/trunk/topreadposts/class/action/
plugins/trunk/topreadposts/class/action/plugintopreadpostsconfigaction.class.php
plugins/trunk/topreadposts/class/action/plugintopreadpostsupdateconfigaction.class.php
plugins/trunk/topreadposts/class/view/
plugins/trunk/topreadposts/class/view/plugintopreadpostsconfigview.class.php
plugins/trunk/topreadposts/locale/
plugins/trunk/topreadposts/locale/locale_en_UK.php
plugins/trunk/topreadposts/locale/locale_zh_CN.php
plugins/trunk/topreadposts/locale/locale_zh_TW.php
plugins/trunk/topreadposts/plugintopreadposts.class.php
plugins/trunk/topreadposts/readme.txt
plugins/trunk/topreadposts/templates/
plugins/trunk/topreadposts/templates/topreadposts.template
plugins/trunk/toptrackbackposts/
plugins/trunk/toptrackbackposts/class/
plugins/trunk/toptrackbackposts/class/action/
plugins/trunk/toptrackbackposts/class/action/plugintoptrackbackpostsconfigaction.class.php
plugins/trunk/toptrackbackposts/class/action/plugintoptrackbackpostsupdateconfigaction.class.php
plugins/trunk/toptrackbackposts/class/view/
plugins/trunk/toptrackbackposts/class/view/plugintoptrackbackpostsconfigview.class.php
plugins/trunk/toptrackbackposts/locale/
plugins/trunk/toptrackbackposts/locale/locale_en_UK.php
plugins/trunk/toptrackbackposts/locale/locale_zh_CN.php
plugins/trunk/toptrackbackposts/locale/locale_zh_TW.php
plugins/trunk/toptrackbackposts/plugintoptrackbackposts.class.php
plugins/trunk/toptrackbackposts/readme.txt
plugins/trunk/toptrackbackposts/templates/
plugins/trunk/toptrackbackposts/templates/toptrackbackposts.template
plugins/trunk/unported/currentlyaddictedto/
plugins/trunk/unported/currentlyaddictedto/README.txt
plugins/trunk/unported/currentlyaddictedto/cat-presentation.txt
plugins/trunk/unported/currentlyaddictedto/class/
plugins/trunk/unported/currentlyaddictedto/class/action/
plugins/trunk/unported/currentlyaddictedto/class/action/plugincurrentlyaddictedtoaction.class.php
plugins/trunk/unported/currentlyaddictedto/class/action/plugincurrentlyaddictedtoselectaction.class.php
plugins/trunk/unported/currentlyaddictedto/class/dao/
plugins/trunk/unported/currentlyaddictedto/class/dao/cat_book.class.php
plugins/trunk/unported/currentlyaddictedto/class/dao/cat_item.class.php
plugins/trunk/unported/currentlyaddictedto/class/dao/cat_music.class.php
plugins/trunk/unported/currentlyaddictedto/lists.txt
plugins/trunk/unported/currentlyaddictedto/plugincurrentlyaddictedto.class.php
plugins/trunk/unported/currentlyaddictedto/template-example/
plugins/trunk/unported/currentlyaddictedto/template-example/grey/
plugins/trunk/unported/currentlyaddictedto/template-example/grey/header.template
plugins/trunk/unported/currentlyaddictedto/templates/
plugins/trunk/unported/currentlyaddictedto/templates/cat_book.template
plugins/trunk/unported/currentlyaddictedto/templates/cat_music.template
plugins/trunk/unported/currentlyaddictedto/templates/select.template
plugins/trunk/validatetrackback/locale/locale_ca_ES.php
Removed:
plugins/trunk/ayearago/class/
plugins/trunk/ayearago/class/action/
plugins/trunk/ayearago/class/action/pluginayearagoconfigaction.class.php
plugins/trunk/ayearago/class/action/pluginayearagoupdateconfigaction.class.php
plugins/trunk/ayearago/class/view/
plugins/trunk/ayearago/class/view/pluginayearagoconfigview.class.php
plugins/trunk/ayearago/locale/
plugins/trunk/ayearago/locale/locale_en_UK.php
plugins/trunk/ayearago/locale/locale_es_ES.php
plugins/trunk/ayearago/pluginayearago.class.php
plugins/trunk/ayearago/readme.txt
plugins/trunk/ayearago/templates/
plugins/trunk/ayearago/templates/ayearago.template
plugins/trunk/categorycloud/class/
plugins/trunk/categorycloud/class/action/
plugins/trunk/categorycloud/class/action/plugincategorycloudconfigaction.class.php
plugins/trunk/categorycloud/class/action/plugincategorycloudupdateconfigaction.class.php
plugins/trunk/categorycloud/class/view/
plugins/trunk/categorycloud/class/view/plugincategorycloudconfigview.class.php
plugins/trunk/categorycloud/locale/
plugins/trunk/categorycloud/locale/locale_en_UK.php
plugins/trunk/categorycloud/locale/locale_es_ES.php
plugins/trunk/categorycloud/plugincategorycloud.class.php
plugins/trunk/categorycloud/readme.txt
plugins/trunk/categorycloud/templates/
plugins/trunk/categorycloud/templates/categorycloud.template
plugins/trunk/ectocustom/README.txt
plugins/trunk/ectocustom/class/
plugins/trunk/ectocustom/class/action/
plugins/trunk/ectocustom/class/action/pluginectocustomconfigaction.class.php
plugins/trunk/ectocustom/class/action/pluginectocustomupdateconfigaction.class.php
plugins/trunk/ectocustom/class/view/
plugins/trunk/ectocustom/class/view/pluginectocustomconfigview.class.php
plugins/trunk/ectocustom/locale/
plugins/trunk/ectocustom/locale/locale_en_UK.php
plugins/trunk/ectocustom/pluginectocustom.class.php
plugins/trunk/ectocustom/templates/
plugins/trunk/ectocustom/templates/ectocustom.template
plugins/trunk/editcomments/class/
plugins/trunk/editcomments/class/action/
plugins/trunk/editcomments/class/action/admineditcommentaction.class.php
plugins/trunk/editcomments/class/action/adminedittrackbackaction.class.php
plugins/trunk/editcomments/class/action/adminplugineditcommentsaction.class.php
plugins/trunk/editcomments/class/action/adminpluginedittrackbacksaction.class.php
plugins/trunk/editcomments/class/action/adminupdatecommentaction.class.php
plugins/trunk/editcomments/class/action/adminupdatetrackbackaction.class.php
plugins/trunk/editcomments/class/view/
plugins/trunk/editcomments/class/view/admineditcommentsview.class.php
plugins/trunk/editcomments/class/view/admineditcommentview.class.php
plugins/trunk/editcomments/class/view/adminedittrackbacksview.class.php
plugins/trunk/editcomments/class/view/adminedittrackbackview.class.php
plugins/trunk/editcomments/locale/
plugins/trunk/editcomments/locale/locale_en_UK.php
plugins/trunk/editcomments/plugineditcomments.class.php
plugins/trunk/editcomments/readme.txt
plugins/trunk/editcomments/templates/
plugins/trunk/editcomments/templates/editcomment.template
plugins/trunk/editcomments/templates/editcomments.template
plugins/trunk/editcomments/templates/edittrackback.template
plugins/trunk/editcomments/templates/edittrackbacks.template
plugins/trunk/gallery/README
plugins/trunk/gallery/class/
plugins/trunk/gallery/class/action/
plugins/trunk/gallery/class/action/plugingalleryconfigaction.class.php
plugins/trunk/gallery/class/action/plugingalleryshowaction.class.php
plugins/trunk/gallery/class/action/plugingalleryupdateconfigaction.class.php
plugins/trunk/gallery/class/gallery/
plugins/trunk/gallery/class/gallery/galleryhelper.class.php
plugins/trunk/gallery/class/view/
plugins/trunk/gallery/class/view/plugingalleryconfigview.class.php
plugins/trunk/gallery/class/view/plugingalleryshowview.class.php
plugins/trunk/gallery/locale/
plugins/trunk/gallery/locale/locale_en_UK.php
plugins/trunk/gallery/locale/locale_zh_TW.php
plugins/trunk/gallery/plugingallery.class.php
plugins/trunk/gallery/templates/
plugins/trunk/gallery/templates/galleryAdmin.template
plugins/trunk/gallery/templates/galleryShow.template
plugins/trunk/hotlinkprevention/class/
plugins/trunk/hotlinkprevention/class/action/
plugins/trunk/hotlinkprevention/class/action/pluginglobalhotlinkpreventionconfigaction.class.php
plugins/trunk/hotlinkprevention/class/action/pluginglobalhotlinkpreventionupdateconfigaction.class.php
plugins/trunk/hotlinkprevention/class/action/pluginhotlinkpreventionconfigaction.class.php
plugins/trunk/hotlinkprevention/class/action/pluginhotlinkpreventionupdateconfigaction.class.php
plugins/trunk/hotlinkprevention/class/security/
plugins/trunk/hotlinkprevention/class/security/hotlinkpreventionfilter.class.php
plugins/trunk/hotlinkprevention/class/view/
plugins/trunk/hotlinkprevention/class/view/pluginglobalhotlinkpreventionconfigview.class.php
plugins/trunk/hotlinkprevention/class/view/pluginhotlinkpreventionconfigview.class.php
plugins/trunk/hotlinkprevention/locale/
plugins/trunk/hotlinkprevention/locale/locale_en_UK.php
plugins/trunk/hotlinkprevention/locale/locale_zh_TW.php
plugins/trunk/hotlinkprevention/pluginhotlinkprevention.class.php
plugins/trunk/hotlinkprevention/readme.txt
plugins/trunk/hotlinkprevention/templates/
plugins/trunk/hotlinkprevention/templates/globalhotlinkprevention.template
plugins/trunk/hotlinkprevention/templates/hotlinkprevention.template
plugins/trunk/linkcounter/class/
plugins/trunk/linkcounter/class/action/
plugins/trunk/linkcounter/class/action/pluginlinkcounterconfigaction.class.php
plugins/trunk/linkcounter/class/action/pluginlinkcounterupdateconfigaction.class.php
plugins/trunk/linkcounter/class/view/
plugins/trunk/linkcounter/class/view/pluginlinkcounterconfigview.class.php
plugins/trunk/linkcounter/locale/
plugins/trunk/linkcounter/locale/locale_en_UK.php
plugins/trunk/linkcounter/pluginlinkcounter.class.php
plugins/trunk/linkcounter/readme.txt
plugins/trunk/linkcounter/templates/
plugins/trunk/linkcounter/templates/linkcounter.template
plugins/trunk/movabletype/class/
plugins/trunk/movabletype/class/action/
plugins/trunk/movabletype/class/action/pluginmovabletypeconfigaction.class.php
plugins/trunk/movabletype/class/action/pluginmovabletypeupdateconfigaction.class.php
plugins/trunk/movabletype/class/view/
plugins/trunk/movabletype/class/view/pluginmovabletypeconfigview.class.php
plugins/trunk/movabletype/locale/
plugins/trunk/movabletype/locale/locale_en_UK.php
plugins/trunk/movabletype/pluginmovabletype.class.php
plugins/trunk/movabletype/readme.txt
plugins/trunk/movabletype/templates/
plugins/trunk/movabletype/templates/movabletype.template
plugins/trunk/openid/OpenID.php
plugins/trunk/openid/README.txt
plugins/trunk/openid/class/
plugins/trunk/openid/class/action/
plugins/trunk/openid/class/action/pluginopenidconfigaction.class.php
plugins/trunk/openid/class/action/pluginopenidupdateconfigaction.class.php
plugins/trunk/openid/class/view/
plugins/trunk/openid/class/view/pluginopenidconfigview.class.php
plugins/trunk/openid/locale/
plugins/trunk/openid/locale/locale_en_UK.php
plugins/trunk/openid/pluginopenid.class.php
plugins/trunk/openid/templates/
plugins/trunk/openid/templates/openid.template
plugins/trunk/plogpoll/LICENSE
plugins/trunk/plogpoll/README
plugins/trunk/plogpoll/class/
plugins/trunk/plogpoll/class/action/
plugins/trunk/plogpoll/class/action/adminplogpolladdpollaction.class.php
plugins/trunk/plogpoll/class/action/adminplogpolldeletepollaction.class.php
plugins/trunk/plogpoll/class/action/adminplogpolllistviewaction.class.php
plugins/trunk/plogpoll/class/action/adminplogpollnewpollviewaction.class.php
plugins/trunk/plogpoll/class/action/plogpollregistervoteaction.class.php
plugins/trunk/plogpoll/class/dao/
plugins/trunk/plogpoll/class/dao/plogpollpoll.class.php
plugins/trunk/plogpoll/class/dao/plogpollpolls.class.php
plugins/trunk/plogpoll/class/view/
plugins/trunk/plogpoll/class/view/adminplogpolllistview.class.php
plugins/trunk/plogpoll/class/view/adminplogpollnewpollview.class.php
plugins/trunk/plogpoll/locale/
plugins/trunk/plogpoll/locale/locale_ca_ES.php
plugins/trunk/plogpoll/locale/locale_en_UK.php
plugins/trunk/plogpoll/pluginplogpoll.class.php
plugins/trunk/plogpoll/templates/
plugins/trunk/plogpoll/templates/adminnewpoll.template
plugins/trunk/plogpoll/templates/adminpollview.template
plugins/trunk/randomimage/pluginrandomimage.class.php
plugins/trunk/randomimage/readme.txt
plugins/trunk/recommended/class/
plugins/trunk/recommended/class/action/
plugins/trunk/recommended/class/action/pluginrecommendedconfigaction.class.php
plugins/trunk/recommended/class/action/pluginrecommendedupdateconfigaction.class.php
plugins/trunk/recommended/class/view/
plugins/trunk/recommended/class/view/pluginrecommendedconfigview.class.php
plugins/trunk/recommended/locale/
plugins/trunk/recommended/locale/locale_en_UK.php
plugins/trunk/recommended/pluginrecommended.class.php
plugins/trunk/recommended/readme.txt
plugins/trunk/recommended/templates/
plugins/trunk/recommended/templates/recommended.template
plugins/trunk/remembercommentdata/class/
plugins/trunk/remembercommentdata/class/action/
plugins/trunk/remembercommentdata/class/action/pluginremembercommentdataconfigaction.class.php
plugins/trunk/remembercommentdata/class/action/pluginremembercommentdataupdateconfigaction.class.php
plugins/trunk/remembercommentdata/class/view/
plugins/trunk/remembercommentdata/class/view/pluginremembercommentdataconfigview.class.php
plugins/trunk/remembercommentdata/js/
plugins/trunk/remembercommentdata/js/remembercommentdata.js
plugins/trunk/remembercommentdata/locale/
plugins/trunk/remembercommentdata/locale/locale_en_UK.php
plugins/trunk/remembercommentdata/locale/locale_es_ES.php
plugins/trunk/remembercommentdata/pluginremembercommentdata.class.php
plugins/trunk/remembercommentdata/readme.txt
plugins/trunk/remembercommentdata/templates/
plugins/trunk/remembercommentdata/templates/remembercommentdata.template
plugins/trunk/secret/class/
plugins/trunk/secret/class/action/
plugins/trunk/secret/class/action/adminsecretpluginsettingsaction.class.php
plugins/trunk/secret/class/action/adminsecretpluginupdatesettingsaction.class.php
plugins/trunk/secret/class/action/submitsecretitempasswordaction.class.php
plugins/trunk/secret/class/dao/
plugins/trunk/secret/class/dao/secretitems.class.php
plugins/trunk/secret/class/security/
plugins/trunk/secret/class/security/secretitemfilter.class.php
plugins/trunk/secret/class/view/
plugins/trunk/secret/class/view/adminsecretpluginsettingsview.class.php
plugins/trunk/secret/locale/
plugins/trunk/secret/locale/locale_en_UK.php
plugins/trunk/secret/locale/locale_zh_CN.php
plugins/trunk/secret/locale/locale_zh_TW.php
plugins/trunk/secret/pluginsecret.class.php
plugins/trunk/secret/readme.txt
plugins/trunk/secret/templates/
plugins/trunk/secret/templates/passwordform.template
plugins/trunk/secret/templates/pluginsettings.template
plugins/trunk/secretblog/class/
plugins/trunk/secretblog/class/action/
plugins/trunk/secretblog/class/action/adminsecretblogpluginsettingsaction.class.php
plugins/trunk/secretblog/class/action/adminsecretblogpluginupdatesettingsaction.class.php
plugins/trunk/secretblog/class/security/
plugins/trunk/secretblog/class/security/secretblogfilter.class.php
plugins/trunk/secretblog/class/view/
plugins/trunk/secretblog/class/view/adminsecretblogpluginsettingsview.class.php
plugins/trunk/secretblog/locale/
plugins/trunk/secretblog/locale/locale_en_UK.php
plugins/trunk/secretblog/pluginsecretblog.class.php
plugins/trunk/secretblog/templates/
plugins/trunk/secretblog/templates/passwordform.template
plugins/trunk/secretblog/templates/pluginsettings.template
plugins/trunk/shoutbox/README.txt
plugins/trunk/shoutbox/class/
plugins/trunk/shoutbox/class/action/
plugins/trunk/shoutbox/class/action/pluginshoutboxaction.class.php
plugins/trunk/shoutbox/class/action/pluginshoutboxconfigaction.class.php
plugins/trunk/shoutbox/class/action/pluginshoutboxdeleteshoutsaction.class.php
plugins/trunk/shoutbox/class/action/pluginshoutboxhistoryaction.class.php
plugins/trunk/shoutbox/class/action/pluginshoutboxnewshoutaction.class.php
plugins/trunk/shoutbox/class/action/pluginshoutboxquickdeleteaction.class.php
plugins/trunk/shoutbox/class/action/pluginshoutboxsetupaction.class.php
plugins/trunk/shoutbox/class/action/pluginshoutboxupdateconfigaction.class.php
plugins/trunk/shoutbox/class/dao/
plugins/trunk/shoutbox/class/dao/shoutbox.class.php
plugins/trunk/shoutbox/class/dao/shoutboxInstaller.class.php
plugins/trunk/shoutbox/locale/
plugins/trunk/shoutbox/locale/locale_en_UK.php
plugins/trunk/shoutbox/locale/locale_it_IT.php
plugins/trunk/shoutbox/pluginshoutbox.class.php
plugins/trunk/shoutbox/templates-sample/
plugins/trunk/shoutbox/templates-sample/.htaccess
plugins/trunk/shoutbox/templates-sample/standard/
plugins/trunk/shoutbox/templates-sample/standard/footer.template
plugins/trunk/shoutbox/templates-sample/standard/info.template
plugins/trunk/shoutbox/templates-sample/standard/shoutbox.template
plugins/trunk/shoutbox/templates-sample/standard/shoutbox_history.template
plugins/trunk/shoutbox/templates/
plugins/trunk/shoutbox/templates/shoutbox.template
plugins/trunk/shoutbox/templates/shoutboxConfig.template
plugins/trunk/shoutbox/templates/shoutbox_newshout.template
plugins/trunk/stickyposts/class/
plugins/trunk/stickyposts/class/action/
plugins/trunk/stickyposts/class/action/pluginstickypostsconfigaction.class.php
plugins/trunk/stickyposts/class/action/pluginstickypostsupdateconfigaction.class.php
plugins/trunk/stickyposts/class/view/
plugins/trunk/stickyposts/class/view/pluginstickypostsconfigview.class.php
plugins/trunk/stickyposts/locale/
plugins/trunk/stickyposts/locale/locale_en_UK.php
plugins/trunk/stickyposts/locale/locale_es_ES.php
plugins/trunk/stickyposts/locale/locale_zh_CN.php
plugins/trunk/stickyposts/locale/locale_zh_TW.php
plugins/trunk/stickyposts/pluginstickyposts.class.php
plugins/trunk/stickyposts/readme-zh_CN.txt
plugins/trunk/stickyposts/readme-zh_TW.txt
plugins/trunk/stickyposts/readme.txt
plugins/trunk/stickyposts/templates/
plugins/trunk/stickyposts/templates/stickyposts.template
plugins/trunk/technorati/_notes/
plugins/trunk/technorati/_notes/dwsync.xml
plugins/trunk/technorati/class/
plugins/trunk/technorati/class/action/
plugins/trunk/technorati/class/action/_notes/
plugins/trunk/technorati/class/action/_notes/dwsync.xml
plugins/trunk/technorati/class/action/admintechnoratipluginsettingsaction.class.php
plugins/trunk/technorati/class/action/admintechnoratipluginupdatesettingsaction.class.php
plugins/trunk/technorati/class/tests/
plugins/trunk/technorati/class/tests/plugintechnorati_test.class.php
plugins/trunk/technorati/class/view/
plugins/trunk/technorati/class/view/_notes/
plugins/trunk/technorati/class/view/_notes/dwsync.xml
plugins/trunk/technorati/class/view/admintechnoratipluginsettingsview.class.php
plugins/trunk/technorati/locale/
plugins/trunk/technorati/locale/_notes/
plugins/trunk/technorati/locale/_notes/dwsync.xml
plugins/trunk/technorati/locale/locale_en_UK.php
plugins/trunk/technorati/plugintechnorati.class.php
plugins/trunk/technorati/templates/
plugins/trunk/technorati/templates/_notes/
plugins/trunk/technorati/templates/_notes/dwsync.xml
plugins/trunk/technorati/templates/pluginsettings.template
plugins/trunk/templatefilter/plugintemplatefilter.class.php
plugins/trunk/templatefilter/readme.txt
plugins/trunk/topcommentposts/class/
plugins/trunk/topcommentposts/class/action/
plugins/trunk/topcommentposts/class/action/plugintopcommentpostsconfigaction.class.php
plugins/trunk/topcommentposts/class/action/plugintopcommentpostsupdateconfigaction.class.php
plugins/trunk/topcommentposts/class/view/
plugins/trunk/topcommentposts/class/view/plugintopcommentpostsconfigview.class.php
plugins/trunk/topcommentposts/locale/
plugins/trunk/topcommentposts/locale/locale_en_UK.php
plugins/trunk/topcommentposts/locale/locale_zh_CN.php
plugins/trunk/topcommentposts/locale/locale_zh_TW.php
plugins/trunk/topcommentposts/plugintopcommentposts.class.php
plugins/trunk/topcommentposts/readme.txt
plugins/trunk/topcommentposts/templates/
plugins/trunk/topcommentposts/templates/topcommentposts.template
plugins/trunk/topcommentvisitors/class/
plugins/trunk/topcommentvisitors/class/action/
plugins/trunk/topcommentvisitors/class/action/plugintopcommentvisitorsconfigaction.class.php
plugins/trunk/topcommentvisitors/class/action/plugintopcommentvisitorsupdateconfigaction.class.php
plugins/trunk/topcommentvisitors/class/view/
plugins/trunk/topcommentvisitors/class/view/plugintopcommentvisitorsconfigview.class.php
plugins/trunk/topcommentvisitors/locale/
plugins/trunk/topcommentvisitors/locale/locale_en_UK.php
plugins/trunk/topcommentvisitors/locale/locale_zh_CN.php
plugins/trunk/topcommentvisitors/locale/locale_zh_TW.php
plugins/trunk/topcommentvisitors/plugintopcommentvisitors.class.php
plugins/trunk/topcommentvisitors/readme.txt
plugins/trunk/topcommentvisitors/templates/
plugins/trunk/topcommentvisitors/templates/topcommentvisitors.template
plugins/trunk/topreadposts/class/
plugins/trunk/topreadposts/class/action/
plugins/trunk/topreadposts/class/action/plugintopreadpostsconfigaction.class.php
plugins/trunk/topreadposts/class/action/plugintopreadpostsupdateconfigaction.class.php
plugins/trunk/topreadposts/class/view/
plugins/trunk/topreadposts/class/view/plugintopreadpostsconfigview.class.php
plugins/trunk/topreadposts/locale/
plugins/trunk/topreadposts/locale/locale_en_UK.php
plugins/trunk/topreadposts/locale/locale_zh_CN.php
plugins/trunk/topreadposts/locale/locale_zh_TW.php
plugins/trunk/topreadposts/plugintopreadposts.class.php
plugins/trunk/topreadposts/readme.txt
plugins/trunk/topreadposts/templates/
plugins/trunk/topreadposts/templates/topreadposts.template
plugins/trunk/toptrackbackposts/class/
plugins/trunk/toptrackbackposts/class/action/
plugins/trunk/toptrackbackposts/class/action/plugintoptrackbackpostsconfigaction.class.php
plugins/trunk/toptrackbackposts/class/action/plugintoptrackbackpostsupdateconfigaction.class.php
plugins/trunk/toptrackbackposts/class/view/
plugins/trunk/toptrackbackposts/class/view/plugintoptrackbackpostsconfigview.class.php
plugins/trunk/toptrackbackposts/locale/
plugins/trunk/toptrackbackposts/locale/locale_en_UK.php
plugins/trunk/toptrackbackposts/locale/locale_zh_CN.php
plugins/trunk/toptrackbackposts/locale/locale_zh_TW.php
plugins/trunk/toptrackbackposts/plugintoptrackbackposts.class.php
plugins/trunk/toptrackbackposts/readme.txt
plugins/trunk/toptrackbackposts/templates/
plugins/trunk/toptrackbackposts/templates/toptrackbackposts.template
plugins/trunk/unported/currentlyaddictedto/README.txt
plugins/trunk/unported/currentlyaddictedto/cat-presentation.txt
plugins/trunk/unported/currentlyaddictedto/class/
plugins/trunk/unported/currentlyaddictedto/class/action/
plugins/trunk/unported/currentlyaddictedto/class/action/plugincurrentlyaddictedtoaction.class.php
plugins/trunk/unported/currentlyaddictedto/class/action/plugincurrentlyaddictedtoselectaction.class.php
plugins/trunk/unported/currentlyaddictedto/class/dao/
plugins/trunk/unported/currentlyaddictedto/class/dao/cat_book.class.php
plugins/trunk/unported/currentlyaddictedto/class/dao/cat_item.class.php
plugins/trunk/unported/currentlyaddictedto/class/dao/cat_music.class.php
plugins/trunk/unported/currentlyaddictedto/lists.txt
plugins/trunk/unported/currentlyaddictedto/plugincurrentlyaddictedto.class.php
plugins/trunk/unported/currentlyaddictedto/template-example/
plugins/trunk/unported/currentlyaddictedto/template-example/grey/
plugins/trunk/unported/currentlyaddictedto/template-example/grey/header.template
plugins/trunk/unported/currentlyaddictedto/templates/
plugins/trunk/unported/currentlyaddictedto/templates/cat_book.template
plugins/trunk/unported/currentlyaddictedto/templates/cat_music.template
plugins/trunk/unported/currentlyaddictedto/templates/select.template
plugins/trunk/unported/editcomments/
plugins/trunk/unported/gallery/
plugins/trunk/unported/hotlinkprevention/
plugins/trunk/unported/plogpoll/
plugins/trunk/unported/randomimage/
plugins/trunk/unported/recommended/
plugins/trunk/unported/remembercommentdata/
plugins/trunk/unported/secret/
plugins/trunk/unported/secretblog/
plugins/trunk/unported/shoutbox/
plugins/trunk/unported/stickyposts/
plugins/trunk/unported/technorati/
plugins/trunk/unported/topcommentposts/
plugins/trunk/unported/topcommentvisitors/
plugins/trunk/unported/topreadposts/
plugins/trunk/unported/toptrackbackposts/
Modified:
plugins/trunk/adminnotifier/pluginadminnotifier.class.php
plugins/trunk/atom/class/action/adminatompluginsettingsaction.class.php
plugins/trunk/atom/class/action/adminatompluginupdatesettingsaction.class.php
plugins/trunk/atom/class/dao/atompasswords.class.php
plugins/trunk/atom/class/logger/atomlogger.class.php
plugins/trunk/atom/class/net/atomrequestgenerator.class.php
plugins/trunk/atom/class/template/atomoutputrenderer.class.php
plugins/trunk/atom/class/view/adminatompluginsettingsview.class.php
plugins/trunk/atom/class/xml/atom/atomFunc.php
plugins/trunk/atom/class/xml/atom/atomabstractservice.class.php
plugins/trunk/atom/class/xml/atom/atomerrorresponse.class.php
plugins/trunk/atom/class/xml/atom/atomrequest.class.php
plugins/trunk/atom/class/xml/atom/atomserver.class.php
plugins/trunk/atom/class/xml/atom/categoriesservice.class.php
plugins/trunk/atom/class/xml/atom/defaultservice.class.php
plugins/trunk/atom/class/xml/atom/editservice.class.php
plugins/trunk/atom/class/xml/atom/feedservice.class.php
plugins/trunk/atom/class/xml/atom/plogatomabstractservice.class.php
plugins/trunk/atom/class/xml/atom/plogatomauthentication.class.php
plugins/trunk/atom/class/xml/atom/postservice.class.php
plugins/trunk/atom/class/xml/atom/wsseauthentication.class.php
plugins/trunk/atom/pluginatom.class.php
plugins/trunk/badbehavior/bad-behavior/admin.inc.php
plugins/trunk/badbehavior/bad-behavior/banned.inc.php
plugins/trunk/badbehavior/bad-behavior/blacklist.inc.php
plugins/trunk/badbehavior/bad-behavior/common_tests.inc.php
plugins/trunk/badbehavior/bad-behavior/core.inc.php
plugins/trunk/badbehavior/bad-behavior/functions.inc.php
plugins/trunk/badbehavior/bad-behavior/google.inc.php
plugins/trunk/badbehavior/bad-behavior/housekeeping.inc.php
plugins/trunk/badbehavior/bad-behavior/konqueror.inc.php
plugins/trunk/badbehavior/bad-behavior/lynx.inc.php
plugins/trunk/badbehavior/bad-behavior/movabletype.inc.php
plugins/trunk/badbehavior/bad-behavior/mozilla.inc.php
plugins/trunk/badbehavior/bad-behavior/msie.inc.php
plugins/trunk/badbehavior/bad-behavior/msnbot.inc.php
plugins/trunk/badbehavior/bad-behavior/opera.inc.php
plugins/trunk/badbehavior/bad-behavior/post.inc.php
plugins/trunk/badbehavior/bad-behavior/responses.inc.php
plugins/trunk/badbehavior/bad-behavior/safari.inc.php
plugins/trunk/badbehavior/bad-behavior/screener.inc.php
plugins/trunk/badbehavior/bad-behavior/trackback.inc.php
plugins/trunk/badbehavior/bad-behavior/version.inc.php
plugins/trunk/badbehavior/bad-behavior/whitelist.inc.php
plugins/trunk/badbehavior/pluginbadbehavior.class.php
plugins/trunk/bin/build.sh
plugins/trunk/contentfilter/class/action/adminaddfilteredcontentaction.class.php
plugins/trunk/contentfilter/class/action/admindeletefilteredcontentaction.class.php
plugins/trunk/contentfilter/class/action/admineditfilteredcontentaction.class.php
plugins/trunk/contentfilter/class/action/adminfilteredcontentaction.class.php
plugins/trunk/contentfilter/class/action/adminnewfilteredcontentaction.class.php
plugins/trunk/contentfilter/class/action/adminupdatefilteredcontentaction.class.php
plugins/trunk/dnsantispam/plugindnsantispam.class.php
plugins/trunk/galleryimages/plugingalleryimages.class.php
plugins/trunk/gravatar/locale/locale_en_UK.php
plugins/trunk/gravatar/plugingravatar.class.php
plugins/trunk/gravatar/readme.txt
plugins/trunk/hostblock/locale/locale_en_UK.php
plugins/trunk/mailcentre/templates/userselector.template
plugins/trunk/mobile/class/action/mobileaction.class.php
plugins/trunk/mobile/class/action/mobiledefaultaction.class.php
plugins/trunk/mobile/class/action/mobileviewarticleaction.class.php
plugins/trunk/mobile/class/controller/mobilecontroller.class.php
plugins/trunk/mobile/class/net/mobilerequestgenerator.class.php
plugins/trunk/mobile/class/net/terminalidentifier.class.php
plugins/trunk/mobile/class/view/mobiledefaultview.class.php
plugins/trunk/mobile/class/view/mobileerrorview.class.php
plugins/trunk/mobile/class/view/mobileview.class.php
plugins/trunk/mobile/class/view/mobileviewarticleview.class.php
plugins/trunk/mobile/pluginmobile.class.php
plugins/trunk/moderate/locale/locale_en_UK.php
plugins/trunk/moderate/locale/locale_es_ES.php
plugins/trunk/moderate/readme.txt
plugins/trunk/nestedcomments/pluginnestedcomments.class.php
plugins/trunk/plogeshi/class/action/pluginplogeshiconfigaction.class.php
plugins/trunk/plogeshi/class/action/pluginplogeshiupdateconfigaction.class.php
plugins/trunk/plogeshi/class/view/pluginplogeshiconfigview.class.php
plugins/trunk/plogeshi/inc/geshi/php-brief.php
plugins/trunk/plogeshi/inc/geshi/php.php
plugins/trunk/plogeshi/pluginplogeshi.class.php
plugins/trunk/print/pluginprint.class.php
plugins/trunk/recentcomments/pluginrecentcomments.class.php
plugins/trunk/recentcomments/readme.txt
plugins/trunk/sitemap/pluginsitemap.class.php
plugins/trunk/smileys/pluginsmileys.class.php
plugins/trunk/sociable/pluginsociable.class.php
plugins/trunk/tagcloud/class/action/plugintagcloudupdateconfigaction.class.php
plugins/trunk/tagcloud/class/view/plugintagcloudconfigview.class.php
plugins/trunk/tagcloud/locale/locale_en_UK.php
plugins/trunk/tagcloud/plugintagcloud.class.php
plugins/trunk/tagcloud/templates/tagcloud.template
plugins/trunk/templateeditor/class/action/pluginblogcopytemplatesetaction.class.php
plugins/trunk/templateeditor/class/action/pluginblogdeletetemplatesetsaction.class.php
plugins/trunk/templateeditor/js/editor/smartyeditor.js
Log:
time to start working on plugins for LT 1.2
Modified: plugins/trunk/adminnotifier/pluginadminnotifier.class.php
===================================================================
--- plugins/trunk/adminnotifier/pluginadminnotifier.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/adminnotifier/pluginadminnotifier.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -57,9 +57,15 @@
$eventName = $eventList[ $eventType ];
// build the message
- $rg = $this->blogInfo->getBlogRequestGenerator();
- $blogLink = $rg->blogLink();
- $blogName = $this->blogInfo->getBlog();
+ if( $this->blogInfo === null ) {
+ $blogName = "(undefined)";
+ $blogLink = "(undefined)";
+ }
+ else {
+ $rg = $this->blogInfo->getBlogRequestGenerator();
+ $blogLink = $rg->blogLink();
+ $blogName = $this->blogInfo->getBlog();
+ }
$t = new Timestamp();
$timestamp = $t->getTimestamp();
$message = "Event: {$eventName}\n
Modified: plugins/trunk/atom/class/action/adminatompluginsettingsaction.class.php
===================================================================
--- plugins/trunk/atom/class/action/adminatompluginsettingsaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/atom/class/action/adminatompluginsettingsaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,16 +1,16 @@
<?php
- include_once( PLOG_CLASS_PATH."class/action/admin/blogowneradminaction.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/atom/class/view/adminatompluginsettingsview.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
+ lt_include( PLOG_CLASS_PATH."plugins/atom/class/view/adminatompluginsettingsview.class.php" );
/**
* doesn't do almost anything :))
*/
- class AdminAtomPluginSettingsAction extends BlogOwnerAdminAction
+ class AdminAtomPluginSettingsAction extends AdminAction
{
function AdminAtomPluginSettingsAction( $actionInfo, $request )
{
- $this->BlogOwnerAdminAction( $actionInfo, $request );
+ $this->AdminAction( $actionInfo, $request );
}
function perform()
Modified: plugins/trunk/atom/class/action/adminatompluginupdatesettingsaction.class.php
===================================================================
--- plugins/trunk/atom/class/action/adminatompluginupdatesettingsaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/atom/class/action/adminatompluginupdatesettingsaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,11 +1,11 @@
<?php
- include_once( PLOG_CLASS_PATH."class/action/admin/blogowneradminaction.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/atom/class/view/adminatompluginsettingsview.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/atom/class/dao/atompasswords.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/atom/class/xml/atom/atomconstants.properties.php" );
+ lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
+ lt_include( PLOG_CLASS_PATH."plugins/atom/class/view/adminatompluginsettingsview.class.php" );
+ lt_include( PLOG_CLASS_PATH."plugins/atom/class/dao/atompasswords.class.php" );
+ lt_include( PLOG_CLASS_PATH."plugins/atom/class/xml/atom/atomconstants.properties.php" );
- class AdminAtomPluginUpdateSettingsAction extends BlogOwnerAdminAction
+ class AdminAtomPluginUpdateSettingsAction extends AdminAction
{
var $_categoryId;
var $_albumId;
@@ -16,7 +16,7 @@
function AdminAtomPluginUpdateSettingsAction( $actionInfo, $request )
{
- $this->BlogOwnerAdminAction( $actionInfo, $request );
+ $this->AdminAction( $actionInfo, $request );
}
function validate()
Modified: plugins/trunk/atom/class/dao/atompasswords.class.php
===================================================================
--- plugins/trunk/atom/class/dao/atompasswords.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/atom/class/dao/atompasswords.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,6 +1,6 @@
<?php
- include_once( PLOG_CLASS_PATH."class/dao/model.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/model.class.php" );
/**
* schema of the table, so that we can tell ADOdb to create it
Modified: plugins/trunk/atom/class/logger/atomlogger.class.php
===================================================================
--- plugins/trunk/atom/class/logger/atomlogger.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/atom/class/logger/atomlogger.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,7 +1,7 @@
<?php
- include_once( PLOG_CLASS_PATH."class/config/config.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
/**
* simple class that logs a message to the standard log file, but only if enabled
Modified: plugins/trunk/atom/class/net/atomrequestgenerator.class.php
===================================================================
--- plugins/trunk/atom/class/net/atomrequestgenerator.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/atom/class/net/atomrequestgenerator.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,7 +1,7 @@
<?php
- include_once( PLOG_CLASS_PATH."class/net/rawrequestgenerator.class.php" );
- include_once( PLOG_CLASS_PATH."class/net/url.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/net/rawrequestgenerator.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/net/url.class.php" );
/**
* Generates a few additional useful urls, extending the original
Modified: plugins/trunk/atom/class/template/atomoutputrenderer.class.php
===================================================================
--- plugins/trunk/atom/class/template/atomoutputrenderer.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/atom/class/template/atomoutputrenderer.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,7 +1,7 @@
<?php
- include_once( PLOG_CLASS_PATH."class/template/smarty/Smarty.class.php" );
- include_once( PLOG_CLASS_PATH."class/config/config.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/template/smarty/Smarty.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
class AtomOutputRenderer extends Smarty
{
Modified: plugins/trunk/atom/class/view/adminatompluginsettingsview.class.php
===================================================================
--- plugins/trunk/atom/class/view/adminatompluginsettingsview.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/atom/class/view/adminatompluginsettingsview.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,9 +1,9 @@
<?php
- include_once( PLOG_CLASS_PATH."class/view/admin/adminplugintemplatedview.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/articlecategories.class.php" );
- include_once( PLOG_CLASS_PATH."class/gallery/dao/galleryalbums.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/atom/class/dao/atompasswords.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/view/admin/adminplugintemplatedview.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/articlecategories.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryalbums.class.php" );
+ lt_include( PLOG_CLASS_PATH."plugins/atom/class/dao/atompasswords.class.php" );
/**
* loads and displays the plugin settings
Modified: plugins/trunk/atom/class/xml/atom/atomFunc.php
===================================================================
--- plugins/trunk/atom/class/xml/atom/atomFunc.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/atom/class/xml/atom/atomFunc.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -491,7 +491,7 @@
if ($contentHandler) {
AtomLogger::Log("getContentHandler: [" . $mimeId . "][" . $content->type . "][" . $contentHandler . "]");
- include_once("handler" . $contentHandler . ".php");
+ lt_include("handler" . $contentHandler . ".php");
AtomLogger::Log("getContentHandler: included mimeHandler: handler" . $contentHandler . ".php" );
// Creating the class name
@@ -566,7 +566,7 @@
global $req;
AtomLogger::Log("getAtomStorageHandler: Storage mechanism: store" . $storage . ".php");
- include_once("store" . $storage . ".php");
+ lt_include("store" . $storage . ".php");
// Creating the class name
$storageHandlerClass = $storage . "Storage";
@@ -592,7 +592,7 @@
AtomLogger::Log("getAtomServiceHandler: Service: service" . $services[$service]["class"] . ".php");
- include_once("service" . $services[$service]["class"] . ".php");
+ lt_include("service" . $services[$service]["class"] . ".php");
// Creating the class name
$serviceHandlerClass = $services[$service]["class"] . "Service";
Modified: plugins/trunk/atom/class/xml/atom/atomabstractservice.class.php
===================================================================
--- plugins/trunk/atom/class/xml/atom/atomabstractservice.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/atom/class/xml/atom/atomabstractservice.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,7 +1,7 @@
<?php
- include_once( PLOG_CLASS_PATH."plugins/atom/class/xml/atom/atomrequest.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/atom/class/logger/atomlogger.class.php" );
+ lt_include( PLOG_CLASS_PATH."plugins/atom/class/xml/atom/atomrequest.class.php" );
+ lt_include( PLOG_CLASS_PATH."plugins/atom/class/logger/atomlogger.class.php" );
/**
* encapsulates an atom service
Modified: plugins/trunk/atom/class/xml/atom/atomerrorresponse.class.php
===================================================================
--- plugins/trunk/atom/class/xml/atom/atomerrorresponse.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/atom/class/xml/atom/atomerrorresponse.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,6 +1,6 @@
<?php
- include_once( PLOG_CLASS_PATH."plugins/atom/class/xml/atom/atomresponse.class.php" );
+ lt_include( PLOG_CLASS_PATH."plugins/atom/class/xml/atom/atomresponse.class.php" );
/**
* pre-defined error response, used mainly by the AtomServer class to report some
Modified: plugins/trunk/atom/class/xml/atom/atomrequest.class.php
===================================================================
--- plugins/trunk/atom/class/xml/atom/atomrequest.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/atom/class/xml/atom/atomrequest.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,12 +1,12 @@
<?php
- include_once( PLOG_CLASS_PATH."class/net/http/httpvars.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/atom/class/xml/lib.xml.inc.php" );
- include_once( PLOG_CLASS_PATH."plugins/atom/class/xml/atom/atomFunc.php" );
- include_once( PLOG_CLASS_PATH."plugins/atom/class/xml/atom/atomDom.php" );
- include_once( PLOG_CLASS_PATH."plugins/atom/class/xml/atom/atomClasses.php" );
- include_once( PLOG_CLASS_PATH."plugins/atom/class/xml/atom/plogatomauthentication.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/net/http/httpvars.class.php" );
+ lt_include( PLOG_CLASS_PATH."plugins/atom/class/xml/lib.xml.inc.php" );
+ lt_include( PLOG_CLASS_PATH."plugins/atom/class/xml/atom/atomFunc.php" );
+ lt_include( PLOG_CLASS_PATH."plugins/atom/class/xml/atom/atomDom.php" );
+ lt_include( PLOG_CLASS_PATH."plugins/atom/class/xml/atom/atomClasses.php" );
+ lt_include( PLOG_CLASS_PATH."plugins/atom/class/xml/atom/plogatomauthentication.class.php" );
/**
* represents an Atom request
Modified: plugins/trunk/atom/class/xml/atom/atomserver.class.php
===================================================================
--- plugins/trunk/atom/class/xml/atom/atomserver.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/atom/class/xml/atom/atomserver.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,16 +1,16 @@
<?php
- include_once( PLOG_CLASS_PATH."plugins/atom/class/xml/atom/atomrequest.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/atom/class/xml/atom/atomresponse.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/atom/class/xml/atom/atomerrorresponse.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/atom/class/xml/atom/atomconstants.properties.php" );
- include_once( PLOG_CLASS_PATH."plugins/atom/class/xml/atom/defaultservice.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/atom/class/xml/atom/feedservice.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/atom/class/xml/atom/categoriesservice.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/atom/class/xml/atom/editservice.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/atom/class/xml/atom/postservice.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/atom/class/xml/atom/plogatomauthentication.class.php" );
+ lt_include( PLOG_CLASS_PATH."plugins/atom/class/xml/atom/atomrequest.class.php" );
+ lt_include( PLOG_CLASS_PATH."plugins/atom/class/xml/atom/atomresponse.class.php" );
+ lt_include( PLOG_CLASS_PATH."plugins/atom/class/xml/atom/atomerrorresponse.class.php" );
+ lt_include( PLOG_CLASS_PATH."plugins/atom/class/xml/atom/atomconstants.properties.php" );
+ lt_include( PLOG_CLASS_PATH."plugins/atom/class/xml/atom/defaultservice.class.php" );
+ lt_include( PLOG_CLASS_PATH."plugins/atom/class/xml/atom/feedservice.class.php" );
+ lt_include( PLOG_CLASS_PATH."plugins/atom/class/xml/atom/categoriesservice.class.php" );
+ lt_include( PLOG_CLASS_PATH."plugins/atom/class/xml/atom/editservice.class.php" );
+ lt_include( PLOG_CLASS_PATH."plugins/atom/class/xml/atom/postservice.class.php" );
+ lt_include( PLOG_CLASS_PATH."plugins/atom/class/xml/atom/plogatomauthentication.class.php" );
/**
* Array with all the services implemented so far
Modified: plugins/trunk/atom/class/xml/atom/categoriesservice.class.php
===================================================================
--- plugins/trunk/atom/class/xml/atom/categoriesservice.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/atom/class/xml/atom/categoriesservice.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,9 +1,9 @@
<?php
- include_once( PLOG_CLASS_PATH."plugins/atom/class/xml/atom/plogatomabstractservice.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/atom/class/template/atomoutputrenderer.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/atom/class/net/atomrequestgenerator.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/articlecategories.class.php" );
+ lt_include( PLOG_CLASS_PATH."plugins/atom/class/xml/atom/plogatomabstractservice.class.php" );
+ lt_include( PLOG_CLASS_PATH."plugins/atom/class/template/atomoutputrenderer.class.php" );
+ lt_include( PLOG_CLASS_PATH."plugins/atom/class/net/atomrequestgenerator.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/articlecategories.class.php" );
/**
* implements the service.categories service
Modified: plugins/trunk/atom/class/xml/atom/defaultservice.class.php
===================================================================
--- plugins/trunk/atom/class/xml/atom/defaultservice.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/atom/class/xml/atom/defaultservice.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,10 +1,10 @@
<?php
- include_once( PLOG_CLASS_PATH."plugins/atom/class/xml/atom/plogatomabstractservice.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/atom/class/template/atomoutputrenderer.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/atom/class/net/atomrequestgenerator.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/users.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
+ lt_include( PLOG_CLASS_PATH."plugins/atom/class/xml/atom/plogatomabstractservice.class.php" );
+ lt_include( PLOG_CLASS_PATH."plugins/atom/class/template/atomoutputrenderer.class.php" );
+ lt_include( PLOG_CLASS_PATH."plugins/atom/class/net/atomrequestgenerator.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/users.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
class DefaultService extends PlogAtomAbstractService
{
Modified: plugins/trunk/atom/class/xml/atom/editservice.class.php
===================================================================
--- plugins/trunk/atom/class/xml/atom/editservice.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/atom/class/xml/atom/editservice.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,12 +1,12 @@
<?php
- include_once( PLOG_CLASS_PATH."plugins/atom/class/xml/atom/plogatomabstractservice.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/atom/class/template/atomoutputrenderer.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/atom/class/net/atomrequestgenerator.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/users.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/articles.class.php" );
- include_once( PLOG_CLASS_PATH."class/template/cachecontrol.class.php" );
+ lt_include( PLOG_CLASS_PATH."plugins/atom/class/xml/atom/plogatomabstractservice.class.php" );
+ lt_include( PLOG_CLASS_PATH."plugins/atom/class/template/atomoutputrenderer.class.php" );
+ lt_include( PLOG_CLASS_PATH."plugins/atom/class/net/atomrequestgenerator.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/articles.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/template/cachecontrol.class.php" );
class EditService extends PlogAtomAbstractService
{
Modified: plugins/trunk/atom/class/xml/atom/feedservice.class.php
===================================================================
--- plugins/trunk/atom/class/xml/atom/feedservice.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/atom/class/xml/atom/feedservice.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,6 +1,6 @@
<?php
- include_once( PLOG_CLASS_PATH."plugins/atom/class/xml/atom/plogatomabstractservice.class.php" );
+ lt_include( PLOG_CLASS_PATH."plugins/atom/class/xml/atom/plogatomabstractservice.class.php" );
class FeedService extends PlogAtomAbstractService
{
@@ -15,12 +15,12 @@
*/
function doGet()
{
- include_once( PLOG_CLASS_PATH."plugins/atom/class/template/atomoutputrenderer.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/atom/class/net/atomrequestgenerator.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/users.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/articles.class.php" );
- include_once( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
+ lt_include( PLOG_CLASS_PATH."plugins/atom/class/template/atomoutputrenderer.class.php" );
+ lt_include( PLOG_CLASS_PATH."plugins/atom/class/net/atomrequestgenerator.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/articles.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
$output = new AtomOutputRenderer( "feed" );
$output->setValue( "blog", $this->_blogInfo );
Modified: plugins/trunk/atom/class/xml/atom/plogatomabstractservice.class.php
===================================================================
--- plugins/trunk/atom/class/xml/atom/plogatomabstractservice.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/atom/class/xml/atom/plogatomabstractservice.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,8 +1,8 @@
<?php
- include_once( PLOG_CLASS_PATH."plugins/atom/class/xml/atom/atomabstractservice.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/users.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
+ lt_include( PLOG_CLASS_PATH."plugins/atom/class/xml/atom/atomabstractservice.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/users.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
/**
* plog-dependent class that starts messing around with blogs and users. So far the layer
Modified: plugins/trunk/atom/class/xml/atom/plogatomauthentication.class.php
===================================================================
--- plugins/trunk/atom/class/xml/atom/plogatomauthentication.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/atom/class/xml/atom/plogatomauthentication.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,8 +1,8 @@
<?php
- include_once( PLOG_CLASS_PATH."plugins/atom/class/xml/atom/wsseauthentication.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/users.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/atom/class/dao/atompasswords.class.php" );
+ lt_include( PLOG_CLASS_PATH."plugins/atom/class/xml/atom/wsseauthentication.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/users.class.php" );
+ lt_include( PLOG_CLASS_PATH."plugins/atom/class/dao/atompasswords.class.php" );
/**
* pLog-specific authentication class for Atom
Modified: plugins/trunk/atom/class/xml/atom/postservice.class.php
===================================================================
--- plugins/trunk/atom/class/xml/atom/postservice.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/atom/class/xml/atom/postservice.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,17 +1,17 @@
<?php
- include_once( PLOG_CLASS_PATH."plugins/atom/class/xml/atom/plogatomabstractservice.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/atom/class/template/atomoutputrenderer.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/atom/class/net/atomrequestgenerator.class.php" );
- include_once( PLOG_CLASS_PATH."class/net/requestgenerator.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/articles.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/articlecategories.class.php" );
- include_once( PLOG_CLASS_PATH."class/gallery/dao/galleryresources.class.php" );
- include_once( PLOG_CLASS_PATH."class/data/mimetype.class.php" );
- include_once( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
- include_once( PLOG_CLASS_PATH."class/config/config.class.php" );
- include_once( PLOG_CLASS_PATH."class/file/file.class.php" );
- include_once( PLOG_CLASS_PATH."class/template/cachecontrol.class.php" );
+ lt_include( PLOG_CLASS_PATH."plugins/atom/class/xml/atom/plogatomabstractservice.class.php" );
+ lt_include( PLOG_CLASS_PATH."plugins/atom/class/template/atomoutputrenderer.class.php" );
+ lt_include( PLOG_CLASS_PATH."plugins/atom/class/net/atomrequestgenerator.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/net/requestgenerator.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/gallery/dao/galleryresources.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/data/mimetype.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/file/file.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/template/cachecontrol.class.php" );
/**
* Takes care of service.post requests, which basically means adding
@@ -354,7 +354,7 @@
// use the default one
$blogSettings = $this->_blogInfo->getSettings();
$albumId = $blogSettings->getValue( "plugin_atom_gallery_resource_album_id" );
- include_once( PLOG_CLASS_PATH."class/gallery/dao/galleryalbums.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/gallery/dao/galleryalbums.class.php" );
$albums = new GalleryAlbums();
$album = $albums->getAlbum( $albumId );
if( !$album ) {
Modified: plugins/trunk/atom/class/xml/atom/wsseauthentication.class.php
===================================================================
--- plugins/trunk/atom/class/xml/atom/wsseauthentication.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/atom/class/xml/atom/wsseauthentication.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,7 +1,7 @@
<?php
- include_once( PLOG_CLASS_PATH."plugins/atom/class/data/sha1.class.php" );
+ lt_include( PLOG_CLASS_PATH."plugins/atom/class/data/sha1.class.php" );
/**
* implements HTTP-based WSSE authentication
Modified: plugins/trunk/atom/pluginatom.class.php
===================================================================
--- plugins/trunk/atom/pluginatom.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/atom/pluginatom.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,6 +1,6 @@
<?php
- include_once( PLOG_CLASS_PATH."class/plugin/pluginbase.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/plugin/pluginbase.class.php" );
/**
* plugin registration and stuff like that...
@@ -48,7 +48,7 @@
*/
function install()
{
- include_once( PLOG_CLASS_PATH."plugins/atom/class/dao/atompasswords.class.php" );
+ lt_include( PLOG_CLASS_PATH."plugins/atom/class/dao/atompasswords.class.php" );
$passwords = new AtomPasswords();
$passwords->checkTables();
Copied: plugins/trunk/ayearago (from rev 4487, plugins/branches/lifetype-1.1/ayearago)
Copied: plugins/trunk/ayearago/class (from rev 4487, plugins/branches/lifetype-1.1/ayearago/class)
Copied: plugins/trunk/ayearago/class/action (from rev 4487, plugins/branches/lifetype-1.1/ayearago/class/action)
Deleted: plugins/trunk/ayearago/class/action/pluginayearagoconfigaction.class.php
===================================================================
--- plugins/branches/lifetype-1.1/ayearago/class/action/pluginayearagoconfigaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/ayearago/class/action/pluginayearagoconfigaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,27 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- include_once( PLOG_CLASS_PATH."class/view/admin/adminplugintemplatedview.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/ayearago/class/view/pluginayearagoconfigview.class.php" );
-
- /**
- * shows a form with the current configuration
- */
- class PluginAYearAgoConfigAction extends AdminAction
- {
-
- function PluginAYearAgoConfigAction( $actionInfo, $request )
- {
- $this->AdminAction( $actionInfo, $request );
- }
-
- function perform()
- {
- $this->_view = new PluginAYearAgoConfigView( $this->_blogInfo );
-
- $this->setCommonData();
-
- return true;
- }
- }
-?>
Copied: plugins/trunk/ayearago/class/action/pluginayearagoconfigaction.class.php (from rev 4487, plugins/branches/lifetype-1.1/ayearago/class/action/pluginayearagoconfigaction.class.php)
Deleted: plugins/trunk/ayearago/class/action/pluginayearagoupdateconfigaction.class.php
===================================================================
--- plugins/branches/lifetype-1.1/ayearago/class/action/pluginayearagoupdateconfigaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/ayearago/class/action/pluginayearagoupdateconfigaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,69 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- include_once( PLOG_CLASS_PATH."class/view/admin/adminplugintemplatedview.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/ayearago/class/view/pluginayearagoconfigview.class.php" );
-
- /**
- * updates the plugin configuration
- */
- class PluginAYearAgoUpdateConfigAction extends AdminAction
- {
- var $_pluginEnabled;
- var $_maxPosts;
-
- function PluginAYearAgoUpdateConfigAction( $actionInfo, $request )
- {
- $this->AdminAction( $actionInfo, $request );
- }
-
- function validate()
- {
- $this->_pluginEnabled = $this->_request->getValue( "pluginEnabled" );
- $this->_pluginEnabled = ($this->_pluginEnabled != "" );
- $this->_maxPosts = $this->_request->getValue( "maxPosts" );
- if( $this->_maxPosts <= 0 || !ctype_digit($this->_maxPosts) ) {
- $this->_view = new PluginAYearAgoConfigView( $this->_blogInfo );
- $this->_view->setErrorMessage( $this->_locale->tr("ayearago_error_maxposts"));
- $this->setCommonData();
-
- return false;
- }
-
- return true;
- }
-
- function perform()
- {
- // // update the plugin configurations to blog setting
- $blogSettings = $this->_blogInfo->getSettings();
- $blogSettings->setValue( "plugin_ayearago_enabled", $this->_pluginEnabled );
- $blogSettings->setValue( "plugin_ayearago_maxcomments", $this->_maxPosts );
- $this->_blogInfo->setSettings( $blogSettings );
-
- // save the blogs settings
- $blogs = new Blogs();
- if( !$blogs->updateBlog( $this->_blogInfo )) {
- $this->_view = new PluginAYearAgoConfigView( $this->_blogInfo );
- $this->_view->setErrorMessage( $this->_locale->tr("error_updating_settings"));
- $this->setCommonData();
-
- return false;
- }
-
- // if everything went ok...
- $this->_blogInfo->setSettings( $blogSettings );
- $this->_session->setValue( "blogInfo", $this->_blogInfo );
- $this->saveSession();
-
- $this->_view = new PluginAYearAgoConfigView( $this->_blogInfo );
- $this->_view->setSuccessMessage( $this->_locale->tr("ayearago_settings_saved_ok"));
- $this->setCommonData();
-
- // clear the cache
- CacheControl::resetBlogCache( $this->_blogInfo->getId());
-
- return true;
- }
- }
-?>
Copied: plugins/trunk/ayearago/class/action/pluginayearagoupdateconfigaction.class.php (from rev 4487, plugins/branches/lifetype-1.1/ayearago/class/action/pluginayearagoupdateconfigaction.class.php)
Copied: plugins/trunk/ayearago/class/view (from rev 4487, plugins/branches/lifetype-1.1/ayearago/class/view)
Deleted: plugins/trunk/ayearago/class/view/pluginayearagoconfigview.class.php
===================================================================
--- plugins/branches/lifetype-1.1/ayearago/class/view/pluginayearagoconfigview.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/ayearago/class/view/pluginayearagoconfigview.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,31 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/view/admin/adminplugintemplatedview.class.php" );
-
- /**
- * implements the main view of the a year ago plugin
- */
- class PluginAYearAgoConfigView extends AdminPluginTemplatedView
- {
-
- function PluginAYearAgoConfigView( $blogInfo )
- {
- $this->AdminPluginTemplatedView( $blogInfo, "ayearago", "ayearago" );
- }
-
- function render()
- {
- // load some configuration settings
- $blogSettings = $this->_blogInfo->getSettings();
- $pluginEnabled = $blogSettings->getValue( "plugin_ayearago_enabled" );
- $maxPosts = $blogSettings->getValue( "plugin_ayearago_maxposts" );
- if ($maxPosts == "") $maxPosts = 3;
-
- // create a view and export the settings to the template
- $this->setValue( "pluginEnabled", $pluginEnabled );
- $this->setValue( "maxPosts", $maxPosts );
-
- parent::render();
- }
- }
-?>
Copied: plugins/trunk/ayearago/class/view/pluginayearagoconfigview.class.php (from rev 4487, plugins/branches/lifetype-1.1/ayearago/class/view/pluginayearagoconfigview.class.php)
Copied: plugins/trunk/ayearago/locale (from rev 4487, plugins/branches/lifetype-1.1/ayearago/locale)
Deleted: plugins/trunk/ayearago/locale/locale_en_UK.php
===================================================================
--- plugins/branches/lifetype-1.1/ayearago/locale/locale_en_UK.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/ayearago/locale/locale_en_UK.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,15 +0,0 @@
-<?php
-$messages["AYearAgo"] = "A Year Ago";
-$messages["ayearago"] = "a year ago";
-
-$messages["ayearago_maxposts"] = "Maximum Showed Articles";
-$messages["ayearago_plugin_enabled"] = "Enable this plugin";
-$messages["ayearago_plugin"] = "A Year Ago Plugin";
-
-$messages["ayearago_settings_saved_ok"] = "A Year Ago settings saved successfully!";
-$messages["ayearago_error_maxposts"] = "Maximum Showed Posts Should be > 0!";
-
-$messages["label_configuration"] = "Configuration";
-$messages["label_enable"] = "Enable";
-$messages["label_maxposts"] = "Max Articles";
-?>
Copied: plugins/trunk/ayearago/locale/locale_en_UK.php (from rev 4487, plugins/branches/lifetype-1.1/ayearago/locale/locale_en_UK.php)
Deleted: plugins/trunk/ayearago/locale/locale_es_ES.php
===================================================================
--- plugins/branches/lifetype-1.1/ayearago/locale/locale_es_ES.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/ayearago/locale/locale_es_ES.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,15 +0,0 @@
-<?php
-$messages["AYearAgo"] = "Hace un año";
-$messages["ayearago"] = "hace un año";
-
-$messages["ayearago_maxposts"] = "Máximo de artículos a mostrar";
-$messages["ayearago_plugin_enabled"] = "Activar este plugin";
-$messages["ayearago_plugin"] = "Plugin Hace un año";
-
-$messages["ayearago_settings_saved_ok"] = "Los datos se han guardado con éxito";
-$messages["ayearago_error_maxposts"] = "El máximo debe ser mayor a 0!";
-
-$messages["label_configuration"] = "Configuración";
-$messages["label_enable"] = "Activar";
-$messages["label_maxposts"] = "Máx Artículos";
-?>
Copied: plugins/trunk/ayearago/locale/locale_es_ES.php (from rev 4487, plugins/branches/lifetype-1.1/ayearago/locale/locale_es_ES.php)
Deleted: plugins/trunk/ayearago/pluginayearago.class.php
===================================================================
--- plugins/branches/lifetype-1.1/ayearago/pluginayearago.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/ayearago/pluginayearago.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,141 +0,0 @@
-<?php
- include_once( PLOG_CLASS_PATH."class/plugin/pluginbase.class.php" );
- include_once( PLOG_CLASS_PATH."class/plugin/pluginmanager.class.php" );
-
- /**
- * Plugin that returns an array of posts written a year before
- */
- class PluginAYearAgo extends PluginBase
- {
- var $pluginEnabled;
- var $maxPosts;
-
- function PluginAYearAgo()
- {
- $this->PluginBase();
-
- $this->id = "ayearago";
- $this->author = "Mariano Draghi (cHagHi)";
- $this->desc = "This plugin offers various methods to get a list of posts written a year before a given post, or based on the current date.";
- $this->version = '1.0';
- $this->locales = Array( "en_UK", "es_ES" );
-
- $this->init();
- }
-
- function init()
- {
- $this->registerAdminAction( "ayearago", "PluginAYearAgoConfigAction" );
- $this->registerAdminAction( "updateAYearAgoConfig", "PluginAYearAgoUpdateConfigAction" );
-
- $this->addMenuEntry( "/menu/controlCenter/manageSettings", "AYearAgo", "?op=ayearago", "" );
- }
-
- function register()
- {
- $blogSettings = $this->blogInfo->getSettings();
- $this->pluginEnabled = $blogSettings->getValue( "plugin_ayearago_enabled" );
- $this->maxPosts = $blogSettings->getValue( "plugin_ayearago_maxposts", 3 );
- }
-
- function isEnabled()
- {
- return $this->pluginEnabled;
- }
-
- function getOneYearAgoPosts( $post, $maxPosts = -1 )
- {
- if ( $maxPosts < 0 )
- {
- $maxPosts = $this->maxPosts;
- }
-
- // Timestamp used to find the articles based on a post
- $timestamp = $this->_getAYearAgoTimestamp( $post->getDateObject() );
-
- // Get the articles
- $minDate = $timestamp->getYear().$timestamp->getMonth().$this->_getDay( $timestamp );
- $maxDate = $timestamp->getYear().$timestamp->getMonth().$this->_getDay( $timestamp )."235959";
- $articles = new Articles();
- return ( $articles->getBlogArticles( $this->blogInfo->getId(), $minDate, $maxPosts, 0, 0, 0, $maxDate, "", -1 ) );
- }
-
- function getOneYearAgoPostsFuzzy( $post, $maxPosts = -1 )
- {
- if ( $maxPosts < 0 )
- {
- $maxPosts = $this->maxPosts;
- }
-
- // Timestamp used to find the articles based on a post
- $timestamp = $this->_getAYearAgoTimestamp( $post->getDateObject() );
-
- // Get the articles
- $maxDate = $timestamp->getYear().$timestamp->getMonth().$this->_getDay( $timestamp )."235959";
- $articles = new Articles();
- $posts = $articles->getBlogArticles( $this->blogInfo->getId(), -1, $maxPosts, 0, 0, 0, $maxDate, "", -1 );
-
- // Now check that the retrieved posts don't get overlaped with the previous post
- $prevArticle = $post->getPrevArticle();
- $prevTimestamp = $this->_getAYearAgoTimestamp( $prevArticle->getDateObject(), true );
- $validPosts = Array();
- foreach ( $posts as $post )
- {
- $t = new Timestamp( $post->getDateObject() );
- if ( $t > $prevTimestamp )
- {
- $validPosts[] = $post;
- }
- }
-
- return( $validPosts );
- }
-
- function getRecentArticlesAYearAgo( $maxPosts = -1 )
- {
- if ( $maxPosts < 0 )
- {
- $blogSettings = $this->blogInfo->getSettings();
- $maxPosts = $blogSettings->getValue( 'recent_posts_max' );
- }
-
- // Timestamp for a year ago
- $timestamp = $this->_getAYearAgoTimestamp( new Timestamp() );
-
- // Get the articles
- $maxDate = $timestamp->getYear().$timestamp->getMonth().$this->_getDay( $timestamp )."235959";
- $articles = new Articles();
- return ( $articles->getBlogArticles( $this->blogInfo->getId(), -1, $maxPosts, 0, 0, 0, $maxDate, "", -1 ) );
- }
-
- function _getAYearAgoTimestamp( $date, $end = false )
- {
- if ( $date->getMonth() == 2 && $date->getDay() == 29 )
- {
- $date->setDay( 28 );
- }
-
- $date->setYear( $date->getYear() - 1 );
-
- if ( $end )
- {
- $date->setHour( 23 );
- $date->setMinute( 59 );
- $date->setSecond( 59 );
-
- }
-
- return ( new Timestamp( $date ) );
- }
-
- function _getDay( $timestamp )
- {
- // returns a day ensuring 2 digits
- $day = $timestamp->getDay();
- if( $day < 10 && $day[0] != "0" )
- $day = "0".$day;
-
- return $day;
- }
- }
-?>
Copied: plugins/trunk/ayearago/pluginayearago.class.php (from rev 4487, plugins/branches/lifetype-1.1/ayearago/pluginayearago.class.php)
Deleted: plugins/trunk/ayearago/readme.txt
===================================================================
--- plugins/branches/lifetype-1.1/ayearago/readme.txt 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/ayearago/readme.txt 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,51 +0,0 @@
-Plugin: A Year Ago
-Author: Mariano Draghi
-Release Date: 2006/11/02
-Version: 1.0
-
-This plugin offers various methods to get a list of posts written a year
-before a given post, or a year before based on the current date.
-Usage as follow:
-
-You can use:
-1. $ayearago->isEnabled()
- To check if the plugin is enabled or not.
-
-2.a. $ayearago->getOneYearAgoPosts( $post, $maxPosts )
- To get the posts (if any) written EXACTLY a year ago the given post.
- Useful if you post very frecuently.
-
-2.b. $ayearago->getOneYearAgoPostsFuzzy( $post, $maxPosts )
- To get the posts (if any) written between the given post and the
- previous one, but a year before.
- This alternative is more useful if you doesn't post that frequently.
-
-Both 2.a & 2.b are meant to be used in the post.template
-
-3. $ayearago->getRecentArticlesAYearAgo( $maxPosts )
- To get the posts written a year ago, based on the current date.
- This is similar to the normal Recent Articles feature, but for
- the previous year. This is meant to be used in the header or
- footer template.
-
-Where:
-1. $post is the current post
-2. $maxPosts is the max. quantity of posts to return. It's optional.
- If ommitted, for 2.a & 2.b the plugin uses the
- plugin_ayearago_maxposts setting. For 3, recent_posts_max is used
- (same setting as the standard Recent Articles feature).
-
-Example:
-Add the following code to post.template:
-{if $ayearago->isEnabled()}
-{assign var="yearAgoPosts" value=$ayearago->getOneYearAgoPostsFuzzy($post)}
-{if sizeof($yearAgoPosts) > 0}
-<div class="ayearago">
-{foreach name=ayearago from=$yearAgoPosts item=yearAgoPost}
- {if $smarty.foreach.ayearago.first}A year ago I was writting: {/if}
- <a href="{$url->postPermalink($yearAgoPost)}">{$yearAgoPost->getTopic()}</a>
- {if !$smarty.foreach.ayearago.last} :: {/if}
-{/foreach}
-</div>
-{/if}
-{/if}
Copied: plugins/trunk/ayearago/readme.txt (from rev 4487, plugins/branches/lifetype-1.1/ayearago/readme.txt)
Copied: plugins/trunk/ayearago/templates (from rev 4487, plugins/branches/lifetype-1.1/ayearago/templates)
Deleted: plugins/trunk/ayearago/templates/ayearago.template
===================================================================
--- plugins/branches/lifetype-1.1/ayearago/templates/ayearago.template 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/ayearago/templates/ayearago.template 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,32 +0,0 @@
-{include file="$admintemplatepath/header.template"}
-{include file="$admintemplatepath/navigation.template" showOpt=AYearAgo title=$locale->tr("ayearago_plugin")}
-<form name="ayearagoPluginConfig" method="post">
- <fieldset class="inputField">
- <legend>{$locale->tr("label_configuration")}</legend>
- {include file="$admintemplatepath/successmessage.template"}
- {include file="$admintemplatepath/errormessage.template"}
- <div class="field">
- <label for="pluginEnabled">{$locale->tr("label_enable")}</label>
- <span class="required"></span>
- <div class="formHelp">
- <input class="checkbox" type="checkbox" name="pluginEnabled" id="pluginEnabled" {if $pluginEnabled} checked="checked" {/if} value="1" />{$locale->tr("ayearago_plugin_enabled")}
- </div>
- </div>
-
- <div class="field">
- <label for="maxPosts">{$locale->tr("label_maxposts")}</label>
- <span class="required">*</span>
- <div class="formHelp">{$locale->tr("ayearago_maxposts")}</div>
- <input class="text" type="text" name="maxPosts" id="maxPosts" value="{$maxPosts}" width="10" />
- </div>
-
- </fieldset>
-
- <div class="buttons">
- <input type="hidden" name="op" value="updateAYearAgoConfig" />
- <input type="reset" name="{$locale->tr("reset")}" />
- <input type="submit" name="{$locale->tr("update_settings")}" value="{$locale->tr("update")}" />
- </div>
-</form>
-{include file="$admintemplatepath/footernavigation.template"}
-{include file="$admintemplatepath/footer.template"}
Copied: plugins/trunk/ayearago/templates/ayearago.template (from rev 4487, plugins/branches/lifetype-1.1/ayearago/templates/ayearago.template)
Modified: plugins/trunk/badbehavior/bad-behavior/admin.inc.php
===================================================================
--- plugins/trunk/badbehavior/bad-behavior/admin.inc.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/badbehavior/bad-behavior/admin.inc.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,75 +1,75 @@
-<?php if (!defined('BB2_CORE')) die('I said no cheating!');
-
-function bb2_admin_pages() {
- if (function_exists('current_user_can')) {
- // The new 2.x way
- if (current_user_can('manage_options')) {
- $bb2_is_admin = true;
- }
- } else {
- // The old 1.x way
- global $user_ID;
- if (user_can_edit_user($user_ID, 0)) {
- $bb2_is_admin = true;
- }
- }
-
- if ($bb2_is_admin) {
- add_options_page(__("Bad Behavior"), __("Bad Behavior"), 8, 'bb2_options', 'bb2_options');
- }
-}
-
-function bb2_options()
-{
- $settings = bb2_read_settings();
-
- if ($_POST) {
- if ($_POST['display_stats']) {
- $settings['display_stats'] = true;
- } else {
- $settings['display_stats'] = false;
- }
- if ($_POST['strict']) {
- $settings['strict'] = true;
- } else {
- $settings['strict'] = false;
- }
- if ($_POST['verbose']) {
- $settings['verbose'] = true;
- } else {
- $settings['verbose'] = false;
- }
- bb2_write_settings($settings);
-?>
- <div id="message" class="updated fade"><p><strong><?php _e('Options saved.') ?></strong></p></div>
-<?php
- }
-?>
- <div class="wrap">
- <h2><?php _e("Bad Behavior"); ?></h2>
- <form method="post" action="<?php echo $_SERVER['REQUEST_URI']; ?>">
- <p>For more information please visit the <a href="http://www.homelandstupidity.us/software/bad-behavior/">Bad Behavior</a> homepage.</p>
- <p>If you find Bad Behavior valuable, please consider making a <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business=error%40ioerror%2eus&item_name=Bad%20Behavior%20<?php echo BB2_VERSION; ?>%20%28From%20Admin%29&no_shipping=1&cn=Comments%20about%20Bad%20Behavior&tax=0¤cy_code=USD&bn=PP%2dDonationsBF&charset=UTF%2d8">financial contribution</a> to further development of Bad Behavior.</p>
-
- <fieldset class="options">
- <legend><?php _e('Statistics'); ?></legend>
- <?php bb2_insert_stats(true); ?>
- <p><label><input type="checkbox" name="display_stats" value="true" <?php if ($settings['display_stats']) { ?>checked="checked" <?php } ?>/> <?php _e('Display statistics in blog footer'); ?></label></p>
- </fieldset>
-
- <fieldset class="options">
- <legend><?php _e('Logging'); ?></legend>
- <p><label><input type="checkbox" name="verbose" value="true" <?php if ($settings['verbose']) { ?>checked="checked" <?php } ?>/> <?php _e('Verbose HTTP request logging'); ?></label></p>
- <legend><?php _e('Strict Mode'); ?></legend>
- <p><label><input type="checkbox" name="strict" value="true" <?php if ($settings['strict']) { ?>checked="checked" <?php } ?>/> <?php _e('Strict checking (blocks more spam but may block some people)'); ?></label></p>
- </fieldset>
-
- <p class="submit"><input type="submit" name="submit" value="<?php _e('Update »'); ?>" /></p>
- </form>
- </div>
-<?php
-}
-
-add_action('admin_menu', 'bb2_admin_pages');
-
-?>
+<?php if (!defined('BB2_CORE')) die('I said no cheating!');
+
+function bb2_admin_pages() {
+ if (function_exists('current_user_can')) {
+ // The new 2.x way
+ if (current_user_can('manage_options')) {
+ $bb2_is_admin = true;
+ }
+ } else {
+ // The old 1.x way
+ global $user_ID;
+ if (user_can_edit_user($user_ID, 0)) {
+ $bb2_is_admin = true;
+ }
+ }
+
+ if ($bb2_is_admin) {
+ add_options_page(__("Bad Behavior"), __("Bad Behavior"), 8, 'bb2_options', 'bb2_options');
+ }
+}
+
+function bb2_options()
+{
+ $settings = bb2_read_settings();
+
+ if ($_POST) {
+ if ($_POST['display_stats']) {
+ $settings['display_stats'] = true;
+ } else {
+ $settings['display_stats'] = false;
+ }
+ if ($_POST['strict']) {
+ $settings['strict'] = true;
+ } else {
+ $settings['strict'] = false;
+ }
+ if ($_POST['verbose']) {
+ $settings['verbose'] = true;
+ } else {
+ $settings['verbose'] = false;
+ }
+ bb2_write_settings($settings);
+?>
+ <div id="message" class="updated fade"><p><strong><?php _e('Options saved.') ?></strong></p></div>
+<?php
+ }
+?>
+ <div class="wrap">
+ <h2><?php _e("Bad Behavior"); ?></h2>
+ <form method="post" action="<?php echo $_SERVER['REQUEST_URI']; ?>">
+ <p>For more information please visit the <a href="http://www.homelandstupidity.us/software/bad-behavior/">Bad Behavior</a> homepage.</p>
+ <p>If you find Bad Behavior valuable, please consider making a <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_xclick&business=error%40ioerror%2eus&item_name=Bad%20Behavior%20<?php echo BB2_VERSION; ?>%20%28From%20Admin%29&no_shipping=1&cn=Comments%20about%20Bad%20Behavior&tax=0¤cy_code=USD&bn=PP%2dDonationsBF&charset=UTF%2d8">financial contribution</a> to further development of Bad Behavior.</p>
+
+ <fieldset class="options">
+ <legend><?php _e('Statistics'); ?></legend>
+ <?php bb2_insert_stats(true); ?>
+ <p><label><input type="checkbox" name="display_stats" value="true" <?php if ($settings['display_stats']) { ?>checked="checked" <?php } ?>/> <?php _e('Display statistics in blog footer'); ?></label></p>
+ </fieldset>
+
+ <fieldset class="options">
+ <legend><?php _e('Logging'); ?></legend>
+ <p><label><input type="checkbox" name="verbose" value="true" <?php if ($settings['verbose']) { ?>checked="checked" <?php } ?>/> <?php _e('Verbose HTTP request logging'); ?></label></p>
+ <legend><?php _e('Strict Mode'); ?></legend>
+ <p><label><input type="checkbox" name="strict" value="true" <?php if ($settings['strict']) { ?>checked="checked" <?php } ?>/> <?php _e('Strict checking (blocks more spam but may block some people)'); ?></label></p>
+ </fieldset>
+
+ <p class="submit"><input type="submit" name="submit" value="<?php _e('Update »'); ?>" /></p>
+ </form>
+ </div>
+<?php
+}
+
+add_action('admin_menu', 'bb2_admin_pages');
+
+?>
Modified: plugins/trunk/badbehavior/bad-behavior/banned.inc.php
===================================================================
--- plugins/trunk/badbehavior/bad-behavior/banned.inc.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/badbehavior/bad-behavior/banned.inc.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,48 +1,48 @@
-<?php if (!defined('BB2_CORE')) die('I said no cheating!');
-
-// Functions called when a request has been denied
-// This part can be gawd-awful slow, doesn't matter :)
-
-require_once(BB2_CORE . "/responses.inc.php");
-
-function bb2_display_denial($settings, $key, $previous_key = false)
-{
- if (!$previous_key) $previous_key = $key;
- if ($key == "e87553e1") {
- // FIXME: lookup the real key
- }
- // Create support key
- $ip = explode(".", $_SERVER['REMOTE_ADDR']);
- $ip_hex = "";
- foreach ($ip as $octet) {
- $ip_hex .= str_pad(dechex($octet), 2, 0, STR_PAD_LEFT);
- }
- $support_key = implode("-", str_split("$ip_hex$key", 4));
-
- // Get response data
- $response = bb2_get_response($previous_key);
- header("HTTP/1.1 " . $response['response'] . " Bad Behavior");
- header("Status: " . $response['response'] . " Bad Behavior");
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>HTTP Error <?php echo $response['response']; ?></title>
-</head>
-<body>
-<h1>Error <?php echo $response['response']; ?></h1>
-<p>We're sorry, but we could not fulfill your request for
-<?php echo htmlspecialchars($_SERVER['REQUEST_URI']) ?> on this server.</p>
-<p><?php echo $response['explanation']; ?></p>
-<p>Your technical support key is: <strong><?php echo $support_key; ?></strong></p>
-<p>You can use this key to <a href="http://www.ioerror.us/bb2-support-key?key=<?php echo $support_key; ?>">fix this problem yourself</a>.</p>
-<p>If you are unable to fix the problem yourself, please contact <a href="mailto:<?php echo htmlspecialchars(str_replace("@", "+nospam at nospam.", bb2_email())); ?>"><?php echo htmlspecialchars(str_replace("@", " at ", bb2_email())); ?></a> and be sure to provide the technical support key shown above.</p>
-<?php
-}
-
-function bb2_log_denial($settings, $package, $key, $previous_key=false)
-{
- bb2_db_query(bb2_insert($settings, $package, $key));
-}
-
-?>
+<?php if (!defined('BB2_CORE')) die('I said no cheating!');
+
+// Functions called when a request has been denied
+// This part can be gawd-awful slow, doesn't matter :)
+
+require_once(BB2_CORE . "/responses.inc.php");
+
+function bb2_display_denial($settings, $key, $previous_key = false)
+{
+ if (!$previous_key) $previous_key = $key;
+ if ($key == "e87553e1") {
+ // FIXME: lookup the real key
+ }
+ // Create support key
+ $ip = explode(".", $_SERVER['REMOTE_ADDR']);
+ $ip_hex = "";
+ foreach ($ip as $octet) {
+ $ip_hex .= str_pad(dechex($octet), 2, 0, STR_PAD_LEFT);
+ }
+ $support_key = implode("-", str_split("$ip_hex$key", 4));
+
+ // Get response data
+ $response = bb2_get_response($previous_key);
+ header("HTTP/1.1 " . $response['response'] . " Bad Behavior");
+ header("Status: " . $response['response'] . " Bad Behavior");
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>HTTP Error <?php echo $response['response']; ?></title>
+</head>
+<body>
+<h1>Error <?php echo $response['response']; ?></h1>
+<p>We're sorry, but we could not fulfill your request for
+<?php echo htmlspecialchars($_SERVER['REQUEST_URI']) ?> on this server.</p>
+<p><?php echo $response['explanation']; ?></p>
+<p>Your technical support key is: <strong><?php echo $support_key; ?></strong></p>
+<p>You can use this key to <a href="http://www.ioerror.us/bb2-support-key?key=<?php echo $support_key; ?>">fix this problem yourself</a>.</p>
+<p>If you are unable to fix the problem yourself, please contact <a href="mailto:<?php echo htmlspecialchars(str_replace("@", "+nospam at nospam.", bb2_email())); ?>"><?php echo htmlspecialchars(str_replace("@", " at ", bb2_email())); ?></a> and be sure to provide the technical support key shown above.</p>
+<?php
+}
+
+function bb2_log_denial($settings, $package, $key, $previous_key=false)
+{
+ bb2_db_query(bb2_insert($settings, $package, $key));
+}
+
+?>
Copied: plugins/trunk/badbehavior/bad-behavior/blackhole.inc.php (from rev 4487, plugins/branches/lifetype-1.1/badbehavior/bad-behavior/blackhole.inc.php)
Modified: plugins/trunk/badbehavior/bad-behavior/blacklist.inc.php
===================================================================
--- plugins/trunk/badbehavior/bad-behavior/blacklist.inc.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/badbehavior/bad-behavior/blacklist.inc.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,99 +1,106 @@
-<?php if (!defined('BB2_CORE')) die('I said no cheating!');
-
-function bb2_blacklist($package) {
-
- // Blacklisted user agents
- // These user agent strings occur at the beginning of the line.
- $bb2_spambots_0 = array(
- "8484 Boston Project", // video poker/porn spam
- "adwords", // referrer spam
- "autoemailspider", // spam harvester
- "blogsearchbot-martin", // from honeypot
- "Digger", // spam harvester
- "ecollector", // spam harvester
- "EmailCollector", // spam harvester
- "Email Extractor", // spam harvester
- "Email Siphon", // spam harvester
- "EmailSiphon", // spam harvester
- "grub crawler", // misc comment/email spam
- "HttpProxy", // misc comment/email spam
- "Jakarta Commons", // custommised spambots
- "Java 1.", // definitely a spammer
- "Java/1.", // definitely a spammer
- "libwww-perl", // spambot scripts
- "LWP", // spambot scripts
- "Microsoft URL", // spam harvester
- "Missigua", // spam harvester
- "Movable Type", // customised spambots
- "Mozilla ", // malicious software
- "Mozilla/4.0(", // from honeypot
- "MSIE", // malicious software
- "OmniExplorer", // spam harvester
- "PussyCat ", // misc comment spam
- "psycheclone", // spam harvester
- "Shockwave Flash", // spam harvester
- "User-Agent: ", // spam harvester
- "Wordpress Hash Grabber",// malicious software
- "\\\"", // malicious software
- );
-
- // These user agent strings occur anywhere within the line.
- $bb2_spambots = array(
- "; Widows ", // misc comment/email spam
- "a href=", // referrer spam
- "Bad Behavior Test", // Add this to your user-agent to test BB
- "compatible ; MSIE", // misc comment/email spam
- "compatible-", // misc comment/email spam
- "DTS Agent", // misc comment/email spam
- "Gecko/25", // revisit this in 500 years
- "grub-client", // search engine ignores robots.txt
- "hanzoweb", // very badly behaved crawler
- "Indy Library", // misc comment/email spam
- "Murzillo compatible", // comment spam bot
- ".NET CLR 1)", // free poker, etc.
- "POE-Component-Client", // free poker, etc.
- "Turing Machine", // www.anonymizer.com abuse
- "WISEbot", // spam harvester
- "WISEnutbot", // spam harvester
- "Windows NT 4.0;)", // wikispam bot
- "Windows NT 5.1;)", // wikispam bot
- "Windows XP 5", // spam harvester
- "\\\\)", // spam harvester
- );
-
- // These are regular expression matches.
- $bb2_spambots_regex = array(
- "/^[A-Z]{10}$/", // misc email spam
- "/^Mozilla...0$/i", // fake user agent/email spam
- "/[bcdfghjklmnpqrstvwxyz ]{8,}/",
- "/;\){1,2}$/", // misc spammers/harvesters
-// "/MSIE.*Windows XP/", // misc comment spam
- );
-
- // Do not edit below this line.
-
- $ua = $package['headers_mixed']['User-Agent'];
-
- foreach ($bb2_spambots_0 as $spambot) {
- $pos = stripos($ua, $spambot);
- if ($pos !== FALSE && $pos == 0) {
- return "17f4e8c8";
- }
- }
-
- foreach ($bb2_spambots as $spambot) {
- if (stripos($ua, $spambot) !== FALSE) {
- return "17f4e8c8";
- }
- }
-
- foreach ($bb2_spambots_regex as $spambot) {
- if (preg_match($spambot, $ua)) {
- return "17f4e8c8";
- }
- }
-
- return FALSE;
-}
-
-?>
+<?php if (!defined('BB2_CORE')) die('I said no cheating!');
+
+function bb2_blacklist($package) {
+
+ // Blacklisted user agents
+ // These user agent strings occur at the beginning of the line.
+ $bb2_spambots_0 = array(
+ "<sc", // XSS exploit attempts
+ "8484 Boston Project", // video poker/porn spam
+ "adwords", // referrer spam
+ "autoemailspider", // spam harvester
+ "blogsearchbot-martin", // from honeypot
+ "Digger", // spam harvester
+ "ecollector", // spam harvester
+ "EmailCollector", // spam harvester
+ "Email Extractor", // spam harvester
+ "Email Siphon", // spam harvester
+ "EmailSiphon", // spam harvester
+ "grub crawler", // misc comment/email spam
+ "HttpProxy", // misc comment/email spam
+ "Internet Explorer", // XMLRPC exploits seen
+ "Jakarta Commons", // custommised spambots
+ "Java 1.", // definitely a spammer
+ "Java/1.", // definitely a spammer
+ "libwww-perl", // spambot scripts
+ "LWP", // spambot scripts
+ "Microsoft URL", // spam harvester
+ "Missigua", // spam harvester
+ "Movable Type", // customised spambots
+ "Mozilla ", // malicious software
+ "Mozilla/4.0(", // from honeypot
+ "Mozilla/4.0+(", // suspicious harvester
+ "MSIE", // malicious software
+ "OmniExplorer", // spam harvester
+ "PussyCat ", // misc comment spam
+ "psycheclone", // spam harvester
+ "Shockwave Flash", // spam harvester
+ "User Agent: ", // spam harvester
+ "User-Agent: ", // spam harvester
+ "Wordpress Hash Grabber",// malicious software
+ "\"", // malicious software
+ );
+
+ // These user agent strings occur anywhere within the line.
+ $bb2_spambots = array(
+ "\r", // A really dumb bot
+ "; Widows ", // misc comment/email spam
+ "a href=", // referrer spam
+ "Bad Behavior Test", // Add this to your user-agent to test BB
+ "compatible ; MSIE", // misc comment/email spam
+ "compatible-", // misc comment/email spam
+ "DTS Agent", // misc comment/email spam
+ "Gecko/25", // revisit this in 500 years
+ "grub-client", // search engine ignores robots.txt
+ "hanzoweb", // very badly behaved crawler
+ "Indy Library", // misc comment/email spam
+ "larbin at unspecified", // stealth harvesters
+ "Murzillo compatible", // comment spam bot
+ ".NET CLR 1)", // free poker, etc.
+ "POE-Component-Client", // free poker, etc.
+ "Turing Machine", // www.anonymizer.com abuse
+ "WISEbot", // spam harvester
+ "WISEnutbot", // spam harvester
+ "Windows NT 4.0;)", // wikispam bot
+ "Windows NT 5.0;)", // wikispam bot
+ "Windows NT 5.1;)", // wikispam bot
+ "Windows XP 5", // spam harvester
+ "\\\\)", // spam harvester
+ );
+
+ // These are regular expression matches.
+ $bb2_spambots_regex = array(
+ "/^[A-Z]{10}$/", // misc email spam
+ "/^Mozilla...[05]$/i", // fake user agent/email spam
+ "/[bcdfghjklmnpqrstvwxz ]{8,}/",
+// "/(;\){1,2}$/", // misc spammers/harvesters
+// "/MSIE.*Windows XP/", // misc comment spam
+ );
+
+ // Do not edit below this line.
+
+ $ua = $package['headers_mixed']['User-Agent'];
+
+ foreach ($bb2_spambots_0 as $spambot) {
+ $pos = stripos($ua, $spambot);
+ if ($pos !== FALSE && $pos == 0) {
+ return "17f4e8c8";
+ }
+ }
+
+ foreach ($bb2_spambots as $spambot) {
+ if (stripos($ua, $spambot) !== FALSE) {
+ return "17f4e8c8";
+ }
+ }
+
+ foreach ($bb2_spambots_regex as $spambot) {
+ if (preg_match($spambot, $ua)) {
+ return "17f4e8c8";
+ }
+ }
+
+ return FALSE;
+}
+
+?>
Modified: plugins/trunk/badbehavior/bad-behavior/common_tests.inc.php
===================================================================
--- plugins/trunk/badbehavior/bad-behavior/common_tests.inc.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/badbehavior/bad-behavior/common_tests.inc.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,93 +1,114 @@
-<?php if (!defined('BB2_CORE')) die('I said no cheating!');
-
-// Enforce adherence to protocol version claimed by user-agent.
-
-function bb2_protocol($settings, $package)
-{
- // Is it claiming to be HTTP/1.0? Then it shouldn't do HTTP/1.1 things
- // Always run this test; we should never see Expect:
- if (array_key_exists('Expect', $package['headers_mixed']) && stripos($package['headers_mixed']['Expect'], "100-continue") !== FALSE) {
- return "a0105122";
- }
-
- // Is it claiming to be HTTP/1.1? Then it shouldn't do HTTP/1.0 things
- // Blocks some common corporate proxy servers in strict mode
- if ($settings['strict'] && !strcmp($package['server_protocol'], "HTTP/1.1")) {
- if (array_key_exists('Pragma', $package['headers_mixed']) && strpos($package['headers_mixed']['Pragma'], "no-cache") !== FALSE && !array_key_exists('Cache-Control', $package['headers_mixed'])) {
- return "41feed15";
- }
- }
- return false;
-}
-
-function bb2_misc_headers($settings, $package)
-{
- $ua = $package['headers_mixed']['User-Agent'];
-
- if (!strcmp($package['request_method'], "POST") && empty($ua)) {
- return "f9f2b8b9";
- }
-
- // Range: field exists and begins with 0
- // Real user-agents do not start ranges at 0
- // NOTE: this blocks the whois.sc bot. No big loss.
- if (array_key_exists('Range', $package['headers_mixed']) && strpos($package['headers_mixed']['Range'], "=0-") !== FALSE) {
- if (strncmp($ua, "MovableType", 11)) {
- return "7ad04a8a";
- }
- }
-
- // Content-Range is a response header, not a request header
- if (array_key_exists('Content-Range', $package['headers_mixed'])) {
- return '7d12528e';
- }
-
- // Lowercase via is used by open proxies/referrer spammers
- if (array_key_exists('via', $package['headers'])) {
- return "9c9e4979";
- }
-
- // pinappleproxy is used by referrer spammers
- if (array_key_exists('Via', $package['headers_mixed'])) {
- if (stripos($package['headers_mixed']['Via'], "pinappleproxy") !== FALSE || stripos($package['headers_mixed']['Via'], "PCNETSERVER") !== FALSE || stripos($package['headers_mixed']['Via'], "Invisiware") !== FALSE) {
- return "939a6fbb";
- }
- }
-
- // TE: if present must have Connection: TE
- // RFC 2616 14.39
- // Opera 8.01 has a bug which causes it to be blocked. Use 8.02 or later.
- if (array_key_exists('Te', $package['headers_mixed'])) {
- if (!preg_match('/\bTE\b/', $package['headers_mixed']['Connection'])) {
- return "582ec5e4";
- }
- }
-
- if (array_key_exists('Connection', $package['headers_mixed'])) {
- // Connection: keep-alive and close are mutually exclusive
- if (preg_match('/\bKeep-Alive\b/i', $package['headers_mixed']['Connection']) && preg_match('/\bClose\b/i', $package['headers_mixed']['Connection'])) {
- return "a52f0448";
- }
- // Close shouldn't appear twice
- if (preg_match('/\bclose,\s?close\b/i', $package['headers_mixed']['Connection'])) {
- return "a52f0448";
- }
- // Keey-Alive shouldn't appear twice either
- if (preg_match('/\bkeep-alive,\s?keep-alive\b/i', $package['headers_mixed']['Connection'])) {
- return "a52f0448";
- }
- }
-
-
- // Headers which are not seen from normal user agents; only malicious bots
- if (array_key_exists('X-Aaaaaaaaaaaa', $package['headers_mixed']) || array_key_exists('X-Aaaaaaaaaa', $package['headers_mixed'])) {
- return "b9cc1d86";
- }
- if (array_key_exists('Proxy-Connection', $package['headers_mixed'])) {
- return "b7830251";
- }
-
- return false;
-}
-
-?>
+<?php if (!defined('BB2_CORE')) die('I said no cheating!');
+
+// Enforce adherence to protocol version claimed by user-agent.
+
+function bb2_protocol($settings, $package)
+{
+ // Is it claiming to be HTTP/1.0? Then it shouldn't do HTTP/1.1 things
+ // Always run this test; we should never see Expect:
+ if (array_key_exists('Expect', $package['headers_mixed']) && stripos($package['headers_mixed']['Expect'], "100-continue") !== FALSE) {
+ return "a0105122";
+ }
+
+ // Is it claiming to be HTTP/1.1? Then it shouldn't do HTTP/1.0 things
+ // Blocks some common corporate proxy servers in strict mode
+ if ($settings['strict'] && !strcmp($package['server_protocol'], "HTTP/1.1")) {
+ if (array_key_exists('Pragma', $package['headers_mixed']) && strpos($package['headers_mixed']['Pragma'], "no-cache") !== FALSE && !array_key_exists('Cache-Control', $package['headers_mixed'])) {
+ return "41feed15";
+ }
+ }
+ return false;
+}
+
+function bb2_misc_headers($settings, $package)
+{
+ $ua = $package['headers_mixed']['User-Agent'];
+
+ if (!strcmp($package['request_method'], "POST") && empty($ua)) {
+ return "f9f2b8b9";
+ }
+
+ // Broken spambots send URLs with various invalid characters
+ if (strpos($package['request_uri'], "#") !== FALSE || strpos($package['headers_mixed']['Referer'], "#") !== FALSE) {
+ return "dfd9b1ad";
+ }
+
+ // Range: field exists and begins with 0
+ // Real user-agents do not start ranges at 0
+ // NOTE: this blocks the whois.sc bot. No big loss.
+ if (array_key_exists('Range', $package['headers_mixed']) && strpos($package['headers_mixed']['Range'], "=0-") !== FALSE) {
+ // LifeType mod: jondaley: LiveJournal uses URI::Fetch for OpenID checking
+ if (strncmp($ua, "MovableType", 11) && strncmp($ua, "URI::Fetch", 10)) {
+ return "7ad04a8a";
+ }
+ }
+
+ // Content-Range is a response header, not a request header
+ if (array_key_exists('Content-Range', $package['headers_mixed'])) {
+ return '7d12528e';
+ }
+
+ // Lowercase via is used by open proxies/referrer spammers
+ if (array_key_exists('via', $package['headers'])) {
+ return "9c9e4979";
+ }
+
+ // pinappleproxy is used by referrer spammers
+ if (array_key_exists('Via', $package['headers_mixed'])) {
+ if (stripos($package['headers_mixed']['Via'], "pinappleproxy") !== FALSE || stripos($package['headers_mixed']['Via'], "PCNETSERVER") !== FALSE || stripos($package['headers_mixed']['Via'], "Invisiware") !== FALSE) {
+ return "939a6fbb";
+ }
+ }
+
+ // TE: if present must have Connection: TE
+ // RFC 2616 14.39
+ // Blocks Microsoft ISA Server 2004 in strict mode. Contact Microsoft
+ // to obtain a hotfix.
+ if ($settings['strict'] && array_key_exists('Te', $package['headers_mixed'])) {
+ if (!preg_match('/\bTE\b/', $package['headers_mixed']['Connection'])) {
+ return "582ec5e4";
+ }
+ }
+
+ if (array_key_exists('Connection', $package['headers_mixed'])) {
+ // Connection: keep-alive and close are mutually exclusive
+ if (preg_match('/\bKeep-Alive\b/i', $package['headers_mixed']['Connection']) && preg_match('/\bClose\b/i', $package['headers_mixed']['Connection'])) {
+ return "a52f0448";
+ }
+ // Close shouldn't appear twice
+ if (preg_match('/\bclose,\s?close\b/i', $package['headers_mixed']['Connection'])) {
+ return "a52f0448";
+ }
+ // Keey-Alive shouldn't appear twice either
+ if (preg_match('/\bkeep-alive,\s?keep-alive\b/i', $package['headers_mixed']['Connection'])) {
+ return "a52f0448";
+ }
+ }
+
+
+ // Headers which are not seen from normal user agents; only malicious bots
+ if (array_key_exists('X-Aaaaaaaaaaaa', $package['headers_mixed']) || array_key_exists('X-Aaaaaaaaaa', $package['headers_mixed'])) {
+ return "b9cc1d86";
+ }
+ if (array_key_exists('Proxy-Connection', $package['headers_mixed'])) {
+ return "b7830251";
+ }
+
+ if (array_key_exists('Referer', $package['headers_mixed'])) {
+ // Referer, if it exists, must not be blank
+ if (empty($package['headers_mixed'])) {
+ return "69920ee5";
+ }
+
+ // Referer, if it exists, must contain a :
+ // While a relative URL is technically valid in Referer, all known
+ // legit user-agents send an absolute URL
+ if (strpos($package['headers_mixed']['Referer'], ":") === FALSE) {
+ return "45b35e30";
+ }
+ }
+
+ return false;
+}
+
+?>
Modified: plugins/trunk/badbehavior/bad-behavior/core.inc.php
===================================================================
--- plugins/trunk/badbehavior/bad-behavior/core.inc.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/badbehavior/bad-behavior/core.inc.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,200 +1,203 @@
-<?php if (!defined('BB2_CWD')) die("I said no cheating!");
-
-// Bad Behavior entry point is start_bad_behavior().
-// If you're reading this, you are probably lost.
-// Go read the bad-behavior-generic.php file.
-
-define('BB2_CORE', dirname(__FILE__));
-define('BB2_COOKIE', 'bb2_screener_');
-
-require_once(BB2_CORE . "/functions.inc.php");
-
-// Our log table structure
-function bb2_table_structure($name)
-{
- // It's not paranoia if they really are out to get you.
- $name_escaped = bb2_db_escape($name);
- return "CREATE TABLE IF NOT EXISTS `$name_escaped` (
- `id` INT(11) NOT NULL auto_increment,
- `ip` TEXT NOT NULL,
- `date` DATETIME NOT NULL default '0000-00-00 00:00:00',
- `request_method` TEXT NOT NULL,
- `request_uri` TEXT NOT NULL,
- `server_protocol` TEXT NOT NULL,
- `http_headers` TEXT NOT NULL,
- `user_agent` TEXT NOT NULL,
- `request_entity` TEXT NOT NULL,
- `key` TEXT NOT NULL,
- INDEX (`ip`(15)),
- INDEX (`user_agent`(10)),
- PRIMARY KEY (`id`) );"; // TODO: INDEX might need tuning
-}
-
-// Insert a new record
-function bb2_insert($settings, $package, $key)
-{
- $ip = bb2_db_escape($package['ip']);
- $date = bb2_db_date();
- $request_method = bb2_db_escape($package['request_method']);
- $request_uri = bb2_db_escape($package['request_uri']);
- $server_protocol = bb2_db_escape($package['server_protocol']);
- $user_agent = bb2_db_escape($package['user_agent']);
- $headers = "$request_method $request_uri $server_protocol\n";
- foreach ($package['headers'] as $h => $v) {
- $headers .= bb2_db_escape("$h: $v\n");
- }
- $request_entity = "";
- if (!strcasecmp($request_method, "POST")) {
- foreach ($package['request_entity'] as $h => $v) {
- $request_entity .= bb2_db_escape("$h: $v\n");
- }
- }
- return "INSERT INTO `" . bb2_db_escape($settings['log_table']) . "`
- (`ip`, `date`, `request_method`, `request_uri`, `server_protocol`, `http_headers`, `user_agent`, `request_entity`, `key`) VALUES
- ('$ip', '$date', '$request_method', '$request_uri', '$server_protocol', '$headers', '$user_agent', '$request_entity', '$key')";
-}
-
-// Kill 'em all!
-function bb2_banned($settings, $package, $key, $previous_key=false)
-{
- require_once(BB2_CORE . "/banned.inc.php");
- bb2_display_denial($settings, $key, $previous_key);
- bb2_log_denial($settings, $package, $key, $previous_key);
- if (is_callable('bb2_banned_callback')) {
- bb2_banned_callback($settings, $package, $key);
- }
- // Penalize the spammers some more
- require_once(BB2_CORE . "/housekeeping.inc.php");
- bb2_housekeeping($settings, $package);
- die();
-}
-
-function bb2_approved($settings, $package)
-{
- // Dirk wanted this
- if (is_callable('bb2_approved_callback')) {
- bb2_approved_callback($settings, $package);
- }
-
- // Decide what to log on approved requests.
- if ($settings['verbose'] || empty($package['user_agent'])) {
- bb2_db_query(bb2_insert($settings, $package, "00000000"));
- }
-}
-
-// Check the results of a particular test; see below for usage
-// Returns FALSE if test passed (yes this is backwards)
-function bb2_test($settings, $package, $result)
-{
- if ($result !== FALSE)
- {
- bb2_banned($settings, $package, $result);
- return TRUE;
- }
- return FALSE;
-}
-
-
-// Let God sort 'em out!
-function bb2_start($settings)
-{
- // Gather up all the information we need, first of all.
- $headers = bb2_load_headers();
- // Postprocess the headers to mixed-case
- // FIXME: get the world to stop using PHP as CGI
- $headers_mixed = array();
- foreach ($headers as $h => $v) {
- $headers_mixed[uc_all($h)] = $v;
- }
-
- // We use these frequently. Keep a copy close at hand.
- $ip = $_SERVER['REMOTE_ADDR'];
- $request_method = $_SERVER['REQUEST_METHOD'];
- $request_uri = $_SERVER['REQUEST_URI'];
- $server_protocol = $_SERVER['SERVER_PROTOCOL'];
- $user_agent = $_SERVER['HTTP_USER_AGENT'];
-
- // Reconstruct the HTTP entity, if present.
- $request_entity = array();
- if (!strcasecmp($request_method, "POST") || !strcasecmp($request_method, "PUT")) {
- foreach ($_POST as $h => $v) {
- $request_entity[$h] = $v;
- }
- }
-
- $package = array('ip' => $ip, 'headers' => $headers, 'headers_mixed' => $headers_mixed, 'request_method' => $request_method, 'request_uri' => $request_uri, 'server_protocol' => $server_protocol, 'request_entity' => $request_entity, 'user_agent' => $user_agent, 'is_browser' => false);
-
- // Please proceed to the security checkpoint and have your
- // identification and boarding pass ready.
-
- // First check the whitelist
- require_once(BB2_CORE . "/whitelist.inc.php");
- if (!bb2_whitelist($package)) {
- // Now check the blacklist
- require_once(BB2_CORE . "/blacklist.inc.php");
- bb2_test($settings, $package, bb2_blacklist($package));
-
- // Check for common stuff
- require_once(BB2_CORE . "/common_tests.inc.php");
- bb2_test($settings, $package, bb2_protocol($settings, $package));
- bb2_test($settings, $package, bb2_misc_headers($settings, $package));
-
- // Specific checks
- $ua = $headers_mixed['User-Agent'];
- // MSIE checks
- if (stripos($ua, "MSIE") !== FALSE) {
- $package['is_browser'] = true;
- if (stripos($ua, "Opera") !== FALSE) {
- require_once(BB2_CORE . "/opera.inc.php");
- bb2_test($settings, $package, bb2_opera($package));
- } else {
- require_once(BB2_CORE . "/msie.inc.php");
- bb2_test($settings, $package, bb2_msie($package));
- }
- } elseif (stripos($ua, "Konqueror") !== FALSE) {
- $package['is_browser'] = true;
- require_once(BB2_CORE . "/konqueror.inc.php");
- bb2_test($settings, $package, bb2_konqueror($package));
- } elseif (stripos($ua, "Opera") !== FALSE) {
- $package['is_browser'] = true;
- require_once(BB2_CORE . "/opera.inc.php");
- bb2_test($settings, $package, bb2_opera($package));
- } elseif (stripos($ua, "Safari") !== FALSE) {
- $package['is_browser'] = true;
- require_once(BB2_CORE . "/safari.inc.php");
- bb2_test($settings, $package, bb2_safari($package));
- } elseif (stripos($ua, "Lynx") !== FALSE) {
- $package['is_browser'] = true;
- require_once(BB2_CORE . "/lynx.inc.php");
- bb2_test($settings, $package, bb2_lynx($package));
- } elseif (stripos($ua, "MovableType") !== FALSE) {
- require_once(BB2_CORE . "/movabletype.inc.php");
- bb2_test($settings, $package, bb2_movabletype($package));
- } elseif (stripos($ua, "msnbot") !== FALSE || stripos($ua, "MS Search") !== FALSE) {
- require_once(BB2_CORE . "/msnbot.inc.php");
- bb2_test($settings, $package, bb2_msnbot($package));
- } elseif (stripos($ua, "Googlebot") !== FALSE || stripos($ua, "Mediapartners-Google") !== FALSE) {
- require_once(BB2_CORE . "/google.inc.php");
- bb2_test($settings, $package, bb2_google($package));
- } elseif (stripos($ua, "Mozilla") !== FALSE && stripos($ua, "Mozilla" == 0)) {
- $package['is_browser'] = true;
- require_once(BB2_CORE . "/mozilla.inc.php");
- bb2_test($settings, $package, bb2_mozilla($package));
- }
-
- // More intensive screening applies to POST requests
- if (!strcasecmp('POST', $package['request_method'])) {
- require_once(BB2_CORE . "/post.inc.php");
- bb2_test($settings, $package, bb2_post($settings, $package));
- }
- }
-
- // Last chance screening.
- require_once(BB2_CORE . "/screener.inc.php");
- bb2_screener($settings, $package);
-
- // And that's about it.
- bb2_approved($settings, $package);
- return true;
-}
-?>
+<?php if (!defined('BB2_CWD')) die("I said no cheating!");
+
+// Bad Behavior entry point is start_bad_behavior().
+// If you're reading this, you are probably lost.
+// Go read the bad-behavior-generic.php file.
+
+define('BB2_CORE', dirname(__FILE__));
+define('BB2_COOKIE', 'bb2_screener_');
+
+require_once(BB2_CORE . "/functions.inc.php");
+
+// Our log table structure
+function bb2_table_structure($name)
+{
+ // It's not paranoia if they really are out to get you.
+ $name_escaped = bb2_db_escape($name);
+ return "CREATE TABLE IF NOT EXISTS `$name_escaped` (
+ `id` INT(11) NOT NULL auto_increment,
+ `ip` TEXT NOT NULL,
+ `date` DATETIME NOT NULL default '0000-00-00 00:00:00',
+ `request_method` TEXT NOT NULL,
+ `request_uri` TEXT NOT NULL,
+ `server_protocol` TEXT NOT NULL,
+ `http_headers` TEXT NOT NULL,
+ `user_agent` TEXT NOT NULL,
+ `request_entity` TEXT NOT NULL,
+ `key` TEXT NOT NULL,
+ INDEX (`ip`(15)),
+ INDEX (`user_agent`(10)),
+ PRIMARY KEY (`id`) );"; // TODO: INDEX might need tuning
+}
+
+// Insert a new record
+function bb2_insert($settings, $package, $key)
+{
+ $ip = bb2_db_escape($package['ip']);
+ $date = bb2_db_date();
+ $request_method = bb2_db_escape($package['request_method']);
+ $request_uri = bb2_db_escape($package['request_uri']);
+ $server_protocol = bb2_db_escape($package['server_protocol']);
+ $user_agent = bb2_db_escape($package['user_agent']);
+ $headers = "$request_method $request_uri $server_protocol\n";
+ foreach ($package['headers'] as $h => $v) {
+ $headers .= bb2_db_escape("$h: $v\n");
+ }
+ $request_entity = "";
+ if (!strcasecmp($request_method, "POST")) {
+ foreach ($package['request_entity'] as $h => $v) {
+ $request_entity .= bb2_db_escape("$h: $v\n");
+ }
+ }
+ return "INSERT INTO `" . bb2_db_escape($settings['log_table']) . "`
+ (`ip`, `date`, `request_method`, `request_uri`, `server_protocol`, `http_headers`, `user_agent`, `request_entity`, `key`) VALUES
+ ('$ip', '$date', '$request_method', '$request_uri', '$server_protocol', '$headers', '$user_agent', '$request_entity', '$key')";
+}
+
+// Kill 'em all!
+function bb2_banned($settings, $package, $key, $previous_key=false)
+{
+ // Some spambots hit too hard. Slow them down a bit.
+ sleep(2);
+
+ require_once(BB2_CORE . "/banned.inc.php");
+ bb2_display_denial($settings, $key, $previous_key);
+ bb2_log_denial($settings, $package, $key, $previous_key);
+ if (is_callable('bb2_banned_callback')) {
+ bb2_banned_callback($settings, $package, $key);
+ }
+ // Penalize the spammers some more
+ require_once(BB2_CORE . "/housekeeping.inc.php");
+ bb2_housekeeping($settings, $package);
+ die();
+}
+
+function bb2_approved($settings, $package)
+{
+ // Dirk wanted this
+ if (is_callable('bb2_approved_callback')) {
+ bb2_approved_callback($settings, $package);
+ }
+
+ // Decide what to log on approved requests.
+ if ($settings['verbose'] || empty($package['user_agent'])) {
+ bb2_db_query(bb2_insert($settings, $package, "00000000"));
+ }
+}
+
+// Check the results of a particular test; see below for usage
+// Returns FALSE if test passed (yes this is backwards)
+function bb2_test($settings, $package, $result)
+{
+ if ($result !== FALSE)
+ {
+ bb2_banned($settings, $package, $result);
+ return TRUE;
+ }
+ return FALSE;
+}
+
+
+// Let God sort 'em out!
+function bb2_start($settings)
+{
+ // Gather up all the information we need, first of all.
+ $headers = bb2_load_headers();
+ // Postprocess the headers to mixed-case
+ // FIXME: get the world to stop using PHP as CGI
+ $headers_mixed = array();
+ foreach ($headers as $h => $v) {
+ $headers_mixed[uc_all($h)] = $v;
+ }
+
+ // We use these frequently. Keep a copy close at hand.
+ $ip = $_SERVER['REMOTE_ADDR'];
+ $request_method = $_SERVER['REQUEST_METHOD'];
+ $request_uri = $_SERVER['REQUEST_URI'];
+ $server_protocol = $_SERVER['SERVER_PROTOCOL'];
+ $user_agent = $_SERVER['HTTP_USER_AGENT'];
+
+ // Reconstruct the HTTP entity, if present.
+ $request_entity = array();
+ if (!strcasecmp($request_method, "POST") || !strcasecmp($request_method, "PUT")) {
+ foreach ($_POST as $h => $v) {
+ $request_entity[$h] = $v;
+ }
+ }
+
+ $package = array('ip' => $ip, 'headers' => $headers, 'headers_mixed' => $headers_mixed, 'request_method' => $request_method, 'request_uri' => $request_uri, 'server_protocol' => $server_protocol, 'request_entity' => $request_entity, 'user_agent' => $user_agent, 'is_browser' => false);
+
+ // Please proceed to the security checkpoint and have your
+ // identification and boarding pass ready.
+
+ // First check the whitelist
+ require_once(BB2_CORE . "/whitelist.inc.php");
+ if (!bb2_whitelist($package)) {
+ // Now check the blacklist
+ require_once(BB2_CORE . "/blacklist.inc.php");
+ bb2_test($settings, $package, bb2_blacklist($package));
+
+ // Check for common stuff
+ require_once(BB2_CORE . "/common_tests.inc.php");
+ bb2_test($settings, $package, bb2_protocol($settings, $package));
+ bb2_test($settings, $package, bb2_misc_headers($settings, $package));
+
+ // Specific checks
+ $ua = $headers_mixed['User-Agent'];
+ // MSIE checks
+ if (stripos($ua, "MSIE") !== FALSE) {
+ $package['is_browser'] = true;
+ if (stripos($ua, "Opera") !== FALSE) {
+ require_once(BB2_CORE . "/opera.inc.php");
+ bb2_test($settings, $package, bb2_opera($package));
+ } else {
+ require_once(BB2_CORE . "/msie.inc.php");
+ bb2_test($settings, $package, bb2_msie($package));
+ }
+ } elseif (stripos($ua, "Konqueror") !== FALSE) {
+ $package['is_browser'] = true;
+ require_once(BB2_CORE . "/konqueror.inc.php");
+ bb2_test($settings, $package, bb2_konqueror($package));
+ } elseif (stripos($ua, "Opera") !== FALSE) {
+ $package['is_browser'] = true;
+ require_once(BB2_CORE . "/opera.inc.php");
+ bb2_test($settings, $package, bb2_opera($package));
+ } elseif (stripos($ua, "Safari") !== FALSE) {
+ $package['is_browser'] = true;
+ require_once(BB2_CORE . "/safari.inc.php");
+ bb2_test($settings, $package, bb2_safari($package));
+ } elseif (stripos($ua, "Lynx") !== FALSE) {
+ $package['is_browser'] = true;
+ require_once(BB2_CORE . "/lynx.inc.php");
+ bb2_test($settings, $package, bb2_lynx($package));
+ } elseif (stripos($ua, "MovableType") !== FALSE) {
+ require_once(BB2_CORE . "/movabletype.inc.php");
+ bb2_test($settings, $package, bb2_movabletype($package));
+ } elseif (stripos($ua, "msnbot") !== FALSE || stripos($ua, "MS Search") !== FALSE) {
+ require_once(BB2_CORE . "/msnbot.inc.php");
+ bb2_test($settings, $package, bb2_msnbot($package));
+ } elseif (stripos($ua, "Googlebot") !== FALSE || stripos($ua, "Mediapartners-Google") !== FALSE) {
+ require_once(BB2_CORE . "/google.inc.php");
+ bb2_test($settings, $package, bb2_google($package));
+ } elseif (stripos($ua, "Mozilla") !== FALSE && stripos($ua, "Mozilla" == 0)) {
+ $package['is_browser'] = true;
+ require_once(BB2_CORE . "/mozilla.inc.php");
+ bb2_test($settings, $package, bb2_mozilla($package));
+ }
+
+ // More intensive screening applies to POST requests
+ if (!strcasecmp('POST', $package['request_method'])) {
+ require_once(BB2_CORE . "/post.inc.php");
+ bb2_test($settings, $package, bb2_post($settings, $package));
+ }
+ }
+
+ // Last chance screening.
+ require_once(BB2_CORE . "/screener.inc.php");
+ bb2_screener($settings, $package);
+
+ // And that's about it.
+ bb2_approved($settings, $package);
+ return true;
+}
+?>
Modified: plugins/trunk/badbehavior/bad-behavior/functions.inc.php
===================================================================
--- plugins/trunk/badbehavior/bad-behavior/functions.inc.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/badbehavior/bad-behavior/functions.inc.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,69 +1,69 @@
-<?php if (!defined('BB2_CORE')) die("I said no cheating!");
-
-// Miscellaneous helper functions.
-
-// stripos() needed because stripos is only present on PHP 5
-if (!function_exists('stripos')) {
- function stripos($haystack,$needle,$offset = 0) {
- return(strpos(strtolower($haystack),strtolower($needle),$offset));
- }
-}
-
-// str_split() needed because str_split is only present on PHP 5
-if (!function_exists('str_split')) {
- function str_split($string, $split_length=1)
- {
- if ($split_length < 1) {
- return false;
- }
-
- for ($pos=0, $chunks = array(); $pos < strlen($string); $pos+=$split_length) {
- $chunks[] = substr($string, $pos, $split_length);
- }
- return $chunks;
- }
-}
-
-// Convert a string to mixed-case on word boundaries.
-function uc_all($string) {
- $temp = preg_split('/(\W)/', str_replace("_", "-", $string), -1, PREG_SPLIT_DELIM_CAPTURE);
- foreach ($temp as $key=>$word) {
- $temp[$key] = ucfirst(strtolower($word));
- }
- return join ('', $temp);
-}
-
-// Determine if an IP address resides in a CIDR netblock or netblocks.
-function match_cidr($addr, $cidr) {
- $output = false;
-
- if (is_array($cidr)) {
- foreach ($cidr as $cidrlet) {
- if (match_cidr($addr, $cidrlet)) {
- $output = true;
- }
- }
- } else {
- list($ip, $mask) = explode('/', $cidr);
- $mask = 0xffffffff << (32 - $mask);
- $output = ((ip2long($addr) & $mask) == (ip2long($ip) & $mask));
- }
- return $output;
-}
-
-// Obtain all the HTTP headers.
-// NB: on PHP-CGI we have to fake it out a bit, since we can't get the REAL
-// headers. Run PHP as Apache 2.0 module if possible for best results.
-function bb2_load_headers() {
- if (!is_callable('getallheaders')) {
- $headers = array();
- foreach ($_SERVER as $h => $v)
- if (ereg('HTTP_(.+)', $h, $hp))
- $headers[str_replace("_", "-", uc_all($hp[1]))] = $v;
- } else {
- $headers = getallheaders();
- }
- return $headers;
-}
-
-?>
+<?php if (!defined('BB2_CORE')) die("I said no cheating!");
+
+// Miscellaneous helper functions.
+
+// stripos() needed because stripos is only present on PHP 5
+if (!function_exists('stripos')) {
+ function stripos($haystack,$needle,$offset = 0) {
+ return(strpos(strtolower($haystack),strtolower($needle),$offset));
+ }
+}
+
+// str_split() needed because str_split is only present on PHP 5
+if (!function_exists('str_split')) {
+ function str_split($string, $split_length=1)
+ {
+ if ($split_length < 1) {
+ return false;
+ }
+
+ for ($pos=0, $chunks = array(); $pos < strlen($string); $pos+=$split_length) {
+ $chunks[] = substr($string, $pos, $split_length);
+ }
+ return $chunks;
+ }
+}
+
+// Convert a string to mixed-case on word boundaries.
+function uc_all($string) {
+ $temp = preg_split('/(\W)/', str_replace("_", "-", $string), -1, PREG_SPLIT_DELIM_CAPTURE);
+ foreach ($temp as $key=>$word) {
+ $temp[$key] = ucfirst(strtolower($word));
+ }
+ return join ('', $temp);
+}
+
+// Determine if an IP address resides in a CIDR netblock or netblocks.
+function match_cidr($addr, $cidr) {
+ $output = false;
+
+ if (is_array($cidr)) {
+ foreach ($cidr as $cidrlet) {
+ if (match_cidr($addr, $cidrlet)) {
+ $output = true;
+ }
+ }
+ } else {
+ list($ip, $mask) = explode('/', $cidr);
+ $mask = 0xffffffff << (32 - $mask);
+ $output = ((ip2long($addr) & $mask) == (ip2long($ip) & $mask));
+ }
+ return $output;
+}
+
+// Obtain all the HTTP headers.
+// NB: on PHP-CGI we have to fake it out a bit, since we can't get the REAL
+// headers. Run PHP as Apache 2.0 module if possible for best results.
+function bb2_load_headers() {
+ if (!is_callable('getallheaders')) {
+ $headers = array();
+ foreach ($_SERVER as $h => $v)
+ if (ereg('HTTP_(.+)', $h, $hp))
+ $headers[str_replace("_", "-", uc_all($hp[1]))] = $v;
+ } else {
+ $headers = getallheaders();
+ }
+ return $headers;
+}
+
+?>
Modified: plugins/trunk/badbehavior/bad-behavior/google.inc.php
===================================================================
--- plugins/trunk/badbehavior/bad-behavior/google.inc.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/badbehavior/bad-behavior/google.inc.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,13 +1,13 @@
-<?php if (!defined('BB2_CORE')) die('I said no cheating!');
-
-// Analyze user agents claiming to be Googlebot
-
-function bb2_google($package)
-{
- if (match_cidr($package['ip'], "66.249.64.0/19") === FALSE) {
- return "f1182195";
- }
- return false;
-}
-
-?>
+<?php if (!defined('BB2_CORE')) die('I said no cheating!');
+
+// Analyze user agents claiming to be Googlebot
+
+function bb2_google($package)
+{
+ if (match_cidr($package['ip'], "66.249.64.0/19") === FALSE && match_cidr($package['ip'], "64.233.160.0/19") === FALSE) {
+ return "f1182195";
+ }
+ return false;
+}
+
+?>
Modified: plugins/trunk/badbehavior/bad-behavior/housekeeping.inc.php
===================================================================
--- plugins/trunk/badbehavior/bad-behavior/housekeeping.inc.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/badbehavior/bad-behavior/housekeeping.inc.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,16 +1,16 @@
-<?php if (!defined('BB2_CORE')) die('I said no cheating!');
-
-function bb2_housekeeping($settings, $package)
-{
- // FIXME Yes, the interval's hard coded (again) for now.
- $query = "DELETE FROM `" . $settings['log_table'] . "` WHERE `date` < DATE_SUB('" . bb2_db_date() . "', INTERVAL 7 DAY)";
- bb2_db_query($query);
-
- // Waste a bunch more of the spammer's time, sometimes.
- if (rand(1,1000) == 1) {
- $query = "OPTIMIZE TABLE `" . $settings['log_table'] . "`";
- bb2_db_query($query);
- }
-}
-
-?>
+<?php if (!defined('BB2_CORE')) die('I said no cheating!');
+
+function bb2_housekeeping($settings, $package)
+{
+ // FIXME Yes, the interval's hard coded (again) for now.
+ $query = "DELETE FROM `" . $settings['log_table'] . "` WHERE `date` < DATE_SUB('" . bb2_db_date() . "', INTERVAL 7 DAY)";
+ bb2_db_query($query);
+
+ // Waste a bunch more of the spammer's time, sometimes.
+ if (rand(1,1000) == 1) {
+ $query = "OPTIMIZE TABLE `" . $settings['log_table'] . "`";
+ bb2_db_query($query);
+ }
+}
+
+?>
Modified: plugins/trunk/badbehavior/bad-behavior/konqueror.inc.php
===================================================================
--- plugins/trunk/badbehavior/bad-behavior/konqueror.inc.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/badbehavior/bad-behavior/konqueror.inc.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,17 +1,17 @@
-<?php if (!defined('BB2_CORE')) die('I said no cheating!');
-
-// Analyze user agents claiming to be Konqueror
-
-function bb2_konqueror($package)
-{
- // CafeKelsa is a dev project at Yahoo which indexes job listings for
- // Yahoo! HotJobs. It identifies as Konqueror so we skip these checks.
- if (stripos($package['headers_mixed']['User-Agent'], "YahooSeeker/CafeKelsa") === FALSE || match_cidr($package['ip'], "209.73.160.0/19") === FALSE) {
- if (!array_key_exists('Accept', $package['headers_mixed'])) {
- return "17566707";
- }
- }
- return false;
-}
-
-?>
+<?php if (!defined('BB2_CORE')) die('I said no cheating!');
+
+// Analyze user agents claiming to be Konqueror
+
+function bb2_konqueror($package)
+{
+ // CafeKelsa is a dev project at Yahoo which indexes job listings for
+ // Yahoo! HotJobs. It identifies as Konqueror so we skip these checks.
+ if (stripos($package['headers_mixed']['User-Agent'], "YahooSeeker/CafeKelsa") === FALSE || match_cidr($package['ip'], "209.73.160.0/19") === FALSE) {
+ if (!array_key_exists('Accept', $package['headers_mixed'])) {
+ return "17566707";
+ }
+ }
+ return false;
+}
+
+?>
Modified: plugins/trunk/badbehavior/bad-behavior/lynx.inc.php
===================================================================
--- plugins/trunk/badbehavior/bad-behavior/lynx.inc.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/badbehavior/bad-behavior/lynx.inc.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,13 +1,13 @@
-<?php if (!defined('BB2_CORE')) die('I said no cheating!');
-
-// Analyze user agents claiming to be Lynx
-
-function bb2_lynx($package)
-{
- if (!array_key_exists('Accept', $package['headers_mixed'])) {
- return "17566707";
- }
- return false;
-}
-
-?>
+<?php if (!defined('BB2_CORE')) die('I said no cheating!');
+
+// Analyze user agents claiming to be Lynx
+
+function bb2_lynx($package)
+{
+ if (!array_key_exists('Accept', $package['headers_mixed'])) {
+ return "17566707";
+ }
+ return false;
+}
+
+?>
Modified: plugins/trunk/badbehavior/bad-behavior/movabletype.inc.php
===================================================================
--- plugins/trunk/badbehavior/bad-behavior/movabletype.inc.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/badbehavior/bad-behavior/movabletype.inc.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,14 +1,14 @@
-<?php if (!defined('BB2_CORE')) die('I said no cheating!');
-
-function bb2_movabletype($package)
-{
- // Is it a trackback?
- if (strcasecmp($package['request_method'], "POST")) {
- if (strcmp($package['headers_mixed']['Range'], "bytes=0-99999")) {
- return "7d12528e";
- }
- }
- return false;
-}
-
-?>
+<?php if (!defined('BB2_CORE')) die('I said no cheating!');
+
+function bb2_movabletype($package)
+{
+ // Is it a trackback?
+ if (strcasecmp($package['request_method'], "POST")) {
+ if (strcmp($package['headers_mixed']['Range'], "bytes=0-99999")) {
+ return "7d12528e";
+ }
+ }
+ return false;
+}
+
+?>
Modified: plugins/trunk/badbehavior/bad-behavior/mozilla.inc.php
===================================================================
--- plugins/trunk/badbehavior/bad-behavior/mozilla.inc.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/badbehavior/bad-behavior/mozilla.inc.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,17 +1,19 @@
-<?php if (!defined('BB2_CORE')) die('I said no cheating!');
-
-// Analyze user agents claiming to be Mozilla
-
-function bb2_mozilla($package)
-{
- // First off, workaround for Google Desktop, until they fix it FIXME
- // Always check accept header for Mozilla user agents
- if (strpos($package['headers_mixed']['User-Agent'], "Google Desktop") === FALSE) {
- if (!array_key_exists('Accept', $package['headers_mixed'])) {
- return "17566707";
- }
- }
- return false;
-}
-
-?>
+<?php if (!defined('BB2_CORE')) die('I said no cheating!');
+
+// Analyze user agents claiming to be Mozilla
+
+function bb2_mozilla($package)
+{
+ // First off, workaround for Google Desktop, until they fix it FIXME
+ // Google Desktop fixed it, but apparently some old versions are
+ // still out there. :(
+ // Always check accept header for Mozilla user agents
+ if (strpos($package['headers_mixed']['User-Agent'], "Google Desktop") === FALSE) {
+ if (!array_key_exists('Accept', $package['headers_mixed'])) {
+ return "17566707";
+ }
+ }
+ return false;
+}
+
+?>
Modified: plugins/trunk/badbehavior/bad-behavior/msie.inc.php
===================================================================
--- plugins/trunk/badbehavior/bad-behavior/msie.inc.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/badbehavior/bad-behavior/msie.inc.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,24 +1,24 @@
-<?php if (!defined('BB2_CORE')) die('I said no cheating!');
-
-// Analyze user agents claiming to be MSIE
-
-function bb2_msie($package)
-{
- if (!array_key_exists('Accept', $package['headers_mixed'])) {
- return "17566707";
- }
-
- // MSIE does NOT send "Windows ME" or "Windows XP" in the user agent
- if (strpos($package['headers_mixed']['User-Agent'], "Windows ME") !== FALSE || strpos($package['headers_mixed']['User-Agent'], "Windows XP") !== FALSE || strpos($package['headers_mixed']['User-Agent'], "Windows 2000") !== FALSE || strpos($package['headers_mixed']['User-Agent'], "Win32") !== FALSE) {
- return "a1084bad";
- }
-
- // MSIE does NOT send Connection: TE
- if (preg_match('/\bTE\b/i', $package['headers_mixed']['Connection'])) {
- return "2b90f772";
- }
-
- return false;
-}
-
-?>
+<?php if (!defined('BB2_CORE')) die('I said no cheating!');
+
+// Analyze user agents claiming to be MSIE
+
+function bb2_msie($package)
+{
+ if (!array_key_exists('Accept', $package['headers_mixed'])) {
+ return "17566707";
+ }
+
+ // MSIE does NOT send "Windows ME" or "Windows XP" in the user agent
+ if (strpos($package['headers_mixed']['User-Agent'], "Windows ME") !== FALSE || strpos($package['headers_mixed']['User-Agent'], "Windows XP") !== FALSE || strpos($package['headers_mixed']['User-Agent'], "Windows 2000") !== FALSE || strpos($package['headers_mixed']['User-Agent'], "Win32") !== FALSE) {
+ return "a1084bad";
+ }
+
+ // MSIE does NOT send Connection: TE
+ if (preg_match('/\bTE\b/i', $package['headers_mixed']['Connection'])) {
+ return "2b90f772";
+ }
+
+ return false;
+}
+
+?>
Modified: plugins/trunk/badbehavior/bad-behavior/msnbot.inc.php
===================================================================
--- plugins/trunk/badbehavior/bad-behavior/msnbot.inc.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/badbehavior/bad-behavior/msnbot.inc.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,13 +1,13 @@
-<?php if (!defined('BB2_CORE')) die('I said no cheating!');
-
-// Analyze user agents claiming to be msnbot
-
-function bb2_msnbot($package)
-{
- if (match_cidr($package['ip'], "207.46.0.0/16") === FALSE && match_cidr($package['ip'], "65.52.0.0/14") === FALSE && match_cidr($package['ip'], "207.68.128.0/18") === FALSE && match_cidr($package['ip'], "207.68.192.0/20") === FALSE && match_cidr($package['ip'], "64.4.0.0/18") === FALSE) {
- return "e4de0453";
- }
- return false;
-}
-
-?>
+<?php if (!defined('BB2_CORE')) die('I said no cheating!');
+
+// Analyze user agents claiming to be msnbot
+
+function bb2_msnbot($package)
+{
+ if (match_cidr($package['ip'], "207.46.0.0/16") === FALSE && match_cidr($package['ip'], "65.52.0.0/14") === FALSE && match_cidr($package['ip'], "207.68.128.0/18") === FALSE && match_cidr($package['ip'], "207.68.192.0/20") === FALSE && match_cidr($package['ip'], "64.4.0.0/18") === FALSE) {
+ return "e4de0453";
+ }
+ return false;
+}
+
+?>
Modified: plugins/trunk/badbehavior/bad-behavior/opera.inc.php
===================================================================
--- plugins/trunk/badbehavior/bad-behavior/opera.inc.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/badbehavior/bad-behavior/opera.inc.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,13 +1,13 @@
-<?php if (!defined('BB2_CORE')) die('I said no cheating!');
-
-// Analyze user agents claiming to be Opera
-
-function bb2_opera($package)
-{
- if (!array_key_exists('Accept', $package['headers_mixed'])) {
- return "17566707";
- }
- return false;
-}
-
-?>
+<?php if (!defined('BB2_CORE')) die('I said no cheating!');
+
+// Analyze user agents claiming to be Opera
+
+function bb2_opera($package)
+{
+ if (!array_key_exists('Accept', $package['headers_mixed'])) {
+ return "17566707";
+ }
+ return false;
+}
+
+?>
Modified: plugins/trunk/badbehavior/bad-behavior/post.inc.php
===================================================================
--- plugins/trunk/badbehavior/bad-behavior/post.inc.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/badbehavior/bad-behavior/post.inc.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,64 +1,76 @@
-<?php if (!defined('BB2_CORE')) die('I said no cheating!');
-
-// All tests which apply specifically to POST requests
-function bb2_post($settings, $package)
-{
- // MovableType needs specialized screening
- if (stripos($package['headers_mixed']['User-Agent'], "MovableType") !== FALSE) {
- if (strcmp($package['headers_mixed']['Range'], "bytes=0-99999")) {
- return "7d12528e";
- }
- }
-
- // Trackbacks need special screening
- $request_entity = $package['request_entity'];
- if (isset($request_entity['title']) && isset($request_entity['url']) && isset($request_entity['blog_name'])) {
- require_once(BB2_CORE . "/trackback.inc.php");
- return bb2_trackback($package);
- }
-
- // Catch a few completely broken spambots
- if (isset($request_entity[' document.write(Math.round (']) || isset($request_entity[' document.write('])) {
- return "dfd9b1ad";
- }
-
- // Screen by cookie/JavaScript form add
- if (isset($_COOKIE[BB2_COOKIE])) {
- $screener1 = explode(" ", $_COOKIE[BB2_COOKIE]);
- }
- if (isset($_POST[BB2_COOKIE])) {
- $screener2 = explode(" ", $_POST[BB2_COOKIE]);
- }
- $screener = max($screener1[0], $screener2[0]);
-
- if ($screener > 0) {
- // Posting too fast? 5 sec
- // FIXME: even 5 sec is too intrusive
- // if ($screener + 5 > time())
- // return "408d7e72";
- // Posting too slow? 48 hr
- // LifeType mod by jondaley: since pages can be cached, the cookie might not be updated
- // and this can get tripped incorrectly
-// if ($screener + 172800 < time())
-// return "b40c8ddc";
-
- // Screen by IP address
- $ip = ip2long($package['ip']);
- $ip_screener = ip2long($screener[1]);
-// FIXME: This is b0rked, but why?
-// if ($ip && $ip_screener && abs($ip_screener - $ip) > 256)
-// return "c1fa729b";
-
- // Screen for user agent changes
- // User connected previously with blank user agent
- $q = bb2_db_query("SELECT `ip` FROM " . $settings['log_table'] . " WHERE (`ip` = '" . $package['ip'] . "' OR `ip` = '" . $screener[1] . "') AND `user_agent` = '' AND `date` > DATE_SUB('" . bb2_db_date() . "', INTERVAL 1 MINUTE)");
- // Damnit, too many ways for this to fail :(
- if ($q !== FALSE && $q != NULL && bb2_db_num_rows($q) > 0)
- return "799165c2";
-
- }
-
- return false;
-}
-
-?>
+<?php if (!defined('BB2_CORE')) die('I said no cheating!');
+
+// All tests which apply specifically to POST requests
+function bb2_post($settings, $package)
+{
+ // LifeType mod by pwestbro: dns blacklist checks can be done in the
+ // dnsantispam plugin.
+// // Check blackhole lists for known spam/malicious activity
+// require_once(BB2_CORE . "/blackhole.inc.php");
+// bb2_test($settings, $package, bb2_blackhole($package));
+
+ // MovableType needs specialized screening
+ if (stripos($package['headers_mixed']['User-Agent'], "MovableType") !== FALSE) {
+ if (strcmp($package['headers_mixed']['Range'], "bytes=0-99999")) {
+ return "7d12528e";
+ }
+ }
+
+ // Trackbacks need special screening
+ $request_entity = $package['request_entity'];
+ if (isset($request_entity['title']) && isset($request_entity['url']) && isset($request_entity['blog_name'])) {
+ require_once(BB2_CORE . "/trackback.inc.php");
+ return bb2_trackback($package);
+ }
+
+ // Catch a few completely broken spambots
+ foreach ($request_entity as $key => $value) {
+ $pos = strpos($key, " document.write");
+ if ($pos !== FAlSE) {
+ return "dfd9b1ad";
+ }
+ }
+
+ // Screen by cookie/JavaScript form add
+ if (isset($_COOKIE[BB2_COOKIE])) {
+ $screener1 = explode(" ", $_COOKIE[BB2_COOKIE]);
+ }
+ if (isset($_POST[BB2_COOKIE])) {
+ $screener2 = explode(" ", $_POST[BB2_COOKIE]);
+ }
+ $screener = max($screener1[0], $screener2[0]);
+
+ if ($screener > 0) {
+ // Posting too fast? 5 sec
+ // LifeType mod by jondaley: catch 1 second posts
+ // FIXME: even 5 sec is too intrusive
+ if ($screener + 1 > time())
+ return "408d7e72";
+ // Posting too slow? 48 hr
+ // LifeType mod by jondaley: since pages can be cached,
+ // the cookie might not be updated
+ // and this can get tripped incorrectly. NOTE, perhaps
+ // we could add the _POST[BB2_COOKIE]
+ // to the post form? I think that isn't currently used?
+// if ($screener + 172800 < time())
+// return "b40c8ddc";
+
+ // Screen by IP address
+ $ip = ip2long($package['ip']);
+ $ip_screener = ip2long($screener[1]);
+// FIXME: This is b0rked, but why?
+// if ($ip && $ip_screener && abs($ip_screener - $ip) > 256)
+// return "c1fa729b";
+
+ // Screen for user agent changes
+ // User connected previously with blank user agent
+ $q = bb2_db_query("SELECT `ip` FROM " . $settings['log_table'] . " WHERE (`ip` = '" . $package['ip'] . "' OR `ip` = '" . $screener[1] . "') AND `user_agent` != '" . $package['user_agent'] . "' AND `date` > DATE_SUB('" . bb2_db_date() . "', INTERVAL 5 MINUTE)");
+ // Damnit, too many ways for this to fail :(
+ if ($q !== FALSE && $q != NULL && bb2_db_num_rows($q) > 0)
+ return "799165c2";
+ }
+
+ return false;
+}
+
+?>
Modified: plugins/trunk/badbehavior/bad-behavior/responses.inc.php
===================================================================
--- plugins/trunk/badbehavior/bad-behavior/responses.inc.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/badbehavior/bad-behavior/responses.inc.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,43 +1,44 @@
-<?php if (!defined('BB2_CORE')) die('I said no cheating!');
-
-// Defines the responses which Bad Behavior might return.
-
-function bb2_get_response($key) {
- $bb2_responses = array(
- '00000000' => array('response' => 200, 'explanation' => '', 'log' => ''),
- '17566707' => array('response' => 400, 'explanation' => 'An invalid request was received from your browser. This may be caused by a malfunctioning proxy server or browser privacy software.', 'log' => 'Required header \'Accept\' missing'),
- '17f4e8c8' => array('response' => 403, 'explanation' => 'You do not have permission to access this server.', 'log' => 'User-Agent was found on blacklist'),
- '21f11d3f' => array('response' => 403, 'explanation' => 'An invalid request was received. You claimed to be a mobile Web device, but you do not actually appear to be a mobile Web device.', 'log' => 'User-Agent claimed to be AvantGo, claim appears false'),
- '2b90f772' => array('response' => 403, 'explanation' => 'You do not have permission to access this server. If you are using the Opera browser, then Opera must appear in your user agent.', 'log' => 'Connection: TE present, not supported by MSIE'),
- '408d7e72' => array('response' => 403, 'explanation' => 'You do not have permission to access this server. Before trying again, run anti-virus and anti-spyware software and remove any viruses and spyware from your computer.', 'log' => 'POST comes too quickly after GET'),
- '41feed15' => array('response' => 400, 'explanation' => 'An invalid request was received. This may be caused by a malfunctioning proxy server. Bypass the proxy server and connect directly, or contact your proxy server administrator.', 'log' => 'Header \'Pragma\' without \'Cache-Control\' prohibited for HTTP/1.1 requests'),
- '45b35e30' => array('response' => 403, 'explanation' => 'An invalid request was received from your browser. This may be caused by a malfunctioning proxy server or browser privacy software.', 'log' => 'Header \'Referer\' is corrupt'),
- '57796684' => array('response' => 403, 'explanation' => 'You do not have permission to access this server. Before trying again, run anti-virus and anti-spyware software and remove any viruses and spyware from your computer.', 'log' => 'Prohibited header \'X-Aaaaaaaaaa\' or \'X-Aaaaaaaaaaaa\' present'),
- '582ec5e4' => array('response' => 400, 'explanation' => 'An invalid request was received. If you are using a proxy server, bypass the proxy server or contact your proxy server administrator. This may also be caused by a bug in the Opera web browser.', 'log' => '"Header \'TE\' present but TE not specified in \'Connection\' header'),
- '69920ee5' => array('response' => 403, 'explanation' => 'An invalid request was received from your browser. This may be caused by a malfunctioning proxy server or browser privacy software.', 'log' => 'Header \'Referer\' present but blank'),
- '799165c2' => array('response' => 403, 'explanation' => 'You do not have permission to access this server.', 'log' => 'Rotating user-agents detected'),
- '7a06532b' => array('response' => 400, 'explanation' => 'An invalid request was received from your browser. This may be caused by a malfunctioning proxy server or browser privacy software.', 'log' => 'Required header \'Accept-Encoding\' missing'),
- '7ad04a8a' => array('response' => 400, 'explanation' => 'The automated program you are using is not permitted to access this server. Please use a different program or a standard Web browser.', 'log' => 'Prohibited header \'Range\' present'),
- '7d12528e' => array('response' => 403, 'explanation' => 'You do not have permission to access this server.', 'log' => 'Prohibited header \'Range\' or \'Content-Range\' in POST request'),
- '939a6fbb' => array('response' => 403, 'explanation' => 'The proxy server you are using is not permitted to access this server. Please bypass the proxy server, or contact your proxy server administrator.', 'log' => 'Banned proxy server in use'),
- '9c9e4979' => array('response' => 403, 'explanation' => 'The proxy server you are using is not permitted to access this server. Please bypass the proxy server, or contact your proxy server administrator.', 'log' => 'Prohibited header \'via\' present'),
- 'a0105122' => array('response' => 417, 'explanation' => 'Expectation failed. Please retry your request.', 'log' => 'Header \'Expect\' prohibited; resend without Expect'),
- 'a1084bad' => array('response' => 403, 'explanation' => 'You do not have permission to access this server.', 'log' => 'User-Agent claimed to be MSIE, with invalid Windows version'),
- 'a52f0448' => array('response' => 400, 'explanation' => 'An invalid request was received. This may be caused by a malfunctioning proxy server or browser privacy software. If you are using a proxy server, bypass the proxy server or contact your proxy server administrator.', 'log' => 'Header \'Connection\' contains invalid values'),
- 'b40c8ddc' => array('response' => 403, 'explanation' => 'You do not have permission to access this server. Before trying again, close your browser, run anti-virus and anti-spyware software and remove any viruses and spyware from your computer.', 'log' => 'POST more than two days after GET'),
- 'b7830251' => array('response' => 400, 'explanation' => 'Your proxy server sent an invalid request. Please contact the proxy server administrator to have this problem fixed.', 'log' => 'Prohibited header \'Proxy-Connection\' present'),
- 'b9cc1d86' => array('response' => 403, 'explanation' => 'The proxy server you are using is not permitted to access this server. Please bypass the proxy server, or contact your proxy server administrator.', 'log' => 'Prohibited header \'X-Aaaaaaaaaa\' or \'X-Aaaaaaaaaaaa\' present'),
- 'c1fa729b' => array('response' => 403, 'explanation' => 'You do not have permission to access this server. Before trying again, run anti-virus and anti-spyware software and remove any viruses and spyware from your computer.', 'log' => 'Use of rotating proxy servers detected'),
- 'd60b87c7' => array('response' => 403, 'explanation' => 'You do not have permission to access this server. Before trying again, please remove any viruses or spyware from your computer.', 'log' => 'Trackback received via proxy server'),
- 'dfd9b1ad' => array('response' => 403, 'explanation' => 'You do not have permission to access this server.', 'log' => 'Request contained a malicious JavaScript or SQL injection attack'),
- 'e4de0453' => array('response' => 403, 'explanation' => 'An invalid request was received. You claimed to be a major search engine, but you do not appear to actually be a major search engine.', 'log' => 'User-Agent claimed to be msnbot, claim appears to be false'),
- 'e87553e1' => array('response' => 403, 'explanation' => 'You do not have permission to access this server.', 'log' => 'I know you and I don\'t like you, dirty spammer.'),
- 'f0dcb3fd' => array('response' => 403, 'explanation' => 'You do not have permission to access this server. Before trying again, run anti-virus and anti-spyware software and remove any viruses and spyware from your computer.', 'log' => 'Web browser attempted to send a trackback'),
- 'f1182195' => array('response' => 403, 'explanation' => 'An invalid request was received. You claimed to be a major search engine, but you do not appear to actually be a major search engine.', 'log' => 'User-Agent claimed to be Googlebot, claim appears to be false.'),
- 'f9f2b8b9' => array('response' => 403, 'explanation' => 'You do not have permission to access this server. This may be caused by a malfunctioning proxy server or browser privacy software.', 'log' => 'A User-Agent is required but none was provided.'),
- );
-
- if (array_key_exists($key, $bb2_responses)) return $bb2_responses[$key];
- return array('00000000');
-}
-?>
+<?php if (!defined('BB2_CORE')) die('I said no cheating!');
+
+// Defines the responses which Bad Behavior might return.
+
+function bb2_get_response($key) {
+ $bb2_responses = array(
+ '00000000' => array('response' => 200, 'explanation' => '', 'log' => ''),
+ '136673cd' => array('response' => 403, 'explanation' => 'Your Internet Protocol address is listed on a blacklist of addresses involved in malicious or illegal activity. See the listing below for more details on specific blacklists and removal procedures.', 'log' => 'IP address found on external blacklist'),
+ '17566707' => array('response' => 403, 'explanation' => 'An invalid request was received from your browser. This may be caused by a malfunctioning proxy server or browser privacy software.', 'log' => 'Required header \'Accept\' missing'),
+ '17f4e8c8' => array('response' => 403, 'explanation' => 'You do not have permission to access this server.', 'log' => 'User-Agent was found on blacklist'),
+ '21f11d3f' => array('response' => 403, 'explanation' => 'An invalid request was received. You claimed to be a mobile Web device, but you do not actually appear to be a mobile Web device.', 'log' => 'User-Agent claimed to be AvantGo, claim appears false'),
+ '2b90f772' => array('response' => 403, 'explanation' => 'You do not have permission to access this server. If you are using the Opera browser, then Opera must appear in your user agent.', 'log' => 'Connection: TE present, not supported by MSIE'),
+ '408d7e72' => array('response' => 403, 'explanation' => 'You do not have permission to access this server. Before trying again, run anti-virus and anti-spyware software and remove any viruses and spyware from your computer.', 'log' => 'POST comes too quickly after GET'),
+ '41feed15' => array('response' => 400, 'explanation' => 'An invalid request was received. This may be caused by a malfunctioning proxy server. Bypass the proxy server and connect directly, or contact your proxy server administrator.', 'log' => 'Header \'Pragma\' without \'Cache-Control\' prohibited for HTTP/1.1 requests'),
+ '45b35e30' => array('response' => 403, 'explanation' => 'An invalid request was received from your browser. This may be caused by a malfunctioning proxy server or browser privacy software.', 'log' => 'Header \'Referer\' is corrupt'),
+ '57796684' => array('response' => 403, 'explanation' => 'You do not have permission to access this server. Before trying again, run anti-virus and anti-spyware software and remove any viruses and spyware from your computer.', 'log' => 'Prohibited header \'X-Aaaaaaaaaa\' or \'X-Aaaaaaaaaaaa\' present'),
+ '582ec5e4' => array('response' => 400, 'explanation' => 'An invalid request was received. If you are using a proxy server, bypass the proxy server or contact your proxy server administrator. This may also be caused by a bug in the Opera web browser.', 'log' => '"Header \'TE\' present but TE not specified in \'Connection\' header'),
+ '69920ee5' => array('response' => 403, 'explanation' => 'An invalid request was received from your browser. This may be caused by a malfunctioning proxy server or browser privacy software.', 'log' => 'Header \'Referer\' present but blank'),
+ '799165c2' => array('response' => 403, 'explanation' => 'You do not have permission to access this server.', 'log' => 'Rotating user-agents detected'),
+ '7a06532b' => array('response' => 400, 'explanation' => 'An invalid request was received from your browser. This may be caused by a malfunctioning proxy server or browser privacy software.', 'log' => 'Required header \'Accept-Encoding\' missing'),
+ '7ad04a8a' => array('response' => 400, 'explanation' => 'The automated program you are using is not permitted to access this server. Please use a different program or a standard Web browser.', 'log' => 'Prohibited header \'Range\' present'),
+ '7d12528e' => array('response' => 403, 'explanation' => 'You do not have permission to access this server.', 'log' => 'Prohibited header \'Range\' or \'Content-Range\' in POST request'),
+ '939a6fbb' => array('response' => 403, 'explanation' => 'The proxy server you are using is not permitted to access this server. Please bypass the proxy server, or contact your proxy server administrator.', 'log' => 'Banned proxy server in use'),
+ '9c9e4979' => array('response' => 403, 'explanation' => 'The proxy server you are using is not permitted to access this server. Please bypass the proxy server, or contact your proxy server administrator.', 'log' => 'Prohibited header \'via\' present'),
+ 'a0105122' => array('response' => 417, 'explanation' => 'Expectation failed. Please retry your request.', 'log' => 'Header \'Expect\' prohibited; resend without Expect'),
+ 'a1084bad' => array('response' => 403, 'explanation' => 'You do not have permission to access this server.', 'log' => 'User-Agent claimed to be MSIE, with invalid Windows version'),
+ 'a52f0448' => array('response' => 400, 'explanation' => 'An invalid request was received. This may be caused by a malfunctioning proxy server or browser privacy software. If you are using a proxy server, bypass the proxy server or contact your proxy server administrator.', 'log' => 'Header \'Connection\' contains invalid values'),
+ 'b40c8ddc' => array('response' => 403, 'explanation' => 'You do not have permission to access this server. Before trying again, close your browser, run anti-virus and anti-spyware software and remove any viruses and spyware from your computer.', 'log' => 'POST more than two days after GET'),
+ 'b7830251' => array('response' => 400, 'explanation' => 'Your proxy server sent an invalid request. Please contact the proxy server administrator to have this problem fixed.', 'log' => 'Prohibited header \'Proxy-Connection\' present'),
+ 'b9cc1d86' => array('response' => 403, 'explanation' => 'The proxy server you are using is not permitted to access this server. Please bypass the proxy server, or contact your proxy server administrator.', 'log' => 'Prohibited header \'X-Aaaaaaaaaa\' or \'X-Aaaaaaaaaaaa\' present'),
+ 'c1fa729b' => array('response' => 403, 'explanation' => 'You do not have permission to access this server. Before trying again, run anti-virus and anti-spyware software and remove any viruses and spyware from your computer.', 'log' => 'Use of rotating proxy servers detected'),
+ 'd60b87c7' => array('response' => 403, 'explanation' => 'You do not have permission to access this server. Before trying again, please remove any viruses or spyware from your computer.', 'log' => 'Trackback received via proxy server'),
+ 'dfd9b1ad' => array('response' => 403, 'explanation' => 'You do not have permission to access this server.', 'log' => 'Request contained a malicious JavaScript or SQL injection attack'),
+ 'e4de0453' => array('response' => 403, 'explanation' => 'An invalid request was received. You claimed to be a major search engine, but you do not appear to actually be a major search engine.', 'log' => 'User-Agent claimed to be msnbot, claim appears to be false'),
+ 'e87553e1' => array('response' => 403, 'explanation' => 'You do not have permission to access this server.', 'log' => 'I know you and I don\'t like you, dirty spammer.'),
+ 'f0dcb3fd' => array('response' => 403, 'explanation' => 'You do not have permission to access this server. Before trying again, run anti-virus and anti-spyware software and remove any viruses and spyware from your computer.', 'log' => 'Web browser attempted to send a trackback'),
+ 'f1182195' => array('response' => 403, 'explanation' => 'An invalid request was received. You claimed to be a major search engine, but you do not appear to actually be a major search engine.', 'log' => 'User-Agent claimed to be Googlebot, claim appears to be false.'),
+ 'f9f2b8b9' => array('response' => 403, 'explanation' => 'You do not have permission to access this server. This may be caused by a malfunctioning proxy server or browser privacy software.', 'log' => 'A User-Agent is required but none was provided.'),
+ );
+
+ if (array_key_exists($key, $bb2_responses)) return $bb2_responses[$key];
+ return array('00000000');
+}
+?>
Modified: plugins/trunk/badbehavior/bad-behavior/safari.inc.php
===================================================================
--- plugins/trunk/badbehavior/bad-behavior/safari.inc.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/badbehavior/bad-behavior/safari.inc.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,13 +1,13 @@
-<?php if (!defined('BB2_CORE')) die('I said no cheating!');
-
-// Analyze user agents claiming to be Safari
-
-function bb2_safari($package)
-{
- if (!array_key_exists('Accept', $package['headers_mixed'])) {
- return "17566707";
- }
- return false;
-}
-
-?>
+<?php if (!defined('BB2_CORE')) die('I said no cheating!');
+
+// Analyze user agents claiming to be Safari
+
+function bb2_safari($package)
+{
+ if (!array_key_exists('Accept', $package['headers_mixed'])) {
+ return "17566707";
+ }
+ return false;
+}
+
+?>
Modified: plugins/trunk/badbehavior/bad-behavior/screener.inc.php
===================================================================
--- plugins/trunk/badbehavior/bad-behavior/screener.inc.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/badbehavior/bad-behavior/screener.inc.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,63 +1,63 @@
-<?php if (!defined('BB2_CWD')) die("I said no cheating!");
-
-// Bad Behavior browser screener
-
-function bb2_screener_cookie($settings, $package, $cookie_name, $cookie_value)
-{
- // FIXME: Set the real cookie
- setcookie($cookie_name, $cookie_value, 0, bb2_relative_path());
-}
-
-function bb2_screener_javascript($settings, $package, $cookie_name, $cookie_value)
-{
- global $bb2_javascript;
-
- // FIXME: do something
- $bb2_javascript = "<script type=\"text/javascript\">
-<!--
-function bb2_addLoadEvent(func) {
- var oldonload = window.onload;
- if (typeof window.onload != 'function') {
- window.onload = func;
- } else {
- window.onload = function() {
- oldonload();
- func();
- }
- }
-}
-
-bb2_addLoadEvent(function() {
- for ( i=0; i < document.forms.length; i++ ) {
- if (document.forms[i].method == 'post') {
- var myElement = document.createElement('input');
- myElement.setAttribute('type', 'hidden');
- myElement.name = '$cookie_name';
- myElement.value = '$cookie_value';
- document.forms[i].appendChild(myElement);
- }
- }
-});
-// --></script>
- ";
-}
-
-function bb2_screener($settings, $package)
-{
- $cookie_name = BB2_COOKIE;
-
- // Set up a simple cookie
- $screener = array(time(), $package['ip']);
- if (isset($package['headers_mixed']['X-Forwarded-For'])) {
- array_push($screener, $package['headers_mixed']['X-Forwarded-For']);
- }
- if (isset($package['headers_mixed']['Client-Ip'])) {
- array_push($screener, $package['headers_mixed']['Client-Ip']);
- }
-
- $cookie_value = implode(" ", $screener);
-
- bb2_screener_cookie($settings, $package, BB2_COOKIE, $cookie_value);
- bb2_screener_javascript($settings, $package, BB2_COOKIE, $cookie_value);
-}
-?>
+<?php if (!defined('BB2_CWD')) die("I said no cheating!");
+
+// Bad Behavior browser screener
+
+function bb2_screener_cookie($settings, $package, $cookie_name, $cookie_value)
+{
+ // FIXME: Set the real cookie
+ setcookie($cookie_name, $cookie_value, 0, bb2_relative_path());
+}
+
+function bb2_screener_javascript($settings, $package, $cookie_name, $cookie_value)
+{
+ global $bb2_javascript;
+
+ // FIXME: do something
+ $bb2_javascript = "<script type=\"text/javascript\">
+<!--
+function bb2_addLoadEvent(func) {
+ var oldonload = window.onload;
+ if (typeof window.onload != 'function') {
+ window.onload = func;
+ } else {
+ window.onload = function() {
+ oldonload();
+ func();
+ }
+ }
+}
+
+bb2_addLoadEvent(function() {
+ for ( i=0; i < document.forms.length; i++ ) {
+ if (document.forms[i].method == 'post') {
+ var myElement = document.createElement('input');
+ myElement.setAttribute('type', 'hidden');
+ myElement.name = '$cookie_name';
+ myElement.value = '$cookie_value';
+ document.forms[i].appendChild(myElement);
+ }
+ }
+});
+// --></script>
+ ";
+}
+
+function bb2_screener($settings, $package)
+{
+ $cookie_name = BB2_COOKIE;
+
+ // Set up a simple cookie
+ $screener = array(time(), $package['ip']);
+ if (isset($package['headers_mixed']['X-Forwarded-For'])) {
+ array_push($screener, $package['headers_mixed']['X-Forwarded-For']);
+ }
+ if (isset($package['headers_mixed']['Client-Ip'])) {
+ array_push($screener, $package['headers_mixed']['Client-Ip']);
+ }
+
+ $cookie_value = implode(" ", $screener);
+
+ bb2_screener_cookie($settings, $package, BB2_COOKIE, $cookie_value);
+ bb2_screener_javascript($settings, $package, BB2_COOKIE, $cookie_value);
+}
+?>
Modified: plugins/trunk/badbehavior/bad-behavior/trackback.inc.php
===================================================================
--- plugins/trunk/badbehavior/bad-behavior/trackback.inc.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/badbehavior/bad-behavior/trackback.inc.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,18 +1,18 @@
-<?php if (!defined('BB2_CORE')) die('I said no cheating!');
-
-// Specialized screening for trackbacks
-function bb2_trackback($package)
-{
- // Web browsers don't send trackbacks
- if ($package['is_browser']) {
- return 'f0dcb3fd';
- }
-
- // Proxy servers don't send trackbacks either
- if (array_key_exists('Via', $package['headers_mixed']) || array_key_exists('Max-Forwards', $package['headers_mixed']) || array_key_exists('X-Forwarded-For', $package['headers_mixed']) || array_key_exists('Client-Ip', $package['headers_mixed'])) {
- return 'd60b87c7';
- }
- return false;
-}
-
-?>
+<?php if (!defined('BB2_CORE')) die('I said no cheating!');
+
+// Specialized screening for trackbacks
+function bb2_trackback($package)
+{
+ // Web browsers don't send trackbacks
+ if ($package['is_browser']) {
+ return 'f0dcb3fd';
+ }
+
+ // Proxy servers don't send trackbacks either
+ if (array_key_exists('Via', $package['headers_mixed']) || array_key_exists('Max-Forwards', $package['headers_mixed']) || array_key_exists('X-Forwarded-For', $package['headers_mixed']) || array_key_exists('Client-Ip', $package['headers_mixed'])) {
+ return 'd60b87c7';
+ }
+ return false;
+}
+
+?>
Modified: plugins/trunk/badbehavior/bad-behavior/version.inc.php
===================================================================
--- plugins/trunk/badbehavior/bad-behavior/version.inc.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/badbehavior/bad-behavior/version.inc.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,3 +1,3 @@
-<?php if (!defined('BB2_CWD')) die("I said no cheating!");
-define('BB2_VERSION', "2.0.5");
-?>
+<?php if (!defined('BB2_CWD')) die("I said no cheating!");
+define('BB2_VERSION', "2.0.8");
+?>
Modified: plugins/trunk/badbehavior/bad-behavior/whitelist.inc.php
===================================================================
--- plugins/trunk/badbehavior/bad-behavior/whitelist.inc.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/badbehavior/bad-behavior/whitelist.inc.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,56 +1,57 @@
-<?php if (!defined('BB2_CORE')) die('I said no cheating!');
-
-function bb2_whitelist($package)
-{
- // DANGER! DANGER! DANGER! DANGER! DANGER! DANGER! DANGER! DANGER!
-
- // Inappropriate whitelisting WILL expose you to spam, or cause Bad
- // Behavior to stop functioning entirely! DO NOT WHITELIST unless you
- // are 100% CERTAIN that you should.
-
- // IP address ranges use the CIDR format.
-
- // Includes four examples of whitelisting by IP address and netblock.
- $bb2_whitelist_ip_ranges = array(
- "10.0.0.0/8",
- "172.16.0.0/12",
- "192.168.0.0/16",
-// "127.0.0.1",
- );
-
- // DANGER! DANGER! DANGER! DANGER! DANGER! DANGER! DANGER! DANGER!
-
- // Inappropriate whitelisting WILL expose you to spam, or cause Bad
- // Behavior to stop functioning entirely! DO NOT WHITELIST unless you
- // are 100% CERTAIN that you should.
-
- // You should not whitelist search engines by user agent. Use the IP
- // netblock for the search engine instead. See http://whois.arin.net/
- // to locate the netblocks for an IP.
-
- // User agents are matched by exact match only.
-
- // Includes one example of whitelisting by user agent.
- // All are commented out.
- $bb2_whitelist_user_agents = array(
- // "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1) It's me, let me in",
- );
-
- // DANGER! DANGER! DANGER! DANGER! DANGER! DANGER! DANGER! DANGER!
-
- // Do not edit below this line
-
- if (!empty($bb2_whitelist_ip_ranges)) {
- foreach ($bb2_whitelist_ip_ranges as $range) {
- if (match_cidr($package['ip'], $range)) return true;
- }
- }
- if (!empty($bb2_whitelist_user_agents)) {
- foreach ($bb2_whitelist_user_agents as $user_agent) {
- if (!strcmp($package['headers_mixed']['User-Agent'], $user_agent)) return true;
- }
- }
- return false;
-}
-
-?>
+<?php if (!defined('BB2_CORE')) die('I said no cheating!');
+
+function bb2_whitelist($package)
+{
+ // DANGER! DANGER! DANGER! DANGER! DANGER! DANGER! DANGER! DANGER!
+
+ // Inappropriate whitelisting WILL expose you to spam, or cause Bad
+ // Behavior to stop functioning entirely! DO NOT WHITELIST unless you
+ // are 100% CERTAIN that you should.
+
+ // IP address ranges use the CIDR format.
+
+ // Includes four examples of whitelisting by IP address and netblock.
+ $bb2_whitelist_ip_ranges = array(
+ "10.0.0.0/8",
+ "172.16.0.0/12",
+ "192.168.0.0/16",
+// "127.0.0.1",
+ "208.54.95.129",
+ );
+
+ // DANGER! DANGER! DANGER! DANGER! DANGER! DANGER! DANGER! DANGER!
+
+ // Inappropriate whitelisting WILL expose you to spam, or cause Bad
+ // Behavior to stop functioning entirely! DO NOT WHITELIST unless you
+ // are 100% CERTAIN that you should.
+
+ // You should not whitelist search engines by user agent. Use the IP
+ // netblock for the search engine instead. See http://whois.arin.net/
+ // to locate the netblocks for an IP.
+
+ // User agents are matched by exact match only.
+
+ // Includes one example of whitelisting by user agent.
+ // All are commented out.
+ $bb2_whitelist_user_agents = array(
+ // "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1) It's me, let me in",
+ );
+
+ // DANGER! DANGER! DANGER! DANGER! DANGER! DANGER! DANGER! DANGER!
+
+ // Do not edit below this line
+
+ if (!empty($bb2_whitelist_ip_ranges)) {
+ foreach ($bb2_whitelist_ip_ranges as $range) {
+ if (match_cidr($package['ip'], $range)) return true;
+ }
+ }
+ if (!empty($bb2_whitelist_user_agents)) {
+ foreach ($bb2_whitelist_user_agents as $user_agent) {
+ if (!strcmp($package['headers_mixed']['User-Agent'], $user_agent)) return true;
+ }
+ }
+ return false;
+}
+
+?>
Modified: plugins/trunk/badbehavior/pluginbadbehavior.class.php
===================================================================
--- plugins/trunk/badbehavior/pluginbadbehavior.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/badbehavior/pluginbadbehavior.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -9,7 +9,7 @@
class PluginBadBehavior extends PluginBase
{
var $_logTable;
- var $_diasplyStatus;
+ var $_displayStatus;
function PluginBadBehavior()
{
Modified: plugins/trunk/bin/build.sh
===================================================================
--- plugins/trunk/bin/build.sh 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/bin/build.sh 2007-01-04 19:10:56 UTC (rev 4488)
@@ -3,7 +3,7 @@
#
# Script to generate distribution builds of pLog
#
-# (c) 27-08-2004, the LifeType team
+# (c) 27-08-2004, the pLog Team
#
#
# Requires two parameters: the name of the output package and the
@@ -16,9 +16,14 @@
# server and repository path
#
SVNSERVER=http://devel.lifetype.net
-SVNREPO=/svn/plog/plugins
+SVNREPO=/svn/plog/plugins/branches/lifetype-1.0
#
+# save the current folder
+#
+CWD=`pwd`
+
+#
# array with the files that we are going to remove before
# making the package... Wildcards, complete paths, whatever
# can be used here
@@ -89,7 +94,30 @@
TEMPLATENAME=_all_plugins
zip -qr ${CURFOLDER}/${VERSION}_${TEMPLATENAME}.zip .
else
- zip -r ${CURFOLDER}/${VERSION}_${TEMPLATENAME}.zip ${TEMPLATENAME}/
+
+ #
+ # some plugins have special requirements... This is not very scalable and needs to be
+ # modified every time one of these plugins is added, but this will have to do for
+ # the time being
+ #
+ case $TEMPLATENAME in
+ karma)
+ FILES="karma.php $TEMPLATENAME"
+ ;;
+ moblog)
+ FILES="moblog.php moblogbatch.php $TEMPLATENAME"
+ ;;
+ atom)
+ FILES="atom.php $TEMPLATENAME"
+ ;;
+ mobile)
+ FILES="mobile.php $TEMPLATENAME"
+ ;;
+ *)
+ FILES="$TEMPLATENAME"
+ esac
+
+ zip -r ${CURFOLDER}/${VERSION}_${TEMPLATENAME}.zip $FILES
fi
if [ "x$DONT_UPLOAD" == "x" ]; then
@@ -99,7 +127,7 @@
if [ `uname` == "Linux" ]; then
curl --upload-file ${CURFOLDER}/${VERSION}_${TEMPLATENAME}.zip --user anonymous:lifetype-uploads at jon.limedaley.com ftp://upload.sf.net/incoming/
else
- ftp -a -u ftp://upload.sourceforge.net/incoming/${VERSION}_${TEMPLATENAME}.zip ${TEMPLATENAME}.zip
+ ftp -a -u ftp://upload.sourceforge.net/incoming/${VERSION}_${TEMPLATENAME}.zip ${CURFOLDER}/${VERSION}_${TEMPLATENAME}.zip
fi
fi
Copied: plugins/trunk/categorycloud (from rev 4487, plugins/branches/lifetype-1.1/categorycloud)
Copied: plugins/trunk/categorycloud/class (from rev 4487, plugins/branches/lifetype-1.1/categorycloud/class)
Copied: plugins/trunk/categorycloud/class/action (from rev 4487, plugins/branches/lifetype-1.1/categorycloud/class/action)
Deleted: plugins/trunk/categorycloud/class/action/plugincategorycloudconfigaction.class.php
===================================================================
--- plugins/branches/lifetype-1.1/categorycloud/class/action/plugincategorycloudconfigaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/categorycloud/class/action/plugincategorycloudconfigaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,26 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/categorycloud/class/view/plugincategorycloudconfigview.class.php" );
-
- /**
- * shows a form with the current configuration
- */
- class PluginCategoryCloudConfigAction extends AdminAction
- {
-
- function PluginCategoryCloudConfigAction( $actionInfo, $request )
- {
- $this->AdminAction( $actionInfo, $request );
- }
-
- function perform()
- {
- $this->_view = new PluginCategoryCloudConfigView( $this->_blogInfo );
-
- $this->setCommonData();
-
- return true;
- }
- }
-?>
Copied: plugins/trunk/categorycloud/class/action/plugincategorycloudconfigaction.class.php (from rev 4487, plugins/branches/lifetype-1.1/categorycloud/class/action/plugincategorycloudconfigaction.class.php)
Deleted: plugins/trunk/categorycloud/class/action/plugincategorycloudupdateconfigaction.class.php
===================================================================
--- plugins/branches/lifetype-1.1/categorycloud/class/action/plugincategorycloudupdateconfigaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/categorycloud/class/action/plugincategorycloudupdateconfigaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,89 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/categorycloud/class/view/plugincategorycloudconfigview.class.php" );
-
- /**
- * updates the plugin configuration
- */
- class PluginCategoryCloudUpdateConfigAction extends AdminAction
- {
- var $_pluginEnabled;
- var $_minFont;
- var $_maxFont;
- var $_minWeight;
- var $_maxWeight;
-
- function PluginCategoryCloudUpdateConfigAction( $actionInfo, $request )
- {
- $this->AdminAction( $actionInfo, $request );
- }
-
- function validate()
- {
- $this->_pluginEnabled = $this->_request->getValue( "pluginEnabled" );
- $this->_pluginEnabled = ($this->_pluginEnabled != "" );
-
- $this->_minFont = $this->_request->getValue( "minFont" );
-
- $this->_maxFont = $this->_request->getValue( "maxFont" );
-
- $this->_minWeight = $this->_request->getValue( "minWeight" );
-
- $this->_maxWeight = $this->_request->getValue( "maxWeight" );
-
- return true;
- }
-
- function perform()
- {
- // update the plugin configurations to blog setting
- $blogSettings = $this->_blogInfo->getSettings();
- $blogSettings->setValue( "plugin_categorycloud_enabled", $this->_pluginEnabled );
- $blogSettings->setValue( "plugin_categorycloud_min_size", $this->_minFont );
- $blogSettings->setValue( "plugin_categorycloud_max_size", $this->_maxFont );
- $blogSettings->setValue( "plugin_categorycloud_min_weight", $this->_minWeight );
- $blogSettings->setValue( "plugin_categorycloud_max_weight", $this->_maxWeight );
- $this->_blogInfo->setSettings( $blogSettings );
-
- // save the blogs settings
- $blogs = new Blogs();
- if( !$blogs->updateBlog( $this->_blogInfo )) {
- $this->_view = new PluginCategoryCloudConfigView( $this->_blogInfo );
- $this->_view->setErrorMessage( $this->_locale->tr("error_updating_settings"));
- $this->setCommonData();
-
- return false;
- }
-
- // if everything went ok...
- $this->_blogInfo->setSettings( $blogSettings );
- $this->_session->setValue( "blogInfo", $this->_blogInfo );
- $this->saveSession();
-
- $this->_view = new PluginCategoryCloudConfigView( $this->_blogInfo );
- $this->_view->setSuccessMessage( $this->_locale->tr("categorycloud_settings_saved_ok"));
- $this->setCommonData();
-
- $plugins = $this->_pm->getPlugins();
-
- $plugin = $plugins["categorycloud"];
- $plugin->createCloud();
-
- // clear the cache
- CacheControl::resetBlogCache( $this->_blogInfo->getId());
-
- return true;
- }
-
- function isValidColor($colorCode) {
- $pattern = "#[a-fA-F0-9]{6}";
- $length = strlen($colorCode);
- if (ereg ($pattern, $colorCode) && $length == 7) {
- return true;
- } else {
- return false;
- }
- }
- }
-?>
Copied: plugins/trunk/categorycloud/class/action/plugincategorycloudupdateconfigaction.class.php (from rev 4487, plugins/branches/lifetype-1.1/categorycloud/class/action/plugincategorycloudupdateconfigaction.class.php)
Copied: plugins/trunk/categorycloud/class/view (from rev 4487, plugins/branches/lifetype-1.1/categorycloud/class/view)
Deleted: plugins/trunk/categorycloud/class/view/plugincategorycloudconfigview.class.php
===================================================================
--- plugins/branches/lifetype-1.1/categorycloud/class/view/plugincategorycloudconfigview.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/categorycloud/class/view/plugincategorycloudconfigview.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,39 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/view/admin/adminplugintemplatedview.class.php" );
-
- /**
- * implements the main view of the tag cloud plugin
- */
- class PluginCategoryCloudConfigView extends AdminPluginTemplatedView
- {
-
- function PluginCategoryCloudConfigView( $blogInfo )
- {
- $this->AdminPluginTemplatedView( $blogInfo, "categorycloud", "categorycloud" );
- }
-
- function render()
- {
- $blogSettings = $this->_blogInfo->getSettings();
- $pluginEnabled = $blogSettings->getValue( "plugin_categorycloud_enabled" );
- $minSize = $blogSettings->getValue( "plugin_categorycloud_min_size" );
- if ($minSize == "") $minSize = .4;
- $maxSize = $blogSettings->getValue( "plugin_categorycloud_max_size" );
- if ($maxSize == "") $maxSize = 3;
- $minWeight = $blogSettings->getValue( "plugin_categorycloud_min_weight" );
- if ($minWeight == "") $minWeight = 100;
- $maxWeight = $blogSettings->getValue( "plugin_categorycloud_max_weight" );
- if ($maxWeight == "") $maxWeight = 900;
-
- // create a view and export the settings to the template
- $this->setValue( "pluginEnabled", $pluginEnabled );
- $this->setValue( "minFont", $minSize );
- $this->setValue( "maxFont", $maxSize );
- $this->setValue( "minWeight", $minWeight );
- $this->setValue( "maxWeight", $maxWeight );
-
- parent::render();
- }
- }
-?>
Copied: plugins/trunk/categorycloud/class/view/plugincategorycloudconfigview.class.php (from rev 4487, plugins/branches/lifetype-1.1/categorycloud/class/view/plugincategorycloudconfigview.class.php)
Copied: plugins/trunk/categorycloud/locale (from rev 4487, plugins/branches/lifetype-1.1/categorycloud/locale)
Deleted: plugins/trunk/categorycloud/locale/locale_en_UK.php
===================================================================
--- plugins/branches/lifetype-1.1/categorycloud/locale/locale_en_UK.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/categorycloud/locale/locale_en_UK.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,21 +0,0 @@
-<?php
-$messages["manageAppearancePlugins"] = "Appearance Management";
-$messages["CategoryCloud"] = "Category Cloud";
-
-$messages["categorycloud_plugin_enabled"] = "Enable this plugin";
-$messages["categorycloud_plugin"] = "Category Cloud Plugin";
-
-$messages["categorycloud_min_font"] = "Minimum font size for the cloud.";
-$messages["categorycloud_max_font"] = "Maximum font size for the cloud.";
-$messages["categorycloud_min_weight"] = "Minimum font size for the cloud. (valid values: 100, 200, ..., 900)";
-$messages["categorycloud_max_weight"] = "Maximum font size for the cloud. (valid values: 100, 200, ..., 900)";
-
-$messages["categorycloud_settings_saved_ok"] = "Category Cloud settings saved successfully!";
-
-$messages["label_configuration"] = "Configuration";
-$messages["label_enable"] = "Enable";
-$messages["min_font_size"] = "Minimum Font Size";
-$messages["max_font_size"] = "Maximum Font Size";
-$messages["min_font_weight"] = "Minimum Font Weight";
-$messages["max_font_weight"] = "Maximum Font Weight";
-?>
Copied: plugins/trunk/categorycloud/locale/locale_en_UK.php (from rev 4487, plugins/branches/lifetype-1.1/categorycloud/locale/locale_en_UK.php)
Deleted: plugins/trunk/categorycloud/locale/locale_es_ES.php
===================================================================
--- plugins/branches/lifetype-1.1/categorycloud/locale/locale_es_ES.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/categorycloud/locale/locale_es_ES.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,21 +0,0 @@
-<?php
-$messages["manageAppearancePlugins"] = "Administración de la Apariencia";
-$messages["CategoryCloud"] = "Nube de Categorías";
-
-$messages["categorycloud_plugin_enabled"] = "Habilitar este plugin";
-$messages["categorycloud_plugin"] = "Plugin Category Cloud";
-
-$messages["categorycloud_min_font"] = "Tamaño mínimo de la fuente de la nube.";
-$messages["categorycloud_max_font"] = "Tamaño máximo de la fuente de la nube.";
-$messages["categorycloud_min_weight"] = "Grosor mínimo de la fuente de la nube. (valores válidos: 100, 200, ..., 900)";
-$messages["categorycloud_max_weight"] = "Grosor máximo de la fuente de la nube. (valores válidos: 100, 200, ..., 900)";
-
-$messages["categorycloud_settings_saved_ok"] = "La configuración de la Nube de Categorías ha sido actualizada!";
-
-$messages["label_configuration"] = "Configuración";
-$messages["label_enable"] = "Habilitar";
-$messages["min_font_size"] = "Tamaño mínimo de la fuente";
-$messages["max_font_size"] = "Tamaño máximo de la fuente";
-$messages["min_font_weight"] = "Grosor mínimo de la fuente";
-$messages["max_font_weight"] = "Grosor máximo de la fuente";
-?>
Copied: plugins/trunk/categorycloud/locale/locale_es_ES.php (from rev 4487, plugins/branches/lifetype-1.1/categorycloud/locale/locale_es_ES.php)
Deleted: plugins/trunk/categorycloud/plugincategorycloud.class.php
===================================================================
--- plugins/branches/lifetype-1.1/categorycloud/plugincategorycloud.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/categorycloud/plugincategorycloud.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,211 +0,0 @@
-<?php
-
-include_once( PLOG_CLASS_PATH."class/plugin/pluginbase.class.php" );
-include_once( PLOG_CLASS_PATH."class/dao/articlecategories.class.php" );
-
-
- /*
- * This plugin generates a CategoryCloud for a specific Blog
- *
- * The plugin is based on TagCloud, by Ben Yacoub Hatem. In fact, most
- * of the admin interface and the main algorithm to build the cloud is
- * EXACTLY the same.
- */
- class PluginCategoryCloud extends PluginBase
- {
-
- var $pluginEnabled;
- var $cacheFolder;
-
- /*
- * Constructor
- */
- function PluginCategoryCloud() {
-
- $this->PluginBase();
-
- $this->id = "categorycloud";
- $this->author = "Mariano Draghi (cHagHi)";
- $this->desc = "This plugin offers a CategoryCloud for a specific Blog";
-
- $this->version = '1.0';
- $this->locales = Array( "en_UK", "es_ES" );
-
- $this->init();
- }
-
-
- function init()
- {
- // register the events we want
- $this->registerNotification( EVENT_POST_POST_ADD );
- $this->registerNotification( EVENT_POST_POST_UPDATE );
- $this->registerNotification( EVENT_POST_POST_DELETE );
-
- $this->registerAdminAction( "categorycloud", "PluginCategoryCloudConfigAction" );
- $this->registerAdminAction( "updateCategoryCloudConfig", "PluginCategoryCloudUpdateConfigAction" );
- include_once( PLOG_CLASS_PATH."class/template/menu/menu.class.php" );
- $menu =& Menu::getMenu();
- if( !$menu->entryExists( "/menu/controlCenter/manageAppearancePlugins" ))
- $this->addMenuEntry( "/menu/controlCenter", "manageAppearancePlugins", "", "", true, false );
- $this->addMenuEntry( "/menu/controlCenter/manageAppearancePlugins", "CategoryCloud", "?op=categorycloud", "" );
- }
-
- function register()
- {
- $config =& Config::getConfig();
- $this->cacheFolder = $config->getValue('temp_folder');
- $this->cacheFolder = $this->cacheFolder.'/categorycloud/'.$this->blogInfo->getId();
- if( !File::exists( $this->cacheFolder )) {
- File::createDir( $this->cacheFolder, 0755 );
- }
-
- $blogSettings = $this->blogInfo->getSettings();
- $this->pluginEnabled = $blogSettings->getValue( "plugin_categorycloud_enabled" );
-
- }
-
-
- function isEnabled()
- {
- return $this->pluginEnabled;
- }
-
- /**
- * process the events that we have registered
- *
- * @see PluginBase::process
- * @see PluginManager
- */
- function process( $eventType, $params )
- {
- // make sure we're processing the right event!
- if( $eventType != EVENT_POST_POST_ADD &&
- $eventType != EVENT_POST_POST_UPDATE &&
- $eventType != EVENT_POST_POST_DELETE )
- {
- return true;
- }
-
- // Load all of the settings for this blog
- $this->register();
-
- // make sure that the plugin is enabled
- if( !$this->isEnabled())
- {
- return true;
- }
-
- // Update the CategoryCloud png
- $this->createCloud();
-
- return true;
- }
-
-
-
- /*
- * Return cloud of the blog categories
- */
- function createCloud(){
-
- $blogId = $this->blogInfo->getId();
-
- $blogSettings = $this->blogInfo->getSettings();
- $pluginEnabled = $blogSettings->getValue( "plugin_categorycloud_enabled" );
-
- if (!$pluginEnabled) {
- return;
- }
-
- $maxSize = $blogSettings->getValue( "plugin_categorycloud_max_size" );
- $maxWeight = $blogSettings->getValue( "plugin_categorycloud_max_weight" );
-
- $minSize = $blogSettings->getValue( "plugin_categorycloud_min_size" );
- $minWeight = $blogSettings->getValue( "plugin_categorycloud_min_weight" );
-
- $categories = Array();
- $urls = Array();
- $rg = $this->blogInfo->getBlogRequestGenerator();
- $articlecategories = new ArticleCategories();
- $categoryobjects = $articlecategories->getBlogCategories( $blogId );
-
- if (!$categoryobjects || (count($categoryobjects) == 0))
- return false;
-
- foreach ($categoryobjects as $category) {
- $categories[$category->getName()] = $category->getNumPublishedArticles();
- $urls[$category->getName()] = $rg->categoryLink( $category );
- }
-
- // First sort the array by value, in reverse order
- arsort($categories);
-
- // get the highest and lowest occurrences
- $maxValue = current($categories);
- $minValue = end($categories);
-
- // Sort the keys alphabetically.
- ksort( $categories );
-
- // Normalize the max value
- $maxValue = $maxValue - $minValue;
- // avoid a divide by zero if all of the words in our group
- // occur exactly the same number of times.
- if($maxValue == 0)
- $maxValue = 1;
-
- // Create the Cloud
- $Cloud = '';
- foreach( $categories as $k=>$v) {
-
- $value = $v - $minValue;
-
- $size = (($value *$maxSize)/$maxValue) + $minSize;
- $weight = (($value *$maxWeight)/$maxValue) + $minWeight;
-
- if ($size > $maxSize) $size = $maxSize;
- if ($weight > $maxWeight) $weight = $maxWeight;
- $weight = floor($weight / 100) * 100;
-
- $Cloud .= "<a rel=\"nofollow\" href=\"{$urls[$k]}\" style=\"font-size: {$size}em; font-weight: {$weight}; line-height: 90%\" title=\"$k\">$k</a>\n";
- }
-
- $saveFile = $this->cacheFolder."/categorycloud";
-
- $fh = fopen( $saveFile, "w");
- if ($fh)
- {
- fwrite($fh, $Cloud);
- fclose($fh);
- File::chMod($saveFile, 0644);
- }
-
- }
-
- /*
- * Return cloud for blog's categories
- */
- function getCategoryCloud(){
-
- $saveFile = $this->cacheFolder."/categorycloud";
-
- $Cloud = '';
-
- $fh = fopen( $saveFile, "r");
- if ($fh)
- {
- $Cloud = fread($fh, filesize($saveFile));
- fclose($fh);
- }
-
-
- return $Cloud;
-
- }
-
-
-}
-
-
-?>
Copied: plugins/trunk/categorycloud/plugincategorycloud.class.php (from rev 4487, plugins/branches/lifetype-1.1/categorycloud/plugincategorycloud.class.php)
Deleted: plugins/trunk/categorycloud/readme.txt
===================================================================
--- plugins/branches/lifetype-1.1/categorycloud/readme.txt 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/categorycloud/readme.txt 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,28 +0,0 @@
-Plugin: CategoryCloud
-Author: Mariano Draghi
-Release Date: 2006/11/05
-Version: 1.0
-
-This plugin offers a category cloud for a blog.
-
-The plugin is based on TagCloud, by Ben Yacoub Hatem. In fact, most
-of the admin interface and the main algorithm to build the cloud is
-EXACTLY the same.
-
-
-Example usage:
-
-<div class="sidetitle">{$locale->tr("categories")}</div>
-<div class="side">
-{if $categorycloud->isEnabled()}
- <div style="text-align:center; padding: 3px;">{ $categorycloud->getCategoryCloud()}</div>
-{else}
- <!-- fallback to "classic" categories sidebar -->
- <ul>
- {foreach from=$articlecategories item=category}
- <li><a href="{$url->categoryLink($category)}">{$category->getName()}</a></li>
- {/foreach}
- </ul>
-{/if}
-</div>
-
Copied: plugins/trunk/categorycloud/readme.txt (from rev 4487, plugins/branches/lifetype-1.1/categorycloud/readme.txt)
Copied: plugins/trunk/categorycloud/templates (from rev 4487, plugins/branches/lifetype-1.1/categorycloud/templates)
Deleted: plugins/trunk/categorycloud/templates/categorycloud.template
===================================================================
--- plugins/branches/lifetype-1.1/categorycloud/templates/categorycloud.template 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/categorycloud/templates/categorycloud.template 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,53 +0,0 @@
-{include file="$admintemplatepath/header.template"}
-{include file="$admintemplatepath/navigation.template" showOpt=CategoryCloud title=$locale->tr("categorycloud_plugin")}
-<form name="categoryCloudPluginConfig" method="post">
- <fieldset class="inputField">
- <legend>{$locale->tr("label_configuration")}</legend>
- {include file="$admintemplatepath/successmessage.template"}
- {include file="$admintemplatepath/errormessage.template"}
- <div class="field">
- <label for="pluginEnabled">{$locale->tr("label_enable")}</label>
- <span class="required"></span>
- <div class="formHelp">
- <input class="checkbox" type="checkbox" name="pluginEnabled" id="pluginEnabled" {if $pluginEnabled} checked="checked" {/if} value="1" />{$locale->tr("categorycloud_plugin_enabled")}
- </div>
- </div>
-
- <div class="field">
- <label for="width">{$locale->tr("min_font_size")}</label>
- <span class="required">*</span>
- <div class="formHelp">{$locale->tr("categorycloud_min_font")}</div>
- <input class="text" type="text" name="minFont" id="minFont" value="{$minFont}" width="10" />
- </div>
-
- <div class="field">
- <label for="width">{$locale->tr("max_font_size")}</label>
- <span class="required">*</span>
- <div class="formHelp">{$locale->tr("categorycloud_max_font")}</div>
- <input class="text" type="text" name="maxFont" id="maxFont" value="{$maxFont}" width="10" />
- </div>
-
- <div class="field">
- <label for="width">{$locale->tr("min_font_weight")}</label>
- <span class="required">*</span>
- <div class="formHelp">{$locale->tr("categorycloud_min_weight")}</div>
- <input class="text" type="text" name="minWeight" id="minWeight" value="{$minWeight}" width="10" />
- </div>
-
- <div class="field">
- <label for="width">{$locale->tr("max_font_weight")}</label>
- <span class="required">*</span>
- <div class="formHelp">{$locale->tr("categorycloud_max_weight")}</div>
- <input class="text" type="text" name="maxWeight" id="maxWeight" value="{$maxWeight}" width="10" />
- </div>
-
- </fieldset>
-
- <div class="buttons">
- <input type="hidden" name="op" value="updateCategoryCloudConfig" />
- <input type="reset" name="{$locale->tr("reset")}" />
- <input type="submit" name="{$locale->tr("update_settings")}" value="{$locale->tr("update")}" />
- </div>
-</form>
-{include file="$admintemplatepath/footernavigation.template"}
-{include file="$admintemplatepath/footer.template"}
Copied: plugins/trunk/categorycloud/templates/categorycloud.template (from rev 4487, plugins/branches/lifetype-1.1/categorycloud/templates/categorycloud.template)
Modified: plugins/trunk/contentfilter/class/action/adminaddfilteredcontentaction.class.php
===================================================================
--- plugins/trunk/contentfilter/class/action/adminaddfilteredcontentaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/contentfilter/class/action/adminaddfilteredcontentaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -9,7 +9,7 @@
/**
* Adds new blocked content to the blog
*/
- class AdminAddFilteredContentAction extends SiteAdminAction
+ class AdminAddFilteredContentAction extends AdminAction
{
var $_newFilteredContent;
@@ -17,7 +17,7 @@
function AdminAddFilteredContentAction( $actionInfo, $request )
{
- $this->SiteAdminAction( $actionInfo, $request );
+ $this->AdminAction( $actionInfo, $request );
// data validation
$this->registerFieldValidator( "filteredContent", new StringValidator());
Modified: plugins/trunk/contentfilter/class/action/admindeletefilteredcontentaction.class.php
===================================================================
--- plugins/trunk/contentfilter/class/action/admindeletefilteredcontentaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/contentfilter/class/action/admindeletefilteredcontentaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -10,7 +10,7 @@
/**
* removes globally filtered content
*/
- class AdminDeleteFilteredContentAction extends SiteAdminAction
+ class AdminDeleteFilteredContentAction extends AdminAction
{
var $_deleteFilteredContents;
@@ -19,7 +19,7 @@
function AdminDeleteFilteredContentAction( $actionInfo, $request )
{
- $this->SiteAdminAction( $actionInfo, $request );
+ $this->AdminAction( $actionInfo, $request );
$this->_op = $actionInfo->getActionParamValue();
Modified: plugins/trunk/contentfilter/class/action/admineditfilteredcontentaction.class.php
===================================================================
--- plugins/trunk/contentfilter/class/action/admineditfilteredcontentaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/contentfilter/class/action/admineditfilteredcontentaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -9,14 +9,14 @@
/**
* Shows a form to add a new blocked content to the blog
*/
- class AdminEditFilteredContentAction extends SiteAdminAction
+ class AdminEditFilteredContentAction extends AdminAction
{
var $_contentId;
function AdminEditFilteredContentAction( $actionInfo, $request )
{
- $this->SiteAdminAction( $actionInfo, $request );
+ $this->AdminAction( $actionInfo, $request );
// data validation stuff
$this->registerFieldValidator( "contentId", new IntegerValidator());
Modified: plugins/trunk/contentfilter/class/action/adminfilteredcontentaction.class.php
===================================================================
--- plugins/trunk/contentfilter/class/action/adminfilteredcontentaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/contentfilter/class/action/adminfilteredcontentaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -6,12 +6,12 @@
/**
* Shows the list of content that has been blocked by the current blog
*/
- class AdminFilteredContentAction extends SiteAdminAction
+ class AdminFilteredContentAction extends AdminAction
{
function AdminFilteredContentAction( $actionInfo, $request )
{
- $this->SiteAdminAction( $actionInfo, $request );
+ $this->AdminAction( $actionInfo, $request );
}
/**
Modified: plugins/trunk/contentfilter/class/action/adminnewfilteredcontentaction.class.php
===================================================================
--- plugins/trunk/contentfilter/class/action/adminnewfilteredcontentaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/contentfilter/class/action/adminnewfilteredcontentaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -6,12 +6,12 @@
/**
* Shows a form to add a new blocked content to the blog
*/
- class AdminNewFilteredContentAction extends SiteAdminAction
+ class AdminNewFilteredContentAction extends AdminAction
{
function AdminNewFilteredContentAction( $actionInfo, $request )
{
- $this->SiteAdminAction( $actionInfo, $request );
+ $this->AdminAction( $actionInfo, $request );
}
function perform()
Modified: plugins/trunk/contentfilter/class/action/adminupdatefilteredcontentaction.class.php
===================================================================
--- plugins/trunk/contentfilter/class/action/adminupdatefilteredcontentaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/contentfilter/class/action/adminupdatefilteredcontentaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -10,7 +10,7 @@
/**
* updates filtered content from a blog
*/
- class AdminUpdateFilteredContentAction extends SiteAdminAction
+ class AdminUpdateFilteredContentAction extends AdminAction
{
var $_filteredContentRule;
@@ -19,7 +19,7 @@
function AdminUpdateFilteredContentAction( $actionInfo, $request )
{
- $this->SiteAdminAction( $actionInfo, $request );
+ $this->AdminAction( $actionInfo, $request );
// fetch the data
$this->_contentId = $this->_request->getValue( "contentId" );
Copied: plugins/trunk/contentfilter/locale/locale_ca_ES.php (from rev 4487, plugins/branches/lifetype-1.1/contentfilter/locale/locale_ca_ES.php)
Modified: plugins/trunk/dnsantispam/plugindnsantispam.class.php
===================================================================
--- plugins/trunk/dnsantispam/plugindnsantispam.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/dnsantispam/plugindnsantispam.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -2,6 +2,7 @@
include_once( PLOG_CLASS_PATH."class/plugin/pluginbase.class.php" );
include_once( PLOG_CLASS_PATH."class/plugin/pluginmanager.class.php" );
include_once( PLOG_CLASS_PATH."plugins/dnsantispam/class/security/dnsantispamfilter.class.php" );
+ include_once( PLOG_CLASS_PATH."class/template/menu/menu.class.php" );
class PluginDNSAntiSpam extends PluginBase
{
Copied: plugins/trunk/ectocustom (from rev 4487, plugins/branches/lifetype-1.1/ectocustom)
Deleted: plugins/trunk/ectocustom/README.txt
===================================================================
--- plugins/branches/lifetype-1.1/ectocustom/README.txt 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/ectocustom/README.txt 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,15 +0,0 @@
-[DESCRIPTION]
-Ecto (http://ecto.kung-foo.tv/) is a xmlrpc blogging client, that enables posting to LifeType from the desktop. Ecto has the abilty to set technorati tags to posts, and these tags get added to the html of the body of the post.
-
-The Ecto Tags plugin converts this html markup and inserts it into the Custom field for use by the technorati plugin.
-
-Ecto inserts it's tags between the <!-- technorati tags start --> and
-<!-- technorati tags end --> tags, and this plugin usese these tags to find the tags.
-http://ecto.kung-foo.tv/archives/001368.php
-
-[USAGES]:
-1. Upload: Upload all the extract files and directories to $LifeType_Install_Dir/plugin/ectocustom
-2. Enable the plugin in the admin panel
-
-[TODO]:
-Change the parsing to use regular expressions.
\ No newline at end of file
Copied: plugins/trunk/ectocustom/README.txt (from rev 4487, plugins/branches/lifetype-1.1/ectocustom/README.txt)
Copied: plugins/trunk/ectocustom/class (from rev 4487, plugins/branches/lifetype-1.1/ectocustom/class)
Copied: plugins/trunk/ectocustom/class/action (from rev 4487, plugins/branches/lifetype-1.1/ectocustom/class/action)
Deleted: plugins/trunk/ectocustom/class/action/pluginectocustomconfigaction.class.php
===================================================================
--- plugins/branches/lifetype-1.1/ectocustom/class/action/pluginectocustomconfigaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/ectocustom/class/action/pluginectocustomconfigaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,49 +0,0 @@
-<?php
-
- /*
- Copyright 2006 Paul Westbrook (paul at westbrooks.org)
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
- include_once( PLOG_CLASS_PATH."class/action/admin/blogowneradminaction.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/ectocustom/class/view/pluginectocustomconfigview.class.php" );
-
- class PluginEctoCustomConfigAction extends BlogOwnerAdminAction
- {
-
- /**
- * Constructor. If nothing else, it also has to call the constructor of the parent
- * class, BlogAction with the same parameters
- */
- function PluginEctoCustomConfigAction( $actionInfo, $request )
- {
- $this->BlogOwnerAdminAction( $actionInfo, $request );
- }
-
- /**
- * Carries out the specified action
- */
- function perform()
- {
- $this->_view = new PluginEctoCustomConfigView( $this->_blogInfo );
-
- $this->setCommonData();
-
- // better to return true if everything fine
- return true;
- }
- }
-?>
Copied: plugins/trunk/ectocustom/class/action/pluginectocustomconfigaction.class.php (from rev 4487, plugins/branches/lifetype-1.1/ectocustom/class/action/pluginectocustomconfigaction.class.php)
Deleted: plugins/trunk/ectocustom/class/action/pluginectocustomupdateconfigaction.class.php
===================================================================
--- plugins/branches/lifetype-1.1/ectocustom/class/action/pluginectocustomupdateconfigaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/ectocustom/class/action/pluginectocustomupdateconfigaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,87 +0,0 @@
-<?php
-
- /*
- Copyright 2006 Paul Westbrook (paul at westbrooks.org)
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
- include_once( PLOG_CLASS_PATH."class/action/admin/blogowneradminaction.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/ectocustom/class/view/pluginectocustomconfigview.class.php" );
-
- $apiKeyValid = true;
-
- class PluginEctoCustomUpdateConfigAction extends BlogOwnerAdminAction
- {
-
- var $_pluginEnabled;
-
-
- /**
- * Constructor. If nothing else, it also has to call the constructor of the parent
- * class, BlogAction with the same parameters
- */
- function PluginEctoCustomUpdateConfigAction( $actionInfo, $request )
- {
- $this->BlogOwnerAdminAction( $actionInfo, $request );
- }
-
- function validate()
- {
-
- $this->_pluginEnabled = $this->_request->getValue( "pluginEnabled" );
- $this->_pluginEnabled = ($this->_pluginEnabled != "" );
-
- return true;
- }
-
- /**
- * Carries out the specified action
- */
- function perform()
- {
- // update the plugin configurations to blog setting
- $blogSettings = $this->_blogInfo->getSettings();
- $blogSettings->setValue( "plugin_ectocustom_enabled", $this->_pluginEnabled );
-
- $this->_blogInfo->setSettings( $blogSettings );
-
- // save the blogs settings
- $blogs = new Blogs();
- if( !$blogs->updateBlog( $this->_blogInfo )) {
- $this->_view = new PluginEctoCustomConfigView( $this->_blogInfo );
- $this->_view->setErrorMessage( $this->_locale->tr("error_updating_settings"));
- $this->setCommonData();
-
- return false;
- }
-
- // if everything went ok...
- $this->_blogInfo->setSettings( $blogSettings );
- $this->_session->setValue( "blogInfo", $this->_blogInfo );
- $this->saveSession();
-
- $this->_view = new PluginEctoCustomConfigView( $this->_blogInfo );
- $this->_view->setSuccessMessage( $this->_locale->tr("ectocustom_settings_saved_ok"));
- $this->setCommonData();
-
- // clear the cache
- CacheControl::resetBlogCache( $this->_blogInfo->getId());
-
- return true;
- }
- }
-
-?>
Copied: plugins/trunk/ectocustom/class/action/pluginectocustomupdateconfigaction.class.php (from rev 4487, plugins/branches/lifetype-1.1/ectocustom/class/action/pluginectocustomupdateconfigaction.class.php)
Copied: plugins/trunk/ectocustom/class/view (from rev 4487, plugins/branches/lifetype-1.1/ectocustom/class/view)
Deleted: plugins/trunk/ectocustom/class/view/pluginectocustomconfigview.class.php
===================================================================
--- plugins/branches/lifetype-1.1/ectocustom/class/view/pluginectocustomconfigview.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/ectocustom/class/view/pluginectocustomconfigview.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,47 +0,0 @@
-<?php
-
- /*
- Copyright 2006 Paul Westbrook (paul at westbrooks.org)
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
- include_once( PLOG_CLASS_PATH."class/view/admin/adminplugintemplatedview.class.php" );
-
- /**
- * implements the main view of the validate trackback plugin
- */
- class PluginEctoCustomConfigView extends AdminPluginTemplatedView
- {
-
- function PluginEctoCustomConfigView( $blogInfo )
- {
- $this->AdminPluginTemplatedView( $blogInfo, "ectocustom", "ectocustom" );
- }
-
- function render()
- {
- // load some configuration settings
- $blogSettings = $this->_blogInfo->getSettings();
- $pluginEnabled = $blogSettings->getValue( "plugin_ectocustom_enabled" );
-
-
- // create a view and export the settings to the template
- $this->setValue( "pluginEnabled", $pluginEnabled );
-
- parent::render();
- }
- }
-?>
\ No newline at end of file
Copied: plugins/trunk/ectocustom/class/view/pluginectocustomconfigview.class.php (from rev 4487, plugins/branches/lifetype-1.1/ectocustom/class/view/pluginectocustomconfigview.class.php)
Copied: plugins/trunk/ectocustom/locale (from rev 4487, plugins/branches/lifetype-1.1/ectocustom/locale)
Deleted: plugins/trunk/ectocustom/locale/locale_en_UK.php
===================================================================
--- plugins/branches/lifetype-1.1/ectocustom/locale/locale_en_UK.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/ectocustom/locale/locale_en_UK.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,13 +0,0 @@
-<?php
-$messages["manageIntegrationPlugins"] = "Integration Management";
-$messages["ectocustomPluginSettings"] = "Ecto Tags";
-$messages["ectocustom"] = "Ecto Tags";
-
-$messages["ectocustom_plugin_enabled"] = "Enable this plugin";
-$messages["ectocustom_plugin"] = "Ecto Tags Plugin";
-
-$messages["ectocustom_settings_saved_ok"] = "Ecto Tags settings saved successfully!";
-
-$messages["label_configuration"] = "Configuration";
-$messages["label_enable"] = "Enable";
-?>
\ No newline at end of file
Copied: plugins/trunk/ectocustom/locale/locale_en_UK.php (from rev 4487, plugins/branches/lifetype-1.1/ectocustom/locale/locale_en_UK.php)
Deleted: plugins/trunk/ectocustom/pluginectocustom.class.php
===================================================================
--- plugins/branches/lifetype-1.1/ectocustom/pluginectocustom.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/ectocustom/pluginectocustom.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,204 +0,0 @@
-<?php
-
- /*
- Copyright 2006 Paul Westbrook (paul at westbrooks.org)
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
- include_once( PLOG_CLASS_PATH."class/plugin/pluginbase.class.php" );
- include_once( PLOG_CLASS_PATH."class/plugin/pluginmanager.class.php" );
-
- class PluginEctoCustom extends PluginBase
- {
- var $pluginEnabled;
-
- function PluginEctoCustom()
- {
- $this->PluginBase();
-
- $this->id = "ectocustom";
- $this->desc = "The Ecto Custom plugin inserts the ecto technotati tags into the custom field used by the technorati plugin.";
- $this->author = "Paul Westbrook";
- $this->locales = Array( "en_UK" );
-
- $this->init();
- }
-
- function init()
- {
-
- // register the events we want
- $this->registerNotification( EVENT_PRE_POST_ADD );
- $this->registerNotification( EVENT_PRE_POST_UPDATE );
-
- $this->registerAdminAction( "ectocustom", "PluginEctoCustomConfigAction" );
- $this->registerAdminAction( "updateEctoCustomConfig", "PluginEctoCustomUpdateConfigAction" );
-
- include_once( PLOG_CLASS_PATH."class/template/menu/menu.class.php" );
-
- $menu =& Menu::getMenu();
- if( !$menu->entryExists( "/menu/controlCenter/manageIntegrationPlugins" ))
- $this->addMenuEntry( "/menu/controlCenter", "manageIntegrationPlugins", "", "", true, false );
- $this->addMenuEntry( "/menu/controlCenter/manageIntegrationPlugins", "ectocustom", "?op=ectocustom", "" );
- }
-
- function register()
- {
- $blogSettings = $this->blogInfo->getSettings();
- $this->pluginEnabled = $blogSettings->getValue( "plugin_ectocustom_enabled" );
- }
-
- function isEnabled()
- {
- return $this->pluginEnabled;
- }
-
- /**
- * process the events that we have registered
- *
- * @see PluginBase::process
- * @see PluginManager
- */
- function process( $eventType, $params )
- {
- // make sure we're processing the right event!
- if( $eventType != EVENT_PRE_POST_ADD &&
- $eventType != EVENT_PRE_POST_UPDATE )
- {
- return true;
- }
-
- // Load all of the settings for this blog
- $this->register();
-
- // make sure that the plugin is enabled
- if( !$this->isEnabled())
- {
- return true;
- }
-
- $article = $params["article"];
-
- // Update the Blogtime png
- $params["article"] = $this->convertTagsToCustomFields($article);
-
- return true;
- }
-
- /**
- * strips the tags added by ecto, and adds them to the technorati custom field
- */
- function convertTagsToCustomFields( $post )
- {
- // Get the text of the post
- $text = $post->getText(false);
-
-
- // Are the tags in the post
-
- /**
- * The format is:
- <!-- technorati tags start --><p style="text-align:right;font-size:10px;">Technorati Tags: <a href="http://www.technorati.com/tag/Apple Mail" rel="tag">Apple Mail</a>, <a href="http://www.technorati.com/tag/IMAP IDLE" rel="tag">IMAP IDLE</a>, <a href="http://www.technorati.com/tag/Mac OS X" rel="tag">Mac OS X</a>, <a href="http://www.technorati.com/tag/Mail.app plugin" rel="tag">Mail.app plugin</a></p><!-- technorati tags end -->
- */
-
- $beginningTag = "<!-- technorati tags start -->";
-
- $pos = strpos($text, $beginningTag);
- if ( $pos === false )
- {
- // just return the original post
- return $post;
- }
-
- $endOfText = $pos;
- $posBeginTags = $pos + strlen($beginningTag);
-
- // Make sure the end tag is present
- $endTag = "<!-- technorati tags end -->";
- $pos = strpos($text, $endTag, $posBeginTags);
- if ( $pos === false )
- {
- // just return the original post
- return $post;
- }
-
- // Get the string with the tags
- $tagString = substr($text, $posBeginTags, $pos - $posBeginTags);
-
- // Get the text without the tags;
- $text = substr( $text, 0, $endOfText) . substr( $text, $pos + strlen($endTag));
-
- // This really should be done as a regular expression
-
- $customFieldValueText = "";
- //Break out the tags
- $tags = explode( "rel=\"tag\">", $tagString);
- // Skip over the first one
- array_shift($tags);
- foreach($tags as $tag)
- {
- $tagArray = explode( "</a>", $tag );
-
- if ($customFieldValueText != "")
- {
- $customFieldValueText = $customFieldValueText . ",";
- }
- $customFieldValueText = $customFieldValueText . $tagArray[0];
- }
-
- include_once( PLOG_CLASS_PATH."class/dao/customfields/customfields.class.php" );
-
- $customFields = new CustomFields();
- $blogFields = $customFields->getBlogCustomFields( $this->blogInfo->getId());
-
- $foundField = false;
- $fieldId = 0;
- foreach($blogFields as $blogField)
- {
- if ( $blogField->getName() == "technoratiTags" )
- {
- $foundField = true;
- $fieldId = $blogField->getId();
- break;
- }
- }
-
- if( $foundField == false) {
- // The field doesn't exist, bail out
- return $post;
- }
-
- // Add the modified text back to the post
- $post->setText($text);
- include_once( PLOG_CLASS_PATH."class/dao/customfields/customfieldvalue.class.php" );
-
- // Create a new CustomFieldValue
- $postCustomFields = $post->getCustomFields();
-
- $customFieldValue = new CustomFieldValue( $fieldId,
- $customFieldValueText,
- $post->getId(),
- $this->blogInfo->getId());
-
- $postCustomFields["technoratiTags"] = $customFieldValue;
-
- $post->setFields( $postCustomFields );
-
-
- return $post;
- }
- }
-?>
\ No newline at end of file
Copied: plugins/trunk/ectocustom/pluginectocustom.class.php (from rev 4487, plugins/branches/lifetype-1.1/ectocustom/pluginectocustom.class.php)
Copied: plugins/trunk/ectocustom/templates (from rev 4487, plugins/branches/lifetype-1.1/ectocustom/templates)
Deleted: plugins/trunk/ectocustom/templates/ectocustom.template
===================================================================
--- plugins/branches/lifetype-1.1/ectocustom/templates/ectocustom.template 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/ectocustom/templates/ectocustom.template 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,25 +0,0 @@
-{include file="$admintemplatepath/header.template"}
-{include file="$admintemplatepath/navigation.template" showOpt=ectocustom title=$locale->tr("ectocustom_plugin")}
-<form name="ectocustomPluginSettings" method="post">
- <fieldset class="inputField">
- <legend>{$locale->tr("label_configuration")}</legend>
- {include file="$admintemplatepath/successmessage.template"}
- {include file="$admintemplatepath/errormessage.template"}
- <div class="field">
- <label for="pluginEnabled">{$locale->tr("label_enable")}</label>
- <div class="formHelp">
- <input class="checkbox" type="checkbox" name="pluginEnabled" id="pluginEnabled" {if $pluginEnabled} checked="checked" {/if} value="1" />{$locale->tr("ectocustom_plugin_enabled")}
- </div>
- </div>
-
-
- </fieldset>
-
- <div class="buttons">
- <input type="hidden" name="op" value="updateEctoCustomConfig" />
- <input type="reset" name="{$locale->tr("reset")}" />
- <input type="submit" name="{$locale->tr("update_settings")}" value="{$locale->tr("update")}" />
- </div>
-</form>
-{include file="$admintemplatepath/footernavigation.template"}
-{include file="$admintemplatepath/footer.template"}
\ No newline at end of file
Copied: plugins/trunk/ectocustom/templates/ectocustom.template (from rev 4487, plugins/branches/lifetype-1.1/ectocustom/templates/ectocustom.template)
Copied: plugins/trunk/editcomments (from rev 4487, plugins/branches/lifetype-1.1/editcomments)
Copied: plugins/trunk/editcomments/class (from rev 4487, plugins/branches/lifetype-1.1/editcomments/class)
Copied: plugins/trunk/editcomments/class/action (from rev 4487, plugins/branches/lifetype-1.1/editcomments/class/action)
Deleted: plugins/trunk/editcomments/class/action/admineditcommentaction.class.php
===================================================================
--- plugins/branches/lifetype-1.1/editcomments/class/action/admineditcommentaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/editcomments/class/action/admineditcommentaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,25 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/editcomments/class/view/admineditcommentview.class.php" );
-
- /**
- * actions that displays the list of comments in the blog.
- */
- class AdminEditCommentAction extends AdminAction{
-
- function AdminEditCommentAction( $actionInfo, $request ){
- $this->AdminAction( $actionInfo, $request );
- }
-
- function perform(){
- $commentId = $this->_request->getValue("commentId");
-
- $this->_view = new AdminEditCommentView($this->_blogInfo, $commentId);
-
- $this->setCommonData();
-
- return true;
- }
- }
-?>
\ No newline at end of file
Copied: plugins/trunk/editcomments/class/action/admineditcommentaction.class.php (from rev 4487, plugins/branches/lifetype-1.1/editcomments/class/action/admineditcommentaction.class.php)
Deleted: plugins/trunk/editcomments/class/action/adminedittrackbackaction.class.php
===================================================================
--- plugins/branches/lifetype-1.1/editcomments/class/action/adminedittrackbackaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/editcomments/class/action/adminedittrackbackaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,25 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/editcomments/class/view/adminedittrackbackview.class.php" );
-
- /**
- * actions that displays the list of comments in the blog.
- */
- class AdminEditTrackbackAction extends AdminAction{
-
- function AdminEditTrackbackAction( $actionInfo, $request ){
- $this->AdminAction( $actionInfo, $request );
- }
-
- function perform(){
- $trackbackId = $this->_request->getValue("trackbackId");
-
- $this->_view = new AdminEditTrackbackView($this->_blogInfo, $trackbackId);
-
- $this->setCommonData();
-
- return true;
- }
- }
-?>
\ No newline at end of file
Copied: plugins/trunk/editcomments/class/action/adminedittrackbackaction.class.php (from rev 4487, plugins/branches/lifetype-1.1/editcomments/class/action/adminedittrackbackaction.class.php)
Deleted: plugins/trunk/editcomments/class/action/adminplugineditcommentsaction.class.php
===================================================================
--- plugins/branches/lifetype-1.1/editcomments/class/action/adminplugineditcommentsaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/editcomments/class/action/adminplugineditcommentsaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,15 +0,0 @@
-<?php
- include_once( PLOG_CLASS_PATH."plugins/editcomments/class/view/admineditcommentsview.class.php" );
- include_once( PLOG_CLASS_PATH."class/action/admin/admineditcommentsaction.class.php" );
-
- /**
- * actions that displays the list of comments in the blog.
- */
- class AdminPluginEditCommentsAction extends AdminEditCommentsAction{
- function AdminPluginEditCommentsAction($actionInfo, $request){
- $this->AdminEditCommentsAction($actionInfo, $request);
- $this->_viewClass = "AdminEditCommentsView";
- }
-
- }
-?>
\ No newline at end of file
Copied: plugins/trunk/editcomments/class/action/adminplugineditcommentsaction.class.php (from rev 4487, plugins/branches/lifetype-1.1/editcomments/class/action/adminplugineditcommentsaction.class.php)
Deleted: plugins/trunk/editcomments/class/action/adminpluginedittrackbacksaction.class.php
===================================================================
--- plugins/branches/lifetype-1.1/editcomments/class/action/adminpluginedittrackbacksaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/editcomments/class/action/adminpluginedittrackbacksaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,17 +0,0 @@
-<?php
- include_once( PLOG_CLASS_PATH."plugins/editcomments/class/view/adminedittrackbacksview.class.php" );
- include_once( PLOG_CLASS_PATH."class/action/admin/adminedittrackbacksaction.class.php" );
-
- /**
- * actions that displays the list of trackbacks in the blog.
- */
- class AdminPluginEditTrackbacksAction extends AdminEditTrackbacksAction {
-
- function AdminPluginEditTrackbacksAction ($actionInfo, $request) {
-
- $this->AdminEditCommentsAction($actionInfo, $request);
- $this->_viewClass = "AdminEditTrackbacksView";
- }
-
- }
-?>
\ No newline at end of file
Copied: plugins/trunk/editcomments/class/action/adminpluginedittrackbacksaction.class.php (from rev 4487, plugins/branches/lifetype-1.1/editcomments/class/action/adminpluginedittrackbacksaction.class.php)
Deleted: plugins/trunk/editcomments/class/action/adminupdatecommentaction.class.php
===================================================================
--- plugins/branches/lifetype-1.1/editcomments/class/action/adminupdatecommentaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/editcomments/class/action/adminupdatecommentaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,162 +0,0 @@
-<?php
-
-include_once( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
-include_once( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
-include_once( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
-include_once( PLOG_CLASS_PATH."class/data/validator/emailvalidator.class.php" );
-include_once( PLOG_CLASS_PATH."class/data/validator/httpurlvalidator.class.php" );
-include_once( PLOG_CLASS_PATH."class/data/validator/usernamevalidator.class.php" );
-include_once( PLOG_CLASS_PATH."plugins/editcomments/class/view/admineditcommentview.class.php" );
-include_once( PLOG_CLASS_PATH."plugins/editcomments/class/view/admineditcommentsview.class.php" );
-include_once( PLOG_CLASS_PATH."class/view/admin/adminpostslistview.class.php" );
-
-class AdminUpdateCommentAction extends AdminAction{
- var $_commentId;
- var $_articleId;
- var $_op;
- var $_authorEmail;
- var $_authorUrl;
- var $_authorName;
- var $_commentText;
- var $_commentTopic;
- var $_commentNormalizedText;
- var $_commentNormalizedTopic;
- var $_commentStatus;
- var $_commentDateTime;
- var $_commentIp;
-
- function AdminUpdateCommentAction($actionInfo, $request){
- $this->AdminAction($actionInfo, $request);
-
- $this->_op = $actionInfo->getActionParamValue();
- if($this->_request->getValue("cancel")){
- $this->_op = "cancel";
- }
-
- // articleId is needed, even on a cancel operation
- $this->registerFieldValidator("articleId", new IntegerValidator());
- $this->_articleId = $this->_request->getValue( "articleId" );
-
- if($this->_op == "updateComment"){
- $view = new AdminEditCommentView($this->_blogInfo, $commentId);
-
- $this->registerFieldValidator("commentId", new IntegerValidator());
- $this->registerFieldValidator("commentText", new StringValidator());
- $this->registerFieldValidator("authorName", new StringValidator());
- $this->registerFieldValidator("commentStatus", new IntegerValidator());
- $this->registerFieldValidator("commentTopic", new StringValidator(), true);
- $this->registerFieldValidator("authorEmail", new EmailValidator(), true);
- $this->registerFieldValidator("authorUrl", new HttpUrlValidator(), true);
- // no validation...
- $this->registerField("commentDateTime");
- $this->registerField("commentIp");
-
- $view->setErrorMessage( $this->_locale->tr("invalid_data"));
- $this->setValidationErrorView( $view );
- $this->_fetchFields();
- }
- }
-
-
- function _fetchFields(){
- include_once( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
- $this->_commentId = $this->_request->getValue("commentId");
- // TODO, be able to change parent? drop down list?
- //$this->_parentId = $this->_request->getValue( "parentId" );
- //if( $this->_parentId == null || $this->_parentId == "" )
- //$this->_parentId = 0;
- $this->_authorEmail = Textfilter::filterAllHTML($this->_request->getValue( "authorEmail" ));
- $this->_authorUrl = Textfilter::filterAllHTML($this->_request->getValue( "authorUrl" ));
- if( (strlen($this->_authorUrl) != 0) &&
- ereg('^https?://',$this->_authorUrl) == false)
- {
- $this->_authorUrl = "http://".$this->_authorUrl;
- }
- $this->_authorName = Textfilter::filterAllHTML($this->_request->getValue( "authorName" ));
- $this->_commentText = trim($this->_request->getValue( "commentText" ));
- $this->_commentTopic = Textfilter::filterAllHTML($this->_request->getValue( "commentTopic" ));
- $this->_commentStatus = $this->_request->getValue("commentStatus");
- $this->_commentIp = $this->_request->getValue("commentIp");
- $this->_commentNormalizedTopic = Textfilter::normalizeText($this->_commentTopic);
- $this->_commentNormalizedText = Textfilter::normalizeText($this->_commentText);
-
- $this->_commentDateTime = $this->_fetchCommentDateInformation();
- }
-
- // copied from AdminPostManagementCommon class
- function _fetchCommentDateInformation(){
- $commentDateTime = $this->_request->getValue("commentDateTime");
- $dateTimeParts = explode(" ", $commentDateTime);
- $dateParts = explode("/", $dateTimeParts[0] );
- $timeParts = explode(":",$dateTimeParts[1] );
-
- $postTimestamp = new Timestamp();
- $postTimestamp->setMinutes($timeParts[1]);
- $postTimestamp->setHour($timeParts[0]);
- $postTimestamp->setDay($dateParts[0]);
- $postTimestamp->setMonth($dateParts[1]);
- $postTimestamp->setYear($dateParts[2]);
-
- return $postTimestamp->getTimestamp();
- }
-
-
- function perform(){
- if($this->_op == "updateComment"){
- $comments = new ArticleComments();
- $comment = $comments->getComment($this->_commentId);
- if(!$comment){
- $this->_view = new AdminEditCommentView($this->_blogInfo, $id);
- $this->_view->setErrorMessage( $this->_locale->tr("pluginEditCommentsFailed") );
- }
- else if(!ArticleCommentStatus::isValidStatus($this->_commentStatus)){
- $this->_view = new AdminEditCommentView($this->_blogInfo, $id);
- $this->_view->setErrorMessage( $this->_locale->tr("pluginEditCommentsFailed") );
- }
- else{
- $comment->setTopic($this->_commentTopic);
- $comment->setText($this->_commentText);
- $comment->setUserName($this->_authorName);
- $comment->setUserEmail($this->_authorEmail);
- $comment->setUserUrl($this->_authorUrl);
- $comment->setDate($this->_commentDateTime);
- $comment->setStatus($this->_commentStatus);
- $comment->setClientIp($this->_commentIp);
- $comment->setNormalizedTopic($this->_commentNormalizedTopic);
- $comment->setNormalizedText($this->_commentNormalizedText);
-
- if($comments->updateComment($comment)){
- if($this->_articleId){
- $articles = new Articles();
- $article = $articles->getBlogArticle($this->_articleId,
- $this->_blogInfo->getId());
- $this->_view = new AdminEditCommentsView($this->_blogInfo,
- array("article" => $article));
- }
- else{
- $this->_view = new AdminPostsListView( $this->_blogInfo );
- }
- $this->_view->setSuccessMessage( $this->_locale->tr("pluginEditCommentsOk") );
- CacheControl::resetBlogCache( $this->_blogInfo->getId());
- }
- else{
- $this->_view = new AdminEditCommentView($this->_blogInfo, $id);
- $this->_view->setErrorMessage( $this->_locale->tr("pluginEditCommentsFailed") );
- }
- }
- }
- else if($this->_articleId){
- $articles = new Articles();
- $article = $articles->getBlogArticle( $this->_articleId, $this->_blogInfo->getId());
-
- $this->_view = new AdminEditCommentsView($this->_blogInfo, array("article" => $article));
- $this->_view->setSuccessMessage( $this->_locale->tr("pluginEditCommentsCancelled") );
- }
- else{
- $this->_view = new AdminPostsListView($this->_blogInfo);
- }
-
- $this->setCommonData();
- }
-}
-?>
\ No newline at end of file
Copied: plugins/trunk/editcomments/class/action/adminupdatecommentaction.class.php (from rev 4487, plugins/branches/lifetype-1.1/editcomments/class/action/adminupdatecommentaction.class.php)
Deleted: plugins/trunk/editcomments/class/action/adminupdatetrackbackaction.class.php
===================================================================
--- plugins/branches/lifetype-1.1/editcomments/class/action/adminupdatetrackbackaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/editcomments/class/action/adminupdatetrackbackaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,163 +0,0 @@
-<?php
-
-include_once( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
-include_once( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
-include_once( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
-include_once( PLOG_CLASS_PATH."class/data/validator/emailvalidator.class.php" );
-include_once( PLOG_CLASS_PATH."class/data/validator/httpurlvalidator.class.php" );
-include_once( PLOG_CLASS_PATH."class/data/validator/usernamevalidator.class.php" );
-include_once( PLOG_CLASS_PATH."plugins/editcomments/class/view/adminedittrackbackview.class.php" );
-include_once( PLOG_CLASS_PATH."plugins/editcomments/class/view/adminedittrackbacksview.class.php" );
-include_once( PLOG_CLASS_PATH."class/view/admin/adminpostslistview.class.php" );
-
-class AdminUpdateTrackbackAction extends AdminAction {
- var $_trackbackId;
- var $_articleId;
- var $_op;
- var $_authorEmail;
- var $_authorUrl;
- var $_authorName;
- var $_commentText;
- var $_commentTopic;
- var $_commentNormalizedText;
- var $_commentNormalizedTopic;
- var $_commentStatus;
- var $_commentDateTime;
- var $_commentIp;
-
- function AdminUpdateTrackbackAction($actionInfo, $request){
- $this->AdminAction($actionInfo, $request);
-
- $this->_op = $actionInfo->getActionParamValue();
- if($this->_request->getValue("cancel")){
- $this->_op = "cancel";
- }
-
- // articleId is needed, even on a cancel operation
- $this->registerFieldValidator("articleId", new IntegerValidator());
- $this->_articleId = $this->_request->getValue( "articleId" );
-
- if($this->_op == "updateTrackback"){
-
- // there is actually no trackbackId here, don't know if it's used somewhere else.
- // I'm programming with no clue...
- $view = new AdminEditTrackbackView($this->_blogInfo, $trackbackId);
-
- $this->registerFieldValidator("trackbackId", new IntegerValidator());
- $this->registerFieldValidator("commentText", new StringValidator());
- $this->registerFieldValidator("authorName", new StringValidator());
- $this->registerFieldValidator("commentStatus", new IntegerValidator());
- $this->registerFieldValidator("commentTopic", new StringValidator(), true);
- $this->registerFieldValidator("authorEmail", new EmailValidator(), true);
- $this->registerFieldValidator("authorUrl", new HttpUrlValidator(), true);
- // no validation...
- $this->registerField("commentDateTime");
- $this->registerField("commentIp");
-
- $view->setErrorMessage( $this->_locale->tr("invalid_data"));
- $this->setValidationErrorView( $view );
- $this->_fetchFields();
- }
- }
-
-
- function _fetchFields(){
- include_once( PLOG_CLASS_PATH."class/data/textfilter.class.php" );
- $this->_trackbackId = $this->_request->getValue("trackbackId");
-
- $this->_authorEmail = Textfilter::filterAllHTML($this->_request->getValue( "authorEmail" ));
- $this->_authorUrl = Textfilter::filterAllHTML($this->_request->getValue( "authorUrl" ));
- if( (strlen($this->_authorUrl) != 0) &&
- ereg('^https?://',$this->_authorUrl) == false)
- {
- $this->_authorUrl = "http://".$this->_authorUrl;
- }
- $this->_authorName = Textfilter::filterAllHTML($this->_request->getValue( "authorName" ));
- $this->_commentText = trim($this->_request->getValue( "commentText" ));
- $this->_commentTopic = Textfilter::filterAllHTML($this->_request->getValue( "commentTopic" ));
- $this->_commentStatus = $this->_request->getValue("commentStatus");
- $this->_commentIp = $this->_request->getValue("commentIp");
- $this->_commentNormalizedTopic = Textfilter::normalizeText($this->_commentTopic);
- $this->_commentNormalizedText = Textfilter::normalizeText($this->_commentText);
-
- $this->_commentDateTime = $this->_fetchCommentDateInformation();
- }
-
- // copied from AdminPostManagementCommon class
- function _fetchCommentDateInformation(){
- $commentDateTime = $this->_request->getValue("commentDateTime");
- $dateTimeParts = explode(" ", $commentDateTime);
- $dateParts = explode("/", $dateTimeParts[0] );
- $timeParts = explode(":",$dateTimeParts[1] );
-
- $postTimestamp = new Timestamp();
- $postTimestamp->setMinutes($timeParts[1]);
- $postTimestamp->setHour($timeParts[0]);
- $postTimestamp->setDay($dateParts[0]);
- $postTimestamp->setMonth($dateParts[1]);
- $postTimestamp->setYear($dateParts[2]);
-
- return $postTimestamp->getTimestamp();
- }
-
-
- function perform(){
- if($this->_op == "updateTrackback"){
- $trackbacks = new Trackbacks();
- $trackback = $trackbacks->getTrackback($this->_trackbackId);
-
- if(!$trackback){
- $this->_view = new AdminEditTrackbackView($this->_blogInfo, $id);
- $this->_view->setErrorMessage( $this->_locale->tr("pluginEditTrackbacksFailed") );
- }
- else if(!ArticleCommentStatus::isValidStatus($this->_commentStatus)){
- $this->_view = new AdminEditTrackbackView($this->_blogInfo, $id);
- $this->_view->setErrorMessage( $this->_locale->tr("pluginEditTrackbacksFailed") );
- }
- else{
- $trackback->setTopic($this->_commentTopic);
- $trackback->setText($this->_commentText);
- $trackback->setUserName($this->_authorName);
- $trackback->setUserEmail($this->_authorEmail);
- $trackback->setUserUrl($this->_authorUrl);
- $trackback->setDate($this->_commentDateTime);
- $trackback->setStatus($this->_commentStatus);
- $trackback->setClientIp($this->_commentIp);
- $trackback->setNormalizedTopic($this->_commentNormalizedTopic);
- $trackback->setNormalizedText($this->_commentNormalizedText);
-
- if($trackbacks->updateComment($trackback)) {
- if($this->_articleId) {
- $articles = new Articles();
- $article = $articles->getBlogArticle($this->_articleId,
- $this->_blogInfo->getId());
- $this->_view = new AdminEditTrackbacksView ($this->_blogInfo,
- array("article" => $article));
- }
- else {
- $this->_view = new AdminPostsListView( $this->_blogInfo );
- }
- $this->_view->setSuccessMessage( $this->_locale->tr("pluginEditTrackbacksOk") );
- CacheControl::resetBlogCache( $this->_blogInfo->getId());
- }
- else {
- $this->_view = new AdminEditTrackbacksView ($this->_blogInfo, $id);
- $this->_view->setErrorMessage( $this->_locale->tr("pluginEditTrackbacksFailed") );
- }
- }
- }
- else if($this->_articleId){
- $articles = new Articles();
- $article = $articles->getBlogArticle( $this->_articleId, $this->_blogInfo->getId());
-
- $this->_view = new AdminEditTrackbacksView ($this->_blogInfo, array("article" => $article));
- $this->_view->setSuccessMessage( $this->_locale->tr("pluginEditTrackbacksCancelled") );
- }
- else{
- $this->_view = new AdminPostsListView($this->_blogInfo);
- }
-
- $this->setCommonData();
- }
-}
-?>
\ No newline at end of file
Copied: plugins/trunk/editcomments/class/action/adminupdatetrackbackaction.class.php (from rev 4487, plugins/branches/lifetype-1.1/editcomments/class/action/adminupdatetrackbackaction.class.php)
Copied: plugins/trunk/editcomments/class/view (from rev 4487, plugins/branches/lifetype-1.1/editcomments/class/view)
Deleted: plugins/trunk/editcomments/class/view/admineditcommentsview.class.php
===================================================================
--- plugins/branches/lifetype-1.1/editcomments/class/view/admineditcommentsview.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/editcomments/class/view/admineditcommentsview.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,124 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/view/admin/adminplugintemplatedview.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/articlecomments.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/articlecommentstatus.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/articles.class.php" );
- include_once( PLOG_CLASS_PATH."class/data/pager/pager.class.php" );
-
- class AdminEditCommentsView extends AdminPluginTemplatedView
- {
- var $_article;
- var $_commentStatus;
- var $_page;
-
- function AdminEditCommentsView( $blogInfo, $params = Array() ){
- $this->AdminPluginTemplatedView( $blogInfo, "editcomments", "editcomments" );
- $this->_setParameters( $params );
- $this->_page = $this->getCurrentPageFromRequest();
- }
-
- /**
- * @private
- */
- function _setParameters( $params )
- {
- // fetch the article id
- $this->_article = null;
- if( isset( $params["article"] ))
- $this->_article = $params["article"];
-
- // load the status
- if( isset( $params["showStatus"] ))
- $this->_commentStatus = $params["showStatus"];
-
- if( !ArticleCommentStatus::isValidStatus( $this->_commentStatus ))
- $this->_commentStatus = COMMENT_STATUS_ALL;
-
- // laod the search terms
- $this->_searchTerms = "";
- if( isset( $params["searchTerms"] ))
- $this->_searchTerms = $params["searchTerms"];
- }
-
- /**
- * show the contents of the view
- */
- function render()
- {
- // load the comments and throw the correct event
- $comments = new CommentsCommon();
- if( $this->_article ) {
- // id of the article, for the pager...
- $articleId = $this->_article->getId();
-
- // load only the comments of the given post
- $postComments = $comments->getPostComments( $articleId,
- COMMENT_ORDER_NEWEST_FIRST,
- $this->_commentStatus,
- COMMENT_TYPE_COMMENT,
- $this->_page,
- DEFAULT_ITEMS_PER_PAGE );
- // number of comments
- $numPostComments = $comments->getNumPostComments( $articleId,
- $this->_commentStatus,
- COMMENT_TYPE_COMMENT );
- }
- else {
- // load all comments given the current status
- $postComments = $comments->getBlogComments( $this->_blogInfo->getId(),
- COMMENT_ORDER_NEWEST_FIRST,
- $this->_commentStatus,
- COMMENT_TYPE_COMMENT,
- $this->_searchTerms,
- $this->_page,
- DEFAULT_ITEMS_PER_PAGE );
- // number of comments
- $numPostComments = $comments->getNumBlogComments( $this->_blogInfo->getId(),
- $this->_commentStatus,
- COMMENT_TYPE_COMMENT,
- $this->_searchTerms );
- // no article id...
- $articleId = 0;
- }
- $this->notifyEvent( EVENT_COMMENTS_LOADED, Array( "comments", &$postComments ));
-
- $pagerUrl = "?op=editComments";
-
- if( $this->_commentStatus > -1 ){
- $pagerUrl .= "&articleId={$articleId}&showStatus=".
- $this->_commentStatus."&searchTerms=".
- $this->_searchTerms."&page=";
- }
- else{
- $pagerUrl .= "&articleId={$articleId}&searchTerms=".
- $this->_searchTerms."&page=";
- }
- // calculate the pager url
- $pager = new Pager( $pagerUrl,
- $this->_page,
- $numPostComments,
- DEFAULT_ITEMS_PER_PAGE );
-
- // get a list with all the different comment status
- $statusList = ArticleCommentStatus::getStatusList( true );
- $statusListWithoutAll = ArticleCommentStatus::getStatusList( false );
-
- // and pass all the information to the templates
- $this->setValue( "comments", $postComments);
- $this->setValue( "commentstatus", $statusList );
- $this->setValue( "commentstatusWithoutAll", $statusListWithoutAll );
- $this->setValue( "currentstatus", $this->_commentStatus );
- $this->setValue( "searchTerms", $this->_searchTerms );
-
- // pass the pager to the view
- $this->setValue( "pager", $pager );+
-
- // pass the common data to the templates
- $this->setValue( "post", $this->_article );
-
- parent::render();
- }
-
- }
-?>
\ No newline at end of file
Copied: plugins/trunk/editcomments/class/view/admineditcommentsview.class.php (from rev 4487, plugins/branches/lifetype-1.1/editcomments/class/view/admineditcommentsview.class.php)
Deleted: plugins/trunk/editcomments/class/view/admineditcommentview.class.php
===================================================================
--- plugins/branches/lifetype-1.1/editcomments/class/view/admineditcommentview.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/editcomments/class/view/admineditcommentview.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,36 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/view/admin/adminplugintemplatedview.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/articlecomments.class.php" );
-
- class AdminEditCommentView extends AdminPluginTemplatedView
- {
- var $_commentId;
-
- function AdminEditCommentView($blogInfo, $commentId){
- $this->_commentId = $commentId;
- $this->AdminPluginTemplatedView( $blogInfo, "editcomments", "editcomment" );
- }
-
- function render(){
- // fetch comment
- $articleComments = new ArticleComments();
- $comment = $articleComments->getComment($this->_commentId);
-
- if($comment){
- $commentDate = $comment->getDateObject();
- $this->setValue( "commentYear", $commentDate->getYear());
- $this->setValue( "commentMonth", $commentDate->getMonth());
- $this->setValue( "commentDay", $commentDate->getDay());
- $this->setValue( "commentHour", $commentDate->getHour());
- $this->setValue( "commentMinutes", $commentDate->getMinutes());
- }
-
- $statusList = ArticleCommentStatus::getStatusList();
- $this->setValue( "commentstatus", $statusList );
- $this->setValue( "editcomment", $comment );
-
- parent::render();
- }
- }
-?>
\ No newline at end of file
Copied: plugins/trunk/editcomments/class/view/admineditcommentview.class.php (from rev 4487, plugins/branches/lifetype-1.1/editcomments/class/view/admineditcommentview.class.php)
Deleted: plugins/trunk/editcomments/class/view/adminedittrackbacksview.class.php
===================================================================
--- plugins/branches/lifetype-1.1/editcomments/class/view/adminedittrackbacksview.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/editcomments/class/view/adminedittrackbacksview.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,124 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/view/admin/adminplugintemplatedview.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/trackbacks.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/articlecommentstatus.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/articles.class.php" );
- include_once( PLOG_CLASS_PATH."class/data/pager/pager.class.php" );
-
- class AdminEditTrackbacksView extends AdminPluginTemplatedView
- {
- var $_article;
- var $_commentStatus;
- var $_page;
- var $_type;
-
- function AdminEditTrackbacksView ( $blogInfo, $params = Array() ){
- $this->AdminPluginTemplatedView( $blogInfo, "editcomments", "edittrackbacks" );
- $this->_setParameters( $params );
- $this->_page = $this->getCurrentPageFromRequest();
- $this->_type = COMMENT_TYPE_TRACKBACK;
- }
-
- /**
- * @private
- */
- function _setParameters( $params )
- {
- // fetch the article id
- $this->_article = null;
- if( isset( $params["article"] ))
- $this->_article = $params["article"];
-
- // load the status
- if( isset( $params["showStatus"] ))
- $this->_commentStatus = $params["showStatus"];
-
- if( !ArticleCommentStatus::isValidStatus( $this->_commentStatus ))
- $this->_commentStatus = COMMENT_STATUS_ALL;
-
- // laod the search terms
- $this->_searchTerms = "";
- if( isset( $params["searchTerms"] ))
- $this->_searchTerms = $params["searchTerms"];
- }
-
- /**
- * show the contents of the view
- */
- function render()
- {
- // load the comments and throw the correct event
- $comments = new CommentsCommon();
- if( $this->_article ) {
- // load only the comments of the given post
- $postComments = $comments->getPostComments( $this->_article->getId(),
- COMMENT_ORDER_NEWEST_FIRST,
- $this->_commentStatus,
- $this->_type,
- $this->_page,
- DEFAULT_ITEMS_PER_PAGE );
- // number of comments
- $numPostComments = $comments->getNumPostComments( $this->_article->getId(),
- $this->_commentStatus,
- $this->_type );
- // id of the article, for the pager...
- $articleId = $this->_article->getId();
- }
- else {
- // load all comments given the current status
- $postComments = $comments->getBlogComments( $this->_blogInfo->getId(),
- COMMENT_ORDER_NEWEST_FIRST,
- $this->_commentStatus,
- $this->_type,
- $this->_searchTerms,
- $this->_page,
- DEFAULT_ITEMS_PER_PAGE );
- // number of comments
- $numPostComments = $comments->getNumBlogComments( $this->_blogInfo->getId(),
- $this->_commentStatus,
- $this->_type,
- $this->_searchTerms );
- // no article id...
- $articleId = 0;
- }
- $this->notifyEvent( EVENT_COMMENTS_LOADED, Array( "comments", &$postComments ));
-
- if( $this->_type == COMMENT_TYPE_COMMENT )
- $pagerUrl = "?op=editComments";
- else
- $pagerUrl = "?op=editTrackbacks";
-
- if( $this->_commentStatus > -1 )
- $pagerUrl .= "&articleId={$articleId}&showStatus=".$this->_commentStatus."&searchTerms=".$this->_searchTerms."&page=";
- else
- $pagerUrl .= "&articleId={$articleId}&searchTerms=".$this->_searchTerms."&page=";
-
- // calculate the pager url
- $pager = new Pager( $pagerUrl,
- $this->_page,
- $numPostComments,
- DEFAULT_ITEMS_PER_PAGE );
-
- // get a list with all the different comment status
- $statusList = ArticleCommentStatus::getStatusList( true );
- $statusListWithoutAll = ArticleCommentStatus::getStatusList( false );
-
- // and pass all the information to the templates
- $this->setValue( "comments", $postComments);
- $this->setValue( "commentstatus", $statusList );
- $this->setValue( "commentstatusWithoutAll", $statusListWithoutAll );
- $this->setValue( "currentstatus", $this->_commentStatus );
- $this->setValue( "searchTerms", $this->_searchTerms );
-
- // pass the pager to the view
- $this->setValue( "pager", $pager );+
-
- // pass the common data to the templates
- $this->setValue( "post", $this->_article );
-
- parent::render();
- }
-
- }
-?>
\ No newline at end of file
Copied: plugins/trunk/editcomments/class/view/adminedittrackbacksview.class.php (from rev 4487, plugins/branches/lifetype-1.1/editcomments/class/view/adminedittrackbacksview.class.php)
Deleted: plugins/trunk/editcomments/class/view/adminedittrackbackview.class.php
===================================================================
--- plugins/branches/lifetype-1.1/editcomments/class/view/adminedittrackbackview.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/editcomments/class/view/adminedittrackbackview.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,36 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/view/admin/adminplugintemplatedview.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/trackbacks.class.php" );
-
- class AdminEditTrackbackView extends AdminPluginTemplatedView
- {
- var $_trackbackId;
-
- function AdminEditTrackbackView($blogInfo, $trackbackId){
- $this->_trackbackId = $trackbackId;
- $this->AdminPluginTemplatedView( $blogInfo, "editcomments", "edittrackback" );
- }
-
- function render(){
- // fetch trackback
- $trackbacks = new Trackbacks();
- $tb = $trackbacks->getTrackBack($this->_trackbackId);
-
- if($tb){
- $tbDate = $tb->getDateObject();
- $this->setValue( "tbYear", $tbDate->getYear());
- $this->setValue( "tbMonth", $tbDate->getMonth());
- $this->setValue( "tbDay", $tbDate->getDay());
- $this->setValue( "tbHour", $tbDate->getHour());
- $this->setValue( "tbMinutes", $tbDate->getMinutes());
- }
-
- $statusList = ArticleCommentStatus::getStatusList();
- $this->setValue( "tbstatus", $statusList );
- $this->setValue( "edittrackback", $tb );
-
- parent::render();
- }
- }
-?>
\ No newline at end of file
Copied: plugins/trunk/editcomments/class/view/adminedittrackbackview.class.php (from rev 4487, plugins/branches/lifetype-1.1/editcomments/class/view/adminedittrackbackview.class.php)
Copied: plugins/trunk/editcomments/locale (from rev 4487, plugins/branches/lifetype-1.1/editcomments/locale)
Deleted: plugins/trunk/editcomments/locale/locale_en_UK.php
===================================================================
--- plugins/branches/lifetype-1.1/editcomments/locale/locale_en_UK.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/editcomments/locale/locale_en_UK.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,12 +0,0 @@
-<?php
-$messages["pluginEditCommentsEdit"] = "Edit Comment";
-$messages["pluginEditTrackbacksEdit"] = "Edit Trackback";
-$messages["pluginEditCommentsCancel"] = "Cancel";
-$messages["pluginEditCommentsOk"] = "Comment saved successfully!";
-$messages["pluginEditTrackbacksOk"] = "Trackback saved successfully!";
-$messages["pluginEditCommentsCancelled"] = "Comment edits discarded.";
-$messages["pluginEditTrackbacksCancelled"] = "Trackback edits discarded.";
-$messages["pluginEditCommentsFailed"] = "Comment editing failed.";
-$messages["pluginEditTrackbacksFailed"] = "Trackback editing failed.";
-$messages["pluginEditCommentsDateFormat"] = "dd/mm/yyyy hh:mm:ss";
-?>
\ No newline at end of file
Copied: plugins/trunk/editcomments/locale/locale_en_UK.php (from rev 4487, plugins/branches/lifetype-1.1/editcomments/locale/locale_en_UK.php)
Deleted: plugins/trunk/editcomments/plugineditcomments.class.php
===================================================================
--- plugins/branches/lifetype-1.1/editcomments/plugineditcomments.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/editcomments/plugineditcomments.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,34 +0,0 @@
-<?php
- include_once( PLOG_CLASS_PATH."class/plugin/pluginbase.class.php" );
-
- class PluginEditComments extends PluginBase{
-
- function PluginEditComments(){
- $this->PluginBase();
-
- $this->id = "editcomments";
- $this->desc = "Allows blog owner to edit comment text";
- $this->author = "Jon Daley";
- $this->locales = Array( "en_UK" );
-
- $this->init();
- }
-
- /**
- * registers all of the actions that we're going to use
- */
- function init(){
- // Override(!) the default editComments action. Cool
- $this->registerAdminAction( "editComments", "AdminPluginEditCommentsAction" );
- $this->registerAdminAction( "editTrackbacks", "AdminPluginEditTrackbacksAction" );
-
- // Here are our additional features that we are adding to the regular
- // comment adding
- $this->registerAdminAction( "editComment", "AdminEditCommentAction" );
- $this->registerAdminAction( "updateComment", "AdminUpdateCommentAction" );
-
- $this->registerAdminAction( "editTrackback", "AdminEditTrackbackAction" );
- $this->registerAdminAction( "updateTrackback", "AdminUpdateTrackbackAction" );
- }
- }
-?>
\ No newline at end of file
Copied: plugins/trunk/editcomments/plugineditcomments.class.php (from rev 4487, plugins/branches/lifetype-1.1/editcomments/plugineditcomments.class.php)
Deleted: plugins/trunk/editcomments/readme.txt
===================================================================
--- plugins/branches/lifetype-1.1/editcomments/readme.txt 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/editcomments/readme.txt 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,20 +0,0 @@
-Plugin: EditComments
-Author: Jon Daley
-Release Date: 2006/12/03
-Version: 1.2
-
-This plugin allows the blog owner to edit comments and trackbacks
-via the administration interface to fix typos, etc.
-
-Install:
-1. Copy the files into your plugin directory like any other plugin.
-
-Use:
-1. Go to Manage Posts -> Posts and click on a comment in the "CM"
-field. (or Manage -> Comments for all comments)
-2. On the edit comments page, there is now a link on the far right
- to edit the actual comment.
-3. Click that button, and you should be able to see the topic, text,
- username, url, etc. to manually edit.
-
-(editing trackbacks works exactly the same way)
\ No newline at end of file
Copied: plugins/trunk/editcomments/readme.txt (from rev 4487, plugins/branches/lifetype-1.1/editcomments/readme.txt)
Copied: plugins/trunk/editcomments/templates (from rev 4487, plugins/branches/lifetype-1.1/editcomments/templates)
Deleted: plugins/trunk/editcomments/templates/editcomment.template
===================================================================
--- plugins/branches/lifetype-1.1/editcomments/templates/editcomment.template 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/editcomments/templates/editcomment.template 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,78 +0,0 @@
-{include file="$admintemplatepath/header.template"}
-{include file="$admintemplatepath/navigation.template" showOpt=editComments title=$locale->tr("pluginEditCommentsEdit")}
-<script type="text/javascript" src="js/calendar/datetimepicker.js"></script>
-
-<form id="editComment" action="admin.php" method="post">
- <div id="list">
- {include file="$admintemplatepath/successmessage.template"}
- {include file="$admintemplatepath/errormessage.template"}
- <table class="info">
- <tr>
- <th>{$locale->tr("topic")}</th>
- <td><input size="50" type="text" name="commentTopic" id=commentTopic"
- value="{$editcomment->getTopic()}" /></td>
- </tr>
- <tr>
- <th style="vertical-align: top">{$locale->tr("text")}</th>
- <td><textarea name="commentText" id="commentText"
- rows="10" cols="50">{$editcomment->getText()}</textarea>
- </td>
- </tr>
- <tr>
- <th>{$locale->tr("author")}</th>
- <td><input type="text" name="authorName" id=authorName"
- value="{$editcomment->getUsername()}" /></td>
- </tr>
- <tr>
- <th>{$locale->tr("email")}</th>
- <td><input size="30" type="text" name="authorEmail" id=authorEmail"
- value="{$editcomment->getUserEmail()}" /></td>
- </tr>
- <tr>
- <th>{$locale->tr("url")}</th>
- <td><input size=60 type="text" name="authorUrl" id="authorUrl"
- value="{$editcomment->getUserUrl()}" /></td>
- </tr>
- <tr>
- <th>{$locale->tr("date")}</th>
- <td>
- {$locale->tr("pluginEditCommentsDateFormat")}<br/>
- <input name="commentDateTime" id="commentDateTime" class="dateTime"
- readonly="true" type="text" size="20"
- value="{$commentDay}/{$commentMonth}/{$commentYear} {$commentHour}:{$commentMinutes}" />
- <a href="javascript:NewCal('commentDateTime','ddmmyyyy',true,24);">
- <img src="imgs/admin/cal.jpg"
- alt="{$locale->tr("pick_date")}"
- style="border:0px" /></a>
- </td>
- </tr>
- <tr>
- <th>{$locale->tr("status")}</th>
- <td>
- <select name="commentStatus" id="commentStatus">
- {foreach from=$commentstatus key=name item=status}
- <option value="{$status}"
- {if $editcomment->getStatus() == $status} selected{/if}>
- {$locale->tr($name)}</option>
- {/foreach}
- </select>
- </td>
- </tr>
- <tr>
- <th>IP</th>
- <td><input type="text" name="commentIp" id=commentIp"
- value="{$editcomment->getClientIp()}" /></td>
- </tr>
- </table>
- </div>
-
- <div id="list_action_bar">
- <input type="hidden" name="op" value="updateComment" />
- <input type="hidden" name="commentId" value="{$editcomment->getId()}" />
- <input type="hidden" name="articleId" value="{$editcomment->getArticleId()}" />
- <input type="submit" name="update" value="{$locale->tr("update")}" />
- <input type="submit" name="cancel" value="{$locale->tr("pluginEditCommentsCancel")}" />
- </div>
-</form>
-
-{include file="$admintemplatepath/footer.template"}
Copied: plugins/trunk/editcomments/templates/editcomment.template (from rev 4487, plugins/branches/lifetype-1.1/editcomments/templates/editcomment.template)
Deleted: plugins/trunk/editcomments/templates/editcomments.template
===================================================================
--- plugins/branches/lifetype-1.1/editcomments/templates/editcomments.template 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/editcomments/templates/editcomments.template 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,142 +0,0 @@
-{include file="$admintemplatepath/header.template"}
-{include file="$admintemplatepath/navigation.template" showOpt=editComments title=$locale->tr("editComments")}
- <script type="text/javascript" src="js/ui/plogui.js"></script>
- <script type="text/javascript">
- var errorCommentStatusMsg = '{$locale->tr("error_comment_status")}';
- var showMassiveChangeOption = '{$locale->tr("show_massive_change_option")}';
- var hideMassiveChangeOption = '{$locale->tr("hide_massive_change_option")}';
- </script>
- <div id="list_nav_bar">
- <div id="list_nav_select">
-
- <form id="showBy" action="admin.php" method="post">
- <fieldset>
- <legend>{$locale->tr("show_by")} {if $post}({$post->getTopic()}){/if}</legend>
-
- <div class="list_nav_option">
- <label for="showStatus">{$locale->tr("status")}</label>
- <br />
- <select name="showStatus" id="showStatus">
- {foreach from=$commentstatus key=name item=status}
- <option value="{$status}" {if $currentstatus == $status} selected="selected"{/if}>{$locale->tr($name)}</option>
- {/foreach}
- </select>
- </div>
-
- <div class="list_nav_option">
- <label for="search">{$locale->tr("search_terms")}</label>
- <br />
- <input type="text" name="searchTerms" value="{$searchTerms}" size="15" id="search" />
- </div>
-
- <div class="list_nav_option">
- <br />
- <input type="hidden" name="op" value="editComments" />
- <input type="hidden" name="articleId" value="{if $post}{$post->getId()}{else}0{/if}" />
- <input type="submit" name="show" value="{$locale->tr("show")}" class="submit" />
- </div>
- </fieldset>
- </form>
- </div>
- <br style="clear:both;" />
- </div>
-
- <form id="postCommentsList" action="admin.php" method="post">
- <div class="optionIcon">
- <a id="optionIconLink" href="#bulkEdit" title="{$locale->tr("show_massive_change_option")}" onclick="switchMassiveOption()">{$locale->tr("show_massive_change_option")}</a>
- </div>
- <div id="list">
- {include file="$admintemplatepath/successmessage.template"}
- {include file="$admintemplatepath/errormessage.template"}
- <table class="info">
- <thead>
- <tr>
- <th style="width:10px;"><input class="checkbox" type="checkbox" name="all" id="all" value="1" onclick="toggleAllChecks('postCommentsList');" /></th>
- <th style="width:85px;">{$locale->tr("topic")}</th>
- <th style="width:360px;">{$locale->tr("text")}</th>
- <th style="width:70px;">{$locale->tr("author")}</th>
- <th style="width:60px;">{$locale->tr("date")}</th>
- <th style="width:60px;">{$locale->tr("status")}</th>
- <th style="width:45px;">IP</th>
- <th style="width:95px;">{$locale->tr("actions")}</th>
- </tr>
- </thead>
- <tbody>
- {foreach from=$comments item=comment}
- <tr class="{cycle values="odd, even"}">
- <td>
- <input class="checkbox" type="checkbox" name="commentIds[{$comment->getId()}]" id="checks_{$comment->getId()}" value="{$comment->getId()}" />
- </td>
- <td class="col_highlighted">
- {$comment->getTopic()|strip_tags|utf8_wordwrap:12:"<br/>":true}
- </td>
- <td>
- {$comment->getText()|strip_tags|utf8_wordwrap:35:"<br/>":true}
- </td>
- <td>
- <a href="mailto:{$comment->getUserEmail()}">
- {$comment->getUsername()}
- </a>
- </td>
- <td>
- {assign var=date value=$comment->getDateObject()}
- {$locale->formatDate($date)}
- </td>
- <td>
- {foreach from=$commentstatus key=name item=status}
- {if $comment->getStatus() == $status}{$locale->tr($name)}{/if}
- {/foreach}
- </td>
- <td style="text-align: center;">
- {$comment->getClientIp()}
- </td>
- <td>
- <div class="list_action_button">
- <a href="?op=deleteComment&commentId={$comment->getId()}&articleId={if $post}{$post->getId()}{else}0{/if}" title="{$locale->tr("delete")}">
- <img src="imgs/admin/icon_delete-16.png" alt="{$locale->tr("delete")}" />
- </a>
- {if $comment->getStatus() == 0}
- <a href="?op=markComment&mode=1&articleId={if $post}{$comment->getArticleId()}{else}0{/if}&commentId={$comment->getId()}" title="{$locale->tr("mark_as_spam")}">
- <img src="imgs/admin/icon_spam-16.png" alt="{$locale->tr("mark_as_spam")}" />
- </a>
- {elseif $comment->getStatus() == 1}
- <a href="?op=markComment&mode=0&articleId={if $post}{$comment->getArticleId()}{else}0{/if}&commentId={$comment->getId()}" title="{$locale->tr("mark_as_no_spam")}">
- <img src="imgs/admin/icon_nospam-16.png" alt="{$locale->tr("mark_as_no_spam")}" />
- </a>
- {/if}
- {if $comment->getUserUrl()}
- <a href="{$comment->getUserUrl()}" title="{$locale->tr("url")}">
- <img src="imgs/admin/icon_url-16.png" alt="{$locale->tr("url")}" />
- </a>
- {/if}
- <a href="?op=editComment&commentId={$comment->getId()}"><img src="imgs/admin/icon_edit-16.png" alt="{$locale->tr("edit")}" /></a>
- </div>
- </td>
- </tr>
- {/foreach}
- </tbody>
- </table>
- </div>
- <a name="bulkEdit"></a>
- <div id="list_action_bar">
- {adminpager style=list}
- <input type="hidden" name="articleId" value="{if $post}{$post->getId()}{else}0{/if}" />
- <input type="button" name="delete" value="{$locale->tr("delete")}" class="submit" onClick="javascript:submitCommentsList('deleteComments');" />
- <input type="hidden" name="op" value="" />
- <div id="massiveChangeOption" style="display: none">
- <fieldset>
- <legend>{$locale->tr("massive_change_option")}</legend>
- <label for="commentStatus">{$locale->tr("status")}</label>
- <select name="commentStatus" id="commentStatus">
- <option value="-1">-{$locale->tr("select")}-</option>
- {foreach from=$commentstatusWithoutAll key=name item=status}
- <option value="{$status}">{$locale->tr($name)}</option>
- {/foreach}
- </select>
- <input type="button" name="changeCommentsStatus" value="{$locale->tr("change_status")}" class="submit" onClick="javascript:submitCommentsList('changeCommentsStatus');" />
- </fieldset>
- </div>
- </div>
- </form>
-{include file="$admintemplatepath/footernavigation.template"}
-{include file="$admintemplatepath/footer.template"}
Copied: plugins/trunk/editcomments/templates/editcomments.template (from rev 4487, plugins/branches/lifetype-1.1/editcomments/templates/editcomments.template)
Deleted: plugins/trunk/editcomments/templates/edittrackback.template
===================================================================
--- plugins/branches/lifetype-1.1/editcomments/templates/edittrackback.template 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/editcomments/templates/edittrackback.template 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,78 +0,0 @@
-{include file="$admintemplatepath/header.template"}
-{include file="$admintemplatepath/navigation.template" showOpt=editTrackbacks title=$locale->tr("pluginEditTrackbacksEdit")}
-<script type="text/javascript" src="js/calendar/datetimepicker.js"></script>
-
-<form id="editComment" action="admin.php" method="post">
- <div id="list">
- {include file="$admintemplatepath/successmessage.template"}
- {include file="$admintemplatepath/errormessage.template"}
- <table class="info">
- <tr>
- <th>{$locale->tr("topic")}</th>
- <td><input size="50" type="text" name="commentTopic" id=commentTopic"
- value="{$edittrackback->getTopic()}" /></td>
- </tr>
- <tr>
- <th style="vertical-align: top">{$locale->tr("text")}</th>
- <td><textarea name="commentText" id="commentText"
- rows="10" cols="50">{$edittrackback->getText()}</textarea>
- </td>
- </tr>
- <tr>
- <th>{$locale->tr("author")}</th>
- <td><input type="text" name="authorName" id=authorName"
- value="{$edittrackback->getUsername()}" /></td>
- </tr>
- <tr>
- <th>{$locale->tr("email")}</th>
- <td><input size="30" type="text" name="authorEmail" id=authorEmail"
- value="{$edittrackback->getUserEmail()}" /></td>
- </tr>
- <tr>
- <th>{$locale->tr("url")}</th>
- <td><input size=60 type="text" name="authorUrl" id="authorUrl"
- value="{$edittrackback->getUserUrl()}" /></td>
- </tr>
- <tr>
- <th>{$locale->tr("date")}</th>
- <td>
- {$locale->tr("pluginEditCommentsDateFormat")}<br/>
- <input name="commentDateTime" id="commentDateTime" class="dateTime"
- readonly="true" type="text" size="20"
- value="{$tbDay}/{$tbMonth}/{$tbYear} {$tbHour}:{$tbMinutes}" />
- <a href="javascript:NewCal('commentDateTime','ddmmyyyy',true,24);">
- <img src="imgs/admin/cal.jpg"
- alt="{$locale->tr("pick_date")}"
- style="border:0px" /></a>
- </td>
- </tr>
- <tr>
- <th>{$locale->tr("status")}</th>
- <td>
- <select name="commentStatus" id="commentStatus">
- {foreach from=$tbstatus key=name item=status}
- <option value="{$status}"
- {if $edittrackback->getStatus() == $status} selected{/if}>
- {$locale->tr($name)}</option>
- {/foreach}
- </select>
- </td>
- </tr>
- <tr>
- <th>IP</th>
- <td><input type="text" name="commentIp" id=commentIp"
- value="{$edittrackback->getClientIp()}" /></td>
- </tr>
- </table>
- </div>
-
- <div id="list_action_bar">
- <input type="hidden" name="op" value="updateTrackback" />
- <input type="hidden" name="trackbackId" value="{$edittrackback->getId()}" />
- <input type="hidden" name="articleId" value="{$edittrackback->getArticleId()}" />
- <input type="submit" name="update" value="{$locale->tr("update")}" />
- <input type="submit" name="cancel" value="{$locale->tr("pluginEditCommentsCancel")}" />
- </div>
-</form>
-
-{include file="$admintemplatepath/footer.template"}
Copied: plugins/trunk/editcomments/templates/edittrackback.template (from rev 4487, plugins/branches/lifetype-1.1/editcomments/templates/edittrackback.template)
Deleted: plugins/trunk/editcomments/templates/edittrackbacks.template
===================================================================
--- plugins/branches/lifetype-1.1/editcomments/templates/edittrackbacks.template 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/editcomments/templates/edittrackbacks.template 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,144 +0,0 @@
-{include file="$admintemplatepath/header.template"}
-{include file="$admintemplatepath/navigation.template" showOpt=editTrackbacks title=$locale->tr("editTrackbacks")}
- <script type="text/javascript" src="js/ui/plogui.js"></script>
- <script type="text/javascript">
- var errorTrackbackStatusMsg = '{$locale->tr("error_trackback_status")}';
- var showMassiveChangeOption = '{$locale->tr("show_massive_change_option")}';
- var hideMassiveChangeOption = '{$locale->tr("hide_massive_change_option")}';
- </script>
- <div id="list_nav_bar">
- <div id="list_nav_select">
-
- <form id="showBy" action="admin.php" method="post">
- <fieldset>
- <legend>{$locale->tr("show_by")} {if $post}( {$post->getTopic()} ){/if}</legend>
-
- <div class="list_nav_option">
- <label for="showStatus">{$locale->tr("status")}</label>
- <br />
- <select name="showStatus" id="showStatus">
- {foreach from=$commentstatus key=name item=status}
- <option value="{$status}" {if $currentstatus == $status} selected="selected"{/if}>{$locale->tr($name)}</option>
- {/foreach}
- </select>
- </div>
-
- <div class="list_nav_option">
- <label for="search">{$locale->tr("search_terms")}</label>
- <br />
- <input type="text" name="searchTerms" value="{$searchTerms}" size="15" id="search" />
- </div>
-
- <div class="list_nav_option">
- <br />
- <input type="hidden" name="op" value="editTrackbacks" />
- {if $post}<input type="hidden" name="articleId" value="{$post->getId()}" />{/if}
- <input type="submit" name="show" value="{$locale->tr("show")}" class="submit" />
- </div>
-
- </fieldset>
- </form>
- </div>
- <br style="clear:both;" />
- </div>
-
- <form id="postTrackbacksList" action="admin.php" method="post">
- <div class="optionIcon">
- <a id="optionIconLink" href="#bulkEdit" title="{$locale->tr("show_massive_change_option")}" onclick="switchMassiveOption()">{$locale->tr("show_massive_change_option")}</a>
- </div>
- <div id="list">
- {include file="$admintemplatepath/successmessage.template"}
- {include file="$admintemplatepath/errormessage.template"}
- <table class="info">
- <thead>
- <tr>
- <th style="width:10px;"><input class="checkbox" type="checkbox" name="all" id="all" value="1" onclick="toggleAllChecks('postTrackbacksList');" /></th>
- <th style="width:85px;">{$locale->tr("topic")}</th>
- <th style="width:360px;">{$locale->tr("text")}</th>
- <th style="width:70px;">{$locale->tr("author")}</th>
- <th style="width:60px;">{$locale->tr("date")}</th>
- <th style="width:60px;">{$locale->tr("status")}</th>
- <th style="width:45px;">IP</th>
- <th style="width:95px;">{$locale->tr("actions")}</th>
- </tr>
- </thead>
- <tbody>
- {foreach from=$comments item=trackback}
- <tr class="{cycle values="odd,even"}">
- <td>
- <input class="checkbox" type="checkbox" name="trackbackIds[{$trackback->getId()}]" id="trackbackIds[{$trackback->getId()}]" value="{$trackback->getId()}" />
- </td>
- <td class="col_highlighted">
- {$trackback->getTopic()|strip_tags|utf8_wordwrap:12:"<br/>":true}
- </td>
- <td>
- {$trackback->getText()|strip_tags|utf8_wordwrap:35:"<br/>":true}
- </td>
- <td>
- <a href="{$trackback->getUserUrl()}">{$trackback->getUserName()}</a>
- </td>
- <td>
- {assign var=date value=$trackback->getDateObject()}
- {$locale->formatDate($date)}
- </td>
- <td>
- {foreach from=$commentstatus key=name item=status}
- {if $trackback->getStatus() == $status}{$locale->tr($name)}{/if}
- {/foreach}
- </td>
- <td style="text-align: center;">
- {$trackback->getClientIp()}
- </td>
- <td>
- <div class="list_action_button">
- <a href="?op=deleteTrackback&articleId={if $post}{$post->getId()}{else}0{/if}&trackbackId={$trackback->getId()}" title="{$locale->tr("delete_trackback")}">
- <img src="imgs/admin/icon_delete-16.png" alt="{$locale->tr("delete_trackback")}" />
- </a>
- {if $bayesian_filter_enabled}
- {if $trackback->getStatus() == 0}
- <a href="?op=markTrackback&mode=1&articleId={if $post}{$post->getId()}{else}0{/if}&trackbackId={$trackback->getId()}" title="{$locale->tr("mark_as_spam")}">
- <img src="imgs/admin/icon_spam-16.png" alt="{$locale->tr("mark_as_spam")}" />
- </a>
- {elseif $trackback->getStatus() == 1}
- <a href="?op=markTrackback&mode=0&articleId={if $post}{$post->getId()}{else}0{/if}&trackbackId={$trackback->getId()}" title="{$locale->tr("mark_as_no_spam")}">
- <img src="imgs/admin/icon_nospam-16.png" alt="{$locale->tr("mark_as_no_spam")}" />
- </a>
- {/if}
- {/if}
- {if $trackback->getUserUrl()}
- <a href="{$trackback->getUserUrl()}" title="{$locale->tr("url")}">
- <img src="imgs/admin/icon_url-16.png" alt="{$locale->tr("url")}" />
- </a>
- {/if}
- <a href="?op=editTrackback&trackbackId={$trackback->getId()}"><img src="imgs/admin/icon_edit-16.png" alt="{$locale->tr("edit")}" /></a>
- </div>
- </td>
- </tr>
- {/foreach}
- </tbody>
- </table>
- </div>
- <a name="bulkEdit"></a>
- <div id="list_action_bar">
- {adminpager style=list}
- <input type="hidden" name="articleId" value="{if $post}{$post->getId()}{else}0{/if}" />
- <input type="button" name="delete" value="{$locale->tr("delete")}" class="submit" onClick="javascript:submitTrackbacksList('deleteTrackbacks');" />
- <input type="hidden" name="op" value="" />
- <div id="massiveChangeOption" style="display: none;">
- <fieldset>
- <legend>{$locale->tr("massive_change_option")}</legend>
- <label for="trackbackStatus">{$locale->tr("status")}</label>
- <select name="trackbackStatus" id="trackbackStatus">
- <option value="-1">-{$locale->tr("select")}-</option>
- {foreach from=$commentstatusWithoutAll key=name item=status}
- {if ($status != 0 && $status != 1) || $bayesian_filter_enabled}<option value="{$status}">{$locale->tr($name)}</option>{/if}
- {/foreach}
- </select>
- <input type="button" name="changeTrackbacksStatus" value="{$locale->tr("change_status")}" class="submit" onClick="javascript:submitTrackbacksList('changeTrackbacksStatus');" />
- </fieldset>
- </div>
- </div>
-
- </form>
-{include file="$admintemplatepath/footernavigation.template"}
-{include file="$admintemplatepath/footer.template"}
\ No newline at end of file
Copied: plugins/trunk/editcomments/templates/edittrackbacks.template (from rev 4487, plugins/branches/lifetype-1.1/editcomments/templates/edittrackbacks.template)
Copied: plugins/trunk/gallery (from rev 4487, plugins/branches/lifetype-1.1/gallery)
Deleted: plugins/trunk/gallery/README
===================================================================
--- plugins/branches/lifetype-1.1/gallery/README 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/gallery/README 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,23 +0,0 @@
-PLUGIN: Embbeded Gallery
-AUTHOR: Laurent Vauthrin
-
-1. Download Gallery2 from http://gallery.menalto.com/ and install it.
-2. Copy this plugin to the plugins directory and configure it.
-3. Add the following to your template so that it adds the link.
- {if $gallery->isEnabled()}
- <a title="My Photos" href="index.php?op=gallery">
- {$locale->tr("gallery")}
- </a>
- {/if}
-4. Optionally add the following for image blocks
- {if $gallery->isEnabled()}{$gallery->getImageBlock()}{/if}
-
-Once it is all done, you may want to change the template that is used to display the
-gallery. The template file (galleryShow.template) is located in the plugin's templates folder.
-More information is available in that file. You should also modify your template's css
-(if you don't plan on using the one returned by gallery) so that the albums look better.
-
-There is room for improvement. For example, no user/session information is passed between
-Gallery and pLog even though the capability is there.
-
-Gallery2 is in beta so there are likely to be changes.
Copied: plugins/trunk/gallery/README (from rev 4487, plugins/branches/lifetype-1.1/gallery/README)
Copied: plugins/trunk/gallery/class (from rev 4487, plugins/branches/lifetype-1.1/gallery/class)
Copied: plugins/trunk/gallery/class/action (from rev 4487, plugins/branches/lifetype-1.1/gallery/class/action)
Deleted: plugins/trunk/gallery/class/action/plugingalleryconfigaction.class.php
===================================================================
--- plugins/branches/lifetype-1.1/gallery/class/action/plugingalleryconfigaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/gallery/class/action/plugingalleryconfigaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,39 +0,0 @@
-<?php
-include_once( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
-include_once( PLOG_CLASS_PATH."plugins/gallery/class/view/plugingalleryconfigview.class.php" );
-
-/**
- * This class is responsible for processing the gallery plugin config action.
- *
- * @version 0.1
- * @author Laurent Vauthrin
- */
-class PluginGalleryConfigAction extends AdminAction
-{
- /**
- * Constructor.
- *
- * @param $actionInfo The action information.
- * @param $request The HTTP request information.
- * @return Returns the value passed back by AdminAction.
- */
- function PluginGalleryConfigAction( $actionInfo, $request )
- {
- $this->AdminAction( $actionInfo, $request );
- }
-
- /**
- * This function performs the action.
- *
- * @param None.
- * @return Returns true
- */
- function perform()
- {
- $this->_view = new PluginGalleryConfigView( $this->_blogInfo );
- $this->setCommonData();
-
- return true;
- }
-}
-?>
Copied: plugins/trunk/gallery/class/action/plugingalleryconfigaction.class.php (from rev 4487, plugins/branches/lifetype-1.1/gallery/class/action/plugingalleryconfigaction.class.php)
Deleted: plugins/trunk/gallery/class/action/plugingalleryshowaction.class.php
===================================================================
--- plugins/branches/lifetype-1.1/gallery/class/action/plugingalleryshowaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/gallery/class/action/plugingalleryshowaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,39 +0,0 @@
-<?php
-include_once( PLOG_CLASS_PATH."class/action/blogaction.class.php" );
-include_once( PLOG_CLASS_PATH."plugins/gallery/class/view/plugingalleryshowview.class.php" );
-
-/**
- * This class is responsible for performing the show gallery action.
- *
- * @version 0.1
- * @author Laurent Vauthrin
- */
-class PluginGalleryShowAction extends BlogAction
-{
- /**
- * Constructor.
- *
- * @param $actionInfo The action information.
- * @param $request The HTTP request information.
- * @return Returns the value passed back by AdminAction.
- */
- function PluginGalleryShowAction( $actionInfo, $request )
- {
- return $this->BlogAction( $actionInfo, $request );
- }
-
- /**
- * This function performs the action.
- *
- * @param None.
- * @return Returns true.
- */
- function perform()
- {
- $this->_view = new PluginGalleryShowView( $this->_blogInfo );
- $this->setCommonData();
-
- return true;
- }
-}
-?>
Copied: plugins/trunk/gallery/class/action/plugingalleryshowaction.class.php (from rev 4487, plugins/branches/lifetype-1.1/gallery/class/action/plugingalleryshowaction.class.php)
Deleted: plugins/trunk/gallery/class/action/plugingalleryupdateconfigaction.class.php
===================================================================
--- plugins/branches/lifetype-1.1/gallery/class/action/plugingalleryupdateconfigaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/gallery/class/action/plugingalleryupdateconfigaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,159 +0,0 @@
-<?php
-include_once( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
-include_once( PLOG_CLASS_PATH."plugins/gallery/class/view/plugingalleryconfigview.class.php" );
-
-/**
- * This class is responsible for updating the gallery plugin settings.
- *
- * @version 0.1
- * @author Laurent Vauthrin
- */
-class PluginGalleryUpdateConfigAction extends AdminAction
-{
- /**
- * @private
- */
- var $_pluginEnabled;
- var $_sidebarEnabled;
- var $_sidebarGreetingEnabled;
- var $_pathbarEnabled;
- var $_absolutePath;
- var $_embedUri;
- var $_embedPath;
- var $_relativPath;
- var $_blocks;
- var $_show;
- var $_itemid;
-
- /**
- * Constructor.
- *
- * @param $actionInfo The action information.
- * @param $request The HTTP request information.
- * @return Returns the value passed back by AdminAction.
- */
- function PluginGalleryUpdateConfigAction( $actionInfo, $request )
- {
- $this->AdminAction( $actionInfo, $request );
- }
-
- /**
- * This function validates the form inputs.
- *
- * @param None.
- * @return Returns true.
- */
- function validate()
- {
- $this->_pluginEnabled = $this->_request->getValue( "pluginEnabled" );
- $this->_pluginEnabled = ( $this->_pluginEnabled != "" );
-
- $this->_sidebarEnabled = $this->_request->getValue( "sidebarEnabled" );
- $this->_sidebarEnabled = ( $this->_sidebarEnabled != "" );
-
- $this->_sidebarGreetingEnabled = $this->_request->getValue( "sidebarGreetingEnabled" );
- $this->_sidebarGreetingEnabled = ( $this->_sidebarGreetingEnabled != "" );
-
- $this->_pathbarEnabled = $this->_request->getValue( "pathbarEnabled" );
- $this->_pathbarEnabled = ( $this->_pathbarEnabled != "" );
-
- $this->_absolutePath = $this->_request->getValue( "absolutePath" );
- $this->_embedUri = $this->_request->getValue( "embedUri" );
- $this->_embedPath = $this->_request->getValue( "embedPath" );
- $this->_relativePath = $this->_request->getValue( "relativePath" );
-
- $this->_blocks = $this->_request->getValue( "blocks" );
- $this->_show = $this->_request->getValue( "show" );
- $this->_itemid = $this->_request->getValue( "itemid" );
-
- if ( $this->_embedUri == "" || $this->_absolutePath == "" ||
- $this->_embedPath == "" || $this->_relativePath == "" ) {
-
- $this->_view = new PluginGalleryConfigView( $this->_blogInfo );
- $this->_view->setErrorMessage( $this->_locale->tr( "error_required_missing" ) );
- $this->setCommonData();
-
- return false;
- }
-
- // TODO: run checks to make sure that blocks and show have valid values
-
- if ( $this->_blocks == "specificItem" && $this->_itemid == "" ) {
- $this->_view = new PluginGalleryConfigView( $this->_blogInfo );
- $this->_view->setErrorMessage( $this->_locale->tr( "error_itemid" ) );
- $this->setCommonData();
-
- return false;
- }
-
- if ( $this->_blocks != "specificItem" ) {
- //$this->_itemid = "";
- }
-
- if ( !file_exists( $this->_absolutePath ) ) {
-
- $this->_view = new PluginGalleryConfigView( $this->_blogInfo );
- $this->_view->setErrorMessage( $this->_locale->tr( "error_absolute_path" ) );
- $this->setCommonData();
-
- return false;
- }
-
- return true;
- }
-
- /**
- * This function performs the action.
- *
- * @param None.
- * @return Returns true if the update was successful; otherwise returns false.
- */
- function perform()
- {
- // Get the blog settings
- $blogSettings = $this->_blogInfo->getSettings();
-
- // Update the relevant values with the form inputs
- $blogSettings->setValue( "plugin_gallery_enabled", $this->_pluginEnabled );
- $blogSettings->setValue( "gallery_sidebar_enabled", $this->_sidebarEnabled );
- $blogSettings->setValue( "gallery_sidebarGreeting_enabled",
- $this->_sidebarGreetingEnabled );
- $blogSettings->setValue( "gallery_pathbar_enabled", $this->_pathbarEnabled );
- $blogSettings->setValue( "gallery_absolute_path", $this->_absolutePath );
- $blogSettings->setValue( "gallery_embed_uri", $this->_embedUri );
- $blogSettings->setValue( "gallery_embed_path", $this->_embedPath );
- $blogSettings->setValue( "gallery_relative_path", $this->_relativePath );
- $blogSettings->setValue( "gallery_blocks", $this->_blocks );
- $blogSettings->setValue( "gallery_show", $this->_show );
- $blogSettings->setValue( "gallery_itemid", $this->_itemid );
-
- // Set and save the new blog settings
- $this->_blogInfo->setSettings( $blogSettings );
- $blogs = new Blogs();
-
- // Display an error message if there was a problem with the update
- if( !$blogs->updateBlog( $this->_blogInfo ) ) {
- $this->_view = new PluginGalleryConfigView( $this->_blogInfo );
- $this->_view->setErrorMessage( $this->_locale->tr( "error_updating_settings" ) );
- $this->setCommonData();
-
- return false;
- }
-
- // If things went well, save the session...
- $this->_blogInfo->setSettings( $blogSettings );
- $this->_session->setValue( "blogInfo", $this->_blogInfo );
- $this->saveSession();
-
- // and show the success message
- $this->_view = new PluginGalleryConfigView( $this->_blogInfo );
- $this->_view->setSuccessMessage( $this->_locale->tr( "gallery_settings_saved_ok" ) );
- $this->setCommonData();
-
- // clear the cache
- CacheControl::resetBlogCache( $this->_blogInfo->getId() );
-
- return true;
- }
-}
-?>
Copied: plugins/trunk/gallery/class/action/plugingalleryupdateconfigaction.class.php (from rev 4487, plugins/branches/lifetype-1.1/gallery/class/action/plugingalleryupdateconfigaction.class.php)
Copied: plugins/trunk/gallery/class/gallery (from rev 4487, plugins/branches/lifetype-1.1/gallery/class/gallery)
Deleted: plugins/trunk/gallery/class/gallery/galleryhelper.class.php
===================================================================
--- plugins/branches/lifetype-1.1/gallery/class/gallery/galleryhelper.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/gallery/class/gallery/galleryhelper.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,216 +0,0 @@
-<?php
-
-
-/**
- * This class calls the gallery embedding functions.
- *
- * @version 0.1
- * @author Laurent Vauthrin
- */
-class GalleryHelper
-{
- /**
- * @private
- */
- var $_absolutePath;
- var $_embedUri;
- var $_embedPath;
- var $_relativePath;
- var $_title;
- var $_css;
- var $_javascript;
- var $_body;
- var $_error;
-
- /**
- * Constructor used to make a request to Gallery
- *
- * @param $absolutePath Path to the gallery application
- * @param $embedUri File to plog main file
- * @param $embedPath Path to document root from pLog
- * @param $relativePath Path to gallery from pLog
- * @return None.
- */
- function GalleryHelper( $absolutePath,
- $embedUri,
- $embedPath,
- $relativePath )
- {
-
- $this->_absolutePath = $absolutePath;
- $this->_embedUri = $embedUri;
- $this->_embedPath = $embedPath;
- $this->_relativePath = $relativePath;
- }
-
- /**
- * Function which retrieves your galleries
- *
- * @param $sidebarEnabled Boolean used to show/hide the side bar
- * @param $sidebarGreetingEnabled Boolean used to show/hide the side greeting
- * @param $pathbarEnabled Boolean used to show/hide the path bar
- * @return Error object or Gallery HTML.
- */
- function getGallery( $sidebarEnabled,
- $sidebarGreetingEnabled,
- $pathbarEnabled )
- {
- require_once( $this->_absolutePath );
-
- // Set up the gallery call
- $ret = GalleryEmbed::init( array( 'embedUri' => $this->_embedUri,
- 'g2Uri' => $this->_relativePath,
- 'loginRedirect' => '/index.php',
- 'activeUserId' => '' ) );
-
- // Return error details if there is a problem
- if ($ret != null) {
- $this->_error = $ret->getAsHtml();
- return;
- }
-
- // Set gallery options
- GalleryCapabilities::set( 'showSidebar', $sidebarEnabled );
- GalleryCapabilities::set( 'showSidebarGreeting', $sidebarGreetingEnabled );
- GalleryCapabilities::set( 'showPathbar', $pathbarEnabled );
-
- // Process the request
- $g2data = GalleryEmbed::handleRequest();
-
- // Gallery has already sent output (redirect or binary data)
- if ( $g2data['isDone'] ) {
- exit;
- }
-
- // Retrieve the html head
- if ( isset( $g2data['headHtml'] ) ) {
- list( $title, $css, $javascript ) = GalleryEmbed::parseHead( $g2data['headHtml'] );
- $this->_title = $title;
- $this->_css = $css;
- $this->_javascript = $javascript;
- }
-
- // Tell gallery that you are done
- $ret = GalleryEmbed::done();
-
- // Check for errors
- if ($ret != null) {
- return $ret->getAsHtml();
- }
-
- // Retrieve the html body
- $this->_body = $g2data['bodyHtml'];
- }
-
- /**
- * Function which retrieve's Gallery's image block
- *
- * @param $blocks Identifies what image you want to see.
- * @param $show Identifies what to display with the image.
- * @param $itemid The Itemd ID of the image to be shown (must specify in blocks).
- * @return Error object or image block HTML.
- */
- function getImageBlock( $blocks,
- $show,
- $itemid)
-
- {
- require_once($this->_absolutePath);
-
- // Set up the gallery call
-
- $ret = GalleryEmbed::init( array( 'embedUri' => $this->_embedUri,
- 'g2Uri' => $this->_relativePath,
- 'loginRedirect' => '/index.php',
- 'activeUserId' => '',
- 'fullInit' => true) );
-
- // Check for errors
- if ($ret != null) {
- return $ret->getAsHtml();
- }
-
- // Get the image block
- if ( $itemid != "" ) {
- if (is_numeric($itemid) == false) {
- list($ret, $itemid) = GalleryCoreApi::fetchItemIdByPath($itemid);
- }
- list($ret, $g2data) = GalleryEmbed::getImageBlock( array( 'blocks' => $blocks,
- 'show' => $show,
- 'itemId' => $itemid) );
- } else {
- list($ret, $g2data) = GalleryEmbed::getImageBlock( array( 'blocks' => $blocks,
- 'show' => $show ) );
- }
-
- // Check for errors
- if ($ret != null) {
- return $ret->getAsHtml();
- }
-
- // Tell gallery that you are done
- $ret = GalleryEmbed::done();
-
- // Check for errors
- if ($ret != null) {
- return $ret->getAsHtml();
- }
-
- return $g2data;
- }
-
- /**
- * Accessor function used to retrieve the gallery title
- *
- * @param None.
- * @return Gallery title.
- */
- function getTitle()
- {
- return $this->_title;
- }
-
- /**
- * Accessor function used to retrieve the gallery style sheet
- *
- * @param None.
- * @return Gallery style sheet.
- */
- function getCSS()
- {
- return $this->_css;
- }
-
- /**
- * Accessor function used to retrieve the gallery javascript
- *
- * @param None.
- * @return Gallery javascript.
- */
- function getJavascript()
- {
- return $this->_javascript;
- }
-
- /**
- * Accessor function used to retrieve the actual gallery
- *
- * @param None.
- * @return Gallery body.
- */
- function getBody()
- {
- return $this->_body;
- }
-
- /**
- * Accessor function used to retrieve error messages
- *
- * @param None.
- * @return Gallery error message.
- */
- function getError()
- {
- return $this->_error;
- }
-}
Copied: plugins/trunk/gallery/class/gallery/galleryhelper.class.php (from rev 4487, plugins/branches/lifetype-1.1/gallery/class/gallery/galleryhelper.class.php)
Copied: plugins/trunk/gallery/class/view (from rev 4487, plugins/branches/lifetype-1.1/gallery/class/view)
Deleted: plugins/trunk/gallery/class/view/plugingalleryconfigview.class.php
===================================================================
--- plugins/branches/lifetype-1.1/gallery/class/view/plugingalleryconfigview.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/gallery/class/view/plugingalleryconfigview.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,63 +0,0 @@
-<?php
-
-include_once( PLOG_CLASS_PATH."class/view/admin/adminplugintemplatedview.class.php" );
-
-/**
- * Implements the config view for the gallery plugin
- *
- * @version 0.1
- * @author Laurent Vauthrin
- */
-class PluginGalleryConfigView extends AdminPluginTemplatedView {
-
- /**
- * Constructor
- *
- * @param $blogInfo Blog specific information.
- * @return None.
- */
- function PluginGalleryConfigView( $blogInfo ) {
- $this->AdminPluginTemplatedView( $blogInfo, "gallery", "galleryAdmin" );
- }
-
- /**
- * This function renders the admin view
- *
- * @param None.
- * @return Returns true.
- */
- function render() {
-
- // Get the current gallery plugin settings
- $blogSettings = $this->_blogInfo->getSettings();
- $pluginEnabled = $blogSettings->getValue( "plugin_gallery_enabled" );
- $sidebarEnabled = $blogSettings->getValue( "gallery_sidebar_enabled" );
- $sidebarGreetingEnabled = $blogSettings->getValue( "gallery_sidebarGreeting_enabled" );
- $pathbarEnabled = $blogSettings->getValue( "gallery_pathbar_enabled" );
- $absolutePath = $blogSettings->getValue( "gallery_absolute_path" );
- $embedUri = $blogSettings->getValue( "gallery_embed_uri" );
- $embedPath = $blogSettings->getValue( "gallery_embed_path" );
- $relativePath = $blogSettings->getValue( "gallery_relative_path" );
- $blocks = $blogSettings->getValue( "gallery_blocks" );
- $show = $blogSettings->getValue( "gallery_show" );
- $itemid = $blogSettings->getValue( "gallery_itemid" );
-
- // Export the settings to the template
- $this->setValue( "pluginEnabled", $pluginEnabled );
- $this->setValue( "sidebarEnabled", $sidebarEnabled );
- $this->setValue( "sidebarGreetingEnabled", $sidebarGreetingEnabled );
- $this->setValue( "pathbarEnabled", $pathbarEnabled );
- $this->setValue( "absolutePath", $absolutePath );
- $this->setValue( "embedUri", $embedUri );
- $this->setValue( "embedPath", $embedPath );
- $this->setValue( "relativePath", $relativePath );
- $this->setValue( "blocks", $blocks );
- $this->setValue( "show", $show );
- $this->setValue( "itemid", $itemid );
-
- parent::render();
-
- return true;
- }
-}
-?>
Copied: plugins/trunk/gallery/class/view/plugingalleryconfigview.class.php (from rev 4487, plugins/branches/lifetype-1.1/gallery/class/view/plugingalleryconfigview.class.php)
Deleted: plugins/trunk/gallery/class/view/plugingalleryshowview.class.php
===================================================================
--- plugins/branches/lifetype-1.1/gallery/class/view/plugingalleryshowview.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/gallery/class/view/plugingalleryshowview.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,70 +0,0 @@
-<?php
-include_once( PLOG_CLASS_PATH."class/view/plugintemplatedview.class.php" );
-include_once( PLOG_CLASS_PATH."plugins/gallery/class/gallery/galleryhelper.class.php" );
-
-/**
- * This class creates the view for the embedded gallery.
- *
- * @version 0.1
- * @author Laurent Vauthrin
- */
-class PluginGalleryShowView extends PluginTemplatedView
-{
-
- /**
- * Constructor to create a non-cached view
- *
- * @param $blogInfo Blog specific information.
- * @return None.
- */
- function PluginGalleryShowView( $blogInfo )
- {
- $this->PluginTemplatedView( $blogInfo,
- "gallery",
- "galleryShow",
- SMARTY_VIEW_CACHE_DISABLED );
- }
-
- /**
- * This function renders the gallery view
- *
- * @param None.
- * @return Returns true.
- */
- function render()
- {
- // Get the current gallery settings
- $blogSettings = $this->_blogInfo->getSettings();
- $pluginEnabled = $blogSettings->getValue( "plugin_gallery_enabled" );
- $sidebarEnabled = $blogSettings->getValue( "gallery_sidebar_enabled" );
- $sidebarGreetingEnabled = $blogSettings->getValue( "gallery_sidebarGreeting_enabled" );
- $pathbarEnabled = $blogSettings->getValue( "gallery_pathbar_enabled" );
- $absolutePath = $blogSettings->getValue( "gallery_absolute_path" );
- $embedUri = $blogSettings->getValue( "gallery_embed_uri" );
- $embedPath = $blogSettings->getValue( "gallery_embed_path" );
- $relativePath = $blogSettings->getValue( "gallery_relative_path" );
-
- // Create a gallery helper object to interact with gallery
- $gallery = new GalleryHelper( $absolutePath,
- $embedUri,
- $embedPath,
- $relativePath);
-
- $gallery->getGallery($sidebarEnabled,
- $sidebarGreetingEnabled,
- $pathbarEnabled);
-
- // Export values to the template
- $this->setValue( "pluginEnabled", $pluginEnabled );
- $this->setValue( "galleryTitle", $gallery->getTitle() );
- $this->setValue( "galleryCSS", $gallery->getCSS() );
- $this->setValue( "galleryJavascript", $gallery->getJavascript() );
- $this->setValue( "galleryBody", $gallery->getBody() );
- $this->setValue( "galleryError", $gallery->getError() );
-
- parent::render();
-
- return true;
- }
-}
-?>
Copied: plugins/trunk/gallery/class/view/plugingalleryshowview.class.php (from rev 4487, plugins/branches/lifetype-1.1/gallery/class/view/plugingalleryshowview.class.php)
Copied: plugins/trunk/gallery/locale (from rev 4487, plugins/branches/lifetype-1.1/gallery/locale)
Deleted: plugins/trunk/gallery/locale/locale_en_UK.php
===================================================================
--- plugins/branches/lifetype-1.1/gallery/locale/locale_en_UK.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/gallery/locale/locale_en_UK.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,81 +0,0 @@
-<?php
-$messages["embeddedApps"] = "Embedded Applications";
-$messages["Gallery"] = "Gallery";
-$messages["gallery_plugin"] = "Gallery Plugin";
-
-$messages["gallery_sidebar_enabled"] = "Show sidebar";
-$messages["gallery_sidebarGreeting_enabled"] = "Show sidebar greeting";
-$messages["gallery_pathbar_enabled"] = "Show pathbar";
-
-$messages["error_gallery_not_enabled"] = "Please enable Gallery plugin first.";
-$messages["error_required_missing"] = "Please fill in all required values.";
-$messages["error_absolute_path"] = "Absolute path doesn't seem to be correct.";
-$messages["error_itemid"] = "You must fill in Item Id if you choose 'specificItem' in blocks";
-$messages["gallery_settings_saved_ok"] = "Gallery settings saved successfully!";
-
-$messages["label_configuration"] = "Configuration";
-$messages["label_enable"] = "Enable this plugin";
-$messages["label_default"] = "Default";
-$messages["label_sidebar"] = "Enable side bar";
-$messages["label_sidebar_greeting"] = "Enable side bar greeting";
-$messages["label_sidepath"] = "Enable side path";
-$messages["label_absolute_path"] = "embed.php path";
-$messages["label_embed_uri"] = "embedUri";
-$messages["label_embed_path"] = "embedPath (never use now)";
-$messages["label_relative_path"] = "g2Uri";
-$messages["label_example"] = "Example:";
-$messages["label_blocks"] = "Blocks";
-$messages["label_show"] = "Show";
-$messages["label_itemid"] = "Item ID";
-
-$messages["help_enable"] = "Enables the gallery plugin";
-$messages["help_sidebar"] = "Enable the Gallery side bar. This allows for extended functionality.";
-$messages["help_sidebar_greeting"] = "Displays a welcome message to the user.";
-$messages["help_sidepath"] = "Displays a navigation path to the user.";
-$messages["help_absolute_path"] = "Path to Gallery's embed.php file (ex. /usr/share/gallery2/embed.php).";
-$messages["help_embed_uri"] = "Gallery URI used in LifeType.";
-$messages["help_embed_path"] = "URL path from document root to pLog directory. (Never use now, just input / or anything you like)";
-$messages["help_relative_path"] = "Gallery's main.php directory.";
-$messages["help_example"] = "<pre><br />".
-"a) Use different virtualhost:<br />".
-"<br />".
-" Gallery install at /usr/share/gallery2<br />".
-" LifeType URL is http://blog.teatime.com.tw<br />".
-" Gallery URL is http://gallery.teatime.com.tw<br />".
-" LifeType's blogId is 123<br />".
-" The imageblock you want is Gallery's photo in 'v/tommy_baby' this album<br />".
-"<br />".
-" Setting:<br />".
-"<br />".
-" embed.php path: /usr/share/gallery2/embed.php<br />".
-" embedUri: blog.teatime.com.tw/index.php?op=gallery&blogId=123<br />".
-" g2Uri: gallery.teatime.com.tw/main.php<br />".
-" Blocks: randomImage<br />".
-" Item ID: /tommy_baby<br />".
-"<br />".
-"<br />".
-"b) Use same virtualhost:<br />".
-"<br />".
-" Gallery install at /home/abc/public_html/gallery2<br />".
-" LifeType install at /home/abc/public_html/blog<br />".
-" LifeType URL is http://www.teatime.com.tw/~abc/blog<br />".
-" Gallery URL is http://www.teatime.com.tw/~abc/gallery2<br />".
-" LifeType's blogId is 321<br />".
-" The imageblock you want is this photo 'v/tommy_baby/abc/123.jpg' in gallery<br />".
-"<br />".
-" Setting:<br />".
-"<br />".
-" embed.php path: /home/abc/public_html/gallery2/embed.php<br />".
-" embedUri: /blog/index.php?op=gallery&blogId=321<br />".
-" g2Uri: /gallery2/main.php<br />".
-" Blocks: specificItem<br />".
-" ItemID: /tommy_baby/abc/123.jpg<br />".
-"<br /></pre>";
-$messages["help_blocks"] = "A pipe (|) separated list, of one or more possible blocks which are:<br/>".
-" * randomImage|recentImage|viewedImage|randomAlbum|recentAlbum|viewedAlbum|specificItem<br/>".
-" * dailyImage|weeklyImage|monthlyImage|dailyAlbum|weeklyAlbum|monthlyAlbum";
-$messages["help_show"] = "A pipe (|) separated list of one or more possible choices which are:<br/>".
-" * title|date|views|owner|heading|fullSize or just 'none'";
-$messages["help_itemid"] = "If you choose 'blocks' = 'specificItem', you have to specify this field. If you chioose 'blocks' = 'randomImage', you can specify this field to a ablum, it will show the picture in this album randomly.<br />".
-"PS: itemId could be an ID show in Gallery's URL, or if you use a rewrite function in gallery, you can use the path name as the itemId, just like the example above.";
-?>
Copied: plugins/trunk/gallery/locale/locale_en_UK.php (from rev 4487, plugins/branches/lifetype-1.1/gallery/locale/locale_en_UK.php)
Deleted: plugins/trunk/gallery/locale/locale_zh_TW.php
===================================================================
--- plugins/branches/lifetype-1.1/gallery/locale/locale_zh_TW.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/gallery/locale/locale_zh_TW.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,81 +0,0 @@
-<?php
-$messages["embeddedApps"] = "嵌入應用程å¼å¤–掛";
-$messages["Gallery"] = "Gallery 外掛è¨å®š";
-$messages["gallery_plugin"] = "Gallery 外掛è¨å®š";
-
-$messages["gallery_sidebar_enabled"] = "Show sidebar";
-$messages["gallery_sidebarGreeting_enabled"] = "Show sidebar greeting";
-$messages["gallery_pathbar_enabled"] = "Show pathbar";
-
-$messages["error_gallery_not_enabled"] = "請先啟動 Gallery 外掛模組.";
-$messages["error_required_missing"] = "請輸入所有必è¦æ¬„ä½.";
-$messages["error_absolute_path"] = "embed.php 的路徑ä¸æ£ç¢º.";
-$messages["error_itemid"] = "ç•¶ä½ é¸æ“‡ä½¿ç”¨ specificItem 時, å°±å¿…é ˆè¼¸å…¥ Gallery é …ç›®ä»£ç¢¼.";
-$messages["gallery_settings_saved_ok"] = "Gallery 外掛模組è¨å®šæˆåŠŸå„²å˜!";
-
-$messages["label_configuration"] = "è¨å®š";
-$messages["label_enable"] = "啟動這個外掛模組";
-$messages["label_default"] = "é è¨å€¼";
-$messages["label_sidebar"] = "顯示 Gallery ä¸çš„ side bar";
-$messages["label_sidebar_greeting"] = "在 Gallery ä¸çš„ side bar 顯示æ¡è¿Žè¨Šæ¯";
-$messages["label_sidepath"] = "在 Gallery çš„ side bar 顯示ç€è¦½è·¯å¾‘";
-$messages["label_absolute_path"] = "embed.php 所在路徑";
-$messages["label_embed_uri"] = "embedUri åƒæ•¸";
-$messages["label_embed_path"] = "embedPath åƒæ•¸ (無作用)";
-$messages["label_relative_path"] = "g2Uri åƒæ•¸";
-$messages["label_example"] = "範例:";
-$messages["label_blocks"] = "圖片å€å¡Š";
-$messages["label_show"] = "é¡¯ç¤ºé …ç›®";
-$messages["label_itemid"] = "Gallery é …ç›®ä»£ç¢¼";
-
-$messages["help_enable"] = "啟動 Gallery 外掛模組";
-$messages["help_sidebar"] = "顯示 Gallery çš„ side bar. (試ä¸å‡ºé¸ä¸é¸æœ‰ä»€éº¼å·®åˆ¥)";
-$messages["help_sidebar_greeting"] = "在 Gallery çš„ side bar ä¸é¡¯ç¤ºæ¡è¿Žè¨Šæ¯. (試ä¸å‡ºé¸ä¸é¸æœ‰ä»€éº¼å·®åˆ¥)";
-$messages["help_sidepath"] = "在 Gallery çš„ side bar ä¸é¡¯ç¤ºç€è¦½è·¯å¾‘. (試ä¸å‡ºé¸ä¸é¸æœ‰ä»€éº¼å·®åˆ¥)";
-$messages["help_absolute_path"] = "Gallery 的 embed.php 檔案完整路徑 (如: /usr/share/gallery2/embed.php).";
-$messages["help_embed_uri"] = "在 LifeType ä¸åŸ·è¡Œ Gallery 功能時所用的連çµ.";
-$messages["help_embed_path"] = "ç›®å‰å·²ç¶“無作用, 請輸入 / å°±å¯ä»¥äº†.";
-$messages["help_relative_path"] = "Gallery main.php 的路徑.";
-$messages["help_example"] = "<pre><br />".
-"a) 使用ä¸ç”¨è™›æ“¬ä¸»æ©Ÿæ™‚:<br />".
-"<br />".
-" Gallery 安è£æ–¼ /usr/share/gallery2<br />".
-" LifeType 網å€æ˜¯ http://blog.teatime.com.tw<br />".
-" Gallery 網å€æ˜¯ http://gallery.teatime.com.tw<br />".
-" LifeType 的 blog 代碼是 123<br />".
-" è¦é¡¯ç¤ºçš„圖片å€å¡Šæ˜¯éš¨æ©Ÿé¸æ“‡ Gallery å…§ v/tommy_baby 這個相簿內的相片<br />".
-"<br />".
-" è¨å®šå¦‚下:<br />".
-"<br />".
-" embed.php 所在路徑: /usr/share/gallery2/embed.php<br />".
-" embedUri åƒæ•¸: blog.teatime.com.tw/index.php?op=gallery&blogId=123<br />".
-" g2Uri åƒæ•¸: gallery.teatime.com.tw/main.php<br />".
-" 圖片å€å¡Š: randomImage<br />".
-" Gallery é …ç›®ä»£ç¢¼: /tommy_baby<br />".
-"<br />".
-"<br />".
-"b) 使用相åŒè™›æ“¬ä¸»æ©Ÿæ™‚:<br />".
-"<br />".
-" Gallery 安è£æ–¼ /home/abc/public_html/gallery2<br />".
-" LifeType 安è£æ–¼ /home/abc/public_html/blog<br />".
-" LifeType 網å€æ˜¯ http://www.teatime.com.tw/~abc/blog<br />".
-" Gallery 網å€æ˜¯ http://www.teatime.com.tw/~abc/gallery2<br />".
-" LifeType 的 blog 代碼是 321<br />".
-" è¦é¡¯ç¤ºçš„圖片å€å¡Šæ˜¯æŒ‡å®š Gallery å…§ v/tommy_baby/abc/123.jpg 這張相片<br />".
-"<br />".
-" è¨å®šå¦‚下:<br />".
-"<br />".
-" embed.php 所在路徑: /home/abc/public_html/gallery2/embed.php<br />".
-" embedUri åƒæ•¸: /blog/index.php?op=gallery&blogId=321<br />".
-" g2Uri åƒæ•¸: /gallery2/main.php<br />".
-" 圖片å€å¡Š: specificItem<br />".
-" Gallery é …ç›®ä»£ç¢¼: /tommy_baby/abc/123.jpg<br />".
-"<br /></pre>";
-$messages["help_blocks"] = "é¸æ“‡è¦é¡¯ç¤ºçš„圖片å€å¡Š, å¯ä»¥æ˜¯ä¸‹é¢é¸é …ä¸çš„一個或數個, 當é¸æ“‡ä¸åªä¸€å€‹é¸é …時, 請使用 | 分隔<br />".
-" * randomImage|recentImage|viewedImage|randomAlbum|recentAlbum|viewedAlbum|specificItem<br/>".
-" * dailyImage|weeklyImage|monthlyImage|dailyAlbum|weeklyAlbum|monthlyAlbum";
-$messages["help_show"] = "é¸æ“‡åœ¨åœ–片å€å¡Šä¸è¦é¡¯ç¤ºçš„æ–‡å—訊æ¯, å¯ä»¥æ˜¯ä¸‹é¢é¸é …的一個或數個, 如果é¸æ“‡ä¸åªä¸€å€‹é¸é …時, 請使用 | 分隔<br />".
-" * title|date|views|owner|heading|fullSize 或者ä¸è¦é¡¯ç¤ºæ™‚, è«‹å¡«å…¥ 'none'";
-$messages["help_itemid"] = "圖片å€å¡Šæ‰€è¦é¡¯ç¤ºçš„相片或相簿在 Gallery çš„é …ç›®ä»£ç¢¼. 也就是一般在 Gallery ä¸, 使用的 itemId åƒæ•¸ (如果沒有使用 rewrite 功能, 應該在 URL 上é å¯ä»¥çœ‹åˆ°). 或者是相片或相簿的路徑 (在使用 rewrite 功能後, Gallery 通常用 /v/abc/def/ijk.jpg 來表示相片, 或 /v/abc/def 來表示相簿, 這時路徑就是 /abc/def/ijk.jpg 或 /abc/def, 就是表å‰é çš„ /v 移除就å°äº†). å¦‚æžœä½ è¦ä½¿ç”¨çš„是路徑, 請在最å‰é åŠ ä¸Š / å—å…ƒ, 以é¿å…路徑剛好是數å—時, 會被èªç‚ºæ˜¯é …目代碼. å¦‚æžœä½ çš„åœ–ç‰‡å€å¡Šé¸æ“‡ 'specificItem' 時, 這個欄ä½å°±å¿…é ˆè¼¸å…¥æ£ç¢ºçš„資料.<br />".
-"PS. 如果圖片å€å¡Šé¸æ“‡ 'randomImage', 且這個欄ä½è¼¸å…¥çš„æ˜¯ç›¸ç°¿çš„é …ç›®ä»£ç¢¼æˆ–è·¯å¾‘, 表示隨機顯示該相簿內的相片.";
-?>
Copied: plugins/trunk/gallery/locale/locale_zh_TW.php (from rev 4487, plugins/branches/lifetype-1.1/gallery/locale/locale_zh_TW.php)
Deleted: plugins/trunk/gallery/plugingallery.class.php
===================================================================
--- plugins/branches/lifetype-1.1/gallery/plugingallery.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/gallery/plugingallery.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,114 +0,0 @@
-<?php
-include_once( PLOG_CLASS_PATH."class/plugin/pluginbase.class.php" );
-include_once( PLOG_CLASS_PATH."plugins/gallery/class/gallery/galleryhelper.class.php" );
-include_once( PLOG_CLASS_PATH."class/template/menu/menu.class.php" );
-
-/**
- * This class is responsible for initializing the gallery plugin. The gallery plugin
- * creates one blog action (to display the photo gallery) and two admin actions to change
- * the plugin's settings. This class also sets up an menu option in the control center.
- *
- * @version 0.1
- * @author Laurent Vauthrin
- */
-class PluginGallery extends PluginBase
-{
- /**
- * @private
- */
- var $_pluginEnabled;
-
- /**
- * Constructor.
- *
- * @param None.
- * @return None.
- */
- function Plugingallery()
- {
- $this->PluginBase();
-
- // Setup the plugin information
- $this->id = "gallery";
- $this->author = "Laurent Vauthrin";
- $this->desc = "Integrates gallery into plog.";
-
- // Setup the locale
- $this->locales = Array( "en_UK" );
-
- // Register the actions
- $this->registerBlogAction( "gallery", "PluginGalleryShowAction" );
- $this->registerAdminAction( "gallery", "PluginGalleryConfigAction" );
- $this->registerAdminAction( "updateGalleryConfig", "PluginGalleryUpdateConfigAction" );
-
- // Set up the Admin menu options
- $menu =& Menu::getMenu();
- if( !$menu->entryExists( "/menu/controlCenter/embeddedApps" ) ) {
- $this->addMenuEntry( "/menu/controlCenter", "embeddedApps", "", "", true, false );
- }
- $this->addMenuEntry( "/menu/controlCenter/embeddedApps", "Gallery", "?op=gallery", "" );
- }
-
- /**
- * This function initialites the plugin's default values
- *
- * @param None.
- * @return Returns true.
- */
- function register()
- {
- $blogSettings = $this->blogInfo->getSettings();
- $this->_pluginEnabled = $blogSettings->getValue( "plugin_gallery_enabled" );
-
- return true;
- }
-
- /**
- * This function gets Gallery's image block
- *
- * @param
- * @return Returns error or image block.
- */
- function getImageBlock()
- {
- // Get the necessary blog settings
- $blogSettings = $this->blogInfo->getSettings();
- $absolutePath = $blogSettings->getValue( "gallery_absolute_path" );
- $embedUri = $blogSettings->getValue( "gallery_embed_uri" );
- $embedPath = $blogSettings->getValue( "gallery_embed_path" );
- $relativePath = $blogSettings->getValue( "gallery_relative_path" );
- $blocks = $blogSettings->getValue( "gallery_blocks" );
- $show = $blogSettings->getValue( "gallery_show" );
- $itemid = $blogSettings->getValue( "gallery_itemid" );
-
- // Create a gallery helper object to interact with gallery
- $gallery = new GalleryHelper( $absolutePath,
- $embedUri,
- $embedPath,
- $relativePath);
-
- if ( $blocks == "" ) {
- $blocks = "randomImage";
- }
- if ( $show == "" ) {
- $show = "none";
- }
-
- // Get the image block
- return $gallery->getImageBlock($blocks,
- $show,
- $itemid);
- }
-
- /**
- * Accessor function used to determine if the plugin is enabled.
- *
- * @param None.
- * @return A boolean value that tells whether the plugin is enabled or disabled.
- */
- function isEnabled()
- {
- return $this->_pluginEnabled;
- }
-}
-?>
Copied: plugins/trunk/gallery/plugingallery.class.php (from rev 4487, plugins/branches/lifetype-1.1/gallery/plugingallery.class.php)
Copied: plugins/trunk/gallery/templates (from rev 4487, plugins/branches/lifetype-1.1/gallery/templates)
Deleted: plugins/trunk/gallery/templates/galleryAdmin.template
===================================================================
--- plugins/branches/lifetype-1.1/gallery/templates/galleryAdmin.template 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/gallery/templates/galleryAdmin.template 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,104 +0,0 @@
-{include file="$admintemplatepath/header.template"}
-{include file="$admintemplatepath/navigation.template" showOpt=Gallery title=$locale->tr("gallery_plugin")}
-<form name="galleryPluginConfig" method="post">
- <fieldset class="inputField">
- <legend>{$locale->tr("label_configuration")}</legend>
- {include file="$admintemplatepath/successmessage.template"}
- {include file="$admintemplatepath/errormessage.template"}
- <div class="field">
- <span class="required"></span>
- <label for="pluginEnabled">{$locale->tr("label_enable")}</label>
- <div class="formHelp">
- <input class="checkbox" type="checkbox" name="pluginEnabled" id="pluginEnabled"
- {if $pluginEnabled} checked="checked" {/if} value="1"/>{$locale->tr("help_enable")}
- </div>
- </div>
-
- <div class="field">
- <label for="absolutePath">{$locale->tr("label_absolute_path")}</label>
- <span class="required">*</span>
- <div class="formHelp">{$locale->tr("help_absolute_path")}
- <input class="text" type="text" name="absolutePath" id="absolutePath" value="{$absolutePath}"/>
- </div>
- </div>
- <div class="field">
- <label for="embedUri">{$locale->tr("label_embed_uri")}</label>
- <span class="required">*</span>
- <div class="formHelp">{$locale->tr("help_embed_uri")}
- <input class="text" type="text" name="embedUri" id="embedUri" value="{$embedUri}"/>
- </div>
- </div>
- <div class="field">
- <label for="embedPath">{$locale->tr("label_embed_path")}</label>
- <span class="required">*</span>
- <div class="formHelp">{$locale->tr("help_embed_path")}
- <input class="text" type="text" name="embedPath" id="embedPath" value="{$embedPath}"/>
- </div>
- </div>
- <div class="field">
- <label for="relativePath">{$locale->tr("label_relative_path")}</label>
- <span class="required">*</span>
- <div class="formHelp">{$locale->tr("help_relative_path")}
- <input class="text" type="text" name="relativePath" id="relativePath" value="{$relativePath}"/>
- </div>
- </div>
- <div class="field">
- <label>{$locale->tr("label_example")}</label>
- <div class="formHelp">{$locale->tr("help_example")}</div>
- </div>
-
- <div class="field">
- <label for="blocks">{$locale->tr("label_blocks")}</label>
- <span class="required"></span>
- <div class="formHelp">{$locale->tr("help_blocks")}
- <input class="text" type="text" name="blocks" id="blocks" value="{$blocks}"/>
- </div>
- </div>
- <div class="field">
- <label for="show">{$locale->tr("label_show")}</label>
- <span class="required"></span>
- <div class="formHelp">{$locale->tr("help_show")}
- <input class="text" type="text" name="show" id="show" value="{$show}"/>
- </div>
- </div>
- <div class="field">
- <label for="itemid">{$locale->tr("label_itemid")}</label>
- <span class="required"></span>
- <div class="formHelp">{$locale->tr("help_itemid")}
- <input class="text" type="text" name="itemid" id="itemid" value="{$itemid}"/>
- </div>
- </div>
-
- <div class="field">
- <span class="required"></span>
- <label for="pluginEnabled">{$locale->tr("label_sidebar")}</label><br/>
- <div class="formHelp">
- <input class="checkbox" type="checkbox" name="sidebarEnabled" id="sidebarEnabled"
- {if $sidebarEnabled} checked="checked" {/if} value="1" />{$locale->tr("help_sidebar")}
- </div>
- </div>
- <div class="field">
- <span class="required"></span>
- <label for="pluginEnabled">{$locale->tr("label_sidebar_greeting")}</label>
- <div class="formHelp">
- <input class="checkbox" type="checkbox" name="sidebarGreetingEnabled" id="sidebarGreetingEnabled"
- {if $sidebarGreetingEnabled} checked="checked" {/if} value="1" />{$locale->tr("help_sidebar_greeting")}
- </div>
- </div>
- <div class="field">
- <span class="required"></span>
- <label for="pluginEnabled">{$locale->tr("label_sidepath")}</label>
- <div class="formHelp">
- <input class="checkbox" type="checkbox" name="pathbarEnabled" id="pathbarEnabled"
- {if $pathbarEnabled} checked="checked" {/if} value="1" />{$locale->tr("help_sidepath")}
- </div>
- </div>
- </fieldset>
- <div class="buttons">
- <input type="hidden" name="op" value="updateGalleryConfig" />
- <input type="reset" name="{$locale->tr("reset")}" />
- <input type="submit" name="{$locale->tr("update_settings")}" value="{$locale->tr("update")}" />
- </div>
-</form>
-{include file="$admintemplatepath/footernavigation.template"}
-{include file="$admintemplatepath/footer.template"}
Copied: plugins/trunk/gallery/templates/galleryAdmin.template (from rev 4487, plugins/branches/lifetype-1.1/gallery/templates/galleryAdmin.template)
Deleted: plugins/trunk/gallery/templates/galleryShow.template
===================================================================
--- plugins/branches/lifetype-1.1/gallery/templates/galleryShow.template 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/gallery/templates/galleryShow.template 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,26 +0,0 @@
-{include file="$blogtemplate/header.template"}
-
-<!--
-You should modify this template to suit your needs.
-The variables exported to Smarty are:
-
-"pluginEnabled" - Tells you if the plugin is enabled or not.
-"galleryTitle" - The title of the gallery page.
-"galleryCSS" - The CSS for the gallery page (array).
-"galleryJavascript" - The javascript for the gallery page (array).
-"galleryBody" - The actual content of the gallery page.
-"galleryError" - Error message sent back from gallery.
--->
-
-{if $galleryError}
- {$galleryError}
-{else}
-<!-- -->
- {section name=cssSection loop=$galleryCSS}
- {$galleryCSS[cssSection]}
- {/section}
-
- {$galleryBody}
-{/if}
-
-{include file="$blogtemplate/footer.template"}
Copied: plugins/trunk/gallery/templates/galleryShow.template (from rev 4487, plugins/branches/lifetype-1.1/gallery/templates/galleryShow.template)
Modified: plugins/trunk/galleryimages/plugingalleryimages.class.php
===================================================================
--- plugins/trunk/galleryimages/plugingalleryimages.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/galleryimages/plugingalleryimages.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -85,10 +85,10 @@
*/
function randomImage( $album_id = 0 )
{
- $randomImages = $this->randomImages( $album_id );
+ $randomImages = $this->randomImages( 1, $album_id );
if( $randomImages )
- return( array_pop( $randomImage ));
+ return( array_pop( $randomImages ));
else
return( false );
}
@@ -117,8 +117,8 @@
}
$query .=" ORDER BY RAND() LIMIT 0, {$maxImages}";
-
- // just to make things easier, we'll cheat a little here...
+
+ // just to make things easier, we'll cheat a little here...
include_once( PLOG_CLASS_PATH."class/database/db.class.php" );
$db =& Db::getDb();
$result = $db->Execute( $query );
@@ -128,8 +128,8 @@
$randomimages = Array();
while( $row = $result->FetchRow()) {
- array_push( $randomimages, $resources->mapRow( $row ));
- }
+ $randomimages[] = $resources->mapRow( $row );
+ }
return $randomimages;
}
Copied: plugins/trunk/googleanalytics/locale/locale_ca_ES.php (from rev 4487, plugins/branches/lifetype-1.1/googleanalytics/locale/locale_ca_ES.php)
Copied: plugins/trunk/gravatar/locale/locale_ca_ES.php (from rev 4487, plugins/branches/lifetype-1.1/gravatar/locale/locale_ca_ES.php)
Modified: plugins/trunk/gravatar/locale/locale_en_UK.php
===================================================================
--- plugins/trunk/gravatar/locale/locale_en_UK.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/gravatar/locale/locale_en_UK.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -17,4 +17,5 @@
$messages["label_rating"] = "Rating";
$messages["label_size"] = "Size";
$messages["label_default"] = "Default";
+$messages["gravatar_support"] = "<a href=\"http://www.gravatar.com\">Gravatars</a> enabled";
?>
\ No newline at end of file
Copied: plugins/trunk/gravatar/locale/locale_es_ES.php (from rev 4487, plugins/branches/lifetype-1.1/gravatar/locale/locale_es_ES.php)
Modified: plugins/trunk/gravatar/plugingravatar.class.php
===================================================================
--- plugins/trunk/gravatar/plugingravatar.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/gravatar/plugingravatar.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -2,6 +2,7 @@
include_once( PLOG_CLASS_PATH."class/plugin/pluginbase.class.php" );
include_once( PLOG_CLASS_PATH."class/plugin/pluginmanager.class.php" );
+ include_once( PLOG_CLASS_PATH."class/template/menu/menu.class.php" );
/**
* Mostra un avatar a cada comentari descarregant-lo de Gravatar.com. Versió 0.2
@@ -87,7 +88,7 @@
if($comment->getUserEmail() != "")
{
- $gravatar_url = "http://www.gravatar.com/avatar.php?rating=".$rating."&gravatar_id=".md5($comment->getUserEmail())."&default=".urlencode($default)."&size=".$size;
+ $gravatar_url = "http://www.gravatar.com/avatar.php?rating=".$rating."&gravatar_id=".md5($comment->getUserEmail())."&default=".urlencode($default)."&size=".$size;
} else {
$gravatar_url = $default;
}
Modified: plugins/trunk/gravatar/readme.txt
===================================================================
--- plugins/trunk/gravatar/readme.txt 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/gravatar/readme.txt 2007-01-04 19:10:56 UTC (rev 4488)
@@ -20,4 +20,9 @@
<img src="{$gravatar->gravatar($comment)}" width="{$gravatar->getSize()}" height="{$gravatar->getSize()}" align="left" />
{/if}
-You can add your own default avatar image to /plugin/gravatar/avatars. This plugin only support GIF and JPG format currently.
\ No newline at end of file
+You can add your own default avatar image to /plugin/gravatar/avatars. This plugin only support GIF and JPG format currently.
+
+You can also add a note by the email field to inform users that gravatars are enabled:
+{if $gravatar && $gravatar->isEnabled()}
+{$locale->pr("gravatar_support")}
+{/if}
\ No newline at end of file
Copied: plugins/trunk/hostblock/locale/locale_ca_ES.php (from rev 4487, plugins/branches/lifetype-1.1/hostblock/locale/locale_ca_ES.php)
Modified: plugins/trunk/hostblock/locale/locale_en_UK.php
===================================================================
--- plugins/trunk/hostblock/locale/locale_en_UK.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/hostblock/locale/locale_en_UK.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,6 +1,8 @@
<?php
$messages["hostblock_plugin_enabled"] = "Enable this plugin";
+$messages["manageSecurityPlugins"] = "Security Management";
+
$messages["siteSecurity"] = "Site Security";
$messages["blogSecurity"] = "Blog Security";
$messages["hostblock_plugin"] = "Host Block Plugin";
Copied: plugins/trunk/hotlinkprevention (from rev 4487, plugins/branches/lifetype-1.1/hotlinkprevention)
Copied: plugins/trunk/hotlinkprevention/class (from rev 4487, plugins/branches/lifetype-1.1/hotlinkprevention/class)
Copied: plugins/trunk/hotlinkprevention/class/action (from rev 4487, plugins/branches/lifetype-1.1/hotlinkprevention/class/action)
Deleted: plugins/trunk/hotlinkprevention/class/action/pluginglobalhotlinkpreventionconfigaction.class.php
===================================================================
--- plugins/branches/lifetype-1.1/hotlinkprevention/class/action/pluginglobalhotlinkpreventionconfigaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/hotlinkprevention/class/action/pluginglobalhotlinkpreventionconfigaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,27 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- include_once( PLOG_CLASS_PATH."class/view/admin/adminplugintemplatedview.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/hotlinkprevention/class/view/pluginglobalhotlinkpreventionconfigview.class.php" );
-
- /**
- * shows a form with the current configuration
- */
- class PluginGlobalHotlinkPreventionConfigAction extends AdminAction
- {
-
- function PluginGlobalHotlinkPreventionConfigAction( $actionInfo, $request )
- {
- $this->AdminAction( $actionInfo, $request );
- }
-
- function perform()
- {
- $this->_view = new PluginGlobalHotlinkPreventionConfigView( $this->_blogInfo );
-
- $this->setCommonData();
-
- return true;
- }
- }
-?>
\ No newline at end of file
Copied: plugins/trunk/hotlinkprevention/class/action/pluginglobalhotlinkpreventionconfigaction.class.php (from rev 4487, plugins/branches/lifetype-1.1/hotlinkprevention/class/action/pluginglobalhotlinkpreventionconfigaction.class.php)
Deleted: plugins/trunk/hotlinkprevention/class/action/pluginglobalhotlinkpreventionupdateconfigaction.class.php
===================================================================
--- plugins/branches/lifetype-1.1/hotlinkprevention/class/action/pluginglobalhotlinkpreventionupdateconfigaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/hotlinkprevention/class/action/pluginglobalhotlinkpreventionupdateconfigaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,78 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- include_once( PLOG_CLASS_PATH."class/view/admin/adminplugintemplatedview.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/hotlinkprevention/class/view/pluginglobalhotlinkpreventionconfigview.class.php" );
- include_once( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
-
- /**
- * updates the plugin configuration
- */
- class PluginGlobalHotlinkPreventionUpdateConfigAction extends AdminAction
- {
- var $_pluginEnabled;
- var $_allowBlogOwnerOverride;
- var $_fileExtensions;
- var $_blankRefererEnabled;
- var $_allowReferers;
-
- function PluginGlobalHotlinkPreventionUpdateConfigAction( $actionInfo, $request )
- {
- $this->AdminAction( $actionInfo, $request );
-
- // for data validation purposes, fileExtensions can not be empty
- $this->registerFieldValidator( "fileExtensions", new StringValidator());
- $view = new PluginGlobalHotlinkPreventionConfigView( $this->_blogInfo );
- $view->setErrorMessage( $this->_locale->tr("error_hotlinkprevention_fileextensions"));
- $this->setValidationErrorView( $view );
-
- // these fields do not need to be validated but should be there when we show the view once again
- $this->registerField( "pluginEnabled" );
- $this->registerField( "allowBlogOwnerOverride" );
- $this->registerField( "blankRefererEnabled" );
- $this->registerField( "allowReferers" );
- }
-
- function perform()
- {
- $this->_pluginEnabled = $this->_request->getValue( "pluginEnabled" );
- $this->_pluginEnabled = ($this->_pluginEnabled != "" );
- $this->_allowBlogOwnerOverride = $this->_request->getValue( "allowBlogOwnerOverride" );
- $this->_allowBlogOwnerOverride = ($this->_allowBlogOwnerOverride != "" );
- $this->_blankRefererEnabled = $this->_request->getValue( "blankRefererEnabled" );
- $this->_blankRefererEnabled = ($this->_blankRefererEnabled != "" );
- $this->_fileExtensions = $this->_request->getValue( "fileExtensions" );
- $this->_allowReferers = $this->_request->getValue( "allowReferers" );
-
- // update the plugin configurations to config
- $config =& Config::getConfig();
- $config->setValue( "plugin_globalhotlinkprevention_enabled", $this->_pluginEnabled );
- $config->setValue( "plugin_globalhotlinkprevention_allowblogowneroverride", $this->_allowBlogOwnerOverride );
- $config->setValue( "plugin_globalhotlinkprevention_fileextensions", $this->_fileExtensions );
- $config->setValue( "plugin_globalhotlinkprevention_blankrefererenabled", $this->_blankRefererEnabled );
- $config->setValue( "plugin_globalhotlinkprevention_allowreferers", $this->_allowReferers );
-
- // save the config settings
- if( !$config->save() ) {
- $this->_view = new PluginGlobalHotlinkPreventionConfigView( $this->_blogInfo );
- $this->_view->setErrorMessage( $this->_locale->tr("error_updating_settings"));
- $this->setCommonData();
-
- return false;
- }
-
- // if everything went ok...
- $this->_session->setValue( "blogInfo", $this->_blogInfo );
- $this->saveSession();
-
- $this->_view = new PluginGlobalHotlinkPreventionConfigView( $this->_blogInfo );
- $this->_view->setSuccessMessage( $this->_locale->tr("hotlinkprevention_settings_saved_ok"));
- $this->setCommonData();
-
- // clear the cache
- CacheControl::resetBlogCache( $this->_blogInfo->getId());
-
- return true;
- }
- }
-?>
\ No newline at end of file
Copied: plugins/trunk/hotlinkprevention/class/action/pluginglobalhotlinkpreventionupdateconfigaction.class.php (from rev 4487, plugins/branches/lifetype-1.1/hotlinkprevention/class/action/pluginglobalhotlinkpreventionupdateconfigaction.class.php)
Deleted: plugins/trunk/hotlinkprevention/class/action/pluginhotlinkpreventionconfigaction.class.php
===================================================================
--- plugins/branches/lifetype-1.1/hotlinkprevention/class/action/pluginhotlinkpreventionconfigaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/hotlinkprevention/class/action/pluginhotlinkpreventionconfigaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,27 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- include_once( PLOG_CLASS_PATH."class/view/admin/adminplugintemplatedview.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/hotlinkprevention/class/view/pluginhotlinkpreventionconfigview.class.php" );
-
- /**
- * shows a form with the current configuration
- */
- class PluginHotlinkPreventionConfigAction extends AdminAction
- {
-
- function PluginHotlinkPreventionConfigAction( $actionInfo, $request )
- {
- $this->AdminAction( $actionInfo, $request );
- }
-
- function perform()
- {
- $this->_view = new PluginHotlinkPreventionConfigView( $this->_blogInfo );
-
- $this->setCommonData();
-
- return true;
- }
- }
-?>
\ No newline at end of file
Copied: plugins/trunk/hotlinkprevention/class/action/pluginhotlinkpreventionconfigaction.class.php (from rev 4487, plugins/branches/lifetype-1.1/hotlinkprevention/class/action/pluginhotlinkpreventionconfigaction.class.php)
Deleted: plugins/trunk/hotlinkprevention/class/action/pluginhotlinkpreventionupdateconfigaction.class.php
===================================================================
--- plugins/branches/lifetype-1.1/hotlinkprevention/class/action/pluginhotlinkpreventionupdateconfigaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/hotlinkprevention/class/action/pluginhotlinkpreventionupdateconfigaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,76 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- include_once( PLOG_CLASS_PATH."class/view/admin/adminplugintemplatedview.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/hotlinkprevention/class/view/pluginhotlinkpreventionconfigview.class.php" );
- include_once( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
-
- /**
- * updates the plugin configuration
- */
- class PluginHotlinkPreventionUpdateConfigAction extends AdminAction
- {
- var $_pluginEnabled;
- var $_fileExtensions;
- var $_blankRefererEnabled;
- var $_allowReferers;
-
- function PluginHotlinkPreventionUpdateConfigAction( $actionInfo, $request )
- {
- $this->AdminAction( $actionInfo, $request );
-
- // for data validation purposes, fileExtensions can not be empty
- $this->registerFieldValidator( "fileExtensions", new StringValidator());
- $view = new PluginHotlinkPreventionConfigView( $this->_blogInfo );
- $view->setErrorMessage( $this->_locale->tr("error_hotlinkprevention_fileextensions"));
- $this->setValidationErrorView( $view );
-
- // these fields do not need to be validated but should be there when we show the view once again
- $this->registerField( "pluginEnabled" );
- $this->registerField( "blankRefererEnabled" );
- $this->registerField( "allowReferers" );
- }
-
- function perform()
- {
- $this->_pluginEnabled = $this->_request->getValue( "pluginEnabled" );
- $this->_pluginEnabled = ($this->_pluginEnabled != "" );
- $this->_blankRefererEnabled = $this->_request->getValue( "blankRefererEnabled" );
- $this->_blankRefererEnabled = ($this->_blankRefererEnabled != "" );
- $this->_fileExtensions = $this->_request->getValue( "fileExtensions" );
- $this->_allowReferers = $this->_request->getValue( "allowReferers" );
-
- // update the plugin configurations to blog setting
- $blogSettings = $this->_blogInfo->getSettings();
- $blogSettings->setValue( "plugin_hotlinkprevention_enabled", $this->_pluginEnabled );
- $blogSettings->setValue( "plugin_hotlinkprevention_fileextensions", $this->_fileExtensions );
- $blogSettings->setValue( "plugin_hotlinkprevention_blankrefererenabled", $this->_blankRefererEnabled );
- $blogSettings->setValue( "plugin_hotlinkprevention_allowreferers", $this->_allowReferers );
- $this->_blogInfo->setSettings( $blogSettings );
-
- // save the blogs settings
- $blogs = new Blogs();
- if( !$blogs->updateBlog( $this->_blogInfo )) {
- $this->_view = new PluginHotlinkPreventionConfigView( $this->_blogInfo );
- $this->_view->setErrorMessage( $this->_locale->tr("error_updating_settings"));
- $this->setCommonData();
-
- return false;
- }
-
- // if everything went ok...
- $this->_blogInfo->setSettings( $blogSettings );
- $this->_session->setValue( "blogInfo", $this->_blogInfo );
- $this->saveSession();
-
- $this->_view = new PluginHotlinkPreventionConfigView( $this->_blogInfo );
- $this->_view->setSuccessMessage( $this->_locale->tr("hotlinkprevention_settings_saved_ok"));
- $this->setCommonData();
-
- // clear the cache
- CacheControl::resetBlogCache( $this->_blogInfo->getId());
-
- return true;
- }
- }
-?>
\ No newline at end of file
Copied: plugins/trunk/hotlinkprevention/class/action/pluginhotlinkpreventionupdateconfigaction.class.php (from rev 4487, plugins/branches/lifetype-1.1/hotlinkprevention/class/action/pluginhotlinkpreventionupdateconfigaction.class.php)
Copied: plugins/trunk/hotlinkprevention/class/security (from rev 4487, plugins/branches/lifetype-1.1/hotlinkprevention/class/security)
Deleted: plugins/trunk/hotlinkprevention/class/security/hotlinkpreventionfilter.class.php
===================================================================
--- plugins/branches/lifetype-1.1/hotlinkprevention/class/security/hotlinkpreventionfilter.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/hotlinkprevention/class/security/hotlinkpreventionfilter.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,115 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/security/pipelinefilter.class.php" );
- include_once( PLOG_CLASS_PATH."class/misc/glob.class.php" );
-
- // custom error code that will be returned to the pipeline whenever an
- // error is found... Be careful so as to not to have two different modules
- // use the same code!!
- define( "HOTLINK_PREVENTION_MATCH_FOUND", 650 );
-
- class HotlinkPreventionFilter extends PipelineFilter
- {
- function HotlinkPreventionFilter( $pipelineRequest )
- {
- $this->PipelineFilter( $pipelineRequest );
- }
-
- function filter()
- {
- // get some info
- $blogInfo = $this->_pipelineRequest->getBlogInfo();
- $request = $this->_pipelineRequest->getHttpRequest();
-
- // load global configuration settings
- $config =& Config::getConfig();
- $globalPluginEnabled = $config->getValue( "plugin_globalhotlinkprevention_enabled" );
- $globalFileExtensions = $config->getValue( "plugin_globalhotlinkprevention_fileextensions" );
- $globalBlankRefererEnabled = $config->getValue( "plugin_globalhotlinkprevention_blankrefererenabled" );
- $globalAllowReferers = $config->getValue( "plugin_globalhotlinkprevention_allowreferers" );
-
- // if this is already rejected, there is no reason to do anything here
- if ( $this->_pipelineRequest->getRejectedState() )
- return new PipelineResult();
-
- // load blog configuration settings
- $blogSettings = $blogInfo->getSettings();
- if ( $blogSettings->keyExists( "plugin_hotlinkprevention_enabled" ) ) {
- $pluginEnabled = $blogSettings->getValue( "plugin_hotlinkprevention_enabled" );
- } else {
- $pluginEnabled = $globalPluginEnabled;
- }
-
- if ( $blogSettings->keyExists( "plugin_hotlinkprevention_fileextensions" ) ) {
- $fileExtensions = $blogSettings->getValue( "plugin_hotlinkprevention_fileextensions" );
- } else {
- $fileExtensions = $globalFileExtensions;
- }
-
- if ( $blogSettings->keyExists( "plugin_hotlinkprevention_blankrefererenabled" ) ) {
- $blankRefererEnabled = $blogSettings->getValue( "plugin_hotlinkprevention_blankrefererenabled" );
- } else {
- $blankRefererEnabled = $globalBlankRefererEnabled;
- }
-
- if ( $blogSettings->keyExists( "plugin_hotlinkprevention_allowreferers" ) ) {
- $allowReferers = $blogSettings->getValue( "plugin_hotlinkprevention_allowreferers" );
- } else {
- $allowReferers = $globalAllowReferers;
- }
-
- // check if this section has been enabled or disabled
- if( !$pluginEnabled) {
- // if not, nothing to do here...
- $result = new PipelineResult();
- return $result;
- }
-
- // we only have to filter the contents if the user is posting a comment
- // so there's no point in doing anything else if that's not the case
- if( $request->getValue( "op" ) != "ResourceServer" ) {
- $result = new PipelineResult();
- return $result;
- }
-
- // text and topic of the comment
- $referer = $_SERVER['HTTP_REFERER'];
- $fileName = $request->getValue( "resource" );
- $allowRefererFound = false;
-
- if ($referer == "" && !$blankRefererEnabled) {
- $result = new PipelineResult( false, HOTLINK_PREVENTION_MATCH_FOUND, "error_hotlinkprevention_referer_banned" );
- return $result;
- } elseif ($referer == "" && $blankRefererEnabled) {
- $allowRefererFound = true;
- } else {
- foreach(explode( "\r\n", $allowReferers ) as $allowReferer ) {
- trim($allowReferer);
- if( $allowReferer != "" && $allowReferer != "\r\n" && $allowReferer != "\r" && $allowReferer != "\n" ) {
- if( strstr( $referer, $allowReferer )) {
- $allowRefererFound = true;
- break;
- }
- }
- }
- }
-
- if ($allowRefererFound) {
- $result = new PipelineResult();
- return $result;
- } else {
- foreach(explode( " ", $fileExtensions ) as $fileExtension ) {
- trim($fileExtension);
- if( $fileExtension != "" && $fileExtension != " " ) {
- if( Glob::myFnmatch( $fileExtension, $fileName )) {
- $result = new PipelineResult( false, HOTLINK_PREVENTION_MATCH_FOUND, "error_hotlinkprevention_referer_banned" );
- return $result;
- }
- }
- }
- $result = new PipelineResult();
- return $result;
- }
- }
- }
-?>
\ No newline at end of file
Copied: plugins/trunk/hotlinkprevention/class/security/hotlinkpreventionfilter.class.php (from rev 4487, plugins/branches/lifetype-1.1/hotlinkprevention/class/security/hotlinkpreventionfilter.class.php)
Copied: plugins/trunk/hotlinkprevention/class/view (from rev 4487, plugins/branches/lifetype-1.1/hotlinkprevention/class/view)
Deleted: plugins/trunk/hotlinkprevention/class/view/pluginglobalhotlinkpreventionconfigview.class.php
===================================================================
--- plugins/branches/lifetype-1.1/hotlinkprevention/class/view/pluginglobalhotlinkpreventionconfigview.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/hotlinkprevention/class/view/pluginglobalhotlinkpreventionconfigview.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,41 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/view/admin/adminplugintemplatedview.class.php" );
-
- /**
- * implements the main view of the feed reader plugin
- */
- class PluginGlobalHotlinkPreventionConfigView extends AdminPluginTemplatedView
- {
-
- function PluginGlobalHotlinkPreventionConfigView( $blogInfo )
- {
- $this->AdminPluginTemplatedView( $blogInfo, "hotlinkprevention", "globalhotlinkprevention" );
- }
-
- function render()
- {
- // load some configuration settings
- $config =& Config::getConfig();
- $pluginEnabled = $config->getValue( "plugin_globalhotlinkprevention_enabled" );
- $allowBlogOwnerOverride = $config->getValue( "plugin_globalhotlinkprevention_allowblogowneroverride" );
- $fileExtensions = $config->getValue( "plugin_globalhotlinkprevention_fileextensions" );
- if ($fileExtensions == "") $fileExtensions = "*.*";
- $blankRefererEnabled = $config->getValue( "plugin_globalhotlinkprevention_blankrefererenabled" );
- $allowReferers = $config->getValue( "plugin_globalhotlinkprevention_allowreferers" );
- if ($allowReferers == "") {
- $rg =& RequestGenerator::getRequestGenerator( $blogInfo );
- $allowReferers = $rg->getBaseUrl();
- }
-
- // create a view and export the settings to the template
- $this->setValue( "pluginEnabled", $pluginEnabled );
- $this->setValue( "allowBlogOwnerOverride", $allowBlogOwnerOverride );
- $this->setValue( "fileExtensions", $fileExtensions );
- $this->setValue( "blankRefererEnabled", $blankRefererEnabled );
- $this->setValue( "allowReferers", $allowReferers );
-
- parent::render();
- }
- }
-?>
\ No newline at end of file
Copied: plugins/trunk/hotlinkprevention/class/view/pluginglobalhotlinkpreventionconfigview.class.php (from rev 4487, plugins/branches/lifetype-1.1/hotlinkprevention/class/view/pluginglobalhotlinkpreventionconfigview.class.php)
Deleted: plugins/trunk/hotlinkprevention/class/view/pluginhotlinkpreventionconfigview.class.php
===================================================================
--- plugins/branches/lifetype-1.1/hotlinkprevention/class/view/pluginhotlinkpreventionconfigview.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/hotlinkprevention/class/view/pluginhotlinkpreventionconfigview.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,60 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/view/admin/adminplugintemplatedview.class.php" );
-
- /**
- * implements the main view of the feed reader plugin
- */
- class PluginHotlinkPreventionConfigView extends AdminPluginTemplatedView
- {
-
- function PluginHotlinkPreventionConfigView( $blogInfo )
- {
- $this->AdminPluginTemplatedView( $blogInfo, "hotlinkprevention", "hotlinkprevention" );
- }
-
- function render()
- {
- // load global configuration settings
- $config =& Config::getConfig();
- $globalPluginEnabled = $config->getValue( "plugin_globalhotlinkprevention_enabled" );
- $globalFileExtensions = $config->getValue( "plugin_globalhotlinkprevention_fileextensions" );
- $globalBlankRefererEnabled = $config->getValue( "plugin_globalhotlinkprevention_blankrefererenabled" );
- $globalAllowReferers = $config->getValue( "plugin_globalhotlinkprevention_allowreferers" );
-
- // load blog configuration settings
- $blogSettings = $this->_blogInfo->getSettings();
- if ( $blogSettings->keyExists( "plugin_hotlinkprevention_enabled" ) ) {
- $pluginEnabled = $blogSettings->getValue( "plugin_hotlinkprevention_enabled" );
- } else {
- $pluginEnabled = $globalPluginEnabled;
- }
-
- if ( $blogSettings->keyExists( "plugin_hotlinkprevention_fileextensions" ) ) {
- $fileExtensions = $blogSettings->getValue( "plugin_hotlinkprevention_fileextensions" );
- } else {
- $fileExtensions = $globalFileExtensions;
- }
-
- if ( $blogSettings->keyExists( "plugin_hotlinkprevention_blankrefererenabled" ) ) {
- $blankRefererEnabled = $blogSettings->getValue( "plugin_hotlinkprevention_blankrefererenabled" );
- } else {
- $blankRefererEnabled = $globalBlankRefererEnabled;
- }
-
- if ( $blogSettings->keyExists( "plugin_hotlinkprevention_allowreferers" ) ) {
- $allowReferers = $blogSettings->getValue( "plugin_hotlinkprevention_allowreferers" );
- } else {
- $allowReferers = $globalAllowReferers;
- }
-
- // create a view and export the settings to the template
- $this->setValue( "pluginEnabled", $pluginEnabled );
- $this->setValue( "fileExtensions", $fileExtensions );
- $this->setValue( "blankRefererEnabled", $blankRefererEnabled );
- $this->setValue( "allowReferers", $allowReferers );
-
- parent::render();
- }
- }
-?>
\ No newline at end of file
Copied: plugins/trunk/hotlinkprevention/class/view/pluginhotlinkpreventionconfigview.class.php (from rev 4487, plugins/branches/lifetype-1.1/hotlinkprevention/class/view/pluginhotlinkpreventionconfigview.class.php)
Copied: plugins/trunk/hotlinkprevention/locale (from rev 4487, plugins/branches/lifetype-1.1/hotlinkprevention/locale)
Deleted: plugins/trunk/hotlinkprevention/locale/locale_en_UK.php
===================================================================
--- plugins/branches/lifetype-1.1/hotlinkprevention/locale/locale_en_UK.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/hotlinkprevention/locale/locale_en_UK.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,40 +0,0 @@
-<?php
-$messages["manageSecurityPlugins"] = "Security Management";
-$messages["HotlinkPrevention"] = "Hotlink Prevention";
-$messages["globalHotlinkPrevention"] = "Global Hotlink Prevention";
-
-$messages["hotlinkprevention_plugin"] = "Hotlink Prevention Plugin";
-$messages["hotlinkprevention_plugin_enabled"] = "Enable this plugin";
-$messages["hotlinkprevention_plugin_global_enabled"] = "Enable this plugin. The settings will apply to all users.";
-$messages["hotlinkprevention_plugin_allowblogowneroverride"] = "Allow user to config his own Hotlink Prevention settings.";
-$messages["hotlinkprevention_blankrefererenabled"] = "Allow blank referer.";
-$messages["hotlinkprevention_allowreferers"] = "Allow referer lists. It is a white list, only the url list here can hotlink to your resource.";
-$messages["hotlinkprevention_fileextensions"] = "Mamaged file extension lists. It is a white list, only the file extension list here protected by this plugin.";
-
-$messages["hotlinkprevention_settings_saved_ok"] = "Hotlink Prevention settings saved successfully!";
-$messages["error_hotlinkprevention_fileextensions"] = "File extensions shouldn't be empty!";
-
-$messages["label_configuration"] = "Configuration";
-$messages["label_enable"] = "Enable";
-$messages["label_allowblogowneroverride"] = "Allow Blog Owner Override";
-$messages["label_blankrefererenable"] = "Blank Referer";
-$messages["label_allowreferers"] = "Referer Lists";
-$messages["label_fileextensions"] = "Managed File Extension Lists";
-
-
-$messages["manageRecentPlugins"] = "Security Management";
-$messages["RecentComments"] = "Recent Comments";
-$messages["recentcomments"] = "Recent Comments";
-$messages["view_comment_by"] = "View comment by %s";
-
-$messages["recentcomments_maxcomments"] = "Maximum Showed Comments";
-$messages["recentcomments_plugin_enabled"] = "Enable this plugin";
-$messages["recentcomments_plugin"] = "Recent Comments Plugin";
-
-$messages["recentcomments_settings_saved_ok"] = "Recent Comments settings saved successfully!";
-$messages["recentcomments_error_maxcomments"] = "Maximum Showed Comments Should > 0!";
-
-$messages["label_configuration"] = "Configuration";
-$messages["label_enable"] = "Enable";
-$messages["label_maxcomments"] = "Max Comments";
-?>
\ No newline at end of file
Copied: plugins/trunk/hotlinkprevention/locale/locale_en_UK.php (from rev 4487, plugins/branches/lifetype-1.1/hotlinkprevention/locale/locale_en_UK.php)
Deleted: plugins/trunk/hotlinkprevention/locale/locale_zh_TW.php
===================================================================
--- plugins/branches/lifetype-1.1/hotlinkprevention/locale/locale_zh_TW.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/hotlinkprevention/locale/locale_zh_TW.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,23 +0,0 @@
-<?php
-$messages["manageSecurityPlugins"] = "網誌安全管ç†";
-$messages["HotlinkPrevention"] = "防æ¢ç›œé€£è¨å®š";
-$messages["globalHotlinkPrevention"] = "全域防æ¢ç›œé€£è¨å®š";
-
-$messages["hotlinkprevention_plugin"] = "防æ¢ç›œé€£å¤–掛程å¼";
-$messages["hotlinkprevention_plugin_enabled"] = "啟動外掛程å¼";
-$messages["hotlinkprevention_plugin_global_enabled"] = "啟動外掛程å¼ã€‚æ¤è¨å®šå°‡æ‡‰ç”¨åˆ°æ‰€æœ‰ä½¿ç”¨è€…，æˆç‚ºæ‰€æœ‰ä½¿ç”¨è€…的外掛程å¼é è¨å€¼ã€‚";
-$messages["hotlinkprevention_plugin_allowblogowneroverride"] = "å…許使用者自行è¨å®šæœ¬å¤–掛程å¼ã€‚";
-$messages["hotlinkprevention_blankrefererenabled"] = "å…許逆å‘連çµç‚ºç©ºç™½å€¼ã€‚";
-$messages["hotlinkprevention_allowreferers"] = "å…許逆å‘連çµåˆ—表。æ¤è¡¨ç‚ºæ£å‘表列，列在下列表ä¸çš„網站將å¯ä»¥ç›´æŽ¥é€£çµä½ 的資æºï¼›æ²’有列在下方的網站將無法連çµä½ 的資æºã€‚";
-$messages["hotlinkprevention_fileextensions"] = "管制擴充檔å列表。æ¤è¡¨ç‚ºæ£å‘表列，列在下方的擴充檔åå°‡å—本外掛程å¼çš„管制；沒有列在下方的擴充檔åå°‡å¯ä»¥è®“其他網站任æ„連çµã€‚";
-
-$messages["hotlinkprevention_settings_saved_ok"] = "防æ¢ç›œé€£è¨å®šå„²å˜æˆåŠŸã€‚";
-$messages["error_hotlinkprevention_fileextensions"] = "擴充檔åä¸å¯ç‚ºç©ºç™½ï¼";
-
-$messages["label_configuration"] = "è¨å®š";
-$messages["label_enable"] = "å•Ÿå‹•";
-$messages["label_allowblogowneroverride"] = "使用者è¨å®š";
-$messages["label_blankrefererenable"] = "空白逆å‘連çµ";
-$messages["label_allowreferers"] = "逆å‘連çµåˆ—表";
-$messages["label_fileextensions"] = "擴充檔å";
-?>
\ No newline at end of file
Copied: plugins/trunk/hotlinkprevention/locale/locale_zh_TW.php (from rev 4487, plugins/branches/lifetype-1.1/hotlinkprevention/locale/locale_zh_TW.php)
Deleted: plugins/trunk/hotlinkprevention/pluginhotlinkprevention.class.php
===================================================================
--- plugins/branches/lifetype-1.1/hotlinkprevention/pluginhotlinkprevention.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/hotlinkprevention/pluginhotlinkprevention.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,52 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/plugin/pluginbase.class.php" );
- include_once( PLOG_CLASS_PATH."class/plugin/pluginmanager.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/hotlinkprevention/class/security/hotlinkpreventionfilter.class.php" );
-
- /**
- * Plugin that offers features to return a recent article comments from the current blog
- */
- class PluginHotlinkPrevention extends PluginBase
- {
- var $pluginEnabled;
- var $allowBlogOwnerOverride;
-
- function PluginHotlinkPrevention()
- {
- $this->PluginBase();
-
- $this->id = "hotlinkprevention";
- $this->author = "Mark Wu";
- $this->desc = "This plugin offers the hotlink prevention to resource.";
-
- $config =& Config::getConfig();
- $this->pluginEnabled = $config->getValue( "plugin_globalhotlinkprevention_enabled" );
- $this->allowBlogOwnerOverride = $config->getValue( "plugin_globalhotlinkprevention_allowblogowneroverride" );
-
- $this->locales = Array( "en_UK" , "zh_TW" );
-
- $this->init();
- }
-
- function init()
- {
- // we only need to register a filter
- $this->registerFilter( "HotlinkPreventionFilter" );
-
- $this->registerAdminAction( "globalHotlinkPrevention", "PluginGlobalHotlinkPreventionConfigAction" );
- $this->registerAdminAction( "updateGlobalHotlinkPreventionConfig", "PluginGlobalHotlinkPreventionUpdateConfigAction" );
- $this->registerAdminAction( "hotlinkprevention", "PluginHotlinkPreventionConfigAction" );
- $this->registerAdminAction( "updateHotlinkPreventionConfig", "PluginHotlinkPreventionUpdateConfigAction" );
-
- $this->addMenuEntry( "/menu/adminSettings/GlobalSettings", "globalHotlinkPrevention", "?op=globalHotlinkPrevention", "" );
-
- if($this->pluginEnabled && $this->allowBlogOwnerOverride) {
- $menu =& Menu::getMenu();
- if( !$menu->entryExists( "/menu/controlCenter/manageSecurityPlugins" ))
- $this->addMenuEntry( "/menu/controlCenter", "manageSecurityPlugins", "", "", true, false );
- $this->addMenuEntry( "/menu/controlCenter/manageSecurityPlugins", "HotlinkPrevention", "?op=hotlinkprevention", "" );
- }
- }
- }
-?>
\ No newline at end of file
Copied: plugins/trunk/hotlinkprevention/pluginhotlinkprevention.class.php (from rev 4487, plugins/branches/lifetype-1.1/hotlinkprevention/pluginhotlinkprevention.class.php)
Deleted: plugins/trunk/hotlinkprevention/readme.txt
===================================================================
--- plugins/branches/lifetype-1.1/hotlinkprevention/readme.txt 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/hotlinkprevention/readme.txt 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,31 +0,0 @@
-Plugin: Hotlink Prevention
-Author: Mark Wu
-License: Creative Commons Attribution-NonCommercial-ShareAlike 2.5
-Lincese URL: http://creativecommons.org/licenses/by-nc-sa/2.5/deed.en
-Restriction: CAN'T USE THIS PLUGIN IN COMMERCIAL PURPOSE OR ENVIRONMENT. If you want to use this plugin in commercial purpose or environment, just donate US$ 20 to pLog team or me. I'll grant the permission to you after I got the donation.
-Release Date: 2005/09/16
-Version: 1.0
-
-This plugin offers the most powerful hotlink prevention for your resource. Usage as follow:
-
-Install:
-========
-1. Install this plugin to your ./plugins folder
-2. Site owner can reach the control panel through "Admin Settings >> Global Settings >> Hotlink Prevention"
-3. Blog owner can reach the control panel through "Control Center >> Security Management >> Hotlink Prevention"
-
-Hotlink Prevention Algorithm:
-=============================
-1. Check the request referer.
- - If the referer is blank, check the "blankrefererenabled" parameter is enable or not. - If "blankrefererenabled" parameter enabled, go to step 3. if disabled, banned the request.
- - If the referer is not blank, go to step 2.
-2. Check the request referer is available in allow referer list or not.
- - If yes, return the request content to user.
- - If not, go to step 3.
-3. Check the file extension is protected or not.
- - If yes, banned the request.
- - If not, return the request content to user.
-
-Notice:
-=======
-If you found this plugin is useful, please kindly make donation to pLog project or myself (Mark).
\ No newline at end of file
Copied: plugins/trunk/hotlinkprevention/readme.txt (from rev 4487, plugins/branches/lifetype-1.1/hotlinkprevention/readme.txt)
Copied: plugins/trunk/hotlinkprevention/templates (from rev 4487, plugins/branches/lifetype-1.1/hotlinkprevention/templates)
Deleted: plugins/trunk/hotlinkprevention/templates/globalhotlinkprevention.template
===================================================================
--- plugins/branches/lifetype-1.1/hotlinkprevention/templates/globalhotlinkprevention.template 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/hotlinkprevention/templates/globalhotlinkprevention.template 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,55 +0,0 @@
-{include file="$admintemplatepath/header.template"}
-{include file="$admintemplatepath/navigation.template" showOpt=globalHotlinkPrevention title=$locale->tr("hotlinkprevention_plugin")}
-<form name="globalHotlinkPreventionPluginConfig" method="post">
- <fieldset class="inputField">
- <legend>{$locale->tr("label_configuration")}</legend>
- {include file="$admintemplatepath/successmessage.template"}
- {include file="$admintemplatepath/errormessage.template"}
- <div class="field">
- <label for="pluginEnabled">{$locale->tr("label_enable")}</label>
- <span class="required"></span>
- <div class="formHelp">
- <input class="checkbox" type="checkbox" name="pluginEnabled" id="pluginEnabled" {if $pluginEnabled} checked="checked" {/if} value="1" />{$locale->tr("hotlinkprevention_plugin_global_enabled")}
- </div>
- </div>
-
- <div class="field">
- <label for="allowBlogOwnerOverride">{$locale->tr("label_allowblogowneroverride")}</label>
- <span class="required"></span>
- <div class="formHelp">
- <input class="checkbox" type="checkbox" name="allowBlogOwnerOverride" id="allowBlogOwnerOverride" {if $allowBlogOwnerOverride} checked="checked" {/if} value="1" />{$locale->tr("hotlinkprevention_plugin_allowblogowneroverride")}
- </div>
- </div>
-
- <div class="field">
- <label for="blankRefererEnabled">{$locale->tr("label_blankrefererenable")}</label>
- <span class="required"></span>
- <div class="formHelp">
- <input class="checkbox" type="checkbox" name="blankRefererEnabled" id="blankRefererEnabled" {if $blankRefererEnabled} checked="checked" {/if} value="1" />{$locale->tr("hotlinkprevention_blankrefererenabled")}
- </div>
- </div>
-
- <div class="field">
- <label for="allowReferers">{$locale->tr("label_allowreferers")}</label>
- <span class="required">*</span>
- <div class="formHelp">{$locale->tr("hotlinkprevention_allowreferers")}</div>
- <textarea rows="5" id="allowReferers" name="allowReferers" style="width:100%">{$allowReferers}</textarea>
- </div>
-
- <div class="field">
- <label for="fileExtensions">{$locale->tr("label_fileextensions")}</label>
- <span class="required">*</span>
- <div class="formHelp">{$locale->tr("hotlinkprevention_fileextensions")}</div>
- <input class="text" type="text" name="fileExtensions" id="fileExtensions" value="{$fileExtensions}" width="10" />
- </div>
-
- </fieldset>
-
- <div class="buttons">
- <input type="hidden" name="op" value="updateGlobalHotlinkPreventionConfig" />
- <input type="reset" name="{$locale->tr("reset")}" />
- <input type="submit" name="{$locale->tr("update_settings")}" value="{$locale->tr("update")}" />
- </div>
-</form>
-{include file="$admintemplatepath/footernavigation.template"}
-{include file="$admintemplatepath/footer.template"}
Copied: plugins/trunk/hotlinkprevention/templates/globalhotlinkprevention.template (from rev 4487, plugins/branches/lifetype-1.1/hotlinkprevention/templates/globalhotlinkprevention.template)
Deleted: plugins/trunk/hotlinkprevention/templates/hotlinkprevention.template
===================================================================
--- plugins/branches/lifetype-1.1/hotlinkprevention/templates/hotlinkprevention.template 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/hotlinkprevention/templates/hotlinkprevention.template 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,47 +0,0 @@
-{include file="$admintemplatepath/header.template"}
-{include file="$admintemplatepath/navigation.template" showOpt=HotlinkPrevention title=$locale->tr("hotlinkprevention_plugin")}
-<form name="hotlinkpreventionPluginConfig" method="post">
- <fieldset class="inputField">
- <legend>{$locale->tr("label_configuration")}</legend>
- {include file="$admintemplatepath/successmessage.template"}
- {include file="$admintemplatepath/errormessage.template"}
- <div class="field">
- <label for="pluginEnabled">{$locale->tr("label_enable")}</label>
- <span class="required"></span>
- <div class="formHelp">
- <input class="checkbox" type="checkbox" name="pluginEnabled" id="pluginEnabled" {if $pluginEnabled} checked="checked" {/if} value="1" />{$locale->tr("hotlinkprevention_plugin_enabled")}
- </div>
- </div>
-
- <div class="field">
- <label for="blankRefererEnabled">{$locale->tr("label_blankrefererenable")}</label>
- <span class="required"></span>
- <div class="formHelp">
- <input class="checkbox" type="checkbox" name="blankRefererEnabled" id="blankRefererEnabled" {if $blankRefererEnabled} checked="checked" {/if} value="1" />{$locale->tr("hotlinkprevention_blankrefererenabled")}
- </div>
- </div>
-
- <div class="field">
- <label for="allowReferers">{$locale->tr("label_allowreferers")}</label>
- <span class="required">*</span>
- <div class="formHelp">{$locale->tr("hotlinkprevention_allowreferers")}</div>
- <textarea rows="5" id="allowReferers" name="allowReferers" style="width:100%">{$allowReferers}</textarea>
- </div>
-
- <div class="field">
- <label for="fileExtensions">{$locale->tr("label_fileextensions")}</label>
- <span class="required">*</span>
- <div class="formHelp">{$locale->tr("hotlinkprevention_fileextensions")}</div>
- <input class="text" type="text" name="fileExtensions" id="fileExtensions" value="{$fileExtensions}" width="10" />
- </div>
-
- </fieldset>
-
- <div class="buttons">
- <input type="hidden" name="op" value="updateHotlinkPreventionConfig" />
- <input type="reset" name="{$locale->tr("reset")}" />
- <input type="submit" name="{$locale->tr("update_settings")}" value="{$locale->tr("update")}" />
- </div>
-</form>
-{include file="$admintemplatepath/footernavigation.template"}
-{include file="$admintemplatepath/footer.template"}
Copied: plugins/trunk/hotlinkprevention/templates/hotlinkprevention.template (from rev 4487, plugins/branches/lifetype-1.1/hotlinkprevention/templates/hotlinkprevention.template)
Copied: plugins/trunk/linkcounter (from rev 4487, plugins/branches/lifetype-1.1/linkcounter)
Copied: plugins/trunk/linkcounter/class (from rev 4487, plugins/branches/lifetype-1.1/linkcounter/class)
Copied: plugins/trunk/linkcounter/class/action (from rev 4487, plugins/branches/lifetype-1.1/linkcounter/class/action)
Deleted: plugins/trunk/linkcounter/class/action/pluginlinkcounterconfigaction.class.php
===================================================================
--- plugins/branches/lifetype-1.1/linkcounter/class/action/pluginlinkcounterconfigaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/linkcounter/class/action/pluginlinkcounterconfigaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,45 +0,0 @@
-<?php
-
- /*
- Copyright 2006 Paul Westbrook (paul at westbrooks.org)
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-
- include_once( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/linkcounter/class/view/pluginlinkcounterconfigview.class.php" );
-
- /**
- * shows a form with the current configuration
- */
- class PluginLinkcounterConfigAction extends AdminAction
- {
-
- function PluginLinkcounterConfigAction( $actionInfo, $request )
- {
- $this->AdminAction( $actionInfo, $request );
- }
-
- function perform()
- {
- $this->_view = new PluginLinkcounterConfigView( $this->_blogInfo );
-
- $this->setCommonData();
-
- return true;
- }
- }
-?>
\ No newline at end of file
Copied: plugins/trunk/linkcounter/class/action/pluginlinkcounterconfigaction.class.php (from rev 4487, plugins/branches/lifetype-1.1/linkcounter/class/action/pluginlinkcounterconfigaction.class.php)
Deleted: plugins/trunk/linkcounter/class/action/pluginlinkcounterupdateconfigaction.class.php
===================================================================
--- plugins/branches/lifetype-1.1/linkcounter/class/action/pluginlinkcounterupdateconfigaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/linkcounter/class/action/pluginlinkcounterupdateconfigaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,78 +0,0 @@
-<?php
-
- /*
- Copyright 2006 Paul Westbrook (paul at westbrooks.org)
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
- include_once( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/linkcounter/class/view/pluginlinkcounterconfigview.class.php" );
-
- /**
- * updates the plugin configuration
- */
- class PluginLinkcounterUpdateConfigAction extends AdminAction
- {
- var $pluginEnabled;
-
- function PluginLinkcounterUpdateConfigAction( $actionInfo, $request )
- {
- $this->AdminAction( $actionInfo, $request );
- }
-
- function validate()
- {
-
- $this->pluginEnabled = $this->_request->getValue( "pluginEnabled" );
- $this->pluginEnabled = ($this->pluginEnabled != "" );
-
- return true;
- }
-
- function perform()
- {
-
- // update the plugin configurations to blog setting
- $blogSettings = $this->_blogInfo->getSettings();
- $blogSettings->setValue( "plugin_linkcounter_enabled", $this->pluginEnabled );
- $this->_blogInfo->setSettings( $blogSettings );
-
- // save the blogs settings
- $blogs = new Blogs();
- if( !$blogs->updateBlog( $this->_blogInfo )) {
- $this->_view = new PluginLinkcounterConfigView( $this->_blogInfo );
- $this->_view->setErrorMessage( $this->_locale->tr("error_updating_settings"));
- $this->setCommonData();
-
- return false;
- }
-
- // if everything went ok...
- $this->_blogInfo->setSettings( $blogSettings );
- $this->_session->setValue( "blogInfo", $this->_blogInfo );
- $this->saveSession();
-
- $this->_view = new PluginLinkcounterConfigView( $this->_blogInfo );
- $this->_view->setSuccessMessage( $this->_locale->tr("linkcounter_settings_saved_ok"));
- $this->setCommonData();
-
- // clear the cache
- CacheControl::resetBlogCache( $this->_blogInfo->getId());
-
- return true;
- }
- }
-?>
\ No newline at end of file
Copied: plugins/trunk/linkcounter/class/action/pluginlinkcounterupdateconfigaction.class.php (from rev 4487, plugins/branches/lifetype-1.1/linkcounter/class/action/pluginlinkcounterupdateconfigaction.class.php)
Copied: plugins/trunk/linkcounter/class/view (from rev 4487, plugins/branches/lifetype-1.1/linkcounter/class/view)
Deleted: plugins/trunk/linkcounter/class/view/pluginlinkcounterconfigview.class.php
===================================================================
--- plugins/branches/lifetype-1.1/linkcounter/class/view/pluginlinkcounterconfigview.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/linkcounter/class/view/pluginlinkcounterconfigview.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,46 +0,0 @@
-<?php
- /*
- Copyright 2006 Paul Westbrook (paul at westbrooks.org)
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-
- include_once( PLOG_CLASS_PATH."class/view/admin/adminplugintemplatedview.class.php" );
-
- /**
- * implements the main view of the feed reader plugin
- */
- class PluginLinkcounterConfigView extends AdminPluginTemplatedView
- {
- function PluginLinkcounterConfigView( $blogInfo )
- {
- $this->AdminPluginTemplatedView( $blogInfo, "linkcounter", "linkcounter" );
-
- }
-
- function render()
- {
- // load some configuration settings
- $blogSettings = $this->_blogInfo->getSettings();
- $pluginEnabled = $blogSettings->getValue( "plugin_linkcounter_enabled" );
-
- // create a view and export the settings to the template
- $this->setValue( "pluginEnabled", $pluginEnabled );
-
- parent::render();
- }
- }
-?>
\ No newline at end of file
Copied: plugins/trunk/linkcounter/class/view/pluginlinkcounterconfigview.class.php (from rev 4487, plugins/branches/lifetype-1.1/linkcounter/class/view/pluginlinkcounterconfigview.class.php)
Copied: plugins/trunk/linkcounter/locale (from rev 4487, plugins/branches/lifetype-1.1/linkcounter/locale)
Deleted: plugins/trunk/linkcounter/locale/locale_en_UK.php
===================================================================
--- plugins/branches/lifetype-1.1/linkcounter/locale/locale_en_UK.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/linkcounter/locale/locale_en_UK.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,14 +0,0 @@
-<?php
-$messages["manageAppearancePlugins"] = "Appearance Management";
-$messages["linkcounter"] = "Link Counter";
-
-$messages["linkcounter_plugin_enabled"] = "Enable Link Conter";
-$messages["linkcounter_plugin"] = "Link Counter";
-$messages["detail"] = "Detail";
-
-$messages["linkcounter_settings_saved_ok"] = "Link Counter settings saved successfully!";
-
-$messages["label_configuration"] = "Configuration";
-$messages["label_enable"] = "Enable";
-$messages["linkcounter_enable_description"] = "This option changes enables the Technorati Link Counter Widget";
-?>
\ No newline at end of file
Copied: plugins/trunk/linkcounter/locale/locale_en_UK.php (from rev 4487, plugins/branches/lifetype-1.1/linkcounter/locale/locale_en_UK.php)
Deleted: plugins/trunk/linkcounter/pluginlinkcounter.class.php
===================================================================
--- plugins/branches/lifetype-1.1/linkcounter/pluginlinkcounter.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/linkcounter/pluginlinkcounter.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,91 +0,0 @@
-<?php
- /*
- Copyright 2006 Paul Westbrook (paul at westbrooks.org)
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-
-
- include_once( PLOG_CLASS_PATH."class/plugin/pluginbase.class.php" );
- include_once( PLOG_CLASS_PATH."class/plugin/pluginmanager.class.php" );
- include_once( PLOG_CLASS_PATH."class/template/menu/menu.class.php" );
-
-
- class PluginLinkcounter extends PluginBase
- {
-
- var $pluginEnabled;
-
- function PluginLinkcounter()
- {
- $this->PluginBase();
-
- $this->id = "linkcounter";
- $this->author = "Paul Westbrook";
- $this->desc = "This plugin enables extended Technorati Link Counter Widget.";
-
- $this->locales = Array( "en_UK");
-
- $this->init();
- }
-
- function init()
- {
- $this->registerAdminAction( "linkcounterConfig", "PluginLinkcounterConfigAction" );
- $this->registerAdminAction( "updateLinkcounterConfig", "PluginLinkcounterUpdateConfigAction" );
-
- $menu =& Menu::getMenu();
- if( !$menu->entryExists( "/menu/controlCenter/manageAppearancePlugins" ))
- $this->addMenuEntry( "/menu/controlCenter", "manageAppearancePlugins", "", "", true, false );
- $this->addMenuEntry( "/menu/controlCenter/manageAppearancePlugins", "linkcounter", "?op=linkcounterConfig", "" );
- }
-
- function register()
- {
- $blogSettings = $this->blogInfo->getSettings();
- $this->pluginEnabled = $blogSettings->getValue( "plugin_linkcounter_enabled" );
- }
-
-
- function isEnabled()
- {
- return $this->pluginEnabled;
- }
-
-
- function show($postId)
- {
- $str = '';
-
- if ($this->isEnabled())
- {
-
- // articles object
- $articles = new Articles;
-
-
- $rg = $this->blogInfo->getBlogRequestGenerator();
- $rg->setXHTML( false );
- $post = $articles->getBlogArticle($postId);
- $str .= '<script src="http://embed.technorati.com/linkcount" type="text/javascript"></script>';
- $str .= '<a href="http://technorati.com/search/' . urlencode($rg->postPermalink($post)) . '" rel="linkcount">View blog reactions</a>';
- }
- return $str;
- }
-
-
- }
-?>
\ No newline at end of file
Copied: plugins/trunk/linkcounter/pluginlinkcounter.class.php (from rev 4487, plugins/branches/lifetype-1.1/linkcounter/pluginlinkcounter.class.php)
Deleted: plugins/trunk/linkcounter/readme.txt
===================================================================
--- plugins/branches/lifetype-1.1/linkcounter/readme.txt 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/linkcounter/readme.txt 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,19 +0,0 @@
-Plugin: MovableType
-Author: paul at westbrooks.org
-Release Date: 2006/11/26
-Version: 1.0
-
-Implements the Technorati Link Counter Widget (http://www.technorati.com/tools/linkcount/) for LifeType.
-
-[USAGES]:
-1. Upload: Upload all the extract files and directories to $LifeType_Install_Dir/plugin/linkcounter
-2. Add the following to post.template:
- $linkcounter->show($postId)
-
-
-[EXAMPLE]:
-Add the following code in post.template :
-
-Code:
-{assign var="postId" value=$post->getId()}
-{$linkcounter->show($)}
Copied: plugins/trunk/linkcounter/readme.txt (from rev 4487, plugins/branches/lifetype-1.1/linkcounter/readme.txt)
Copied: plugins/trunk/linkcounter/templates (from rev 4487, plugins/branches/lifetype-1.1/linkcounter/templates)
Deleted: plugins/trunk/linkcounter/templates/linkcounter.template
===================================================================
--- plugins/branches/lifetype-1.1/linkcounter/templates/linkcounter.template 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/linkcounter/templates/linkcounter.template 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,23 +0,0 @@
-{include file="$admintemplatepath/header.template"}
-{include file="$admintemplatepath/navigation.template" showOpt=linkcounter title=$locale->tr("linkcounter_plugin")}
-<form name="linkcounterPluginConfig" method="post">
- <fieldset class="inputField">
- <legend>{$locale->tr("label_configuration")}</legend>
- {include file="$admintemplatepath/successmessage.template"}
- {include file="$admintemplatepath/errormessage.template"}
- <div class="field">
- <label for="pluginEnabled">{$locale->tr("label_enable")}</label>
- <div class="formHelp"> {$locale->tr("linkcounter_enable_description")}</div>
- <input class="checkbox" type="checkbox" name="pluginEnabled" id="pluginEnabled" {if $pluginEnabled} checked="checked" {/if} value="1" />{$locale->tr("linkcounter_plugin_enabled")}
-
- </div>
- </fieldset>
-
- <div class="buttons">
- <input type="hidden" name="op" value="updateLinkcounterConfig" />
- <input type="reset" name="{$locale->tr("reset")}" />
- <input type="submit" name="{$locale->tr("update_settings")}" value="{$locale->tr("update")}" />
- </div>
-</form>
-{include file="$admintemplatepath/footernavigation.template"}
-{include file="$admintemplatepath/footer.template"}
Copied: plugins/trunk/linkcounter/templates/linkcounter.template (from rev 4487, plugins/branches/lifetype-1.1/linkcounter/templates/linkcounter.template)
Modified: plugins/trunk/mailcentre/templates/userselector.template
===================================================================
--- plugins/trunk/mailcentre/templates/userselector.template 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/mailcentre/templates/userselector.template 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,7 +1,7 @@
-<html>
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset={$locale->getCharset()}"/>
- <link rel="stylesheet" href="styles/admin.css" type="text/css" />
+<html>
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset={$locale->getCharset()}"/>
+ <link rel="stylesheet" href="styles/admin.css" type="text/css" />
<title>pLog Admin</title>
<script type="text/javascript">
{literal}
@@ -24,31 +24,31 @@
field.value+=address;
}
{/literal}
- </script>
- <style>{literal}
- html,body {
- margin : 0px;
- padding : 0px;
- background : #FFFFFF;
- }
- #container
- {
- width : 400px;
- text-align : left;
- margin-left : auto;
- margin-right : auto;
- }
-.info
-{
- margin-bottom : 10px;
- width : 285px;
-}
-#list_action_bar
-{
- width : 285px;
- padding : 4px;
-}
- {/literal}</style>
+ </script>
+ <style>{literal}
+ html,body {
+ margin : 0px;
+ padding : 0px;
+ background : #FFFFFF;
+ }
+ #container
+ {
+ width : 400px;
+ text-align : left;
+ margin-left : auto;
+ margin-right : auto;
+ }
+.info
+{
+ margin-bottom : 10px;
+ width : 285px;
+}
+#list_action_bar
+{
+ width : 285px;
+ padding : 4px;
+}
+ {/literal}</style>
</head>
<div id="list_nav_bar">
@@ -135,10 +135,10 @@
</table>
</div>
<div id="list_action_bar">
- {include file="$admintemplatepath/adminpager.template" style=list}
+ {adminpager style=list}
<a href="javascript:window.close()">{$locale->tr("close")}</a>
</div>
</form>
-</div>
-</body>
-</html>
+</div>
+</body>
+</html>
Modified: plugins/trunk/mobile/class/action/mobileaction.class.php
===================================================================
--- plugins/trunk/mobile/class/action/mobileaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/mobile/class/action/mobileaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,9 +1,9 @@
<?php
- include_once( PLOG_CLASS_PATH."class/action/action.class.php" );
- include_once( PLOG_CLASS_PATH."class/config/config.class.php" );
- include_once( MOBILE_PLOG_CLASS_PATH."class/net/mobilerequestgenerator.class.php" );
- include_once( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/action/action.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
+ lt_include( MOBILE_PLOG_CLASS_PATH."class/net/mobilerequestgenerator.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
class MobileAction extends Action
{
@@ -35,7 +35,7 @@
*/
function _getBlogInfo()
{
- include_once( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
$blogId = $this->_request->getValue( "blogId" );
$val = new IntegerValidator();
if( !$val->validate( $blogId )) {
Modified: plugins/trunk/mobile/class/action/mobiledefaultaction.class.php
===================================================================
--- plugins/trunk/mobile/class/action/mobiledefaultaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/mobile/class/action/mobiledefaultaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,8 +1,8 @@
<?php
- include_once( MOBILE_PLOG_CLASS_PATH."class/action/mobileaction.class.php" );
- include_once( MOBILE_PLOG_CLASS_PATH."class/view/mobiledefaultview.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/articles.class.php" );
+ lt_include( MOBILE_PLOG_CLASS_PATH."class/action/mobileaction.class.php" );
+ lt_include( MOBILE_PLOG_CLASS_PATH."class/view/mobiledefaultview.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/articles.class.php" );
class MobileDefaultAction extends MobileAction
{
Modified: plugins/trunk/mobile/class/action/mobileviewarticleaction.class.php
===================================================================
--- plugins/trunk/mobile/class/action/mobileviewarticleaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/mobile/class/action/mobileviewarticleaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,10 +1,10 @@
<?php
- include_once( MOBILE_PLOG_CLASS_PATH."class/action/mobileaction.class.php" );
- include_once( MOBILE_PLOG_CLASS_PATH."class/view/mobileerrorview.class.php" );
- include_once( MOBILE_PLOG_CLASS_PATH."class/view/mobileviewarticleview.class.php" );
- include_once( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/articles.class.php" );
+ lt_include( MOBILE_PLOG_CLASS_PATH."class/action/mobileaction.class.php" );
+ lt_include( MOBILE_PLOG_CLASS_PATH."class/view/mobileerrorview.class.php" );
+ lt_include( MOBILE_PLOG_CLASS_PATH."class/view/mobileviewarticleview.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/articles.class.php" );
class MobileViewArticleAction extends MobileAction
{
Modified: plugins/trunk/mobile/class/controller/mobilecontroller.class.php
===================================================================
--- plugins/trunk/mobile/class/controller/mobilecontroller.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/mobile/class/controller/mobilecontroller.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,6 +1,6 @@
<?php
- include_once( PLOG_CLASS_PATH."class/controller/controller.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/controller/controller.class.php" );
class MobileController extends Controller
{
Modified: plugins/trunk/mobile/class/net/mobilerequestgenerator.class.php
===================================================================
--- plugins/trunk/mobile/class/net/mobilerequestgenerator.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/mobile/class/net/mobilerequestgenerator.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,6 +1,6 @@
<?php
- include_once( PLOG_CLASS_PATH."class/net/baserequestgenerator.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/net/baserequestgenerator.class.php" );
class MobileRequestGenerator extends BaseRequestGenerator
{
Modified: plugins/trunk/mobile/class/net/terminalidentifier.class.php
===================================================================
--- plugins/trunk/mobile/class/net/terminalidentifier.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/mobile/class/net/terminalidentifier.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,8 +1,8 @@
<?php
- include_once( PLOG_CLASS_PATH."plugins/mobile/class/net/terminalinfo.class.php" );
- include_once( PLOG_CLASS_PATH."class/config/config.class.php" );
+ lt_include( PLOG_CLASS_PATH."plugins/mobile/class/net/terminalinfo.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
class TerminalIdentifier
{
Modified: plugins/trunk/mobile/class/view/mobiledefaultview.class.php
===================================================================
--- plugins/trunk/mobile/class/view/mobiledefaultview.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/mobile/class/view/mobiledefaultview.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,7 +1,7 @@
<?php
- include_once( MOBILE_PLOG_CLASS_PATH."class/view/mobileview.class.php" );
- include_once( PLOG_CLASS_PATH."class/data/pager/pager.class.php" );
+ lt_include( MOBILE_PLOG_CLASS_PATH."class/view/mobileview.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/data/pager/pager.class.php" );
class MobileDefaultView extends MobileView
{
Modified: plugins/trunk/mobile/class/view/mobileerrorview.class.php
===================================================================
--- plugins/trunk/mobile/class/view/mobileerrorview.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/mobile/class/view/mobileerrorview.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,6 +1,6 @@
<?php
- include_once( MOBILE_PLOG_CLASS_PATH."class/view/mobileview.class.php" );
+ lt_include( MOBILE_PLOG_CLASS_PATH."class/view/mobileview.class.php" );
class MobileErrorView extends MobileView
{
Modified: plugins/trunk/mobile/class/view/mobileview.class.php
===================================================================
--- plugins/trunk/mobile/class/view/mobileview.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/mobile/class/view/mobileview.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,8 +1,8 @@
<?php
- include_once( PLOG_CLASS_PATH."class/view/plugintemplatedview.class.php" );
- include_once( MOBILE_PLOG_CLASS_PATH."class/net/terminalidentifier.class.php" );
- include_once( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/view/plugintemplatedview.class.php" );
+ lt_include( MOBILE_PLOG_CLASS_PATH."class/net/terminalidentifier.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/data/timestamp.class.php" );
class MobileView extends PluginTemplatedView
{
Modified: plugins/trunk/mobile/class/view/mobileviewarticleview.class.php
===================================================================
--- plugins/trunk/mobile/class/view/mobileviewarticleview.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/mobile/class/view/mobileviewarticleview.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,8 +1,8 @@
<?php
- include_once( MOBILE_PLOG_CLASS_PATH."class/view/mobileview.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/articlecomments.class.php" );
- include_once( PLOG_CLASS_PATH."class/data/pager/pager.class.php" );
+ lt_include( MOBILE_PLOG_CLASS_PATH."class/view/mobileview.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/dao/articlecomments.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/data/pager/pager.class.php" );
class MobileViewArticleView extends MobileView
{
Modified: plugins/trunk/mobile/pluginmobile.class.php
===================================================================
--- plugins/trunk/mobile/pluginmobile.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/mobile/pluginmobile.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,6 +1,6 @@
<?php
- include_once( PLOG_CLASS_PATH."class/plugin/pluginbase.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/plugin/pluginbase.class.php" );
if( !defined( "MOBILE_PLOG_CLASS_PATH" )) {
define( "MOBILE_PLOG_CLASS_PATH", PLOG_CLASS_PATH."plugins/mobile/" );
@@ -25,7 +25,7 @@
*/
function blogLink()
{
- include_once( MOBILE_PLOG_CLASS_PATH."class/net/mobilerequestgenerator.class.php" );
+ lt_include( MOBILE_PLOG_CLASS_PATH."class/net/mobilerequestgenerator.class.php" );
$murl = new MobileRequestGenerator( $this->blogInfo );
return( $murl->getMobileUrl()."?blogId=".$this->blogInfo->getId());
}
@@ -38,7 +38,7 @@
*/
function articleLink( $article )
{
- include_once( MOBILE_PLOG_CLASS_PATH."class/net/mobilerequestgenerator.class.php" );
+ lt_include( MOBILE_PLOG_CLASS_PATH."class/net/mobilerequestgenerator.class.php" );
$murl = new MobileRequestGenerator( $this->blogInfo );
return( $murl->getMobileUrl()."?op=ViewArticle&blogId=".$this->blogInfo->getId()."&articleId=".$article->getId());
}
Copied: plugins/trunk/moderate/locale/locale_ca_ES.php (from rev 4487, plugins/branches/lifetype-1.1/moderate/locale/locale_ca_ES.php)
Modified: plugins/trunk/moderate/locale/locale_en_UK.php
===================================================================
--- plugins/trunk/moderate/locale/locale_en_UK.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/moderate/locale/locale_en_UK.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -21,4 +21,6 @@
$messages["label_enable"] = "Enable";
$messages["label_moderate"] = "Moderate";
$messages["label_reject"] = "Reject";
+
+$messages["moderate_form_note"] = "Comments are moderated to prevent spam. This may cause a delay before your post appears.";
?>
\ No newline at end of file
Modified: plugins/trunk/moderate/locale/locale_es_ES.php
===================================================================
--- plugins/trunk/moderate/locale/locale_es_ES.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/moderate/locale/locale_es_ES.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -26,4 +26,6 @@
$messages["label_enable"] = "Activar";
$messages["label_moderate"] = "Moderar";
$messages["label_reject"] = "Rechazar";
+
+$messages["moderate_form_note"] = "Los comentarios son moderados para evitar spam. Esto puede hacer que tu escrito tarde un poco en ser visible.";
?>
\ No newline at end of file
Modified: plugins/trunk/moderate/readme.txt
===================================================================
--- plugins/trunk/moderate/readme.txt 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/moderate/readme.txt 2007-01-04 19:10:56 UTC (rev 4488)
@@ -6,4 +6,10 @@
This plugin offers you moderate of comments.
Install:
-1. Configurate your Moderate plugin in your LifeType control center
\ No newline at end of file
+1. Configurate your Moderate plugin in your LifeType control center
+
+2. If you like you can add the following lines to your commentform.template to inform users that comments are moderated
+
+ {if $moderate && $moderate->isEnabled()}
+ <p>{$locale->tr("moderate_form_note")}</p>
+ {/if}
\ No newline at end of file
Copied: plugins/trunk/movabletype (from rev 4487, plugins/branches/lifetype-1.1/movabletype)
Copied: plugins/trunk/movabletype/class (from rev 4487, plugins/branches/lifetype-1.1/movabletype/class)
Copied: plugins/trunk/movabletype/class/action (from rev 4487, plugins/branches/lifetype-1.1/movabletype/class/action)
Deleted: plugins/trunk/movabletype/class/action/pluginmovabletypeconfigaction.class.php
===================================================================
--- plugins/branches/lifetype-1.1/movabletype/class/action/pluginmovabletypeconfigaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/movabletype/class/action/pluginmovabletypeconfigaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,45 +0,0 @@
-<?php
-
- /*
- Copyright 2006 Paul Westbrook (paul at westbrooks.org)
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-
- include_once( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/movabletype/class/view/pluginmovabletypeconfigview.class.php" );
-
- /**
- * shows a form with the current configuration
- */
- class PluginMovabletypeConfigAction extends AdminAction
- {
-
- function PluginMovabletypeConfigAction( $actionInfo, $request )
- {
- $this->AdminAction( $actionInfo, $request );
- }
-
- function perform()
- {
- $this->_view = new PluginMovabletypeConfigView( $this->_blogInfo );
-
- $this->setCommonData();
-
- return true;
- }
- }
-?>
\ No newline at end of file
Copied: plugins/trunk/movabletype/class/action/pluginmovabletypeconfigaction.class.php (from rev 4487, plugins/branches/lifetype-1.1/movabletype/class/action/pluginmovabletypeconfigaction.class.php)
Deleted: plugins/trunk/movabletype/class/action/pluginmovabletypeupdateconfigaction.class.php
===================================================================
--- plugins/branches/lifetype-1.1/movabletype/class/action/pluginmovabletypeupdateconfigaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/movabletype/class/action/pluginmovabletypeupdateconfigaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,79 +0,0 @@
-<?php
-
- /*
- Copyright 2006 Paul Westbrook (paul at westbrooks.org)
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
- include_once( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/movabletype/class/view/pluginmovabletypeconfigview.class.php" );
-
- /**
- * updates the plugin configuration
- */
- class PluginMovabletypeUpdateConfigAction extends AdminAction
- {
- var $_use_mt_more_text;
- var $_sitesArray;
-
- function PluginMovabletypeUpdateConfigAction( $actionInfo, $request )
- {
- $this->AdminAction( $actionInfo, $request );
- }
-
- function validate()
- {
-
- $this->_use_mt_more_text = $this->_request->getValue( "useMTMoreText" );
- $this->_use_mt_more_text = ($this->_use_mt_more_text != "" );
-
- return true;
- }
-
- function perform()
- {
-
- // update the plugin configurations to blog setting
- $blogSettings = $this->_blogInfo->getSettings();
- $blogSettings->setValue( "xmlrpc_movabletype_enabled", $this->_use_mt_more_text );
- $this->_blogInfo->setSettings( $blogSettings );
-
- // save the blogs settings
- $blogs = new Blogs();
- if( !$blogs->updateBlog( $this->_blogInfo )) {
- $this->_view = new PluginMovabletypeConfigView( $this->_blogInfo );
- $this->_view->setErrorMessage( $this->_locale->tr("error_updating_settings"));
- $this->setCommonData();
-
- return false;
- }
-
- // if everything went ok...
- $this->_blogInfo->setSettings( $blogSettings );
- $this->_session->setValue( "blogInfo", $this->_blogInfo );
- $this->saveSession();
-
- $this->_view = new PluginMovabletypeConfigView( $this->_blogInfo );
- $this->_view->setSuccessMessage( $this->_locale->tr("movabletype_settings_saved_ok"));
- $this->setCommonData();
-
- // clear the cache
- CacheControl::resetBlogCache( $this->_blogInfo->getId());
-
- return true;
- }
- }
-?>
\ No newline at end of file
Copied: plugins/trunk/movabletype/class/action/pluginmovabletypeupdateconfigaction.class.php (from rev 4487, plugins/branches/lifetype-1.1/movabletype/class/action/pluginmovabletypeupdateconfigaction.class.php)
Copied: plugins/trunk/movabletype/class/view (from rev 4487, plugins/branches/lifetype-1.1/movabletype/class/view)
Deleted: plugins/trunk/movabletype/class/view/pluginmovabletypeconfigview.class.php
===================================================================
--- plugins/branches/lifetype-1.1/movabletype/class/view/pluginmovabletypeconfigview.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/movabletype/class/view/pluginmovabletypeconfigview.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,50 +0,0 @@
-<?php
- /*
- Copyright 2006 Paul Westbrook (paul at westbrooks.org)
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-
- include_once( PLOG_CLASS_PATH."class/view/admin/adminplugintemplatedview.class.php" );
-
- /**
- * implements the main view of the feed reader plugin
- */
- class PluginMovabletypeConfigView extends AdminPluginTemplatedView
- {
- var $_pm;
-
-
-
- function PluginMovabletypeConfigView( $blogInfo )
- {
- $this->AdminPluginTemplatedView( $blogInfo, "movabletype", "movabletype" );
-
- }
-
- function render()
- {
- // load some configuration settings
- $blogSettings = $this->_blogInfo->getSettings();
- $mtMoreTextEnabled = $blogSettings->getValue( "xmlrpc_movabletype_enabled" );
-
- // create a view and export the settings to the template
- $this->setValue( "useMTMoreText", $mtMoreTextEnabled );
-
- parent::render();
- }
- }
-?>
\ No newline at end of file
Copied: plugins/trunk/movabletype/class/view/pluginmovabletypeconfigview.class.php (from rev 4487, plugins/branches/lifetype-1.1/movabletype/class/view/pluginmovabletypeconfigview.class.php)
Copied: plugins/trunk/movabletype/locale (from rev 4487, plugins/branches/lifetype-1.1/movabletype/locale)
Deleted: plugins/trunk/movabletype/locale/locale_en_UK.php
===================================================================
--- plugins/branches/lifetype-1.1/movabletype/locale/locale_en_UK.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/movabletype/locale/locale_en_UK.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,14 +0,0 @@
-<?php
-$messages["manageAppearancePlugins"] = "Appearance Management";
-$messages["movabletype"] = "MovableType";
-
-$messages["movabletype_plugin_enabled"] = "Enable MovableType xmlrpc";
-$messages["movabletype_plugin"] = "MovableType";
-$messages["detail"] = "Detail";
-
-$messages["movabletype_settings_saved_ok"] = "MovableType settings saved successfully!";
-
-$messages["label_configuration"] = "Configuration";
-$messages["label_enable"] = "Enable";
-$messages["enable_description"] = "This option changes LifeType to use the MovableType extensions to the xmlrpc specification";
-?>
\ No newline at end of file
Copied: plugins/trunk/movabletype/locale/locale_en_UK.php (from rev 4487, plugins/branches/lifetype-1.1/movabletype/locale/locale_en_UK.php)
Deleted: plugins/trunk/movabletype/pluginmovabletype.class.php
===================================================================
--- plugins/branches/lifetype-1.1/movabletype/pluginmovabletype.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/movabletype/pluginmovabletype.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,59 +0,0 @@
-<?php
- /*
- Copyright 2006 Paul Westbrook (paul at westbrooks.org)
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-
-
- include_once( PLOG_CLASS_PATH."class/plugin/pluginbase.class.php" );
- include_once( PLOG_CLASS_PATH."class/plugin/pluginmanager.class.php" );
- include_once( PLOG_CLASS_PATH."class/template/menu/menu.class.php" );
-
-
- class PluginMovabletype extends PluginBase
- {
-
-
- function PluginMovabletype()
- {
- $this->PluginBase();
-
- $this->id = "movabletype";
- $this->author = "Paul Westbrook";
- $this->desc = "This plugin enables extended text in xmlrpc structures.";
-
- $this->locales = Array( "en_UK");
-
- $this->init();
- }
-
- function init()
- {
- $this->registerAdminAction( "movabletypeConfig", "PluginMovabletypeConfigAction" );
- $this->registerAdminAction( "updateMovabletypeConfig", "PluginMovabletypeUpdateConfigAction" );
-
- $menu =& Menu::getMenu();
- if( !$menu->entryExists( "/menu/controlCenter/manageSettings" ))
- $this->addMenuEntry( "/menu/controlCenter", "manageSettings", "", "", true, false );
- $this->addMenuEntry( "/menu/controlCenter/manageSettings", "movabletype", "?op=movabletypeConfig", "" );
- }
-
- function register()
- {
- }
- }
-?>
\ No newline at end of file
Copied: plugins/trunk/movabletype/pluginmovabletype.class.php (from rev 4487, plugins/branches/lifetype-1.1/movabletype/pluginmovabletype.class.php)
Deleted: plugins/trunk/movabletype/readme.txt
===================================================================
--- plugins/branches/lifetype-1.1/movabletype/readme.txt 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/movabletype/readme.txt 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,7 +0,0 @@
-Plugin: MovableType
-Author: paul at westbrooks.org
-Release Date: 2006/09/25
-Version: 1.0
-
-Enables the MovableType extensions to the metaWeblog xmlrcp specification.
-http://www.movabletype.org/mt-static/docs/mtmanual_programmatic.html
Copied: plugins/trunk/movabletype/readme.txt (from rev 4487, plugins/branches/lifetype-1.1/movabletype/readme.txt)
Copied: plugins/trunk/movabletype/templates (from rev 4487, plugins/branches/lifetype-1.1/movabletype/templates)
Deleted: plugins/trunk/movabletype/templates/movabletype.template
===================================================================
--- plugins/branches/lifetype-1.1/movabletype/templates/movabletype.template 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/movabletype/templates/movabletype.template 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,23 +0,0 @@
-{include file="$admintemplatepath/header.template"}
-{include file="$admintemplatepath/navigation.template" showOpt=movabletype title=$locale->tr("movabletype_plugin")}
-<form name="movabletypePluginConfig" method="post">
- <fieldset class="inputField">
- <legend>{$locale->tr("label_configuration")}</legend>
- {include file="$admintemplatepath/successmessage.template"}
- {include file="$admintemplatepath/errormessage.template"}
- <div class="field">
- <label for="useMTMoreText">{$locale->tr("label_enable")}</label>
- <div class="formHelp"> {$locale->tr("enable_description")}</div>
- <input class="checkbox" type="checkbox" name="useMTMoreText" id="useMTMoreText" {if $useMTMoreText} checked="checked" {/if} value="1" />{$locale->tr("movabletype_plugin_enabled")}
-
- </div>
- </fieldset>
-
- <div class="buttons">
- <input type="hidden" name="op" value="updateMovabletypeConfig" />
- <input type="reset" name="{$locale->tr("reset")}" />
- <input type="submit" name="{$locale->tr("update_settings")}" value="{$locale->tr("update")}" />
- </div>
-</form>
-{include file="$admintemplatepath/footernavigation.template"}
-{include file="$admintemplatepath/footer.template"}
Copied: plugins/trunk/movabletype/templates/movabletype.template (from rev 4487, plugins/branches/lifetype-1.1/movabletype/templates/movabletype.template)
Modified: plugins/trunk/nestedcomments/pluginnestedcomments.class.php
===================================================================
--- plugins/trunk/nestedcomments/pluginnestedcomments.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/nestedcomments/pluginnestedcomments.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -20,18 +20,16 @@
// description
$this->desc = <<<EOD
This plugin will generate a nested list of comments. In order to use it, edit your postandcomments.template file
-and where it says:
+and add the following line:
<pre>
- {foreach from=\$comments item=comment}
+ {assign var=comments value=\$nestedcomments->getNestedComments(\$post)}
</pre>
-with:
+just above this line:
<pre>
- {assign var=comments value=\$nestedcomments->getNestedComments(\$post)}
{foreach from=\$comments item=comment}
</pre>
-In order to nest the comments, you can check the value of the "depth" field in order to know how
-deeply a certain comment should be nested but keeping in mind that the array of comments is already
-sorted correctly:
+Nesting is applied by using CSS classes to increase the left margin of the div block of the comment. The recommended
+implenentation looks like this:
<pre>
{assign var=comments value=\$nestedcomments->getNestedComments(\$post)}
{foreach from=\$comments item=comment}
@@ -41,9 +39,11 @@
</div>
{/foreach}
</pre>
+Please notice that we are defining several different "comment_X" CSS classes that should be defined in our
+CSS file:
In order to apply different graphical styles for different levels of nesting, define up to 6
"comment_X" CSS classes (as in "comment_1", "comment_2", "comment_3", etc) in the CSS file used
-by your template set.
+by your template set:
<pre>
.comment_1 {
margin-left: 10px;
Copied: plugins/trunk/openid (from rev 4487, plugins/branches/lifetype-1.1/openid)
Deleted: plugins/trunk/openid/OpenID.php
===================================================================
--- plugins/branches/lifetype-1.1/openid/OpenID.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/openid/OpenID.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,815 +0,0 @@
-<?
-/*
- * OpenID implementation for LifeType
- * based on
- *
- * phpMyID - A standalone, single user, OpenID Identity Provider
- *
- * by: CJ Niemira <siege (at) siege (dot) org>
- * (c) 2006
- * http://siege.org/projects/phpMyID
- *
- * Version: 0.3
- *
- * This code is licensed under the GNU General Public License
- * http://www.gnu.org/licenses/gpl.html
- *
- *
- * *************************************************************************** *
- * CONFIGURATION
- * *************************************************************************** *
- * You must change these values:
- * auth_username = login name
- * auth_password = md5(username:phpMyID:password)
- *
- * Default username = 'test', password = 'test'
- */
-
-if (!defined( "PLOG_CLASS_PATH" )) {
- define( "PLOG_CLASS_PATH", dirname(__FILE__)."/");
-}
-include_once( PLOG_CLASS_PATH."class/net/http/session/sessionmanager.class.php" );
-include_once( PLOG_CLASS_PATH."class/net/http/httpvars.class.php" );
-include_once( PLOG_CLASS_PATH."class/dao/userinfo.class.php");
-include_once( PLOG_CLASS_PATH."class/dao/users.class.php");
-
-/*
-$profile = array(
- 'auth_username' => 'test',
- 'auth_password' => 'e8358914a32e1ce3c62836db4babaa01'
-);
-*/
-/*
- * Optional - Simple Registration Extension:
- *
- * If you would like to add any of the following optional registration
- * parameters to your login profile, simply uncomment the line, and enter the
- * correct values.
- *
- * Details on the exact allowed values for these paramters can be found at:
- * http://openid.net/specs/openid-simple-registration-extension-1_0.html
- */
-
-$sreg = array (
-# 'nickname' => 'Joe',
-# 'email' => 'joe at example.com',
-# 'fullname' => 'Joe Example',
-# 'dob' => '1970-10-31',
-# 'gender' => 'M',
-# 'postcode' => '22000',
-# 'country' => 'US',
-# 'language' => 'en',
-# 'timezone' => 'America/New_York'
-);
-
-
-
-/******************************************************************************/
-
-/*
- * Internal configuration
- * DO NOT ALTER ANYTHING BELOW THIS POINT UNLESS YOU KNOW WHAT YOU ARE DOING!
- */
-
-$idp_url = sprintf("%s://%s%s",
- ($_SERVER["HTTPS"] == 'on' ? 'https' : 'http'),
- $_SERVER['SERVER_NAME'],
- $_SERVER['PHP_SELF']);
-
-$req_url = sprintf("%s://%s%s",
- ($_SERVER["HTTPS"] == 'on' ? 'https' : 'http'),
- $_SERVER['HTTP_HOST'],
- $_SERVER["REQUEST_URI"]);
-
-$profile['auth_domain'] = "$req_url $idp_url";
-$profile['auth_realm'] = 'LifeType OpenID authentication';
-$profile['lifetime'] = ((session_cache_expire() * 60) - 10);
-
-$known = array(
- 'assoc_types' => array('HMAC-SHA1'),
-
- 'openid_modes' => array('associate',
- 'checkid_immediate',
- 'checkid_setup',
- 'check_authentication',
- 'error',
- 'logout'),
-
- 'session_types' => array('',
- 'DH-SHA1'),
-
- 'bigmath_types' => array('DH-SHA1'),
-);
-
-$g = 2;
-
-$p = '15517289818147369747123225776371553991572480196691540447970779531405762' .
-'9378541917580651227423698188993727816152646631438561595825688188889951272158' .
-'8426754199503412587065565498035801048705376814767265132557470407658574792912' .
-'9157233451064324509471500722962109419434978392598476037559498584825335930558' .
-'5439638443';
-
-
-
-/******************************************************************************/
-
-/*
- * Runmode functions
- */
-
-function associate_mode () {
- global $g, $known, $p, $profile;
-
- // Validate the request
- if (! isset($_POST['openid_mode']) || $_POST['openid_mode'] != 'associate')
- error_400();
-
- // Get the options, use defaults as necessary
- $assoc_type = (strlen($_POST['openid_assoc_type'])
- && in_array($_POST['openid_assoc_type'], $known['assoc_types']))
- ? $_POST['openid_assoc_type']
- : 'HMAC-SHA1';
-
- $session_type = (strlen($_POST['openid_session_type'])
- && in_array($_POST['openid_session_type'], $known['session_types']))
- ? $_POST['openid_session_type']
- : '';
-
- $dh_modulus = (strlen($_POST['openid_dh_modulus']))
- ? $_POST['openid_dh_modulus']
- : ($session_type == 'DH-SHA1'
- ? $p
- : null);
-
- $dh_gen = (strlen($_POST['openid_dh_gen']))
- ? $_POST['openid_dh_gen']
- : ($session_type == 'DH-SHA1'
- ? $g
- : null);
-
- $dh_consumer_public = (strlen($_POST['openid_dh_consumer_public']))
- ? $_POST['openid_dh_consumer_public']
- : ($session_type == 'DH-SHA1'
- ? error_post('dh_consumer_public was not specified')
- : null);
-
- // Create the associate id and shared secret now
- $lifetime = time() + $profile['lifetime'];
-
- // Create standard keys
- $keys = array(
- 'assoc_type' => $assoc_type,
- 'expires_in' => $profile['lifetime']
- );
-
- // If I can't handle bigmath, default to plaintext sessions
- if (in_array($session_type, $known['bigmath_types']) && ! extension_loaded('bcmath'))
- $session_type = null;
-
- // Add response keys based on the session type
- switch ($session_type) {
- case 'DH-SHA1':
- list ($assoc_handle, $shared_secret) = new_assoc($lifetime);
-
- // Compute the Diffie-Hellman stuff
- $private_key = random($dh_modulus);
- $public_key = bcpowmod($dh_gen, $private_key, $dh_modulus);
- $remote_key = long(base64_decode($dh_consumer_public));
- $ss = bcpowmod($remote_key, $private_key, $dh_modulus);
-
- $keys['assoc_handle'] = $assoc_handle;
- $keys['session_type'] = $session_type;
- $keys['dh_server_public'] = base64_encode(bin($public_key));
- $keys['enc_mac_key'] = base64_encode(x_or(sha1_20(bin($ss)), $shared_secret));
-
- break;
-
- default:
- list ($assoc_handle, $shared_secret) = new_assoc();
-
- $keys['assoc_handle'] = $assoc_handle;
- $keys['mac_key'] = base64_encode($shared_secret);
- }
-
- // Return the keys
- wrap_kv($keys);
-}
-
-
-function check_authentication_mode () {
- // Validate the request
- if (! isset($_POST['openid_mode']) || $_POST['openid_mode'] != 'check_authentication')
- error_400();
-
- $assoc_handle = strlen($_POST['openid_assoc_handle'])
- ? $_POST['openid_assoc_handle']
- : error_post('Missing assoc_handle');
-
- $sig = strlen($_POST['openid_sig'])
- ? $_POST['openid_sig']
- : error_post('Missing sig');
-
- $signed = strlen($_POST['openid_signed'])
- ? $_POST['openid_signed']
- : error_post('Missing signed');
-
- // Prepare the return keys
- $keys = array(
- 'openid.mode' => 'id_res'
- );
-
- // Invalidate the assoc handle if we need to
- if (strlen($_POST['openid_invalidate_handle'])) {
- destroy_assoc_handle($_POST['openid_invalidate_handle']);
-
- $keys['invalidate_handle'] = $_POST['openid_invalidate_handle'];
- }
-
- // Validate the sig by recreating the kv pair and signing
- $_POST['openid_mode'] = 'id_res';
- $tokens = '';
- foreach (explode(',', $signed) as $param) {
- $post = preg_replace('/\./', '_', $param);
- $tokens .= sprintf("%s:%s\n", $param, $_POST['openid_' . $post]);
- }
-
- // Add the sreg stuff, if we've got it
- foreach (explode(',', $sreg_required) as $key) {
- if (! isset($sreg[$key]))
- continue;
- $skey = 'sreg.' . $key;
-
- $tokens .= sprintf("%s:%s\n", $skey, $sreg[$key]);
- $keys[$skey] = $sreg[$key];
- $fields[] = $skey;
- }
-
- list ($shared_secret, $expires) = secret($assoc_handle);
-
- // A 'smart mode' id will have an expiration time set, don't allow it
- if ($shared_secret == false || is_numeric($expires)) {
- $keys['is_valid'] = 'false';
-
- } else {
- $ok = base64_encode(hmac($shared_secret, $tokens));
- $keys['is_valid'] = ($sig == $ok) ? 'true' : 'false';
- }
-
- // Return the keys
- wrap_kv($keys);
-}
-
-
-function checkid ( $wait ) {
- debug("checkid : $wait");
- global $idp_url, $known, $profile, $sreg, $user_authenticated;
-
- // Get the options, use defaults as necessary
- $return_to = strlen($_GET['openid_return_to'])
- ? $_GET['openid_return_to']
- : error_400('Missing return_to');
-
- $identity = strlen($_GET['openid_identity'])
- ? $_GET['openid_identity']
- : error_get($return_to, 'Missing identity');
-
- $assoc_handle = strlen($_GET['openid_assoc_handle'])
- ? $_GET['openid_assoc_handle']
- : null;
-
- $trust_root = strlen($_GET['openid_trust_root'])
- ? $_GET['openid_trust_root']
- : $return_to;
-
- $sreg_required = strlen($_GET['openid_sreg_required'])
- ? $_GET['openid_sreg_required']
- : '';
-
- $sreg_optional = strlen($_GET['openid_sreg_optional'])
- ? $_GET['openid_sreg_optional']
- : '';
-
- // required and optional make no difference to us
- $sreg_required .= ',' . $sreg_optional;
-
- $keys = array(
- 'mode' => 'id_res'
- );
-
-/*
- // try to get the digest headers - what a PITA!
- if (version_compare(phpversion(), '5.0.0', 'lt')) {
- if (function_exists('apache_request_headers')) {
- $arh = apache_request_headers();
- $hdr = $arh['Authorization'];
-
- } elseif (isset($_SERVER['HTTP_AUTHORIZATION'])) {
- $hdr = $_SERVER['HTTP_AUTHORIZATION'];
-
- } else {
- $hdr = null;
- }
-
- $digest = substr($hdr,0,7) == 'Digest '
- ? substr($hdr, strpos($hdr, ' ') + 1)
- : null;
-
- } else {
- $digest = empty($_SERVER['PHP_AUTH_DIGEST'])
- ? null
- : $_SERVER['PHP_AUTH_DIGEST'];
- }
-*/
- $username = empty($_SERVER['PHP_AUTH_USER']) ? null : $_SERVER['PHP_AUTH_USER'];
- $password = empty($_SERVER['PHP_AUTH_PW']) ? null : $_SERVER['PHP_AUTH_PW'];
-
- $stale = false;
-
- // is the user trying to log in?
- if ($wait && ! is_null($username) && $user_authenticated === false) {
- /*
- debug($digest);
- $hdr = array();
-
- // decode the Digest authentication headers
- preg_match_all('/(\w+)=(?:"([^"]+)"|([^\s,]+))/', $digest, $mtx, PREG_SET_ORDER);
-
- foreach ($mtx as $m)
- $hdr[$m[1]] = $m[2] ? $m[2] : $m[3];
- debug($hdr);
-
- if ($hdr['nonce'] != $_SESSION['uniqid'])
- $stale = true;
-
- if ($profile['auth_username'] == $hdr['username'] && ! $stale) {
-
- // the entity body should always be null in this case
- $entity_body = '';
- $a1 = $profile['auth_password'];
- $a2 = $hdr['qop'] == 'auth-int'
- ? md5(implode(':', array($_SERVER['REQUEST_METHOD'], $hdr['uri'], md5($entity_body))))
- : md5(implode(':', array($_SERVER['REQUEST_METHOD'], $hdr['uri'])));
- $ok = md5(implode(':', array($a1, $hdr['nonce'], $hdr['nc'], $hdr['cnonce'], $hdr['qop'], $a2)));
-
- // successful login!
- if ($hdr['response'] == $ok) {
- $_SESSION['auth_username'] = $hdr['username'];
- $user_authenticated = true;
-
- // too many failures
- } elseif (strcmp($hdr['nc'], 5) > 0) {
- wrap_refresh($return_to . $q . 'openid.mode=cancel');
- }
- }
- */
-
- $users = new Users();
-
- $auth = $users->authenticateUser( $username, $password );
-
- if ($auth)
- {
- $user_authenticated = true;
-
- // get the user's information
- $userInfo = $users->getUserInfoFromUsername( $username );
- if($userInfo)
- {
- $sreg['email'] = $userInfo->getEmail();
- $sreg['fullname'] = $userInfo->getFullName();
- }
- }
- }
-
- // make sure i am this identifier
- if ($identity != $idp_url) {
- if ($wait) {
- $keys['mode'] = 'cancel';
- } else {
- $keys['user_setup_url'] = $idp_url;
- }
-
- // if the user is not logged in, send the login headers
- } elseif ($user_authenticated === false) {
- if ($wait) {
- $uid = uniqid(mt_rand(1,9));
- $_SESSION['uniqid'] = $uid;
-
- header('HTTP/1.0 401 Unauthorized');
-
- header(sprintf('WWW-Authenticate: Basic realm="%s"', $profile['auth_realm']));
-// header(sprintf('WWW-Authenticate: Digest qop="auth-int, auth", realm="%s", domain="%s", nonce="%s", opaque="%s", stale="%s", algorithm="MD5"', $profile['auth_realm'], $profile['auth_domain'], $uid, md5($profile['auth_realm']), $stale ? 'true' : 'false'));
- $q = strpos($return_to, '?') ? '&' : '?';
- wrap_refresh($return_to . $q . 'openid.mode=cancel');
-
- } else {
- $keys['user_setup_url'] = $idp_url;
- }
-
- // the user is logged in
- } else {
- // check the assoc handle
- list($shared_secret, $expires) = secret($assoc_handle);
- if ($shared_secret == false || (is_numeric($expires) && $expires < time())) {
- if ($assoc_handle != null)
- $keys['invalidate_handle'] = $assoc_handle;
- list ($assoc_handle, $shared_secret) = new_assoc();
- }
-
- $keys['identity'] = $idp_url;
- $keys['assoc_handle'] = $assoc_handle;
- $keys['return_to'] = $return_to;
-
- $fields = array_keys($keys);
- $tokens = '';
- foreach ($fields as $key)
- $tokens .= sprintf("%s:%s\n", $key, $keys[$key]);
-
- // add sreg keys
- foreach (explode(',', $sreg_required) as $key) {
- if (! isset($sreg[$key]))
- continue;
- $skey = 'sreg.' . $key;
-
- $tokens .= sprintf("%s:%s\n", $skey, $sreg[$key]);
- $keys[$skey] = $sreg[$key];
- $fields[] = $skey;
- }
-
- $keys['signed'] = implode(',', $fields);
- $keys['sig'] = base64_encode(hmac($shared_secret, $tokens));
- }
-
- wrap_location($return_to, $keys);
-}
-
-
-function checkid_immediate_mode () {
- if (! isset($_GET['openid_mode']) || $_GET['openid_mode'] != 'checkid_setup')
- error_500();
-
- checkid(false);
-}
-
-
-function checkid_setup_mode () {
- if (! isset($_GET['openid_mode']) || $_GET['openid_mode'] != 'checkid_setup')
- error_500();
-
- checkid(true);
-}
-
-
-function error_mode () {
- isset($_REQUEST['openid_error'])
- ? wrap_html($_REQUEST['openid_error'])
- : error_500();
-}
-
-
-function logout_mode () {
- global $idp_url, $user_authenticated;
-
- if (! $user_authenticated)
- error_400();
-
- session_destroy();
- wrap_refresh($idp_url);
-}
-
-
-function no_mode () {
- global $idp_url, $user_authenticated;
-
- wrap_html('This is an OpenID server endpoint. For more information, see http://openid.net/<br/>' . $idp_url);
-}
-
-
-
-/*
- * Support functions
- */
-function append_openid ($array) {
- $keys = array_keys($array);
- $vals = array_values($array);
-
- $r = array();
- for ($i=0; $i<sizeof($keys); $i++)
- $r['openid.' . $keys[$i]] = $vals[$i];
- return $r;
-}
-
-// Borrowed from http://php.net/manual/en/function.bcpowmod.php#57241
-if (! function_exists('bcpowmod')) {
-function bcpowmod ($value, $exponent, $mod) {
- $r = 1;
- while (true) {
- if (bcmod($exponent, 2) == "1")
- break;
- if (($exponent = bcdiv($exponent, 2)) == '0')
- break;
- $value = bcmod(bcmul($value, $value), $mod);
- }
- return $r;
-}}
-
-
-// Borrowed from PHP-OpenID; http://openidenabled.com
-function bin ($n) {
- $bytes = array();
- while (bccomp($n, 0) > 0) {
- array_unshift($bytes, bcmod($n, 256));
- $n = bcdiv($n, pow(2,8));
- }
-
- if ($bytes && ($bytes[0] > 127))
- array_unshift($bytes, 0);
-
- $b = '';
- foreach ($bytes as $byte)
- $b .= pack('C', $byte);
-
- return $b;
-}
-
-
-function debug ($x) {
- return true; // debugging off
- if (is_array($x)) {
- ob_start();
- print_r($x);
- $x = ob_get_clean();
- }
-
- error_log($x . "\n", 3, "/var/tmp/phpMyID.debug.log");
-}
-
-
-function destroy_assoc_handle ( $id ) {
- debug("Destroy $id");
- $old = session_id();
- session_write_close();
-
- session_id($id);
- session_start();
- session_destroy();
-
- session_id($old);
- session_start();
-}
-
-
-function error_400 ( $message = 'Bad Request' ) {
- header("HTTP/1.1 400 Bad Request");
- wrap_html($message);
-}
-
-
-function error_500 ( $message = 'Internal Server Error' ) {
- header("HTTP/1.1 500 Internal Server Error");
- wrap_html($message);
-}
-
-
-function error_get ( $url, $message = 'Bad Request') {
- wrap_location($url, array('mode' => 'error', 'error' => $message));
-}
-
-
-function error_post ( $message = 'Bad Request' ) {
- header("HTTP/1.1 400 Bad Request");
- echo ('error:' . $message);
- exit(0);
-}
-
-
-// Borrowed from - http://php.net/manual/en/function.sha1.php#39492
-function hmac($key, $data, $hash = 'sha1_20') {
- $blocksize=64;
-
- if (strlen($key) > $blocksize)
- $key = $hash($key);
-
- $key = str_pad($key, $blocksize,chr(0x00));
- $ipad = str_repeat(chr(0x36),$blocksize);
- $opad = str_repeat(chr(0x5c),$blocksize);
-
- $h1 = $hash(($key ^ $ipad) . $data);
- $hmac = $hash(($key ^ $opad) . $h1);
- return $hmac;
-}
-
-
-if (! function_exists('http_build_query')) {
-function http_build_query ($array) {
- $r = array();
- foreach ($array as $key => $val)
- $r[] = sprintf('%s=%s', $key, urlencode($val));
- return implode('&', $r);
-}}
-
-
-// Borrowed from PHP-OpenID; http://openidenabled.com
-function long($b) {
- $bytes = array_merge(unpack('C*', $b));
- $n = 0;
- foreach ($bytes as $byte) {
- $n = bcmul($n, bcpow(2,8));
- $n = bcadd($n, $byte);
- }
- return $n;
-}
-
-
-function new_assoc ( $expiration = null ) {
- $old = session_id();
- session_write_close();
-
- session_start();
- session_regenerate_id('false');
-
- $new = session_id();
- $shared_secret = new_secret();
-
- $_SESSION = array();
- $_SESSION['expiration'] = $expiration;
- $_SESSION['shared_secret'] = base64_encode($shared_secret);
- session_write_close();
-
- session_id($old);
- session_start();
-
- return array($new, $shared_secret);
-}
-
-
-function new_secret () {
- $r = '';
- for($i=0; $i<20; $i++)
- $r .= chr(mt_rand(0, 255));
- debug("New secret >>>$r<<<\nsize = " . strlen($r));
- return $r;
-}
-
-
-function random ( $max ) {
- if (strlen($max) < 4)
- return mt_rand(1, $max - 1);
-
- $r = '';
- for($i=1; $i<strlen($max) - 1; $i++)
- $r .= mt_rand(0,9);
- $r .= mt_rand(1,9);
-
- return $r;
-}
-
-
-function secret ( $handle ) {
- $len = strlen(session_id());
- $regex = '/^\w{' . $len . '}$/';
-
- debug("Get secret for '$handle', which must match '$regex'");
-
- if (! preg_match($regex, $handle))
- return array(false, 0);
-
- $sid = session_id();
- session_write_close();
-
- session_id($handle);
- session_start();
-
- $secret = session_is_registered('shared_secret')
- ? base64_decode($_SESSION['shared_secret'])
- : false;
-
- $expiration = session_is_registered('expiration')
- ? $_SESSION['expiration']
- : null;
-
- session_write_close();
-
- session_id($sid);
- session_start();
-
- debug("expires '$expiration'");
- return array($secret, $expiration);
-}
-
-
-// Borrowed from PHP-OpenID; http://openidenabled.com
-function sha1_20 ($v) {
- $hex = sha1($v);
- $r = '';
- for ($i = 0; $i < 40; $i += 2) {
- $hexcode = substr($hex, $i, 2);
- $charcode = (int)base_convert($hexcode, 16, 10);
- $r .= chr($charcode);
- }
- return $r;
-}
-
-
-function wrap_html ( $message ) {
- global $idp_url, $req_url;
-
- header('Content-Type: text/html; charset=UTF-8');
- echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-<head>
-<title>phpMyID</title>
-<link rel="openid.server" href="' . $req_url . '" />
-<link rel="openid.delegate" href="' . $idp_url . '" />
-</head>
-<body>
-<p>' . $message . '</p>
-</body>
-</html>
-';
-
- exit(0);
-}
-
-
-function wrap_kv ( $keys ) {
- debug($keys);
- header('Content-Type: text/plain; charset=UTF-8');
- foreach ($keys as $key => $value)
- printf("%s:%s\n", $key, $value);
-
- exit(0);
-}
-
-
-function wrap_location ($url, $keys) {
- $keys = append_openid($keys);
- debug($keys);
-
- $q = strpos($url, '?') ? '&' : '?';
- header('Location: ' . $url . $q . http_build_query($keys));
- debug('Location: ' . $url . $q . http_build_query($keys));
- exit(0);
-}
-
-
-function wrap_refresh ($url) {
- header('Content-Type: text/html; charset=UTF-8');
- echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html>
-<head>
-<title>phpMyID</title>
-<meta http-equiv="refresh" content="0;url=' . $url . '">
-</head>
-<body>
-<p>Redirecting to <a href="' . $url . '">' . $url . '</a></p>
-</body>
-</html>
-';
-
- exit(0);
-}
-
-
-function x_or ($a, $b) {
- $r = "";
-
- for ($i = 0; $i < strlen($b); $i++)
- $r .= $a[$i] ^ $b[$i];
- debug("Xor >>>$r<<< : " . strlen($r));
- return $r;
-}
-
-
-
-/*
- * App Initialization
- */
-
-$user_authenticated = false;
-
-// Share LifeType's session information
-SessionManager::init();
-$session = HttpVars::getSession();
-$sessionInfo = $session["SessionInfo"];
-if(isset($sessionInfo)){
- $userInfo = $sessionInfo->getValue("userInfo");
- if(isset($userInfo)){
- $user_authenticated = true;
- $sreg['email'] = $userInfo->getEmail();
- $sreg['fullname'] = $userInfo->getFullName();
- }
-}
-
-// Decide which runmode, based on user request or default
-$run_mode = (isset($_REQUEST['openid_mode'])
- && in_array($_REQUEST['openid_mode'], $known['openid_modes']))
- ? $_REQUEST['openid_mode']
- : 'no';
-
-
-// Run in the determined runmode
-debug("mode: $run_mode " . time());
-debug($_REQUEST);
-eval($run_mode . '_mode();');
-?>
Copied: plugins/trunk/openid/OpenID.php (from rev 4487, plugins/branches/lifetype-1.1/openid/OpenID.php)
Deleted: plugins/trunk/openid/README.txt
===================================================================
--- plugins/branches/lifetype-1.1/openid/README.txt 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/openid/README.txt 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,22 +0,0 @@
-[USAGES]:
-1. Upload: Upload all the extract files and directorys to $LifeType_Install_Dir/plugin/openid
-2. Move OpenID.php to $LifeType_Install_Dir
-3. Modify template: Use $openid->show() in header template file to allow the OpenID tags to be added..
-
-
-OpenID web site:
-http://www.openid.net/
-
-
-[EXAMPLE]:
-Add the following code in header.template, within the <head>, </head> tags:
-
-Code:
-
-<head>
-...
- {if !empty($openid)}
- {$openid->show()}
- {/if}
-</head>
-
Copied: plugins/trunk/openid/README.txt (from rev 4487, plugins/branches/lifetype-1.1/openid/README.txt)
Copied: plugins/trunk/openid/class (from rev 4487, plugins/branches/lifetype-1.1/openid/class)
Copied: plugins/trunk/openid/class/action (from rev 4487, plugins/branches/lifetype-1.1/openid/class/action)
Deleted: plugins/trunk/openid/class/action/pluginopenidconfigaction.class.php
===================================================================
--- plugins/branches/lifetype-1.1/openid/class/action/pluginopenidconfigaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/openid/class/action/pluginopenidconfigaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,26 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/openid/class/view/pluginopenidconfigview.class.php" );
-
- /**
- * shows a form with the current configuration
- */
- class PluginOpenidConfigAction extends AdminAction
- {
-
- function PluginOpenidConfigAction( $actionInfo, $request )
- {
- $this->AdminAction( $actionInfo, $request );
- }
-
- function perform()
- {
- $this->_view = new PluginOpenidConfigView( $this->_blogInfo );
-
- $this->setCommonData();
-
- return true;
- }
- }
-?>
\ No newline at end of file
Copied: plugins/trunk/openid/class/action/pluginopenidconfigaction.class.php (from rev 4487, plugins/branches/lifetype-1.1/openid/class/action/pluginopenidconfigaction.class.php)
Deleted: plugins/trunk/openid/class/action/pluginopenidupdateconfigaction.class.php
===================================================================
--- plugins/branches/lifetype-1.1/openid/class/action/pluginopenidupdateconfigaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/openid/class/action/pluginopenidupdateconfigaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,58 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/openid/class/view/pluginopenidconfigview.class.php" );
-
- /**
- * updates the plugin configuration
- */
- class PluginOpenidUpdateConfigAction extends AdminAction
- {
- var $_pluginEnabled;
-
- function PluginOpenidUpdateConfigAction( $actionInfo, $request )
- {
- $this->AdminAction( $actionInfo, $request );
- }
-
- function validate()
- {
- $this->_pluginEnabled = $this->_request->getValue( "pluginEnabled" );
- $this->_pluginEnabled = ($this->_pluginEnabled != "" );
-
- return true;
- }
-
- function perform()
- {
- // update the plugin configurations to blog setting
- $blogSettings = $this->_blogInfo->getSettings();
- $blogSettings->setValue( "plugin_openid_enabled", $this->_pluginEnabled );
- $this->_blogInfo->setSettings( $blogSettings );
-
- // save the blogs settings
- $blogs = new Blogs();
- if( !$blogs->updateBlog( $this->_blogInfo )) {
- $this->_view = new PluginOpenidConfigView( $this->_blogInfo );
- $this->_view->setErrorMessage( $this->_locale->tr("error_updating_settings"));
- $this->setCommonData();
-
- return false;
- }
-
- // if everything went ok...
- $this->_blogInfo->setSettings( $blogSettings );
- $this->_session->setValue( "blogInfo", $this->_blogInfo );
- $this->saveSession();
-
- $this->_view = new PluginOpenidConfigView( $this->_blogInfo );
- $this->_view->setSuccessMessage( $this->_locale->tr("openid_settings_saved_ok"));
- $this->setCommonData();
-
- // clear the cache
- CacheControl::resetBlogCache( $this->_blogInfo->getId());
-
- return true;
- }
- }
-?>
\ No newline at end of file
Copied: plugins/trunk/openid/class/action/pluginopenidupdateconfigaction.class.php (from rev 4487, plugins/branches/lifetype-1.1/openid/class/action/pluginopenidupdateconfigaction.class.php)
Copied: plugins/trunk/openid/class/view (from rev 4487, plugins/branches/lifetype-1.1/openid/class/view)
Deleted: plugins/trunk/openid/class/view/pluginopenidconfigview.class.php
===================================================================
--- plugins/branches/lifetype-1.1/openid/class/view/pluginopenidconfigview.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/openid/class/view/pluginopenidconfigview.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,28 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/view/admin/adminplugintemplatedview.class.php" );
-
- /**
- * implements the main view of the feed reader plugin
- */
- class PluginOpenidConfigView extends AdminPluginTemplatedView
- {
-
- function PluginOpenidConfigView( $blogInfo )
- {
- $this->AdminPluginTemplatedView( $blogInfo, "openid", "openid" );
- }
-
- function render()
- {
- // load some configuration settings
- $blogSettings = $this->_blogInfo->getSettings();
- $pluginEnabled = $blogSettings->getValue( "plugin_openid_enabled" );
-
- // create a view and export the settings to the template
- $this->setValue( "pluginEnabled", $pluginEnabled );
-
- parent::render();
- }
- }
-?>
\ No newline at end of file
Copied: plugins/trunk/openid/class/view/pluginopenidconfigview.class.php (from rev 4487, plugins/branches/lifetype-1.1/openid/class/view/pluginopenidconfigview.class.php)
Copied: plugins/trunk/openid/locale (from rev 4487, plugins/branches/lifetype-1.1/openid/locale)
Deleted: plugins/trunk/openid/locale/locale_en_UK.php
===================================================================
--- plugins/branches/lifetype-1.1/openid/locale/locale_en_UK.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/openid/locale/locale_en_UK.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,15 +0,0 @@
-<?php
-$messages["manageIntegrationPlugins"] = "Integration Management";
-$messages["openid"] = "OpenID";
-
-$messages["openid_plugin_enabled"] = "Enable this plugin";
-$messages["openid_plugin"] = "OpenID Plugin";
-$messages["detail"] = "Detail";
-$messages["openid_enable_help"] = "Enable this setting to allow this blogs users' credentials to be used for OpenID authentication.";
-
-
-$messages["openid_settings_saved_ok"] = "OpenID settings saved successfully!";
-
-$messages["label_configuration"] = "Configuration";
-$messages["label_enable"] = "Enable";
-?>
\ No newline at end of file
Copied: plugins/trunk/openid/locale/locale_en_UK.php (from rev 4487, plugins/branches/lifetype-1.1/openid/locale/locale_en_UK.php)
Deleted: plugins/trunk/openid/pluginopenid.class.php
===================================================================
--- plugins/branches/lifetype-1.1/openid/pluginopenid.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/openid/pluginopenid.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,80 +0,0 @@
-<?php
- /*
- Copyright 2006 Paul Westbrook (paul at westbrooks.org)
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-
- include_once( PLOG_CLASS_PATH."class/plugin/pluginbase.class.php" );
- include_once( PLOG_CLASS_PATH."class/plugin/pluginmanager.class.php" );
-
- class PluginOpenid extends PluginBase
- {
- var $pluginEnabled;
-
- function PluginOpenid()
- {
- $this->PluginBase();
-
- $this->id = "openid";
- $this->author = "Paul Westbrook (phpMyID provided by <a href=\"http://siege.org/projects/phpMyID/\">CJ Niemira</a>)";
- $this->desc = "Plugin to add OpenID support to LifeType.";
-
- $this->locales = Array( "en_UK");
-
- $this->init();
- }
-
- function init()
- {
- $this->registerAdminAction( "openidConfig", "PluginOpenidConfigAction" );
- $this->registerAdminAction( "updateOpenidConfig", "PluginOpenidUpdateConfigAction" );
-
- $menu =& Menu::getMenu();
- if( !$menu->entryExists( "/menu/controlCenter/manageIntegrationPlugins" ))
- $this->addMenuEntry( "/menu/controlCenter", "manageIntegrationPlugins", "", "", true, false );
- $this->addMenuEntry( "/menu/controlCenter/manageIntegrationPlugins", "openid", "?op=openidConfig", "" );
- }
-
- function register()
- {
- $blogSettings = $this->blogInfo->getSettings();
- $this->pluginEnabled = $blogSettings->getValue( "plugin_openid_enabled" );
- }
-
- function isEnabled()
- {
- return $this->pluginEnabled;
- }
-
- function show()
- {
-
- $str = '';
-
- if ($this->isEnabled())
- {
- $rg = $this->blogInfo->getBlogRequestGenerator();
-
- $str .= '<link rel="openid.server" href="' . $rg->blogLink() . '/OpenID.php">';
- $str .= "\n";
- $str .= '<link rel="openid.delegate" href="' . $rg->blogLink() . '/OpenID.php">';
- $str .= "\n";
- }
- return $str;
- }
- }
-?>
\ No newline at end of file
Copied: plugins/trunk/openid/pluginopenid.class.php (from rev 4487, plugins/branches/lifetype-1.1/openid/pluginopenid.class.php)
Copied: plugins/trunk/openid/templates (from rev 4487, plugins/branches/lifetype-1.1/openid/templates)
Deleted: plugins/trunk/openid/templates/openid.template
===================================================================
--- plugins/branches/lifetype-1.1/openid/templates/openid.template 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/openid/templates/openid.template 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,23 +0,0 @@
-{include file="$admintemplatepath/header.template"}
-{include file="$admintemplatepath/navigation.template" showOpt=openid title=$locale->tr("openid_plugin")}
-<form name="openidPluginConfig" method="post">
- <fieldset class="inputField">
- <legend>{$locale->tr("label_configuration")}</legend>
- {include file="$admintemplatepath/successmessage.template"}
- {include file="$admintemplatepath/errormessage.template"}
- <div class="field">
- <label for="pluginEnabled">{$locale->tr("label_enable")}</label>
- <div class="formHelp"> {$locale->tr("openid_enable_help")} </div>
- <input class="checkbox" type="checkbox" name="pluginEnabled" id="pluginEnabled" {if $pluginEnabled} checked="checked" {/if} value="1" />{$locale->tr("openid_plugin_enabled")}
- </div>
-
- </fieldset>
-
- <div class="buttons">
- <input type="hidden" name="op" value="updateOpenidConfig" />
- <input type="reset" name="{$locale->tr("reset")}" />
- <input type="submit" name="{$locale->tr("update_settings")}" value="{$locale->tr("update")}" />
- </div>
-</form>
-{include file="$admintemplatepath/footernavigation.template"}
-{include file="$admintemplatepath/footer.template"}
\ No newline at end of file
Copied: plugins/trunk/openid/templates/openid.template (from rev 4487, plugins/branches/lifetype-1.1/openid/templates/openid.template)
Modified: plugins/trunk/plogeshi/class/action/pluginplogeshiconfigaction.class.php
===================================================================
--- plugins/trunk/plogeshi/class/action/pluginplogeshiconfigaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/plogeshi/class/action/pluginplogeshiconfigaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,7 +1,7 @@
<?php
- include_once( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/plogeshi/class/view/pluginplogeshiconfigview.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
+ lt_include( PLOG_CLASS_PATH."plugins/plogeshi/class/view/pluginplogeshiconfigview.class.php" );
/**
* shows a form with the current configuration
Modified: plugins/trunk/plogeshi/class/action/pluginplogeshiupdateconfigaction.class.php
===================================================================
--- plugins/trunk/plogeshi/class/action/pluginplogeshiupdateconfigaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/plogeshi/class/action/pluginplogeshiupdateconfigaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,7 +1,7 @@
<?php
- include_once( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/plogeshi/class/view/pluginplogeshiconfigview.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
+ lt_include( PLOG_CLASS_PATH."plugins/plogeshi/class/view/pluginplogeshiconfigview.class.php" );
/**
* updates the plugin configuration
Modified: plugins/trunk/plogeshi/class/view/pluginplogeshiconfigview.class.php
===================================================================
--- plugins/trunk/plogeshi/class/view/pluginplogeshiconfigview.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/plogeshi/class/view/pluginplogeshiconfigview.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,6 +1,6 @@
<?php
- include_once( PLOG_CLASS_PATH."class/view/admin/adminplugintemplatedview.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/view/admin/adminplugintemplatedview.class.php" );
/**
* implements the main view of the feed reader plugin
Modified: plugins/trunk/plogeshi/inc/geshi/php-brief.php
===================================================================
--- plugins/trunk/plogeshi/inc/geshi/php-brief.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/plogeshi/inc/geshi/php-brief.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -56,7 +56,7 @@
'ESCAPE_CHAR' => '\\',
'KEYWORDS' => array(
1 => array(
- 'include', 'require', 'include_once', 'require_once',
+ 'include', 'require', 'lt_include', 'require_once',
'for', 'as', 'foreach', 'if', 'elseif', 'else', 'while', 'do', 'endwhile', 'endif', 'switch', 'case', 'endswitch',
'return', 'break'
),
Modified: plugins/trunk/plogeshi/inc/geshi/php.php
===================================================================
--- plugins/trunk/plogeshi/inc/geshi/php.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/plogeshi/inc/geshi/php.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -59,7 +59,7 @@
'ESCAPE_CHAR' => '\\',
'KEYWORDS' => array(
1 => array(
- 'include', 'require', 'include_once', 'require_once',
+ 'include', 'require', 'lt_include', 'require_once',
'for', 'foreach', 'as', 'if', 'elseif', 'else', 'while', 'do', 'endwhile', 'endif', 'switch', 'case', 'endswitch',
'return', 'break'
),
Modified: plugins/trunk/plogeshi/pluginplogeshi.class.php
===================================================================
--- plugins/trunk/plogeshi/pluginplogeshi.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/plogeshi/pluginplogeshi.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,8 +1,8 @@
<?php
- include_once( PLOG_CLASS_PATH."class/plugin/pluginbase.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/plogeshi/class/plogeshi/plogeshi.class.php" );
- include_once( PLOG_CLASS_PATH."class/template/menu/menu.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/plugin/pluginbase.class.php" );
+ lt_include( PLOG_CLASS_PATH."plugins/plogeshi/class/plogeshi/plogeshi.class.php" );
+ lt_include( PLOG_CLASS_PATH."class/template/menu/menu.class.php" );
define( "PLOGESHI_PATH", PLOG_CLASS_PATH . "plugins/plogeshi/" );
define( "PLOGESHI_GESHI_PATH", PLOGESHI_PATH ."inc/" );
Copied: plugins/trunk/plogpoll (from rev 4487, plugins/branches/lifetype-1.1/plogpoll)
Deleted: plugins/trunk/plogpoll/LICENSE
===================================================================
--- plugins/branches/lifetype-1.1/plogpoll/LICENSE 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/plogpoll/LICENSE 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,142 +0,0 @@
-Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
-
- [This is the first released version of the Lesser GPL. It also counts as the successor of the GNU Library Public License, version 2, hence the version number 2.1.]
-
-Preamble
-
-The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public Licenses are intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users.
-
-This license, the Lesser General Public License, applies to some specially designated software packages--typically libraries--of the Free Software Foundation and other authors who decide to use it. You can use it too, but we suggest you first think carefully about whether this license or the ordinary General Public License is the better strategy to use in any particular case, based on the explanations below.
-
-When we speak of free software, we are referring to freedom of use, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish); that you receive source code or can get it if you want it; that you can change the software and use pieces of it in new free programs; and that you are informed that you can do these things.
-
-To protect your rights, we need to make restrictions that forbid distributors to deny you these rights or to ask you to surrender these rights. These restrictions translate to certain responsibilities for you if you distribute copies of the library or if you modify it.
-
-For example, if you distribute copies of the library, whether gratis or for a fee, you must give the recipients all the rights that we gave you. You must make sure that they, too, receive or can get the source code. If you link other code with the library, you must provide complete object files to the recipients, so that they can relink them with the library after making changes to the library and recompiling it. And you must show them these terms so they know their rights.
-
-We protect your rights with a two-step method: (1) we copyright the library, and (2) we offer you this license, which gives you legal permission to copy, distribute and/or modify the library.
-
-To protect each distributor, we want to make it very clear that there is no warranty for the free library. Also, if the library is modified by someone else and passed on, the recipients should know that what they have is not the original version, so that the original author's reputation will not be affected by problems that might be introduced by others.
-
-Finally, software patents pose a constant threat to the existence of any free program. We wish to make sure that a company cannot effectively restrict the users of a free program by obtaining a restrictive license from a patent holder. Therefore, we insist that any patent license obtained for a version of the library must be consistent with the full freedom of use specified in this license.
-
-Most GNU software, including some libraries, is covered by the ordinary GNU General Public License. This license, the GNU Lesser General Public License, applies to certain designated libraries, and is quite different from the ordinary General Public License. We use this license for certain libraries in order to permit linking those libraries into non-free programs.
-
-When a program is linked with a library, whether statically or using a shared library, the combination of the two is legally speaking a combined work, a derivative of the original library. The ordinary General Public License therefore permits such linking only if the entire combination fits its criteria of freedom. The Lesser General Public License permits more lax criteria for linking other code with the library.
-
-We call this license the "Lesser" General Public License because it does Less to protect the user's freedom than the ordinary General Public License. It also provides other free software developers Less of an advantage over competing non-free programs. These disadvantages are the reason we use the ordinary General Public License for many libraries. However, the Lesser license provides advantages in certain special circumstances.
-
-For example, on rare occasions, there may be a special need to encourage the widest possible use of a certain library, so that it becomes a de-facto standard. To achieve this, non-free programs must be allowed to use the library. A more frequent case is that a free library does the same job as widely used non-free libraries. In this case, there is little to gain by limiting the free library to free software only, so we use the Lesser General Public License.
-
-In other cases, permission to use a particular library in non-free programs enables a greater number of people to use a large body of free software. For example, permission to use the GNU C Library in non-free programs enables many more people to use the whole GNU operating system, as well as its variant, the GNU/Linux operating system.
-
-Although the Lesser General Public License is Less protective of the users' freedom, it does ensure that the user of a program that is linked with the Library has the freedom and the wherewithal to run that program using a modified version of the Library.
-
-The precise terms and conditions for copying, distribution and modification follow. Pay close attention to the difference between a "work based on the library" and a "work that uses the library". The former contains code derived from the library, whereas the latter must be combined with the library in order to run.
-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-0. This License Agreement applies to any software library or other program which contains a notice placed by the copyright holder or other authorized party saying it may be distributed under the terms of this Lesser General Public License (also called "this License"). Each licensee is addressed as "you".
-
-A "library" means a collection of software functions and/or data prepared so as to be conveniently linked with application programs (which use some of those functions and data) to form executables.
-
-The "Library", below, refers to any such software library or work which has been distributed under these terms. A "work based on the Library" means either the Library or any derivative work under copyright law: that is to say, a work containing the Library or a portion of it, either verbatim or with modifications and/or translated straightforwardly into another language. (Hereinafter, translation is included without limitation in the term "modification".)
-
-"Source code" for a work means the preferred form of the work for making modifications to it. For a library, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the library.
-
-Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running a program using the Library is not restricted, and output from such a program is covered only if its contents constitute a work based on the Library (independent of the use of the Library in a tool for writing it). Whether that is true depends on what the Library does and what the program that uses the Library does.
-
-1. You may copy and distribute verbatim copies of the Library's complete source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and distribute a copy of this License along with the Library.
-
-You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.
-
-2. You may modify your copy or copies of the Library or any portion of it, thus forming a work based on the Library, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:
-
- a) The modified work must itself be a software library.
-
- b) You must cause the files modified to carry prominent notices stating that you changed the files and the date of any change.
-
- c) You must cause the whole of the work to be licensed at no charge to all third parties under the terms of this License.
-
- d) If a facility in the modified Library refers to a function or a table of data to be supplied by an application program that uses the facility, other than as an argument passed when the facility is invoked, then you must make a good faith effort to ensure that, in the event an application does not supply such function or table, the facility still operates, and performs whatever part of its purpose remains meaningful.
-
- (For example, a function in a library to compute square roots has a purpose that is entirely well-defined independent of the application. Therefore, Subsection 2d requires that any application-supplied function or table used by this function must be optional: if the application does not supply it, the square root function must still compute square roots.)
-
- These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Library, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Library, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.
-
- Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Library.
-
- In addition, mere aggregation of another work not based on the Library with the Library (or with a work based on the Library) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.
-
-3. You may opt to apply the terms of the ordinary GNU General Public License instead of this License to a given copy of the Library. To do this, you must alter all the notices that refer to this License, so that they refer to the ordinary GNU General Public License, version 2, instead of to this License. (If a newer version than version 2 of the ordinary GNU General Public License has appeared, then you can specify that version instead if you wish.) Do not make any other change in these notices.
-
-Once this change is made in a given copy, it is irreversible for that copy, so the ordinary GNU General Public License applies to all subsequent copies and derivative works made from that copy.
-
-This option is useful when you wish to copy part of the code of the Library into a program that is not a library.
-
-4. You may copy and distribute the Library (or a portion or derivative of it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange.
-
-If distribution of object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place satisfies the requirement to distribute the source code, even though third parties are not compelled to copy the source along with the object code.
-
-5. A program that contains no derivative of any portion of the Library, but is designed to work with the Library by being compiled or linked with it, is called a "work that uses the Library". Such a work, in isolation, is not a derivative work of the Library, and therefore falls outside the scope of this License.
-
-However, linking a "work that uses the Library" with the Library creates an executable that is a derivative of the Library (because it contains portions of the Library), rather than a "work that uses the library". The executable is therefore covered by this License. Section 6 states terms for distribution of such executables.
-
-When a "work that uses the Library" uses material from a header file that is part of the Library, the object code for the work may be a derivative work of the Library even though the source code is not. Whether this is true is especially significant if the work can be linked without the Library, or if the work is itself a library. The threshold for this to be true is not precisely defined by law.
-
-If such an object file uses only numerical parameters, data structure layouts and accessors, and small macros and small inline functions (ten lines or less in length), then the use of the object file is unrestricted, regardless of whether it is legally a derivative work. (Executables containing this object code plus portions of the Library will still fall under Section 6.)
-
-Otherwise, if the work is a derivative of the Library, you may distribute the object code for the work under the terms of Section 6. Any executables containing that work also fall under Section 6, whether or not they are linked directly with the Library itself.
-
-6. As an exception to the Sections above, you may also combine or link a "work that uses the Library" with the Library to produce a work containing portions of the Library, and distribute that work under terms of your choice, provided that the terms permit modification of the work for the customer's own use and reverse engineering for debugging such modifications.
-
-You must give prominent notice with each copy of the work that the Library is used in it and that the Library and its use are covered by this License. You must supply a copy of this License. If the work during execution displays copyright notices, you must include the copyright notice for the Library among them, as well as a reference directing the user to the copy of this License. Also, you must do one of these things:
-
- a) Accompany the work with the complete corresponding machine-readable source code for the Library including whatever changes were used in the work (which must be distributed under Sections 1 and 2 above); and, if the work is an executable linked with the Library, with the complete machine-readable "work that uses the Library", as object code and/or source code, so that the user can modify the Library and then relink to produce a modified executable containing the modified Library. (It is understood that the user who changes the contents of definitions files in the Library will not necessarily be able to recompile the application to use the modified definitions.)
-
- b) Use a suitable shared library mechanism for linking with the Library. A suitable mechanism is one that (1) uses at run time a copy of the library already present on the user's computer system, rather than copying library functions into the executable, and (2) will operate properly with a modified version of the library, if the user installs one, as long as the modified version is interface-compatible with the version that the work was made with.
-
- c) Accompany the work with a written offer, valid for at least three years, to give the same user the materials specified in Subsection 6a, above, for a charge no more than the cost of performing this distribution.
-
- d) If distribution of the work is made by offering access to copy from a designated place, offer equivalent access to copy the above specified materials from the same place.
-
- e) Verify that the user has already received a copy of these materials or that you have already sent this user a copy.
-
-For an executable, the required form of the "work that uses the Library" must include any data and utility programs needed for reproducing the executable from it. However, as a special exception, the materials to be distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.
-
-It may happen that this requirement contradicts the license restrictions of other proprietary libraries that do not normally accompany the operating system. Such a contradiction means you cannot use both them and the Library together in an executable that you distribute.
-
-7. You may place library facilities that are a work based on the Library side-by-side in a single library together with other library facilities not covered by this License, and distribute such a combined library, provided that the separate distribution of the work based on the Library and of the other library facilities is otherwise permitted, and provided that you do these two things:
-
- a) Accompany the combined library with a copy of the same work based on the Library, uncombined with any other library facilities. This must be distributed under the terms of the Sections above.
-
- b) Give prominent notice with the combined library of the fact that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work.
-
-8. You may not copy, modify, sublicense, link with, or distribute the Library except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense, link with, or distribute the Library is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.
-
-9. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Library or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Library (or any work based on the Library), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Library or works based on it.
-
-10. Each time you redistribute the Library (or any work based on the Library), the recipient automatically receives a license from the original licensor to copy, distribute, link with or modify the Library subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties with this License.
-
-11. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Library at all. For example, if a patent license would not permit royalty-free redistribution of the Library by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply, and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.
-
-This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.
-
-12. If the distribution and/or use of the Library is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Library under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License.
-
-13. The Free Software Foundation may publish revised and/or new versions of the Lesser General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Library specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Library does not specify a license version number, you may choose any version ever published by the Free Software Foundation.
-
-14. If you wish to incorporate parts of the Library into other free programs whose distribution conditions are incompatible with these, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.
-
-NO WARRANTY
-
-15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
Copied: plugins/trunk/plogpoll/LICENSE (from rev 4487, plugins/branches/lifetype-1.1/plogpoll/LICENSE)
Deleted: plugins/trunk/plogpoll/README
===================================================================
--- plugins/branches/lifetype-1.1/plogpoll/README 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/plogpoll/README 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,44 +0,0 @@
-pLog Plugin - plogPoll v0.1 for lt 1.1.x
-
-pLogPoll was designed to allow a BlogOwner to publish a poll to his main page and recieve user feedback.
-
-This plugin is fully supported in the pLog Administrator/Blog User Interface and allows one to simply add a poll, view statistics about the poll and delete them. Other "gems" include IP tracking in an attempt to disallow multiple votes from single people and an easy to modify look and feel.
-
---
-{if $plogpoll neq ""}
- <div class="sidetitle">LSNet Poll</div>
- <div class="side">
-{assign var=blogid value=$blog->getId()}
-{insert name="getPlogPollHtml" pollvar=$plogpoll pollid=$blogid}
- </div>
-{/if}
---
-
-The look and feel may be modified easily by css tags like such...
---
-#pollbody {
- color: #99CCFF;
- text-align:center;
- font-size:x-small;
- background:#336699;
- padding: 1px;
- border: 1px dashed black;
-}
-
-#pollbody th{
- text-align:center;
- padding: 0px;
- background:#225588;
-}
-
-#pollbody td{
- padding: 0px;
- text-align: left;
-}
-
-#pollbody div{
- color: white;
-}
---
-
-Further customization can be realized within the pluginplogpoll.class.php file distributed with the plugin.
Copied: plugins/trunk/plogpoll/README (from rev 4487, plugins/branches/lifetype-1.1/plogpoll/README)
Copied: plugins/trunk/plogpoll/class (from rev 4487, plugins/branches/lifetype-1.1/plogpoll/class)
Copied: plugins/trunk/plogpoll/class/action (from rev 4487, plugins/branches/lifetype-1.1/plogpoll/class/action)
Deleted: plugins/trunk/plogpoll/class/action/adminplogpolladdpollaction.class.php
===================================================================
--- plugins/branches/lifetype-1.1/plogpoll/class/action/adminplogpolladdpollaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/plogpoll/class/action/adminplogpolladdpollaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,61 +0,0 @@
-<?php
-/*
-Plugin - PlogPoll
-Copyright (C) 2005 Matthew Wood
-
-This library is free software; you can redistribute it and/or modify it
-under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or
-(at your option) any later version.
-*/
-
-
-include_once(PLOG_CLASS_PATH.
- "class/action/admin/blogowneradminaction.class.php");
-include_once(PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php");
-include_once(PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php");
-include_once(PLOG_CLASS_PATH.
- "plugins/plogpoll/class/dao/plogpollpolls.class.php");
-include_once(PLOG_CLASS_PATH.
- "plugins/plogpoll/class/dao/plogpollpoll.class.php");
-include_once(PLOG_CLASS_PATH.
- "plugins/plogpoll/class/view/adminplogpolllistview.class.php");
-
-class AdminPlogPollAddPollAction extends BlogOwnerAdminAction
-{
- function AdminPlogPollAddPollAction($actionInfo,$request)
- {
- $this->BlogOwnerAdminAction($actionInfo,$request);
- $this->registerFieldValidator("subject",new StringValidator());
- $this->_view = new AdminPlogPollListView($this->_blogInfo);
- }
-
- function perform()
- {
- $sub = $this->_request->getValue("subject");
- $rawresponses = $this->_request->getValue("responses");
- $responses = split("\n",$rawresponses);
- $resdata = array();
- for($i = 0; $i < count($responses); $i++)
- $resdata[$i] = 0;
-
- $poll = new PlogPollPoll(-1,$sub,$responses,$resdata,-1,
- 0,$this->_blogInfo->getId());
- $pollsmodel = new PlogPollPolls();
- if (!$pollsmodel->addPoll($poll))
- {
- $this->_view->setErrorMessage("Failed to add the poll to the database - localize");
- $this->setCommonData();
- return false;
- }
-
- $this->_view->setSuccessMessage("Added Poll - ". $sub ." - localize");
- $this->setCommonData();
-
- return true;
- }
-}
-
-/* vim:sw=2:ai:expandtab:cin:
-*/
-?>
Copied: plugins/trunk/plogpoll/class/action/adminplogpolladdpollaction.class.php (from rev 4487, plugins/branches/lifetype-1.1/plogpoll/class/action/adminplogpolladdpollaction.class.php)
Deleted: plugins/trunk/plogpoll/class/action/adminplogpolldeletepollaction.class.php
===================================================================
--- plugins/branches/lifetype-1.1/plogpoll/class/action/adminplogpolldeletepollaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/plogpoll/class/action/adminplogpolldeletepollaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,74 +0,0 @@
-<?php
-/*
- Plugin - PlogPoll
- Copyright (C) 2005 Matthew Wood
-
- This library is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published by
- the Free Software Foundation; either version 2.1 of the License, or
- (at your option) any later version.
- */
-
-
-include_once(PLOG_CLASS_PATH.
- "class/action/admin/blogowneradminaction.class.php");
-include_once(PLOG_CLASS_PATH."class/data/validator/arrayvalidator.class.php");
-include_once(PLOG_CLASS_PATH.
- "plugins/plogpoll/class/view/adminplogpolllistview.class.php");
-include_once(PLOG_CLASS_PATH.
- "plugins/plogpoll/class/dao/plogpollpolls.class.php");
-
-class AdminPlogPollDeletePollAction extends BlogOwnerAdminAction
-{
- function AdminPlogPollDeletePollAction($actionInfo,$request)
- {
- $this->BlogOwnerAdminAction($actionInfo,$request);
- $this->_view = new AdminPlogPollListView($this->_blogInfo);
- }
- function perform()
- {
- $plids = $this->_request->getValue("plid");
- $pollmodel = new PlogPollPolls();
-
- $emsg = $smsg = "";
-
- if ($plids != "")
- {
- foreach($plids as $plid)
- {
- if (!$pollmodel->deletePoll($plid,$this->_blogInfo->getId()))
- $emsg .= "delete failed - localize\n";
- else
- $smsg .= "delete succeded - localize\n";
- }
- }
-
-
- $activepoll = $this->_request->getValue('activepoll');
- if (is_numeric($activepoll))
- {
- $poll = $pollmodel->getPollById($activepoll);
- if (!$poll)
- $emsg .= "invalid poll to set active... ignoring\n";
- else if ($poll->getBlogId() != $this->_blogInfo->getId())
- $emsg .= "you do not own this poll...\n";
- else
- {
- $pollmodel->setNewActivePoll($poll->getId(),$this->_blogInfo->getId());
- $smsg .= "changes updated\n";
- }
- }
-
- if ($smsg != "")
- $this->_view->setSuccessMessage($smsg);
- if ($emsg != "")
- $this->_view->setErrorMessage($emsg);
-
- $this->setCommonData();
- return true;
- }
-}
-
-/* vim:sw=2:ai:expandtab:cin:
-*/
-?>
Copied: plugins/trunk/plogpoll/class/action/adminplogpolldeletepollaction.class.php (from rev 4487, plugins/branches/lifetype-1.1/plogpoll/class/action/adminplogpolldeletepollaction.class.php)
Deleted: plugins/trunk/plogpoll/class/action/adminplogpolllistviewaction.class.php
===================================================================
--- plugins/branches/lifetype-1.1/plogpoll/class/action/adminplogpolllistviewaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/plogpoll/class/action/adminplogpolllistviewaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,27 +0,0 @@
-<?php
-/*
-Plugin - PlogPoll
-Copyright (C) 2005 Matthew Wood
-
-This library is free software; you can redistribute it and/or modify it
-under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or
-(at your option) any later version.
-*/
-
-include_once(PLOG_CLASS_PATH.
- "class/action/admin/blogowneradminaction.class.php");
-include_once(PLOG_CLASS_PATH."plugins/plogpoll/class/view/adminplogpolllistview.class.php");
-
-class AdminPlogPollListViewAction extends BlogOwnerAdminAction
-{
- function perform()
- {
- $this->_view = new AdminPlogPollListView($this->_blogInfo);
- $this->setCommonData();
-
- return true;
- }
-}
-
-?>
Copied: plugins/trunk/plogpoll/class/action/adminplogpolllistviewaction.class.php (from rev 4487, plugins/branches/lifetype-1.1/plogpoll/class/action/adminplogpolllistviewaction.class.php)
Deleted: plugins/trunk/plogpoll/class/action/adminplogpollnewpollviewaction.class.php
===================================================================
--- plugins/branches/lifetype-1.1/plogpoll/class/action/adminplogpollnewpollviewaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/plogpoll/class/action/adminplogpollnewpollviewaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,28 +0,0 @@
-<?php
-/*
-Plugin - PlogPoll
-Copyright (C) 2005 Matthew Wood
-
-This library is free software; you can redistribute it and/or modify it
-under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or
-(at your option) any later version.
-*/
-
-
-include_once(PLOG_CLASS_PATH.
- "class/action/admin/blogowneradminaction.class.php");
-include_once(PLOG_CLASS_PATH."plugins/plogpoll/class/view/adminplogpollnewpollview.class.php");
-
-class AdminPlogPollNewPollViewAction extends BlogOwnerAdminAction
-{
- function perform()
- {
- $this->_view = new AdminPlogPollNewPollView($this->_blogInfo);
- $this->setCommonData();
-
- return true;
- }
-}
-
-?>
Copied: plugins/trunk/plogpoll/class/action/adminplogpollnewpollviewaction.class.php (from rev 4487, plugins/branches/lifetype-1.1/plogpoll/class/action/adminplogpollnewpollviewaction.class.php)
Deleted: plugins/trunk/plogpoll/class/action/plogpollregistervoteaction.class.php
===================================================================
--- plugins/branches/lifetype-1.1/plogpoll/class/action/plogpollregistervoteaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/plogpoll/class/action/plogpollregistervoteaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,76 +0,0 @@
-<?php
-/*
- Plugin - PlogPoll
- Copyright (C) 2005 Matthew Wood
-
- This library is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published by
- the Free Software Foundation; either version 2.1 of the License, or
- (at your option) any later version.
- */
-
-
-include_once(PLOG_CLASS_PATH."class/action/blogaction.class.php");
-include_once(PLOG_CLASS_PATH."class/view/plugintemplatedview.class.php");
-include_once(PLOG_CLASS_PATH."class/view/blogview.class.php");
-
-include_once(PLOG_CLASS_PATH.
- "plugins/plogpoll/class/dao/plogpollpolls.class.php");
-
-class PlogPollRegisterVoteAction extends BlogAction
-{
- var $_prevpage;
-
- function PlogPollRegisterVoteAction($actionInfo,$request)
- {
- $this->BlogAction($actionInfo,$request);
- $this->_prevpage = $this->_request->getValue("disppage");
- }
- function perform()
- {
- $vote = split("-",$this->_request->getValue("vote"));
- $pollid = $vote[0];
- $voteid = $vote[1];
- if (!is_numeric($pollid) || !is_numeric($voteid))
- {
- $this->_returnToPrevious();
- return false;
- }
-
- $pollmodel = new PlogPollPolls();
- if (!$pollmodel->registerVote($pollid,$voteid))
- {
- $this->_returnToPrevious();
- return false;
- }
- else
- {
- $this->_returnToPrevious();
- return true;
- }
- }
- function _returnToPrevious()
- {
- $redir = urldecode(base64_decode($this->_prevpage));
- if (strpos($redir,"/") === 0)
- {
- //use redirect view instead
- include_once( PLOG_CLASS_PATH."class/view/redirectview.class.php" );
- $this->_view = new RedirectView($redir);
-
- //header("Location: ". $redir);
- }
- else
- {
-
- echo $redir."--";
- echo "caught an attempted xss attempt in plogpoll";
- die();
- }
- }
-}
-
-
-/* vim:sw=2:cin:expandtab:ai:
- */
-?>
Copied: plugins/trunk/plogpoll/class/action/plogpollregistervoteaction.class.php (from rev 4487, plugins/branches/lifetype-1.1/plogpoll/class/action/plogpollregistervoteaction.class.php)
Copied: plugins/trunk/plogpoll/class/dao (from rev 4487, plugins/branches/lifetype-1.1/plogpoll/class/dao)
Deleted: plugins/trunk/plogpoll/class/dao/plogpollpoll.class.php
===================================================================
--- plugins/branches/lifetype-1.1/plogpoll/class/dao/plogpollpoll.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/plogpoll/class/dao/plogpollpoll.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,60 +0,0 @@
-<?php
-/*
- Plugin - PlogPoll
- Copyright (C) 2005 Matthew Wood
-
- This library is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published by
- the Free Software Foundation; either version 2.1 of the License, or
- (at your option) any later version.
- */
-
-
-include_once(PLOG_CLASS_PATH."class/object/object.class.php");
-
-class PlogPollPoll extends Object
-{
- var $_id;
- var $_subject;
- var $_responses;
- var $_responsedata;
- var $_dateadded;
- var $_active;
- var $_blogId;
-
- function PlogPollPoll(
- $id,$subject,$responses,$responsedata,$dateadded,$active,$blogid)
- {
- $this->Object();
- $this->_subject = $subject;
- $this->_responses = $responses;
- $this->_responsedata = $responsedata;
- $this->_dateadded = $dateadded;
- $this->_id = $id;
- $this->_active = $active;
- $this->_blogId = $blogid;
- }
-
- function getSubject() {return $this->_subject;}
- function getResponses() {return $this->_responses;}
- function getResponseData() {return $this->_responsedata;}
- function getDateAdded() {return $this->_dateadded;}
- function getId() {return $this->_id;}
- function getActive() {return $this->_active;}
- function getBlogId() {return $this->_blogId;}
-
- function incrementVotes($responseId)
- {
- if ($responseId < count($this->_responsedata))
- {
- $this->_responsedata[$responseId]++;
- return true;
- }
- else
- return false;
- }
-}
-
-/* vim:ai:cin:sw=2:expandtab:
-*/
-?>
Copied: plugins/trunk/plogpoll/class/dao/plogpollpoll.class.php (from rev 4487, plugins/branches/lifetype-1.1/plogpoll/class/dao/plogpollpoll.class.php)
Deleted: plugins/trunk/plogpoll/class/dao/plogpollpolls.class.php
===================================================================
--- plugins/branches/lifetype-1.1/plogpoll/class/dao/plogpollpolls.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/plogpoll/class/dao/plogpollpolls.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,202 +0,0 @@
-<?php
-/*
- Plugin - PlogPoll
- Copyright (C) 2005 Matthew Wood
-
- This library is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published by
- the Free Software Foundation; either version 2.1 of the License, or
- (at your option) any later version.
- */
-
-
-include_once( PLOG_CLASS_PATH."class/dao/model.class.php");
-include_once(PLOG_CLASS_PATH.
- "plugins/plogpoll/class/dao/plogpollpoll.class.php");
-
-class PlogPollPolls extends Model
-{
- function PlogPollPolls()
- {
- $this->Model();
- }
-
- function addPoll(&$poll)
- {
- $prefix = $this->getPrefix();
- $resps = array();
- foreach($poll->getResponses() as $response)
- if (strlen($response) > 1)
- $resps[] = $response;
-
- $q = "insert into {$prefix}plogpoll_polls ".
- "(subject,responses,responsedata,dateadded,active,blogId) values (".
- "'". Db::qstr($poll->getSubject()) ."',".
- "'". Db::qstr(serialize($resps)) ."',".
- "'". Db::qstr(serialize($poll->getResponseData())) ."',".
- "'". time() ."',".
- "'N','". Db::qstr($poll->getBlogId()) ."')";
- return $this->Execute($q);
- }
-
- function getPollById($id)
- {
- $prefix = $this->getPrefix();
- $q = "select * from {$prefix}plogpoll_polls ".
- "where id='". Db::qstr($id) ."'";
- $res = $this->Execute($q);
-
- if (!$res)
- return false;
-
- $row = $res->FetchRow();
- return $this->_poll_from_sqlrow($row);
- }
-
- function getAllPolls($blogId)
- {
- $prefix = $this->getPrefix();
- $q = "select * from {$prefix}plogpoll_polls ".
- "where blogId='". Db::qstr($blogId) ."'";
- $result = $this->Execute($q);
- $polls = array();
-
- if (!$result)
- return false;
-
- while ($row = $result->FetchRow())
- $polls[] = $this->_poll_from_sqlrow($row);
-
- return $polls;
- }
-
- function hasVoted($pollid)
- {
- $lip = ip2long($GLOBALS['_SERVER']['REMOTE_ADDR']);
- $prefix = $this->getPrefix();
- $q = "select id from {$prefix}plogpoll_voterips ".
- "where ip='". Db::qstr($lip) ."' ".
- "and id='". Db::qstr($pollid) ."'";
- $res = $this->Execute($q);
- $row = $res->FetchRow();
-
- if (!$row) return false;
- else return true;
- }
-
- function registerVote($pollid,$responseid)
- {
- $lip = ip2long($GLOBALS['_SERVER']['REMOTE_ADDR']);
- $prefix = $this->getPrefix();
- $q = "select id,date from {$prefix}plogpoll_voterips ".
- "where ip='". Db::qstr($lip) ."' and ".
- "id='". Db::qstr($pollid) ."'";
- $res = $this->Execute($q);
- $row = $res->FetchRow();
- if (!$res || !$row)
- {
- $q = "select * from {$prefix}plogpoll_polls ".
- "where id='". Db::qstr($pollid) ."'";
- $res = $this->Execute($q);
- if (!$res)
- return false;
-
- $poll = $this->_poll_from_sqlrow($res->FetchRow());
- $poll->incrementVotes($responseid);
-
- $q = "insert into {$prefix}plogpoll_voterips ".
- " (id,ip,date) values (".
- "'". Db::qstr($pollid) ."',".
- "'". Db::qstr($lip) ."',".
- "'". Db::qstr(time()). "')";
- $this->Execute($q);
-
- return $this->updatePoll($poll);
- }
- else
- {
- echo "<h1> b2 </h1>";
- return false;
- }
- }
-
- function deletePoll($pollid,$blogId)
- {
- if (!is_numeric($pollid) && !(($pollid = intval($pollid)) >= 0))
- return false;
-
- $prefix = $this->getPrefix();
-
- $q = "select id from {$prefix}plogpoll_polls where ".
- "id='". Db::qstr($pollid) . "'".
- " and blogId='". Db::qstr($blogId) ."'";
- $res = $this->Execute($q);
-
- if (!($res->FetchRow()))
- return false;
-
- $q = "delete from {$prefix}plogpoll_polls where id=". $pollid;
- $this->Execute($q);
- $q = "delete from {$prefix}plogpoll_voterips where id=". $pollid;
- $this->Execute($q);
-
- return true;
- }
-
- function getActivePoll($blogId)
- {
- $prefix = $this->getPrefix();
- $q = "select * from {$prefix}plogpoll_polls ".
- "where active='Y' and blogId='". Db::qstr($blogId) ."'".
- " limit 1";
- $res = $this->Execute($q);
-
- if (!$res)
- return false;
-
- return $this->_poll_from_sqlrow($res->FetchRow());
- }
-
- function setNewActivePoll($pid,$bid)
- {
- $prefix = $this->getPrefix();
- $q = "update {$prefix}plogpoll_polls ".
- "set active='N' where blogid='". Db::qstr($bid) ."'";
- $this->Execute($q);
- $q = "update {$prefix}plogpoll_polls ".
- "set active='Y' where id='". Db::qstr($pid) ."'";
- $this->Execute($q);
- }
-
- function updatePoll(&$poll)
- {
- $prefix = $this->getPrefix();
-
- $q = "update ${prefix}plogpoll_polls ".
- "set subject='". Db::qstr($poll->getSubject()) ."',".
- "responses='". Db::qstr(serialize($poll->getResponses())) ."',".
- "responsedata='".
- Db::qstr(serialize($poll->getResponseData())) . "'".
- " where id=". $poll->getId();
-
- return $this->Execute($q);
- }
-
- function _poll_from_sqlrow(&$row)
- {
- if (!$row)
- return false;
-
- $poll = new PlogPollPoll( $row['id'], $row['subject'],
- unserialize($row['responses']),
- unserialize($row['responsedata']),
- $row['dateadded'],
- $row['active'],
- $row['blogId']);
- return $poll;
- }
-}
-
-/* vim:ai:cin:sw=2:expandtab:
-*/
-?>
Copied: plugins/trunk/plogpoll/class/dao/plogpollpolls.class.php (from rev 4487, plugins/branches/lifetype-1.1/plogpoll/class/dao/plogpollpolls.class.php)
Copied: plugins/trunk/plogpoll/class/view (from rev 4487, plugins/branches/lifetype-1.1/plogpoll/class/view)
Deleted: plugins/trunk/plogpoll/class/view/adminplogpolllistview.class.php
===================================================================
--- plugins/branches/lifetype-1.1/plogpoll/class/view/adminplogpolllistview.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/plogpoll/class/view/adminplogpolllistview.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,35 +0,0 @@
-<?php
-/*
- Plugin - PlogPoll
- Copyright (C) 2005 Matthew Wood
-
- This library is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published by
- the Free Software Foundation; either version 2.1 of the License, or
- (at your option) any later version.
- */
-
-
-include_once(PLOG_CLASS_PATH.
- "class/view/admin/adminplugintemplatedview.class.php");
-
-class AdminPlogPollListView extends AdminPluginTemplatedView
-{
- function AdminPlogPollListView($blogInfo)
- {
- $this->AdminPluginTemplatedView($blogInfo,"plogpoll","adminpollview");
- }
- function render()
- {
- $polls = new PlogPollPolls();
- $allpolls = $polls->getAllPolls($this->_blogInfo->getId());
-
- $this->setValue("polls",$allpolls);
-
- parent::render();
- }
-}
-
-/* vim:cin:sw=2:expandtab:ai:
-*/
-?>
Copied: plugins/trunk/plogpoll/class/view/adminplogpolllistview.class.php (from rev 4487, plugins/branches/lifetype-1.1/plogpoll/class/view/adminplogpolllistview.class.php)
Deleted: plugins/trunk/plogpoll/class/view/adminplogpollnewpollview.class.php
===================================================================
--- plugins/branches/lifetype-1.1/plogpoll/class/view/adminplogpollnewpollview.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/plogpoll/class/view/adminplogpollnewpollview.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,31 +0,0 @@
-<?php
-/*
- Plugin - PlogPoll
- Copyright (C) 2005 Matthew Wood
-
- This library is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as published by
- the Free Software Foundation; either version 2.1 of the License, or
- (at your option) any later version.
- */
-
-
-include_once(PLOG_CLASS_PATH.
- "class/view/admin/adminplugintemplatedview.class.php");
-
-class AdminPlogPollNewPollView extends AdminPluginTemplatedView
-{
- function AdminPlogPollNewPollView($blogInfo)
- {
- $this->AdminPluginTemplatedView($blogInfo,"plogpoll","adminnewpoll");
- }
- function render()
- {
- parent::render();
- }
-}
-
-
-/* vim:cin:ai:sw=2:expandtab:
-*/
-?>
Copied: plugins/trunk/plogpoll/class/view/adminplogpollnewpollview.class.php (from rev 4487, plugins/branches/lifetype-1.1/plogpoll/class/view/adminplogpollnewpollview.class.php)
Copied: plugins/trunk/plogpoll/locale (from rev 4487, plugins/branches/lifetype-1.1/plogpoll/locale)
Deleted: plugins/trunk/plogpoll/locale/locale_ca_ES.php
===================================================================
--- plugins/branches/lifetype-1.1/plogpoll/locale/locale_ca_ES.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/plogpoll/locale/locale_ca_ES.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,17 +0,0 @@
-<?php
-$messages["PluginNewPollTitle"] = "Enquestes - Nova Enquesta";
-$messages["PluginViewPollsTitle"] = "Enquestes - Veure Enquestes";
-
-$messages["PlogPoll"] = "Enquesta";
-$messages["ViewPollList"] = "Llistat Enquestes";
-$messages["NewPoll"] = "Nova Enquesta";
-$messages["Query"] = "Pregunta";
-$messages["Responses"] = "Respostes";
-
-$messages["responses_help"] = "Separa les possibles respostes en linias diferents apretant la tecla Intro";
-$messages["AddNewPoll"] = "Afegeix Enquesta";
-
-$messages["ActivatePoll"] = "Activa Enquesta";
-$messages["Delete"] = "Borrar";
-$messages["CommitChanges"] = "Desar Canvis";
-?>
\ No newline at end of file
Copied: plugins/trunk/plogpoll/locale/locale_ca_ES.php (from rev 4487, plugins/branches/lifetype-1.1/plogpoll/locale/locale_ca_ES.php)
Deleted: plugins/trunk/plogpoll/locale/locale_en_UK.php
===================================================================
--- plugins/branches/lifetype-1.1/plogpoll/locale/locale_en_UK.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/plogpoll/locale/locale_en_UK.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,14 +0,0 @@
-<?php
-$messages["PluginNewPollTitle"] = "Polls - New Poll";
-$messages["PluginViewPollsTitle"] = "Polls - View Polls";
-
-$messages["PlogPoll"] = "Poll";
-$messages["ViewPollList"] = "Poll List";
-$messages["NewPoll"] = "New Poll";
-
-$messages["responses_help"] = "Seperate poll responses by pressing return/enter key";
-$messages["AddNewPoll"] = "Add New Poll";
-
-$messages["ActivatePoll"] = "Activate Poll";
-$messages["CommitChanges"] = "Commit Changes";
-?>
\ No newline at end of file
Copied: plugins/trunk/plogpoll/locale/locale_en_UK.php (from rev 4487, plugins/branches/lifetype-1.1/plogpoll/locale/locale_en_UK.php)
Deleted: plugins/trunk/plogpoll/pluginplogpoll.class.php
===================================================================
--- plugins/branches/lifetype-1.1/plogpoll/pluginplogpoll.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/plogpoll/pluginplogpoll.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,186 +0,0 @@
-<?php
-/*
-Plugin - PlogPoll
-Copyright (C) 2005 Matthew Wood
-
-port for lt 1.1.x 2006, EagleKing , panying2000(at)gmail(dot)com
-
-This library is free software; you can redistribute it and/or modify it
-under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or
-(at your option) any later version.
-*/
-
-
-include_once(PLOG_CLASS_PATH."class/plugin/pluginbase.class.php");
-include_once(PLOG_CLASS_PATH."plugins/plogpoll/class/dao/plogpollpolls.class.php");
-include_once(PLOG_CLASS_PATH."class/config/config.class.php");
-
-class PluginPlogPoll extends PluginBase
-{
- function PluginPlogPoll()
- {
- $this->PluginBase();
-
- /* setup info */
- $this->id = "plogpoll";
- $this->desc = "Allows plog admins to include polls in their pLog";
- $this->author = "woodzy";
- $this->locale = Array();
-
- /* register the actions needed */
- $this->registerAdminAction(
- "plogpollViewList","AdminPlogPollListViewAction");
- $this->registerAdminAction(
- "plogpollAddPoll","AdminPlogPollAddPollAction");
- $this->registerAdminAction(
- "plogpollDeletePoll","AdminPlogPollDeletePollAction");
- $this->registerAdminAction(
- "plogpollNewPoll","AdminPlogPollNewPollViewAction");
-
- $this->registerBlogAction(
- "plogpollRegisterVote","PlogPollRegisterVoteAction");
-
- /* setup the admin interface information */
- $menu =& Menu::getMenu();
- if( !$menu->entryExists( "/menu/Manage/PlogPoll" ))
- $this->addMenuEntry("/menu/Manage","PlogPoll","", "", true, false);
- $this->addMenuEntry(
- "/menu/Manage/PlogPoll","ViewPollList","?op=plogpollViewList");
- $this->addMenuEntry(
- "/menu/Manage/PlogPoll","NewPoll","?op=plogpollNewPoll");
-
-
- /* seems to be a good idea...
- * !!lifted from other plugins!!
- */
- $this->_verifyTable();
- }
-
- /*@private*/
- function _verifyTable()
- {
- $fields = "
- id I(11) NOTNULL PRIMARY AUTOINCREMENT,
- blogId I(11) NOTNULL KEY,
- active C(1) NOTNULL KEY,
- subject TEXT NOTNULL,
- responses TEXT NOTNULL,
- responsedata TEXT NOTNULL,
- dateadded I(11) NOTNULL";
-
- $fields2 = "
- id I(11) NOTNULL KEY,
- ip I8 NOTNULL KEY,
- date I(11) NOTNULL KEY";
-
- // need include db.class.php first to run .
- include_once( PLOG_CLASS_PATH."class/database/db.class.php" );
- $db =& Db::getDb();
- $dbPrefix = Db::getPrefix();
-
- $tableName = $dbPrefix."plogpoll_polls";
- $tableName2 = $dbPrefix."plogpoll_voterips";
-
- $dict = $db->getDriverDataDictionary();
-
- $sqlAry = $dict->ChangeTableSQL($tableName,$fields);
- $result = $dict->ExecuteSQLArray($sqlAry);
- if (!$result)
- die("There was an error creating/updating plogpoll plugin tables!");
-
- $sqlAry = $dict->ChangeTableSQL($tableName2,$fields2);
- $result = $dict->ExecuteSQLArray($sqlAry);
- if (!$result)
- die("There was an error creating/updating plogpoll plugin tables!");
- }
- function getActivePoll($blogId)
- {
- $pmod = new PlogPollPolls();
- $poll = $pmod->getActivePoll($blogId);
- if (!$poll) /*if no polls active*/
- return false;
- if ($pmod->hasVoted($poll->getId())) /*if ip has voted ignore request*/
- return false;
-
- return $poll; /*no errors*/
- }
- function requestURI()
- {
- return base64_encode(
- $GLOBALS["_SERVER"]["REQUEST_URI"]);
- }
- function generateActivePollHTML($blogId)
- {
- $pmod = new PlogPollPolls();
- $poll = $pmod->getActivePoll($blogId);
- if (!$poll){
- return "<table id='pollbody'>".
- "<tr><th>Currently no poll</th></tr></table>";
- }
-
- $table = "";
-
- if ($pmod->hasVoted($poll->getId()))
- {
- $width = 100;
- $height = 15;
- $totalVotes = 0;
-
- foreach ($poll->getResponseData() as $num)
- $totalVotes+=$num;
-
- $percentage = array();
-
- foreach ($poll->getResponseData() as $votes)
- $percentage[] = (double)$votes/(double)$totalVotes;
-
- $table .= "<table id='pollbody'>";
- $table .= "<tr><th>". $poll->getSubject() ."</th></tr>";
-
- $responses = $poll->getResponses();
- for ($i = 0; $i < count($responses); $i++)
- {
- $table .=
- "<tr>
- <td>".
- $responses[$i]
- ."<div style='width:".
- (int)($percentage[$i]*$width) ."px;
- height:".$height."px;background:darkblue;'>
- ". (int)($percentage[$i]*$width) ."%</div>
- </td>
- </tr>";
- }
- $table .= "</table>";
- }
- else
- {
- $config =& Config::getConfig();
- $table .= "<form method='post' action='". $config->getValue('base_url') ."/?op=plogpollRegisterVote'>\n";
- $table .= "<table id='pollbody'>";
- $table .= "<tr><th>". $poll->getSubject() ."</th></tr>";
-
- $responses = $poll->getResponses();
- for ($i = 0; $i < count($responses); $i++)
- {
- $table.= "<tr><td> <input type='radio' name='vote' ".
- "value='". $poll->getId() ."-". $i ."' />\n". $responses[$i] .
- "</td></tr>\n";
- }
- $table .= "<tr><td>
- <input id='pollsubmit' type='submit' value='Vote' />
- </td></tr></table>
- <input type='hidden' name='disppage'
- value='". $this->requestURI() ."' /></form>";
- }
- return $table;
- }
-}
-function insert_getPlogPollHtml($params)
-{
- return $params['pollvar']->generateActivePollHTML($params['pollid']);
-}
-/* vim:cin:sw=2:expandtab:ai:
-*/
-?>
Copied: plugins/trunk/plogpoll/pluginplogpoll.class.php (from rev 4487, plugins/branches/lifetype-1.1/plogpoll/pluginplogpoll.class.php)
Copied: plugins/trunk/plogpoll/templates (from rev 4487, plugins/branches/lifetype-1.1/plogpoll/templates)
Deleted: plugins/trunk/plogpoll/templates/adminnewpoll.template
===================================================================
--- plugins/branches/lifetype-1.1/plogpoll/templates/adminnewpoll.template 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/plogpoll/templates/adminnewpoll.template 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,29 +0,0 @@
-{include file="$admintemplatepath/header.template"}
-{include file="$admintemplatepath/navigation.template" showOpt=plogpollNewPoll title=$locale->tr("PluginNewPollTitle")}
-
-<form method='post' action="admin.php">
-<div id='list'>
- {include file="$admintemplatepath/successmessage.template"}
- {include file="$admintemplatepath/errormessage.template"}
- <table class='info'>
- <tr>
- <th> {$locale->tr("Query")}: </th>
- <td> <input name='subject' type='text' value='' size='60'/> </td>
- </tr>
- <tr>
- <th> {$locale->tr("Responses")} </th>
- <td> {$locale->tr("responses_help")} </td>
- </tr>
- <tr>
- <td colspan=2> <textarea cols='100' rows='5' name='responses'></textarea>
- </td>
- </tr>
- <tr> <td colspan=2> <input type='submit' value='{$locale->tr("AddNewPoll")}' /> </td> </tr>
- </table>
-</div>
-<input type='hidden' name='op' value="plogpollAddPoll" />
-</form>
-
-
-{include file="$admintemplatepath/footernavigation.template"}
-{include file="$admintemplatepath/footer.template"}
Copied: plugins/trunk/plogpoll/templates/adminnewpoll.template (from rev 4487, plugins/branches/lifetype-1.1/plogpoll/templates/adminnewpoll.template)
Deleted: plugins/trunk/plogpoll/templates/adminpollview.template
===================================================================
--- plugins/branches/lifetype-1.1/plogpoll/templates/adminpollview.template 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/plogpoll/templates/adminpollview.template 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,53 +0,0 @@
-{include file="$admintemplatepath/header.template"}
-{include file="$admintemplatepath/navigation.template" showOpt=pollview title=$locale->tr("PluginViewPollsTitle")}
-
-<form id="pollform" action="admin.php" method="post">
-<div id="list">
- {include file="$admintemplatepath/successmessage.template"}
- {include file="$admintemplatepath/errormessage.template"}
- <table class="info">
- <thead>
- <tr>
- <th> {$locale->tr("Delete")} </th>
- <th> {$locale->tr("ActivatePoll")} </th>
- <th> {$locale->tr("Query")} </th>
- <th> {$locale->tr("Responses")} </th>
- </tr>
- </thead>
- <tbody>
- {if !$polls}
- {else}
- {foreach from=$polls item=poll}
- <tr class="{cycle values="odd,even"}">
- <td style="width:10px">
- <input class='check' type='checkbox' name="plid[]" value="{$poll->getId()}" />
- </td>
- <td style="width:10px">
- <input class='check' type='radio' name='activepoll' value="{$poll->getId()}" {if $poll->getActive() eq 'Y'}checked{/if}/>
- </td>
- <td style="width:400px;"> {$poll->getSubject()} </td>
- <td style="width:275px;">
- <table>
- {assign var="votecount" value=$poll->getResponseData()}
- {foreach name=respview from=$poll->getResponses() item=resp}
- {assign var="interi" value=$smarty.foreach.respview.iteration-1}
- <tr>
- <td width="85%">{$resp}</td>
- <td>{$votecount[$interi]}</td>
- </tr>
- {/foreach}
- </table>
- </td>
- </tr>
- {/foreach}
- {/if}
- </tbody>
- </table>
-</div>
-<div id='list_action_bar'>
- <input type='hidden' name='op' value="plogpollDeletePoll"/>
- <input type='submit' name="Commit Changes" value="{$locale->tr("CommitChanges")} "/>
-</div>
-</form>
-{include file="$admintemplatepath/footernavigation.template"}
-{include file="$admintemplatepath/footer.template"}
Copied: plugins/trunk/plogpoll/templates/adminpollview.template (from rev 4487, plugins/branches/lifetype-1.1/plogpoll/templates/adminpollview.template)
Modified: plugins/trunk/print/pluginprint.class.php
===================================================================
--- plugins/trunk/print/pluginprint.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/print/pluginprint.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -40,7 +40,7 @@
*/
function printView( $article )
{
- $rg =& RequestGenerator::getRequestGenerator( $this->_blogInfo );
+ $rg = $this->blogInfo->getBlogRequestGenerator();
return $rg->getBaseUrl()."/index.php?op=printView&articleId=".$article->getId()."&blogId=".$this->blogInfo->getId();
}
}
Copied: plugins/trunk/randomimage (from rev 4487, plugins/branches/lifetype-1.1/randomimage)
Deleted: plugins/trunk/randomimage/pluginrandomimage.class.php
===================================================================
--- plugins/branches/lifetype-1.1/randomimage/pluginrandomimage.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/randomimage/pluginrandomimage.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,94 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/plugin/pluginbase.class.php" );
- include_once( PLOG_CLASS_PATH."class/plugin/pluginmanager.class.php" );
- include_once( PLOG_CLASS_PATH."class/gallery/dao/galleryalbums.class.php" );
-
-define("RANDOMIMAGE_DEBUG", 0);
-
- /**
- * Plugin returns a randomly selected image from a given album
- */
- class PluginRandomImage extends PluginBase
- {
- function PluginRandomImage(){
- $this->PluginBase();
-
- $this->id = "randomimage";
- $this->author = "Jon Daley";
- $this->desc = "This plugin offers a random image from a specific album.";
-
- $this->locales = Array( "en_UK" );
- }
-
- /**
- * Returns the URL to a random image in $albumName
- * previewType can be "PREVIEW", "MEDIUM" or "FULL"
- */
- function getImage($albumName, $previewType){
- $albums = new GalleryAlbums();
- $album = $albums->getAlbumByName($albumName);
- if(!$album){
- if(RANDOMIMAGE_DEBUG)
- return "no album '$albumName'";
- else
- return "";
- }
-
- $resources = new GalleryResources();
-
- $numResources = $resources->getNumUserResources(
- $this->blogInfo->getOwner(), $album->getId(), GALLERY_RESOURCE_IMAGE);
-
- if($numResources <= 0){
- if(RANDOMIMAGE_DEBUG)
- return "no resources in album: ".
- $this->blogInfo->getOwner()." ". $album->getId()." ".GALLERY_RESOURCE_IMAGE;
- else
- return "";
- }
-
- $whichResource = rand(0, $numResources-1);
-
- $query = "SELECT id FROM ".Db::getPrefix()."gallery_resources ".
- "WHERE album_id = '".$album->getId()."' ".
- "AND resource_type='".GALLERY_RESOURCE_IMAGE."' ".
- "LIMIT $whichResource, 1";
-
- $db =& Db::getDb();
- $result = $db->Execute( $query );
-
- if(!$result){
- if(RANDOMIMAGE_DEBUG)
- return "bad query '".$query."'";
- else
- return "";
- }
-
- if(!($row = $result->FetchRow())){
- if(RANDOMIMAGE_DEBUG)
- return "no results";
- else
- return "";
- }
-
- $resource = $resources->getResource($row["id"]);
- if(!$resource){
- if(RANDOMIMAGE_DEBUG)
- return "bad resource: '".$row["id"]."'";
- else
- return "";
- }
-
- $rg = $this->blogInfo->getBlogRequestGenerator();
- if($previewType == "FULL")
- return $rg->resourceDownloadLink($resource);
- else if($previewType == "MEDIUM")
- return $rg->resourceMediumSizePreviewLink($resource);
- else
- return $rg->resourcePreviewLink($resource);
-
- }
-
- }
-?>
\ No newline at end of file
Copied: plugins/trunk/randomimage/pluginrandomimage.class.php (from rev 4487, plugins/branches/lifetype-1.1/randomimage/pluginrandomimage.class.php)
Deleted: plugins/trunk/randomimage/readme.txt
===================================================================
--- plugins/branches/lifetype-1.1/randomimage/readme.txt 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/randomimage/readme.txt 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,39 +0,0 @@
-Random Image plugin for LifeType
-Author: Jon Daley
-Contact URL: http://limedaley.com/
-Version: 1.1
-
-
-Example URL using this plugin: http://groshlink.net/
- (click into any of the categories to see the images on the right)
-
-
-Example template code:
-
-{if $randomimage}
- <li>
- <a title="Eden (2006)" href="http://groshlink.net/album/eden_06">
- <img src="{$randomimage->getImage("eden_06", "PREVIEW")}" border="0" />
- </a>
- </li>
- <li>
- <a title="Graduate & Faculty Ministry" href="http://groshlink.net/album/graduate__faculty_ministry">
- <img src="{$randomimage->getImage("graduate__faculty_ministry", "PREVIEW")}" border="0" />
- </a>
- </li>
- <li>
- <a title="Pittsburgh" href="http://groshlink.net/album/pittsburgh">
- <img src="{$randomimage->getImage("pittsburgh", "PREVIEW")}" border="0" />
- </a>
- </li>
-{/if}
-
-
-
-TODO:
- Have the album links, and <a title> strings generated automatically
- probably with a parameter or configuration options so it works for
- everyone
-
- Probably can get rid of the SQL query in the plugin and use class
- methods for better compatibility
Copied: plugins/trunk/randomimage/readme.txt (from rev 4487, plugins/branches/lifetype-1.1/randomimage/readme.txt)
Copied: plugins/trunk/recentcomments/class/action/pluginrecentcommentsrssaction.class.php (from rev 4487, plugins/branches/lifetype-1.1/recentcomments/class/action/pluginrecentcommentsrssaction.class.php)
Copied: plugins/trunk/recentcomments/class/view/pluginrecentcommentsrssview.class.php (from rev 4487, plugins/branches/lifetype-1.1/recentcomments/class/view/pluginrecentcommentsrssview.class.php)
Modified: plugins/trunk/recentcomments/pluginrecentcomments.class.php
===================================================================
--- plugins/trunk/recentcomments/pluginrecentcomments.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/recentcomments/pluginrecentcomments.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -24,6 +24,8 @@
function init()
{
+ $this->registerBlogAction( "recentcommentsrss", "PluginRecentCommentsRssAction" );
+
$this->registerAdminAction( "recentcomments", "PluginRecentCommentsConfigAction" );
$this->registerAdminAction( "updateRecentCommentsConfig", "PluginRecentCommentsUpdateConfigAction" );
include_once( PLOG_CLASS_PATH."class/template/menu/menu.class.php" );
@@ -99,5 +101,16 @@
$articles = new Articles();
return $articles->getArticle($artId);
}
+
+ function getRssFeedUrl(){
+ include_once( PLOG_CLASS_PATH."class/net/rawrequestgenerator.class.php" );
+
+ $rg = new RawRequestGenerator($this->blogInfo);
+ $rg->addParameter( "op", "recentcommentsrss" );
+ $rg->addParameter( "blogId", $this->blogInfo->getId());
+
+ $feedUrl = $rg->getIndexUrl().$rg->getRequest();
+ return $feedUrl;
+ }
}
?>
\ No newline at end of file
Modified: plugins/trunk/recentcomments/readme.txt
===================================================================
--- plugins/trunk/recentcomments/readme.txt 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/recentcomments/readme.txt 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,13 +1,15 @@
Plugin: Recent Comments
Author: Mark Wu
Release Date: 2005/01/23
-Version: 1.0
+Version: 1.1
-This plugin offers the most recently article comments. Usage as follow:
+This plugin offers the most recently article comments (for regular
+templates and an RSS feed). Usage as follow:
You can use:
1. $recentcomments->isEnabled() to check the plugin is enabled or not.
2. $recentcomments->getRecentComments( $maxComments , $based ) to get the recent comments.
+3. $recentcomments->getRssFeedUrl() to get the URL to the recent comments feed for the current blog
Where:
1. $maxComments is the the max comments you want to show. Default is 10.
@@ -16,7 +18,7 @@
Example:
Add the following code to footer.template or header.template:
{if $recentcomments->isEnabled()}
-<h2>Recent Comments</h2>
+<h2>Recent Comments [<a href="{$recentcomments->getRssFeedUrl()}">rss</a>]</h2>
{assign var=comments value=$recentcomments->getRecentComments()}
<ul>
{foreach from=$comments item=comment}
@@ -25,4 +27,4 @@
<li><a title="View comments by {$comment->getUsername()}" href="{$url->postPermalink($commentpost)}#{$comment->getId()}"><b>{$comment->getUsername()}¡G</b>{$comment->getText()|truncate:100:"..."|strip_tags}</a></li>
{/foreach}
</ul>
-{/if}
\ No newline at end of file
+{/if}
Copied: plugins/trunk/recentcomments/templates/rss20.template (from rev 4487, plugins/branches/lifetype-1.1/recentcomments/templates/rss20.template)
Copied: plugins/trunk/recommended (from rev 4487, plugins/branches/lifetype-1.1/recommended)
Copied: plugins/trunk/recommended/class (from rev 4487, plugins/branches/lifetype-1.1/recommended/class)
Copied: plugins/trunk/recommended/class/action (from rev 4487, plugins/branches/lifetype-1.1/recommended/class/action)
Deleted: plugins/trunk/recommended/class/action/pluginrecommendedconfigaction.class.php
===================================================================
--- plugins/branches/lifetype-1.1/recommended/class/action/pluginrecommendedconfigaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/recommended/class/action/pluginrecommendedconfigaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,27 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- include_once( PLOG_CLASS_PATH."class/view/admin/adminplugintemplatedview.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/recommended/class/view/pluginrecommendedconfigview.class.php" );
-
- /**
- * shows a form with the current configuration
- */
- class PluginRecommendedConfigAction extends AdminAction
- {
-
- function PluginRecommendedConfigAction( $actionInfo, $request )
- {
- $this->AdminAction( $actionInfo, $request );
- }
-
- function perform()
- {
- $this->_view = new PluginRecommendedConfigView( $this->_blogInfo );
-
- $this->setCommonData();
-
- return true;
- }
- }
-?>
\ No newline at end of file
Copied: plugins/trunk/recommended/class/action/pluginrecommendedconfigaction.class.php (from rev 4487, plugins/branches/lifetype-1.1/recommended/class/action/pluginrecommendedconfigaction.class.php)
Deleted: plugins/trunk/recommended/class/action/pluginrecommendedupdateconfigaction.class.php
===================================================================
--- plugins/branches/lifetype-1.1/recommended/class/action/pluginrecommendedupdateconfigaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/recommended/class/action/pluginrecommendedupdateconfigaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,82 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- include_once( PLOG_CLASS_PATH."class/view/admin/adminplugintemplatedview.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/recommended/class/view/pluginrecommendedconfigview.class.php" );
-
- /**
- * updates the plugin configuration
- */
- class PluginRecommendedUpdateConfigAction extends AdminAction
- {
- var $_pluginEnabled;
- var $_recommendedPosts;
-
- function PluginRecommendedUpdateConfigAction( $actionInfo, $request )
- {
- $this->AdminAction( $actionInfo, $request );
- }
-
- function validate()
- {
- $this->_pluginEnabled = $this->_request->getValue( "pluginEnabled" );
- $this->_pluginEnabled = ($this->_pluginEnabled != "" );
- $this->_recommendedPosts = explode(" ",
- $this->_request->getValue( "recommendedPosts" ));
-
- if(!$this->_recommendedPosts || !$this->_recommendedPosts[0]){
- $this->_recommendedPosts = Array();
- }
-
- foreach($this->_recommendedPosts as $id){
- if(!ctype_digit($id)){
- $errors = true;
- break;
- }
- }
-
- if( $errors ) {
- $this->_view = new PluginRecommendedConfigView( $this->_blogInfo );
- $this->_view->setErrorMessage( $this->_locale->tr("recommended_error_posts"));
- $this->setCommonData();
-
- return false;
- }
-
- return true;
- }
-
- function perform()
- {
- // // update the plugin configurations to blog setting
- $blogSettings = $this->_blogInfo->getSettings();
- $blogSettings->setValue( "plugin_recommended_enabled", $this->_pluginEnabled );
- $blogSettings->setValue( "plugin_recommended_posts", $this->_recommendedPosts );
- $this->_blogInfo->setSettings( $blogSettings );
-
- // save the blogs settings
- $blogs = new Blogs();
- if( !$blogs->updateBlog( $this->_blogInfo )) {
- $this->_view = new PluginRecommendedConfigView( $this->_blogInfo );
- $this->_view->setErrorMessage( $this->_locale->tr("error_updating_settings"));
- $this->setCommonData();
-
- return false;
- }
-
- // if everything went ok...
- $this->_blogInfo->setSettings( $blogSettings );
- $this->_session->setValue( "blogInfo", $this->_blogInfo );
- $this->saveSession();
-
- $this->_view = new PluginRecommendedConfigView( $this->_blogInfo );
- $this->_view->setSuccessMessage( $this->_locale->tr("recommended_settings_saved_ok"));
- $this->setCommonData();
-
- // clear the cache
- CacheControl::resetBlogCache( $this->_blogInfo->getId());
-
- return true;
- }
- }
-?>
\ No newline at end of file
Copied: plugins/trunk/recommended/class/action/pluginrecommendedupdateconfigaction.class.php (from rev 4487, plugins/branches/lifetype-1.1/recommended/class/action/pluginrecommendedupdateconfigaction.class.php)
Copied: plugins/trunk/recommended/class/view (from rev 4487, plugins/branches/lifetype-1.1/recommended/class/view)
Deleted: plugins/trunk/recommended/class/view/pluginrecommendedconfigview.class.php
===================================================================
--- plugins/branches/lifetype-1.1/recommended/class/view/pluginrecommendedconfigview.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/recommended/class/view/pluginrecommendedconfigview.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,30 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/view/admin/adminplugintemplatedview.class.php" );
-
- /**
- * implements the main view of the plugin
- */
- class PluginRecommendedConfigView extends AdminPluginTemplatedView
- {
-
- function PluginRecommendedConfigView( $blogInfo )
- {
- $this->AdminPluginTemplatedView( $blogInfo, "recommended", "recommended" );
- }
-
- function render()
- {
- // load some configuration settings
- $blogSettings = $this->_blogInfo->getSettings();
- $pluginEnabled = $blogSettings->getValue( "plugin_recommended_enabled", 0);
- $recommendedPosts = $blogSettings->getValue( "plugin_recommended_posts", array());
-
- // create a view and export the settings to the template
- $this->setValue( "pluginEnabled", $pluginEnabled );
- $this->setValue( "recommendedPosts", implode(" ", $recommendedPosts) );
-
- parent::render();
- }
- }
-?>
\ No newline at end of file
Copied: plugins/trunk/recommended/class/view/pluginrecommendedconfigview.class.php (from rev 4487, plugins/branches/lifetype-1.1/recommended/class/view/pluginrecommendedconfigview.class.php)
Copied: plugins/trunk/recommended/locale (from rev 4487, plugins/branches/lifetype-1.1/recommended/locale)
Deleted: plugins/trunk/recommended/locale/locale_en_UK.php
===================================================================
--- plugins/branches/lifetype-1.1/recommended/locale/locale_en_UK.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/recommended/locale/locale_en_UK.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,18 +0,0 @@
-<?php
-$messages["manageTopPlugins"] = "Top Activities Management";
-$messages["recommended"] = "Recommended Posts";
-$messages["recommended"] = "Recommended Posts";
-
-$messages["recommended_posts"] = "Recommended Post IDs";
-$messages["recommended_posts_help"] = "Enter a space-delimited list of post IDs that you want to display on the Recommended list";
-
-$messages["recommended_plugin_enabled"] = "Enable this plugin";
-$messages["recommended_plugin"] = "Recommended Posts Plugin";
-
-$messages["recommended_settings_saved_ok"] = "Recommended Posts settings saved successfully!";
-$messages["recommended_error_posts"] = "You must enter numerical post IDs only";
-
-$messages["label_configuration"] = "Configuration";
-$messages["label_enable"] = "Enable";
-$messages["label_recommended"] = "Recommended Post IDs";
-?>
\ No newline at end of file
Copied: plugins/trunk/recommended/locale/locale_en_UK.php (from rev 4487, plugins/branches/lifetype-1.1/recommended/locale/locale_en_UK.php)
Deleted: plugins/trunk/recommended/pluginrecommended.class.php
===================================================================
--- plugins/branches/lifetype-1.1/recommended/pluginrecommended.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/recommended/pluginrecommended.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,91 +0,0 @@
-<?php
-
-include_once( PLOG_CLASS_PATH."class/plugin/pluginbase.class.php" );
-include_once( PLOG_CLASS_PATH."class/plugin/pluginmanager.class.php" );
-include_once( PLOG_CLASS_PATH."class/dao/articles.class.php" );
-
- /**
- * Plugin that offers features to returns the top read posts object of current blog
- */
-class PluginRecommended extends PluginBase
-{
-
- var $prefix;
- var $pluginEnabled;
- var $recommendedPosts;
-
- function PluginRecommended(){
- $this->PluginBase();
-
- $this->id = "recommended";
- $this->author = "Jon Daley";
- $this->desc = "This plugin offers a list of recommended articles, selected by the blog owner";
- $this->prefix = Db::getPrefix();
-
- $this->locales = Array( "en_UK" );
- $this->recommendedPosts = Array();
-
- $this->init();
- }
-
- function init(){
- include_once( PLOG_CLASS_PATH."class/template/menu/menu.class.php" );
- $this->registerAdminAction( "recommended", "PluginRecommendedConfigAction" );
- $this->registerAdminAction( "updateRecommendedConfig",
- "PluginRecommendedUpdateConfigAction" );
-
- $menu =& Menu::getMenu();
- if( !$menu->entryExists( "/menu/controlCenter/manageTopPlugins" ))
- $this->addMenuEntry( "/menu/controlCenter", "manageTopPlugins", "", "", true, false);
- $this->addMenuEntry( "/menu/controlCenter/manageTopPlugins", "Recommended", "?op=recommended", "" );
- }
-
- function register(){
- $blogSettings = $this->blogInfo->getSettings();
- $this->pluginEnabled = $blogSettings->getValue( "plugin_recommended_enabled" );
- $this->recommendedPosts = $blogSettings->getValue( "plugin_recommended_posts" );
- }
-
- function isEnabled(){
- return $this->pluginEnabled;
- }
-
- /**
- * Returns the posts object of current blog
- */
- function getPosts(){
- if(!$this->recommendedPosts)
- return Array();
-
- $articles = new Articles();
- $blogId = $this->blogInfo->getId();
- $query = "SELECT * FROM ".$this->prefix."articles";
- $query .= " WHERE blog_id = ".$blogId." AND status = 1";
- $count = 0;
- foreach($this->recommendedPosts as $id){
- $count++;
- if($count == 1){
- $query .= " AND id = " . $id;
- }
- else{
- $query .= " OR id = " . $id;
- }
- }
- $query .= " ORDER BY num_reads DESC";
-
- $db =& Db::getDb();
- $result = $db->Execute( $query );
-
- if( !$result )
- return false;
-
- $recommended = Array();
- while( $row = $result->FetchRow()) {
- $article = $articles->mapRow( $row );
- array_push( $recommended, $article);
- }
-
- return $recommended;
- }
-}
-?>
\ No newline at end of file
Copied: plugins/trunk/recommended/pluginrecommended.class.php (from rev 4487, plugins/branches/lifetype-1.1/recommended/pluginrecommended.class.php)
Deleted: plugins/trunk/recommended/readme.txt
===================================================================
--- plugins/branches/lifetype-1.1/recommended/readme.txt 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/recommended/readme.txt 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,38 +0,0 @@
-Plugin: Recommended
-Author: Jon Daley
-Release Date: 2006/11/07
-Version: 1.1
-
-This plugin prints the "recommended" posts, as assigned by the blog owner.
-
-You can use:
-1. $recommended->isEnabled() to check the plugin is enabled or not.
-2. $recommended->getPosts() to get the posts set in the control center.
-
-
-Example:
-Add the following code to panel.template
-
-{if $recommended && $recommended->isEnabled()}
- <div class="sidetitle">{$locale->tr("Recommended")}</div>
- <div class="side">
- <div class="sideitem">
- <ul>
- {assign var=posts value=$recommended->getPosts()}
- {foreach from=$posts item=rec_post}
- <li>
- <a title="{$rec_post->getText()|truncate:150:"..."|strip_tags|escape}"
- href="{$url->postLink($rec_post)}">
- {$rec_post->getTopic()|truncate:32:"..."|strip_tags|escape:"htmlall"}</a>
- [{$rec_post->getNumReads()}]
- </li>
- {/foreach}
- </ul>
- </div>
- </div>
-{/if}
-
-
-TODO:
- Don't require the post ids in the control center administration, but
- maybe a drop down list of posts?
Copied: plugins/trunk/recommended/readme.txt (from rev 4487, plugins/branches/lifetype-1.1/recommended/readme.txt)
Copied: plugins/trunk/recommended/templates (from rev 4487, plugins/branches/lifetype-1.1/recommended/templates)
Deleted: plugins/trunk/recommended/templates/recommended.template
===================================================================
--- plugins/branches/lifetype-1.1/recommended/templates/recommended.template 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/recommended/templates/recommended.template 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,33 +0,0 @@
-{include file="$admintemplatepath/header.template"}
-{include file="$admintemplatepath/navigation.template" showOpt=Recommended title=$locale->tr("recommended_plugin")}
-<form name="recommendedPluginConfig" method="post">
- <fieldset class="inputField">
- <legend>{$locale->tr("label_configuration")}</legend>
- {include file="$admintemplatepath/successmessage.template"}
- {include file="$admintemplatepath/errormessage.template"}
- <div class="field">
- <label for="pluginEnabled">{$locale->tr("label_enable")}</label>
- <span class="required"></span>
- <div class="formHelp">
- <input class="checkbox" type="checkbox" name="pluginEnabled" id="pluginEnabled" {if $pluginEnabled} checked="checked" {/if} value="1" />{$locale->tr("recommended_plugin_enabled")}
- </div>
- </div>
-
- <div class="field">
- <label for="recommended">{$locale->tr("label_recommended")}</label>
- <span class="required">*</span>
- <div class="formHelp">{$locale->tr("recommended_posts_help")}</div>
- <input class="text" type="text" name="recommendedPosts" id="recommendedPosts"
- value="{$recommendedPosts}" width="10" />
- </div>
-
- </fieldset>
-
- <div class="buttons">
- <input type="hidden" name="op" value="updateRecommendedConfig" />
- <input type="reset" name="{$locale->tr("reset")}" />
- <input type="submit" name="{$locale->tr("update_settings")}" value="{$locale->tr("update")}" />
- </div>
-</form>
-{include file="$admintemplatepath/footernavigation.template"}
-{include file="$admintemplatepath/footer.template"}
Copied: plugins/trunk/recommended/templates/recommended.template (from rev 4487, plugins/branches/lifetype-1.1/recommended/templates/recommended.template)
Copied: plugins/trunk/remembercommentdata (from rev 4487, plugins/branches/lifetype-1.1/remembercommentdata)
Copied: plugins/trunk/remembercommentdata/class (from rev 4487, plugins/branches/lifetype-1.1/remembercommentdata/class)
Copied: plugins/trunk/remembercommentdata/class/action (from rev 4487, plugins/branches/lifetype-1.1/remembercommentdata/class/action)
Deleted: plugins/trunk/remembercommentdata/class/action/pluginremembercommentdataconfigaction.class.php
===================================================================
--- plugins/branches/lifetype-1.1/remembercommentdata/class/action/pluginremembercommentdataconfigaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/remembercommentdata/class/action/pluginremembercommentdataconfigaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,27 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- include_once( PLOG_CLASS_PATH."class/view/admin/adminplugintemplatedview.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/remembercommentdata/class/view/pluginremembercommentdataconfigview.class.php" );
-
- /**
- * shows a form with the current configuration
- */
- class PluginRememberCommentDataConfigAction extends AdminAction
- {
-
- function PluginRememberCommentDataConfigAction( $actionInfo, $request )
- {
- $this->AdminAction( $actionInfo, $request );
- }
-
- function perform()
- {
- $this->_view = new PluginRememberCommentDataConfigView( $this->_blogInfo );
-
- $this->setCommonData();
-
- return true;
- }
- }
-?>
\ No newline at end of file
Copied: plugins/trunk/remembercommentdata/class/action/pluginremembercommentdataconfigaction.class.php (from rev 4487, plugins/branches/lifetype-1.1/remembercommentdata/class/action/pluginremembercommentdataconfigaction.class.php)
Deleted: plugins/trunk/remembercommentdata/class/action/pluginremembercommentdataupdateconfigaction.class.php
===================================================================
--- plugins/branches/lifetype-1.1/remembercommentdata/class/action/pluginremembercommentdataupdateconfigaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/remembercommentdata/class/action/pluginremembercommentdataupdateconfigaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,59 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- include_once( PLOG_CLASS_PATH."class/view/admin/adminplugintemplatedview.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/remembercommentdata/class/view/pluginremembercommentdataconfigview.class.php" );
-
- /**
- * updates the plugin configuration
- */
- class PluginRememberCommentDataUpdateConfigAction extends AdminAction
- {
- var $_pluginEnabled;
-
- function PluginRememberCommentDataUpdateConfigAction( $actionInfo, $request )
- {
- $this->AdminAction( $actionInfo, $request );
- }
-
- function validate()
- {
- $this->_pluginEnabled = $this->_request->getValue( "pluginEnabled" );
- $this->_pluginEnabled = ($this->_pluginEnabled != "" );
-
- return true;
- }
-
- function perform()
- {
- // update the plugin configurations to blog setting
- $blogSettings = $this->_blogInfo->getSettings();
- $blogSettings->setValue( "plugin_remembercommentdata_enabled", $this->_pluginEnabled );
- $this->_blogInfo->setSettings( $blogSettings );
-
- // save the blogs settings
- $blogs = new Blogs();
- if( !$blogs->updateBlog( $this->_blogInfo )) {
- $this->_view = new PluginRememberCommentDataConfigView( $this->_blogInfo );
- $this->_view->setErrorMessage( $this->_locale->tr("error_updating_settings"));
- $this->setCommonData();
-
- return false;
- }
-
- // if everything went ok...
- $this->_blogInfo->setSettings( $blogSettings );
- $this->_session->setValue( "blogInfo", $this->_blogInfo );
- $this->saveSession();
-
- $this->_view = new PluginRememberCommentDataConfigView( $this->_blogInfo );
- $this->_view->setSuccessMessage( $this->_locale->tr("remcommdata_settings_saved_ok"));
- $this->setCommonData();
-
- // clear the cache
- CacheControl::resetBlogCache( $this->_blogInfo->getId());
-
- return true;
- }
- }
-?>
\ No newline at end of file
Copied: plugins/trunk/remembercommentdata/class/action/pluginremembercommentdataupdateconfigaction.class.php (from rev 4487, plugins/branches/lifetype-1.1/remembercommentdata/class/action/pluginremembercommentdataupdateconfigaction.class.php)
Copied: plugins/trunk/remembercommentdata/class/view (from rev 4487, plugins/branches/lifetype-1.1/remembercommentdata/class/view)
Deleted: plugins/trunk/remembercommentdata/class/view/pluginremembercommentdataconfigview.class.php
===================================================================
--- plugins/branches/lifetype-1.1/remembercommentdata/class/view/pluginremembercommentdataconfigview.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/remembercommentdata/class/view/pluginremembercommentdataconfigview.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,28 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/view/admin/adminplugintemplatedview.class.php" );
-
- /**
- * implements the main view of the feed reader plugin
- */
- class PluginRememberCommentDataConfigView extends AdminPluginTemplatedView
- {
-
- function PluginRememberCommentDataConfigView( $blogInfo )
- {
- $this->AdminPluginTemplatedView( $blogInfo, "remembercommentdata", "remembercommentdata" );
- }
-
- function render()
- {
- // load some configuration settings
- $blogSettings = $this->_blogInfo->getSettings();
- $pluginEnabled = $blogSettings->getValue( "plugin_remembercommentdata_enabled" );
-
- // create a view and export the settings to the template
- $this->setValue( "pluginEnabled", $pluginEnabled );
-
- parent::render();
- }
- }
-?>
\ No newline at end of file
Copied: plugins/trunk/remembercommentdata/class/view/pluginremembercommentdataconfigview.class.php (from rev 4487, plugins/branches/lifetype-1.1/remembercommentdata/class/view/pluginremembercommentdataconfigview.class.php)
Copied: plugins/trunk/remembercommentdata/js (from rev 4487, plugins/branches/lifetype-1.1/remembercommentdata/js)
Deleted: plugins/trunk/remembercommentdata/js/remembercommentdata.js
===================================================================
--- plugins/branches/lifetype-1.1/remembercommentdata/js/remembercommentdata.js 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/remembercommentdata/js/remembercommentdata.js 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,48 +0,0 @@
-function createCookie(name,value,days) {
- if (days)
- {
- var date = new Date();
- date.setTime(date.getTime()+(days*24*60*60*1000));
- var expires = "; expires="+date.toGMTString();
- }
- else var expires = "";
- document.cookie = name+"="+value+expires+"; path=/";
-}
-
-function readCookie(name) {
- var nameEQ = name + "=";
- var ca = document.cookie.split(';');
- for(var i=0;i < ca.length;i++)
- {
- var c = ca[i];
- while (c.charAt(0)==' ') c = c.substring(1,c.length);
- if (c.indexOf(nameEQ) == 0) return c.substring(nameEQ.length,c.length);
- }
- return null;
-}
-
-function eraseCookie(name) {
- createCookie(name,"",-1);
-}
-
-function setCookies() {
- var theForm = document.forms['NewComment'];
- createCookie("plog_cm_name", theForm.userName.value, 180);
- createCookie("plog_cm_email", theForm.userEmail.value, 180);
- createCookie("plog_cm_url", theForm.userUrl.value, 180);
- return true;
-}
-
-function readCookies() {
- var theForm = document.forms['NewComment'];
- var theName = readCookie("plog_cm_name");
- var theAddr = readCookie("plog_cm_email");
- var theUrl = readCookie("plog_cm_url");
- theForm.userName.value = (theName==null)?"":theName;
- theForm.userEmail.value = (theAddr==null)?"":theAddr;
- theForm.userUrl.value = (theUrl==null)?"":theUrl;
-}
-
-document.forms['NewComment'].onsubmit = setCookies;
-
-setTimeout("readCookies()", 3000);
Copied: plugins/trunk/remembercommentdata/js/remembercommentdata.js (from rev 4487, plugins/branches/lifetype-1.1/remembercommentdata/js/remembercommentdata.js)
Copied: plugins/trunk/remembercommentdata/locale (from rev 4487, plugins/branches/lifetype-1.1/remembercommentdata/locale)
Deleted: plugins/trunk/remembercommentdata/locale/locale_en_UK.php
===================================================================
--- plugins/branches/lifetype-1.1/remembercommentdata/locale/locale_en_UK.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/remembercommentdata/locale/locale_en_UK.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,12 +0,0 @@
-<?php
-$messages["manageAppearancePlugins"] = "Appearance Management";
-$messages["RememberCommentData"] = "Remember Comments Data";
-
-$messages["remcommdata_plugin_enabled"] = "Enable this plugin";
-$messages["remcommdata_plugin"] = "Remember Comments Data Plugin";
-
-$messages["remcommdata_settings_saved_ok"] = "Settings saved successfully!";
-
-$messages["label_configuration"] = "Configuration";
-$messages["label_enable"] = "Enable";
-?>
\ No newline at end of file
Copied: plugins/trunk/remembercommentdata/locale/locale_en_UK.php (from rev 4487, plugins/branches/lifetype-1.1/remembercommentdata/locale/locale_en_UK.php)
Deleted: plugins/trunk/remembercommentdata/locale/locale_es_ES.php
===================================================================
--- plugins/branches/lifetype-1.1/remembercommentdata/locale/locale_es_ES.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/remembercommentdata/locale/locale_es_ES.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,17 +0,0 @@
-<?php
-
-// Translation by Andres Bianciotto plog at a-b.com.ar
-// Date 09/Apr/2005
-//
-
-$messages["manageAppearancePlugins"] = "Apariencia";
-$messages["RememberCommentData"] = "Comentarios con Memoria";
-
-$messages["remcommdata_plugin_enabled"] = "Activar este plugin";
-$messages["remcommdata_plugin"] = "Plugin Comentarios con Memoria";
-
-$messages["remcommdata_settings_saved_ok"] = "La configuración se ha guardado con éxito";
-
-$messages["label_configuration"] = "Configuración";
-$messages["label_enable"] = "Activar";
-?>
\ No newline at end of file
Copied: plugins/trunk/remembercommentdata/locale/locale_es_ES.php (from rev 4487, plugins/branches/lifetype-1.1/remembercommentdata/locale/locale_es_ES.php)
Deleted: plugins/trunk/remembercommentdata/pluginremembercommentdata.class.php
===================================================================
--- plugins/branches/lifetype-1.1/remembercommentdata/pluginremembercommentdata.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/remembercommentdata/pluginremembercommentdata.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,53 +0,0 @@
-<?php
- include_once( PLOG_CLASS_PATH."class/plugin/pluginbase.class.php" );
- include_once( PLOG_CLASS_PATH."class/plugin/pluginmanager.class.php" );
-
- class PluginRememberCommentData extends PluginBase
- {
- var $pluginEnabled;
-
- function PluginRememberCommentData()
- {
- $this->PluginBase();
-
- $this->id = "remembercommentdata";
- $this->author = "Andres Bianciotto";
- $this->desc = "Fills the comment form fields with last entered data (cookie based)";
-
- $this->locales = Array( "en_UK" , "es_ES" );
-
- $this->init();
- }
-
- function init()
- {
- $this->registerAdminAction( "remembercommentdata", "PluginRememberCommentDataConfigAction" );
- $this->registerAdminAction( "updateRememberCommentDataConfig", "PluginRememberCommentDataUpdateConfigAction" );
-
- $menu =& Menu::getMenu();
- if( !$menu->entryExists( "/menu/controlCenter/manageAppearancePlugins" ))
- $this->addMenuEntry( "/menu/controlCenter", "manageAppearancePlugins", "", "", true, false );
- $this->addMenuEntry( "/menu/controlCenter/manageAppearancePlugins", "RememberCommentData", "?op=remembercommentdata", "" );
- }
-
- function register()
- {
- $blogSettings = $this->blogInfo->getSettings();
- $this->pluginEnabled = $blogSettings->getValue( "plugin_remembercommentdata_enabled" );
- }
-
- function isEnabled()
- {
- return $this->pluginEnabled;
- }
-
- function show()
- {
- $rg = $this->blogInfo->getBlogRequestGenerator();
- $baseUrl = $rg->getBaseUrl();
- $retValue = "<script src=\"$baseUrl/plugins/remembercommentdata/js/remembercommentdata.js\" language=\"JavaScript\" type=\"text/javascript\"></script>";
- return $retValue;
- }
-
- }
-?>
\ No newline at end of file
Copied: plugins/trunk/remembercommentdata/pluginremembercommentdata.class.php (from rev 4487, plugins/branches/lifetype-1.1/remembercommentdata/pluginremembercommentdata.class.php)
Deleted: plugins/trunk/remembercommentdata/readme.txt
===================================================================
--- plugins/branches/lifetype-1.1/remembercommentdata/readme.txt 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/remembercommentdata/readme.txt 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,21 +0,0 @@
-Plugin: Remember Comment Data
-Author: Andres Bianciotto
-Release Date: 2005/05/15
-Version: 1.0
-
-This plugin makes the blog "remember" the personal information users enter on the comments form.
-
-Install:
-1. Configurate your Remember Comment Data plugin in your LifeType control center
-
-
-Usage:
-Place this BELOW the </form> tag in the commentform.template file
-
-{if $remembercommentdata->isEnabled()}
-{$remembercommentdata->show()}
-{/if}
-
-Notes:
-The form MUST be named "NewComment".
-The users must enable cookies for this plugin to work
Copied: plugins/trunk/remembercommentdata/readme.txt (from rev 4487, plugins/branches/lifetype-1.1/remembercommentdata/readme.txt)
Copied: plugins/trunk/remembercommentdata/templates (from rev 4487, plugins/branches/lifetype-1.1/remembercommentdata/templates)
Deleted: plugins/trunk/remembercommentdata/templates/remembercommentdata.template
===================================================================
--- plugins/branches/lifetype-1.1/remembercommentdata/templates/remembercommentdata.template 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/remembercommentdata/templates/remembercommentdata.template 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,24 +0,0 @@
-{include file="$admintemplatepath/header.template"}
-{include file="$admintemplatepath/navigation.template" showOpt=RememberCommentData title=$locale->tr("remcommdata_plugin")}
-<form name="remcommdataPluginConfig" method="post">
- <fieldset class="inputField">
- <legend>{$locale->tr("label_configuration")}</legend>
- {include file="$admintemplatepath/successmessage.template"}
- {include file="$admintemplatepath/errormessage.template"}
- <div class="field">
- <label for="pluginEnabled">{$locale->tr("label_enable")}</label>
- <div class="formHelp">
- <input class="checkbox" type="checkbox" name="pluginEnabled" id="pluginEnabled" {if $pluginEnabled} checked="checked" {/if} value="1" />{$locale->tr("remcommdata_plugin_enabled")}
- </div>
- </div>
-
- </fieldset>
-
- <div class="buttons">
- <input type="hidden" name="op" value="updateRememberCommentDataConfig" />
- <input type="reset" name="{$locale->tr("reset")}" />
- <input type="submit" name="{$locale->tr("update_settings")}" value="{$locale->tr("update")}" />
- </div>
-</form>
-{include file="$admintemplatepath/footernavigation.template"}
-{include file="$admintemplatepath/footer.template"}
\ No newline at end of file
Copied: plugins/trunk/remembercommentdata/templates/remembercommentdata.template (from rev 4487, plugins/branches/lifetype-1.1/remembercommentdata/templates/remembercommentdata.template)
Copied: plugins/trunk/secret (from rev 4487, plugins/branches/lifetype-1.1/secret)
Copied: plugins/trunk/secret/class (from rev 4487, plugins/branches/lifetype-1.1/secret/class)
Copied: plugins/trunk/secret/class/action (from rev 4487, plugins/branches/lifetype-1.1/secret/class/action)
Deleted: plugins/trunk/secret/class/action/adminsecretpluginsettingsaction.class.php
===================================================================
--- plugins/branches/lifetype-1.1/secret/class/action/adminsecretpluginsettingsaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/secret/class/action/adminsecretpluginsettingsaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,30 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/action/admin/blogowneradminaction.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/secret/class/view/adminsecretpluginsettingsview.class.php" );
-
- class AdminSecretPluginSettingsAction extends BlogOwnerAdminAction
- {
-
- /**
- * Constructor. If nothing else, it also has to call the constructor of the parent
- * class, BlogAction with the same parameters
- */
- function AdminSecretPluginSettingsAction( $actionInfo, $request )
- {
- $this->BlogOwnerAdminAction( $actionInfo, $request );
- }
-
- /**
- * Carries out the specified action
- */
- function perform()
- {
- $this->_view = new AdminSecretPluginSettingsView( $this->_blogInfo );
-
- $this->setCommonData();
-
- return true;
- }
- }
-?>
Copied: plugins/trunk/secret/class/action/adminsecretpluginsettingsaction.class.php (from rev 4487, plugins/branches/lifetype-1.1/secret/class/action/adminsecretpluginsettingsaction.class.php)
Deleted: plugins/trunk/secret/class/action/adminsecretpluginupdatesettingsaction.class.php
===================================================================
--- plugins/branches/lifetype-1.1/secret/class/action/adminsecretpluginupdatesettingsaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/secret/class/action/adminsecretpluginupdatesettingsaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,138 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/action/admin/blogowneradminaction.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/secret/class/view/adminsecretpluginsettingsview.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/customfields/customfields.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/customfields/customfield.class.php" );
-
- class AdminSecretPluginUpdateSettingsAction extends BlogOwnerAdminAction
- {
-
- var $_pluginEnabled;
-
- /**
- * Constructor. If nothing else, it also has to call the constructor of the parent
- * class, BlogAction with the same parameters
- */
- function AdminSecretPluginUpdateSettingsAction( $actionInfo, $request )
- {
- $this->BlogOwnerAdminAction( $actionInfo, $request );
- }
-
- function validate()
- {
- $this->_pluginEnabled = $this->_request->getValue( "pluginEnabled" );
- $this->_pluginEnabled = ($this->_pluginEnabled != "" );
-
- return true;
- }
-
- /**
- * checks if the fields already exist and if not, creates them
- */
- function _createFields()
- {
- $customFields = new CustomFields();
- $blogFields = $customFields->getBlogCustomFields( $this->_blogInfo->getId());
-
-
- // check if the checkbox fields exists
- if( !array_key_exists( "password_protected", $blogFields )) {
- $protectedField = new CustomField( "password_protected",
- $this->_locale->tr("password_protected_help"),
- CUSTOM_FIELD_CHECKBOX,
- $this->_blogInfo->getId());
- $customFields->addCustomField( $protectedField );
- }
- else {
- $protectedField = $blogFields["password_protected"];
- $protectedField->setHidden( false );
- $customFields->updateCustomField( $protectedField );
- }
-
- // check if the field for the password exists
- if( !array_key_exists( "password_field", $blogFields )) {
- $passwordField = new CustomField( "password_field",
- $this->_locale->tr("password_field_help"),
- CUSTOM_FIELD_TEXTBOX,
- $this->_blogInfo->getId());
- $customFields->addCustomField( $passwordField );
- }
- else {
- $passwordField = $blogFields["password_field"];
- $passwordField->setHidden( false );
- $customFields->updateCustomField( $passwordField );
- }
-
- return true;
- }
-
- /**
- * checks if the fields already exist and if so, disables them (sets them to be "hidden")
- */
- function _updateFields()
- {
- $customFields = new CustomFields();
- $blogFields = $customFields->getBlogCustomFields( $this->_blogInfo->getId());
-
-
- // check if the checkbox fields exists
- if( array_key_exists( "password_protected", $blogFields )) {
- $protectedField = $blogFields["password_protected"];
- $protectedField->setHidden( true );
- $customFields->updateCustomField( $protectedField );
- }
-
- // check if the field for the password exists
- if( array_key_exists( "password_field", $blogFields )) {
- $passwordField = $blogFields["password_field"];
- $passwordField->setHidden( true );
- $customFields->updateCustomField( $passwordField );
- }
-
- return true;
- }
-
- /**
- * Carries out the specified action
- */
- function perform()
- {
- // update the plugin configurations to blog setting
- $blogSettings = $this->_blogInfo->getSettings();
- $blogSettings->setValue( "plugin_secret_enabled", $this->_pluginEnabled );
- $this->_blogInfo->setSettings( $blogSettings );
-
- // save the blogs settings
- $blogs = new Blogs();
- if( !$blogs->updateBlog( $this->_blogInfo )) {
- $this->_view = new AdminSecretPluginSettingsView( $this->_blogInfo );
- $this->_view->setErrorMessage( $this->_locale->tr("error_updating_settings"));
- $this->setCommonData();
-
- return false;
- }
-
- // check if the fields already exist and if not, create them
- if( $this->_pluginEnabled )
- $this->_createFields();
- else
- $this->_updateFields();
-
- // if everything went ok...
- $this->_blogInfo->setSettings( $blogSettings );
- $this->_session->setValue( "blogInfo", $this->_blogInfo );
- $this->saveSession();
-
- $this->_view = new AdminSecretPluginSettingsView( $this->_blogInfo );
- $this->_view->setSuccessMessage( $this->_locale->tr("secret_settings_saved_ok"));
- $this->setCommonData();
-
- // clear the cache
- CacheControl::resetBlogCache( $this->_blogInfo->getId());
-
- return true;
- }
- }
-?>
Copied: plugins/trunk/secret/class/action/adminsecretpluginupdatesettingsaction.class.php (from rev 4487, plugins/branches/lifetype-1.1/secret/class/action/adminsecretpluginupdatesettingsaction.class.php)
Deleted: plugins/trunk/secret/class/action/submitsecretitempasswordaction.class.php
===================================================================
--- plugins/branches/lifetype-1.1/secret/class/action/submitsecretitempasswordaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/secret/class/action/submitsecretitempasswordaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,51 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/action/blogaction.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/secret/class/dao/secretitems.class.php" );
- include_once( PLOG_CLASS_PATH."class/view/errorview.class.php" );
- include_once( PLOG_CLASS_PATH."class/net/http/httpvars.class.php" );
-
- class SubmitSecretItemPasswordAction extends BlogAction
- {
-
- var $_articleId;
- var $_password;
-
- function SubmitSecretItemPasswordAction( $actionInfo, $request )
- {
- $this->BlogAction( $actionInfo, $request );
- }
-
- function validate()
- {
- $this->_articleId = $this->_request->getValue( "articleId" );
- $this->_password = $this->_request->getValue( "itemPassword" );
-
- return true;
- }
-
- function perform()
- {
- // check if the password is correct
- $secretItems = new SecretItems();
-
- // if not, show another error
- if( !$secretItems->authenticateItem( $this->_articleId, $this->_password )) {
- $this->_view = new ErrorView( $this->_blogInfo, "Sorry, better luck next time!" );
- $this->setCommonData();
-
- return false;
- }
-
- // but if correct, put the information in the session and try again
- $session = HttpVars::getSession();
- $sessionKey = "article_".$this->_articleId;
- $session[ "$sessionKey" ] = "OK";
- HttpVars::setSession( $session );
-
- BlogController::setForwardAction( "ViewArticle" );
-
- return true;
- }
- }
-?>
\ No newline at end of file
Copied: plugins/trunk/secret/class/action/submitsecretitempasswordaction.class.php (from rev 4487, plugins/branches/lifetype-1.1/secret/class/action/submitsecretitempasswordaction.class.php)
Copied: plugins/trunk/secret/class/dao (from rev 4487, plugins/branches/lifetype-1.1/secret/class/dao)
Deleted: plugins/trunk/secret/class/dao/secretitems.class.php
===================================================================
--- plugins/branches/lifetype-1.1/secret/class/dao/secretitems.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/secret/class/dao/secretitems.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,57 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/dao/model.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/articles.class.php" );
-
- class SecretItems extends Model
- {
-
- function SecretItems()
- {
- $this->Model();
- }
-
- function articleIsSecret( $articleId )
- {
- $articles = new Articles();
- if( is_numeric($articleId))
- $article = $articles->getBlogArticle( $articleId );
- else
- $article = $articles->getBlogArticleByTitle( $articleId );
-
- if( !$article )
- return false;
-
- if( !$article->hasField( "password_protected" ))
- return false;
-
- $isSecretField = $article->getFieldObject( "password_protected" );
-
- return( $isSecretField->getValue() == "1" );
- }
-
- function authenticateItem( $articleId, $password )
- {
- $articles = new Articles();
- $article = $articles->getBlogArticle( $articleId );
-
- if( !$article->hasField( "password_field" ))
- return false;
-
- $passwordField = $article->getFieldObject( "password_field" );
-
- return( $passwordField->getValue() == $password );
- }
-
- function authenticateItemHash( $articleId, $password )
- {
- $articles = new Articles();
- $article = $articles->getBlogArticle( $articleId );
-
- $passwordField = $article->getFieldObject( "password_field" );
-
- return( md5($passwordField->getValue()) == $password );
- }
-
- }
-?>
Copied: plugins/trunk/secret/class/dao/secretitems.class.php (from rev 4487, plugins/branches/lifetype-1.1/secret/class/dao/secretitems.class.php)
Copied: plugins/trunk/secret/class/security (from rev 4487, plugins/branches/lifetype-1.1/secret/class/security)
Deleted: plugins/trunk/secret/class/security/secretitemfilter.class.php
===================================================================
--- plugins/branches/lifetype-1.1/secret/class/security/secretitemfilter.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/secret/class/security/secretitemfilter.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,152 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/security/pipelinefilter.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/secret/class/dao/secretitems.class.php" );
- include_once( PLOG_CLASS_PATH."class/template/templateservice.class.php" );
- include_once( PLOG_CLASS_PATH."class/net/requestgenerator.class.php" );
- include_once( PLOG_CLASS_PATH."class/net/http/httpvars.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/articles.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/articlecategories.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/users.class.php" );
- include_once( PLOG_CLASS_PATH . 'class/template/template.class.php' );
-
- /**
- * Filters the text posted in a comment by a user, to prevent spam-bots. This
- * filter only works if the incoming request has the "op" parameter as
- * "AddComment", because then it means that we're posting a comment. If it's not
- * like that, then we'll quit. Otherwise, the process will continue as normally.
- */
- class SecretItemFilter extends PipelineFilter
- {
-
- function SecretItemFilter( $pipelineRequest )
- {
- $this->PipelineFilter( $pipelineRequest );
- }
-
- function filter()
- {
- // get some info
- $blogInfo = $this->_pipelineRequest->getBlogInfo();
- $request = $this->_pipelineRequest->getHttpRequest();
- $session = HttpVars::getSession();
-
- // if we're not loading an article, we can ignore this
- if( $request->getValue( "op" ) != "ViewArticle" )
- return new PipelineResult();
-
- // if this is already rejected, there is no reason to do anything here
- if ( $this->_pipelineRequest->getRejectedState() )
- return new PipelineResult();
-
- // get the article id from the request, since if it is available, then we know
- // that we have to ask for the password before we can let users watch it
- $articleId = $request->getValue( "articleId" );
-
- // If we use custom url mode, the article id is not available, we need to use
- // - articleName
- // - userId
- // - categoryId
- // - date
- // and $articles->getBlogArticleByTitle() to find the value
- if( $articleId == "" ) {
- $articleName = $request->getValue( "articleName" );
- $categoryId = $request->getValue( "postCategoryId", -1 );
- $categoryName = $request->getValue( "postCategoryName" );
- $userId = $request->getValue( "userId", -1 );
- $userName = $request->getValue( "userName" );
- $date = $request->getValue( "Date", -1 );
-
- // If userName available, use it to find userId
- if( $userName ) {
- $users =& new Users();
- $user = $users->getUserInfoFromUsername( $userName );
- if( !$user ) {
- $result = new PipelineResult( true );
- return $result;
- }
- // if there was a user, use his/her id
- $userId = $user->getId();
- }
- // If categoryName available, use it to find categoryId
- if( $categoryName ) {
- $categories =& new ArticleCategories();
- $category = $categories->getCategoryByName( $categoryName, $blogInfo->getId());
- if( !$category ) {
- $result = new PipelineResult( true );
- return $result;
- }
- // if there was a user, use his/her id
- $categoryId = $category->getId();
- }
-
- // fetch the article
- // the article identifier can be either its internal id number or its mangled topic
- $articles =& new Articles();
- $article = $articles->getBlogArticleByTitle( $articleName, $blogInfo->getId(), false,
- $date, $categoryId, $userId, POST_STATUS_PUBLISHED );
-
- if( $article ) {
- $articleId = $article->getId();
- } else {
- $result = new PipelineResult( true );
- return $result;
- }
- }
-
- // check if the article should be protected or not
- $secretItems = new SecretItems();
- if( $secretItems->articleIsSecret( $articleId )) {
- // if so, first check if the password does not already exist in the session
- $itemPassword = $request->getValue( "itemPassword" );
-
- // do we already have this information in the session?
- $sessionKey = "article_".$articleId."_auth";
- if( isset( $session[ "$sessionKey"] )) {
- if( $session[ "$sessionKey" ] != "" ) {
-
- // check if the information is correct
- if( $secretItems->authenticateItemHash( $articleId, $session[ "$sessionKey" ] )) {
- // if all correct, go ahead!
- $result = new PipelineResult( true );
- return $result;
- }
- }
- }
-
- // if not, check if we are authenticating now...
- if( $itemPassword != "" ) {
- // authenticate using the given password
- if( !$secretItems->authenticateItem( $articleId, $itemPassword )) {
- $result = new PipelineResult( false, 500, "Better luck next time!" );
- }
- else {
- // if the user authenticated correctly, then put the information in the session
- $session = HttpVars::getSession();
- $session[ "$sessionKey" ] = md5( $itemPassword );
- $result = new PipelineResult( true );
- HttpVars::setSession( $session );
- }
- }
- else {
- $ts = new TemplateService();
- $t = $ts->PluginTemplate( "secret", "passwordform" );
- $t->assign( "locale", $blogInfo->getLocale() );
- $t->assign( "params", $request->getAsArray());
- $t->assign( "articleId", $articleId );
- $t->assign( "url", RequestGenerator::getRequestGenerator( $blogInfo ));
- $message = $t->fetch();
- $result = new PipelineResult( false, 500, $message );
- }
-
- return $result;
- }
-
- // if everything went fine, we can say so by returning
- // a positive PipelineResult object
- $result = new PipelineResult( true );
-
- return $result;
- }
- }
-?>
Copied: plugins/trunk/secret/class/security/secretitemfilter.class.php (from rev 4487, plugins/branches/lifetype-1.1/secret/class/security/secretitemfilter.class.php)
Copied: plugins/trunk/secret/class/view (from rev 4487, plugins/branches/lifetype-1.1/secret/class/view)
Deleted: plugins/trunk/secret/class/view/adminsecretpluginsettingsview.class.php
===================================================================
--- plugins/branches/lifetype-1.1/secret/class/view/adminsecretpluginsettingsview.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/secret/class/view/adminsecretpluginsettingsview.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,28 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/view/admin/adminplugintemplatedview.class.php" );
-
- /**
- * implements the main view of the feed reader plugin
- */
- class AdminSecretPluginSettingsView extends AdminPluginTemplatedView
- {
-
- function AdminSecretPluginSettingsView( $blogInfo )
- {
- $this->AdminPluginTemplatedView( $blogInfo, "secret", "pluginsettings" );
- }
-
- function render()
- {
- // load some configuration settings
- $blogSettings = $this->_blogInfo->getSettings();
- $pluginEnabled = $blogSettings->getValue( "plugin_secret_enabled" );
-
- // create a view and export the settings to the template
- $this->setValue( "pluginEnabled", $pluginEnabled );
-
- parent::render();
- }
- }
-?>
\ No newline at end of file
Copied: plugins/trunk/secret/class/view/adminsecretpluginsettingsview.class.php (from rev 4487, plugins/branches/lifetype-1.1/secret/class/view/adminsecretpluginsettingsview.class.php)
Copied: plugins/trunk/secret/locale (from rev 4487, plugins/branches/lifetype-1.1/secret/locale)
Deleted: plugins/trunk/secret/locale/locale_en_UK.php
===================================================================
--- plugins/branches/lifetype-1.1/secret/locale/locale_en_UK.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/secret/locale/locale_en_UK.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,22 +0,0 @@
-<?php
-$messages["manageSecurityPlugins"] = "Security Management";
-$messages["pluginSecretSettings"] = "Secret Post";
-
-$messages["secret_plugin_enabled"] = "Enable this plugin";
-$messages["secret_plugin"] = "Secret Post Plugin";
-
-$messages["error_you_have_been_blocked"] = "You are not allowed to proceed with this request.";
-$messages["secret_settings_saved_ok"] = "Secret Post settings saved successfully!";
-
-$messages["label_configuration"] = "Configuration";
-$messages["label_enable"] = "Enable";
-
-$messages["password_protected"] = "Password Protected";
-$messages["password_protected_help"] = "Enable Password Protection";
-$messages["password_field"] = "Password";
-$messages["password_field_help"] = "Password for this entry (only applies if the 'enable password protection' checkbox on the right side has been enabled, otherwise it will be ignored).";
-
-$messages["item_protected"] = "Secret Post";
-$messages["item_protected_help"] = "Please kindly input your password! This is a secret post, you can not read this article without password.";
-$messages["send"] = "Send";
-?>
\ No newline at end of file
Copied: plugins/trunk/secret/locale/locale_en_UK.php (from rev 4487, plugins/branches/lifetype-1.1/secret/locale/locale_en_UK.php)
Deleted: plugins/trunk/secret/locale/locale_zh_CN.php
===================================================================
--- plugins/branches/lifetype-1.1/secret/locale/locale_zh_CN.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/secret/locale/locale_zh_CN.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,22 +0,0 @@
-<?php
-$messages["manageSecurityPlugins"] = "åšå®¢å®‰å…¨ç®¡ç†";
-$messages["pluginSecretSettings"] = "åŠ å¯†æ–‡ç« è®¾ç½®";
-
-$messages["secret_plugin_enabled"] = "å¯ç”¨æ’件";
-$messages["secret_plugin"] = "åŠ å¯†æ–‡ç« æ’件";
-
-$messages["error_you_have_been_blocked"] = "对ä¸èµ·ï¼ä½ 所è¦è¿›è¡Œçš„æ“ä½œæ— æ³•æ‰§è¡Œã€‚";
-$messages["secret_settings_saved_ok"] = "åŠ å¯†æ–‡ç« è®¾ç½®å‚¨å˜æˆåŠŸã€‚";
-
-$messages["label_configuration"] = "设置";
-$messages["label_enable"] = "å¯ç”¨";
-
-$messages["password_protected"] = "密ç ä¿æŠ¤";
-$messages["password_protected_help"] = "å¯ç”¨å¯†ç ä¿æŠ¤";
-$messages["password_field"] = "æ–‡ç« å¯†ç ";
-$messages["password_field_help"] = "æœ¬ç¯‡æ–‡ç« å¯†ç （åªæœ‰åœ¨å¯ç”¨å¯†ç ä¿æŠ¤æ—¶æ‰éœ€è¦è¾“入，å¦åˆ™å°†ä¼šè¢«å¿½ç•¥ï¼‰ã€‚";
-
-$messages["item_protected"] = "åŠ å¯†æ–‡ç« ";
-$messages["item_protected_help"] = "请输入密ç ï¼æœ¬æ–‡ç« æ˜¯åŠ å¯†æ–‡ç« ï¼Œå¦‚æžœæ‚¨æ²¡æœ‰å¯†ç åˆ™æ— æ³•é˜…è¯»æœ¬æ–‡ç« ã€‚";
-$messages["send"] = "确定";
-?>
Copied: plugins/trunk/secret/locale/locale_zh_CN.php (from rev 4487, plugins/branches/lifetype-1.1/secret/locale/locale_zh_CN.php)
Deleted: plugins/trunk/secret/locale/locale_zh_TW.php
===================================================================
--- plugins/branches/lifetype-1.1/secret/locale/locale_zh_TW.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/secret/locale/locale_zh_TW.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,22 +0,0 @@
-<?php
-$messages["manageSecurityPlugins"] = "網誌安全管ç†";
-$messages["pluginSecretSettings"] = "ç§˜å¯†æ–‡ç« è¨å®š";
-
-$messages["secret_plugin_enabled"] = "啟動外掛程å¼";
-$messages["secret_plugin"] = "ç§˜å¯†æ–‡ç« å¤–æŽ›ç¨‹å¼";
-
-$messages["error_you_have_been_blocked"] = "抱æ‰ï¼ä½ 所è¦æ±‚的動作無法繼續。";
-$messages["secret_settings_saved_ok"] = "ç§˜å¯†æ–‡ç« è¨å®šå„²å˜æˆåŠŸã€‚";
-
-$messages["label_configuration"] = "è¨å®š";
-$messages["label_enable"] = "å•Ÿå‹•";
-
-$messages["password_protected"] = "密碼ä¿è·";
-$messages["password_protected_help"] = "啟用密碼ä¿è·";
-$messages["password_field"] = "æ–‡ç« å¯†ç¢¼";
-$messages["password_field_help"] = "æœ¬ç¯‡æ–‡ç« å¯†ç¢¼ï¼ˆåªæœ‰åœ¨å•Ÿç”¨å¯†ç¢¼ä¿è·æ™‚æ‰éœ€è¦è¼¸å…¥ï¼Œå¦å‰‡å°‡æœƒè¢«å¿½ç•¥ï¼‰ã€‚";
-
-$messages["item_protected"] = "ç§˜å¯†æ–‡ç« ";
-$messages["item_protected_help"] = "請輸入密碼ï¼æœ¬æ–‡ç« æ˜¯ç§˜å¯†æ–‡ç« ï¼Œå¦‚æžœæ‚¨æ²’æœ‰å¯†ç¢¼å°‡ç„¡æ³•è§€çœ‹æœ¬æ–‡ç« ã€‚";
-$messages["send"] = "確定";
-?>
\ No newline at end of file
Copied: plugins/trunk/secret/locale/locale_zh_TW.php (from rev 4487, plugins/branches/lifetype-1.1/secret/locale/locale_zh_TW.php)
Deleted: plugins/trunk/secret/pluginsecret.class.php
===================================================================
--- plugins/branches/lifetype-1.1/secret/pluginsecret.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/secret/pluginsecret.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,57 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/plugin/pluginbase.class.php" );
- include_once( PLOG_CLASS_PATH."class/plugin/pluginmanager.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/secret/class/security/secretitemfilter.class.php" );
- include_once( PLOG_CLASS_PATH."class/template/menu/menu.class.php" );
-
- /**
- * implements secret posts and categories
- */
- class PluginSecret extends PluginBase
- {
- var $pluginEnabled;
-
- function PluginSecret()
- {
- $this->PluginBase();
-
- $this->id = "secret";
- $this->desc = "This plugin offers the password protect to specific articles, unless user provide the right password or they can not see the articles.";
- $this->locales = Array( "en_UK" , "zh_TW" , "zh_CN" );
- $this->author = "The LifeType Project";
-
- $this->init();
- }
-
- /**
- * registers all the filters and actions that we're going to use
- */
- function init()
- {
- // we only need to register a filter
- $this->registerFilter( "SecretItemFilter" );
-
- // register our action and menu entry
- $this->registerAdminAction( "pluginSecretSettings", "AdminSecretPluginSettingsAction" );
- $this->registerAdminAction( "pluginSecretUpdateSettings", "AdminSecretPluginUpdateSettingsAction" );
-
- // register our action and menu entry
- $menu =& Menu::getMenu();
- if( !$menu->entryExists( "/menu/controlCenter/manageSecurityPlugins" ))
- $this->addMenuEntry( "/menu/controlCenter", "manageSecurityPlugins", "", "", true, false );
- $this->addMenuEntry( "/menu/controlCenter/manageSecurityPlugins", "pluginSecretSettings", "admin.php?op=pluginSecretSettings", "", true, false );
- }
-
- function register()
- {
- $blogSettings = $this->blogInfo->getSettings();
- $this->pluginEnabled = $blogSettings->getValue( "plugin_secret_enabled" );
- }
-
- function isEnabled()
- {
- return $this->pluginEnabled;
- }
- }
-?>
\ No newline at end of file
Copied: plugins/trunk/secret/pluginsecret.class.php (from rev 4487, plugins/branches/lifetype-1.1/secret/pluginsecret.class.php)
Deleted: plugins/trunk/secret/readme.txt
===================================================================
--- plugins/branches/lifetype-1.1/secret/readme.txt 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/secret/readme.txt 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,9 +0,0 @@
-Plugin: Secret
-Author: LifeType Team
-Release Date: 2005/01/23
-Version: 1.0
-
-This plugin offers the password protect to specific articles, unless user provide the right password or they can not see the articles.
-
-Install:
-1. Configurate your Secret plugin in your LifeType control center
\ No newline at end of file
Copied: plugins/trunk/secret/readme.txt (from rev 4487, plugins/branches/lifetype-1.1/secret/readme.txt)
Copied: plugins/trunk/secret/templates (from rev 4487, plugins/branches/lifetype-1.1/secret/templates)
Deleted: plugins/trunk/secret/templates/passwordform.template
===================================================================
--- plugins/branches/lifetype-1.1/secret/templates/passwordform.template 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/secret/templates/passwordform.template 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,10 +0,0 @@
-<h3>{$locale->tr("item_protected")}</h3>
-{$locale->tr("item_protected_help")}
-<form name="secretPassword" method="post" action="{$url->getIndexUrl()}">
- <input type="password" name="itemPassword" value="" /><br /><br />
- {foreach from=$params item=param key=paramName}
- <input type="hidden" name="{$paramName}" value="{$param}" />
- {/foreach}
- <input type="hidden" name="articleId" value="{$articleId}" />
- <input type="submit" name="Send" value="{$locale->tr("send")}" />
-</form>
\ No newline at end of file
Copied: plugins/trunk/secret/templates/passwordform.template (from rev 4487, plugins/branches/lifetype-1.1/secret/templates/passwordform.template)
Deleted: plugins/trunk/secret/templates/pluginsettings.template
===================================================================
--- plugins/branches/lifetype-1.1/secret/templates/pluginsettings.template 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/secret/templates/pluginsettings.template 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,24 +0,0 @@
-{include file="$admintemplatepath/header.template"}
-{include file="$admintemplatepath/navigation.template" showOpt=pluginSecretSettings title=$locale->tr("secret_plugin")}
-<form name="pluginSecretSettings" action="admin.php" method="post">
- <fieldset class="inputField">
- <legend>{$locale->tr("label_configuration")}</legend>
- {include file="$admintemplatepath/successmessage.template"}
- {include file="$admintemplatepath/errormessage.template"}
- <div class="field">
- <label for="pluginEnabled">{$locale->tr("label_enable")}</label>
- <div class="formHelp">
- <input class="checkbox" type="checkbox" name="pluginEnabled" id="pluginEnabled" {if $pluginEnabled} checked="checked" {/if} value="1" />{$locale->tr("secret_plugin_enabled")}
- </div>
- </div>
-
- </fieldset>
-
- <div class="buttons">
- <input type="hidden" name="op" value="pluginSecretUpdateSettings" />
- <input type="reset" name="{$locale->tr("reset")}" />
- <input type="submit" name="{$locale->tr("update_settings")}" value="{$locale->tr("update")}" />
- </div>
-</form>
-{include file="$admintemplatepath/footernavigation.template"}
-{include file="$admintemplatepath/footer.template"}
\ No newline at end of file
Copied: plugins/trunk/secret/templates/pluginsettings.template (from rev 4487, plugins/branches/lifetype-1.1/secret/templates/pluginsettings.template)
Copied: plugins/trunk/secretblog (from rev 4487, plugins/branches/lifetype-1.1/secretblog)
Copied: plugins/trunk/secretblog/class (from rev 4487, plugins/branches/lifetype-1.1/secretblog/class)
Copied: plugins/trunk/secretblog/class/action (from rev 4487, plugins/branches/lifetype-1.1/secretblog/class/action)
Deleted: plugins/trunk/secretblog/class/action/adminsecretblogpluginsettingsaction.class.php
===================================================================
--- plugins/branches/lifetype-1.1/secretblog/class/action/adminsecretblogpluginsettingsaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/secretblog/class/action/adminsecretblogpluginsettingsaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,30 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/action/admin/blogowneradminaction.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/secretblog/class/view/adminsecretblogpluginsettingsview.class.php" );
-
- class AdminSecretBlogPluginSettingsAction extends BlogOwnerAdminAction
- {
-
- /**
- * Constructor. If nothing else, it also has to call the constructor of the parent
- * class, BlogAction with the same parameters
- */
- function AdminSecretBlogPluginSettingsAction( $actionInfo, $request )
- {
- $this->BlogOwnerAdminAction( $actionInfo, $request );
- }
-
- /**
- * Carries out the specified action
- */
- function perform()
- {
- $this->_view = new AdminSecretBlogPluginSettingsView( $this->_blogInfo );
-
- $this->setCommonData();
-
- return true;
- }
- }
-?>
Copied: plugins/trunk/secretblog/class/action/adminsecretblogpluginsettingsaction.class.php (from rev 4487, plugins/branches/lifetype-1.1/secretblog/class/action/adminsecretblogpluginsettingsaction.class.php)
Deleted: plugins/trunk/secretblog/class/action/adminsecretblogpluginupdatesettingsaction.class.php
===================================================================
--- plugins/branches/lifetype-1.1/secretblog/class/action/adminsecretblogpluginupdatesettingsaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/secretblog/class/action/adminsecretblogpluginupdatesettingsaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,70 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/action/admin/blogowneradminaction.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/secretblog/class/view/adminsecretblogpluginsettingsview.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
-
- class AdminSecretBlogPluginUpdateSettingsAction extends BlogOwnerAdminAction
- {
-
- var $_pluginEnabled;
- var $_blogPassword;
-
- /**
- * Constructor. If nothing else, it also has to call the constructor of the parent
- * class, BlogAction with the same parameters
- */
- function AdminSecretBlogPluginUpdateSettingsAction( $actionInfo, $request )
- {
- $this->BlogOwnerAdminAction( $actionInfo, $request );
- }
-
- function validate()
- {
- $this->_pluginEnabled = $this->_request->getValue( "pluginEnabled" );
- $this->_pluginEnabled = ($this->_pluginEnabled != "" );
-
- $this->_blogPassword = $this->_request->getValue( "blogPassword" );
-
- return true;
- }
-
- /**
- * Carries out the specified action
- */
- function perform()
- {
- // update the plugin configurations to blog setting
- $blogSettings = $this->_blogInfo->getSettings();
- $blogSettings->setValue( "plugin_secretblog_enabled", $this->_pluginEnabled );
- // only update the password if it's not empty, or else leave it as it is
- if( $this->_blogPassword != "" )
- $blogSettings->setValue( "plugin_secretblog_password", md5( $this->_blogPassword ));
- $this->_blogInfo->setSettings( $blogSettings );
-
- // save the blogs settings
- $blogs = new Blogs();
- if( !$blogs->updateBlog( $this->_blogInfo )) {
- $this->_view = new AdminSecretPluginSettingsView( $this->_blogInfo );
- $this->_view->setErrorMessage( $this->_locale->tr("error_updating_settings"));
- $this->setCommonData();
-
- return false;
- }
-
- // if everything went ok...
- $this->_blogInfo->setSettings( $blogSettings );
- $this->_session->setValue( "blogInfo", $this->_blogInfo );
- $this->saveSession();
-
- $this->_view = new AdminSecretBlogPluginSettingsView( $this->_blogInfo );
- $this->_view->setSuccessMessage( $this->_locale->tr("secretblog_settings_saved_ok"));
- $this->setCommonData();
-
- // clear the cache
- CacheControl::resetBlogCache( $this->_blogInfo->getId());
-
- return true;
- }
- }
-?>
Copied: plugins/trunk/secretblog/class/action/adminsecretblogpluginupdatesettingsaction.class.php (from rev 4487, plugins/branches/lifetype-1.1/secretblog/class/action/adminsecretblogpluginupdatesettingsaction.class.php)
Copied: plugins/trunk/secretblog/class/security (from rev 4487, plugins/branches/lifetype-1.1/secretblog/class/security)
Deleted: plugins/trunk/secretblog/class/security/secretblogfilter.class.php
===================================================================
--- plugins/branches/lifetype-1.1/secretblog/class/security/secretblogfilter.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/secretblog/class/security/secretblogfilter.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,108 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/security/pipelinefilter.class.php" );
- include_once( PLOG_CLASS_PATH . 'class/template/template.class.php' );
-
- class SecretBlogFilter extends PipelineFilter
- {
-
- function SecretBlogFilter( $pipelineRequest )
- {
- $this->PipelineFilter( $pipelineRequest );
- }
-
- function filter()
- {
- // get some info
- $blogInfo = $this->_pipelineRequest->getBlogInfo();
- $blogSettings = $blogInfo->getSettings();
- $request = $this->_pipelineRequest->getHttpRequest();
- $session = HttpVars::getSession();
-
- // is the plugin enabled? If not, we can quit right away
- if( !$blogSettings->getValue( "plugin_secretblog_enabled" )) {
- $result = new PipelineResult( true );
- return( $result );
- }
-
- // if this is already rejected, there is no reason to do anything here
- if ( $this->_pipelineRequest->getRejectedState() )
- return new PipelineResult();
-
- // there are three possible situations:
- // - user not authenticated
- // - user not authenticated but blogPassword parameter in the request
- // - user authenticated
-
- if( $this->isUserAuthenticated( $blogInfo )) {
- $result = new PipelineResult( true );
- return( $result );
- }
- else {
- // is there a "blogPassword" parameter in the session?
- $password = $request->getValue( "blogPassword" );
- if( $password ) {
- // validate the password compared to whatever was stored in the blog settings
- $blogSettings = $blogInfo->getSettings();
- $blogPassword = $blogSettings->getValue( "plugin_secretblog_password" );
- if( $blogPassword == md5( $password )) {
- // set the password in the session
- $session["blogPassword"] = md5( $password );
- HttpVars::setSession( $session );
- // and return everything ok...
- $result = new PipelineResult( true );
- return( $result );
- }
- else {
- // password wasn't correct, try again!
- print( $this->renderPasswordForm( $blogInfo ));
- die();
- }
- }
- else {
- // no password, no authentication info in the session!
- print( $this->renderPasswordForm( $blogInfo ));
- die();
- }
- }
- }
-
- /**
- * @private
- * Returns true if the user has already been authenticated for this session
- */
- function isUserAuthenticated( $blogInfo )
- {
- // retrieve the session
- $session = HttpVars::getSession();
- // and look for our information
- $sessionPassword = $session["blogPassword"];
- if( $sessionPassword ) {
- $blogSettings = $blogInfo->getSettings();
- $blogPassword = $blogSettings->getValue( "plugin_secretblog_password" );
- if( $sessionPassword == $blogPassword )
- return true;
- else
- return false;
- }
- else
- return false;
- }
-
- /**
- * @private
- * Shows the authentication form
- */
- function renderPasswordForm( $blogInfo )
- {
- include_once( PLOG_CLASS_PATH."class/template/templateservice.class.php" );
- $ts = new TemplateService();
- $t = $ts->PluginTemplate( "secretblog", "passwordform" );
- $t->assign( "locale", $blogInfo->getLocale() );
- $t->assign( "articleId", $articleId );
- $t->assign( "url", $blogInfo->getBlogRequestGenerator());
- $t->assign( "blog", $blogInfo );
- return( $t->fetch());
- }
- }
-?>
\ No newline at end of file
Copied: plugins/trunk/secretblog/class/security/secretblogfilter.class.php (from rev 4487, plugins/branches/lifetype-1.1/secretblog/class/security/secretblogfilter.class.php)
Copied: plugins/trunk/secretblog/class/view (from rev 4487, plugins/branches/lifetype-1.1/secretblog/class/view)
Deleted: plugins/trunk/secretblog/class/view/adminsecretblogpluginsettingsview.class.php
===================================================================
--- plugins/branches/lifetype-1.1/secretblog/class/view/adminsecretblogpluginsettingsview.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/secretblog/class/view/adminsecretblogpluginsettingsview.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,25 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/view/admin/adminplugintemplatedview.class.php" );
-
- class AdminSecretBlogPluginSettingsView extends AdminPluginTemplatedView
- {
-
- function AdminSecretBlogPluginSettingsView( $blogInfo )
- {
- $this->AdminPluginTemplatedView( $blogInfo, "secretblog", "pluginsettings" );
- }
-
- function render()
- {
- // load some configuration settings
- $blogSettings = $this->_blogInfo->getSettings();
- $pluginEnabled = $blogSettings->getValue( "plugin_secretblog_enabled" );
-
- // create a view and export the settings to the template
- $this->setValue( "pluginEnabled", $pluginEnabled );
-
- parent::render();
- }
- }
-?>
\ No newline at end of file
Copied: plugins/trunk/secretblog/class/view/adminsecretblogpluginsettingsview.class.php (from rev 4487, plugins/branches/lifetype-1.1/secretblog/class/view/adminsecretblogpluginsettingsview.class.php)
Copied: plugins/trunk/secretblog/locale (from rev 4487, plugins/branches/lifetype-1.1/secretblog/locale)
Deleted: plugins/trunk/secretblog/locale/locale_en_UK.php
===================================================================
--- plugins/branches/lifetype-1.1/secretblog/locale/locale_en_UK.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/secretblog/locale/locale_en_UK.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,13 +0,0 @@
-<?php
-$messages["secretblog_plugin"] = "Secret Blog";
-$messages["secretblog_settings_saved_ok"] = "Plugin settings saved successfully";
-$messages["secretblog_plugin_enabled_help"] = "Enabling this plugin will password-protect this blog";
-$messages["secretblog_plugin_enabled"] = "Enable this plugin";
-$messages["secretblog_password"] = "Password";
-$messages["secretblog_password_help"] = "Please type the password that will be used to protect this blog";
-$messages["pluginSecretBlogSettings"] = "Secret Blog";
-$messages["manageSecurityPlugins"] = "Security Plugins";
-$messages["secretblog_blog_is_password_protected"] = "You must provide the correct password in order to access the contents of this blog.";
-$messages["secretblog_send"] = "Send";
-$messages["secretblog_enter_password"] = "Enter password";
-?>
\ No newline at end of file
Copied: plugins/trunk/secretblog/locale/locale_en_UK.php (from rev 4487, plugins/branches/lifetype-1.1/secretblog/locale/locale_en_UK.php)
Deleted: plugins/trunk/secretblog/pluginsecretblog.class.php
===================================================================
--- plugins/branches/lifetype-1.1/secretblog/pluginsecretblog.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/secretblog/pluginsecretblog.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,32 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/plugin/pluginbase.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/secretblog/class/security/secretblogfilter.class.php" );
- include_once( PLOG_CLASS_PATH."class/template/menu/menu.class.php" );
-
- class PluginSecretBlog extends PluginBase
- {
-
- function PluginSecretBlog()
- {
- $this->PluginBase();
-
- $this->id = "secretblog";
- $this->author = "The LifeType Project";
-
- // we only need to register a filter
- $this->registerFilter( "SecretBlogFilter" );
-
- // register our own actions
- // register our action and menu entry
- $this->registerAdminAction( "pluginSecretBlogSettings", "AdminSecretBlogPluginSettingsAction" );
- $this->registerAdminAction( "pluginSecretBlogUpdateSettings", "AdminSecretBlogPluginUpdateSettingsAction" );
-
- // register our action and menu entry
- $menu =& Menu::getMenu();
- if( !$menu->entryExists( "/menu/controlCenter/manageSecurityPlugins" ))
- $this->addMenuEntry( "/menu/controlCenter", "manageSecurityPlugins", "", "", true, false );
- $this->addMenuEntry( "/menu/controlCenter/manageSecurityPlugins", "pluginSecretBlogSettings", "admin.php?op=pluginSecretBlogSettings", "", true, false );
- }
- }
-?>
\ No newline at end of file
Copied: plugins/trunk/secretblog/pluginsecretblog.class.php (from rev 4487, plugins/branches/lifetype-1.1/secretblog/pluginsecretblog.class.php)
Copied: plugins/trunk/secretblog/templates (from rev 4487, plugins/branches/lifetype-1.1/secretblog/templates)
Deleted: plugins/trunk/secretblog/templates/passwordform.template
===================================================================
--- plugins/branches/lifetype-1.1/secretblog/templates/passwordform.template 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/secretblog/templates/passwordform.template 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,26 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{$locale->getLanguageId()}" lang="{$locale->getLanguageId()}" dir="{$locale->getDirection()}">
- <head>
- <title>{$blog->getBlog()}</title>
- <style>
- {literal}
- .secretBlogTitle {
- font-size: 18px;
- font-weight: bold;
- }
- {/literal}
- </style>
- </head>
- <body>
-<span class="secretBlogTitle">{$locale->tr("secretblog_enter_password")}</span>
-<p>
-{$locale->tr("secretblog_blog_is_password_protected")}
-</p>
-<form name="password" action="{$url->getIndexUrl()}" method="post">
- {$locale->tr("password")}: <input type="password" name="blogPassword" value="" />
- <input type="hidden" name="blogId" value="{$blog->getId()}" />
- <input type="submit" name="Send" value="{$locale->tr("secretblog_send")}" />
- <input type="hidden" name="op" value="Default" />
-</form>
- </body>
-</html>
\ No newline at end of file
Copied: plugins/trunk/secretblog/templates/passwordform.template (from rev 4487, plugins/branches/lifetype-1.1/secretblog/templates/passwordform.template)
Deleted: plugins/trunk/secretblog/templates/pluginsettings.template
===================================================================
--- plugins/branches/lifetype-1.1/secretblog/templates/pluginsettings.template 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/secretblog/templates/pluginsettings.template 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,32 +0,0 @@
-{include file="$admintemplatepath/header.template"}
-{include file="$admintemplatepath/navigation.template" showOpt=pluginSecretBlogSettings title=$locale->tr("secretblog_plugin")}
-<form name="pluginSecretBlogSettings" action="admin.php" method="post">
- <fieldset class="inputField">
- <legend>{$locale->tr("pluginSecretBlogSettings")}</legend>
- {include file="$admintemplatepath/successmessage.template"}
- {include file="$admintemplatepath/errormessage.template"}
- <div class="field">
- <label for="pluginEnabled">{$locale->tr("secretblog_plugin_enabled")}</label>
- <div class="formHelp">
- <input class="checkbox" type="checkbox" name="pluginEnabled" id="pluginEnabled" {if $pluginEnabled} checked="checked" {/if} value="1" />{$locale->tr("secretblog_plugin_enabled_help")}
- </div>
- </div>
-
- <div class="field">
- <label for="blogPassword">{$locale->tr("secretblog_password")}</label>
- <span class="required">*</span>
- <div class="formHelp">{$locale->tr("secretblog_password_help")}</div>
- <input type="password" name="blogPassword" value="" />
- </label>
- </div>
-
- </fieldset>
-
- <div class="buttons">
- <input type="hidden" name="op" value="pluginSecretBlogUpdateSettings" />
- <input type="reset" name="{$locale->tr("reset")}" />
- <input type="submit" name="{$locale->tr("update_settings")}" value="{$locale->tr("update")}" />
- </div>
-</form>
-{include file="$admintemplatepath/footernavigation.template"}
-{include file="$admintemplatepath/footer.template"}
\ No newline at end of file
Copied: plugins/trunk/secretblog/templates/pluginsettings.template (from rev 4487, plugins/branches/lifetype-1.1/secretblog/templates/pluginsettings.template)
Copied: plugins/trunk/shoutbox (from rev 4487, plugins/branches/lifetype-1.1/shoutbox)
Deleted: plugins/trunk/shoutbox/README.txt
===================================================================
--- plugins/branches/lifetype-1.1/shoutbox/README.txt 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/shoutbox/README.txt 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,122 +0,0 @@
-++++++++++++++++++++++++++++++++++++++++++++++++
-Readme for the "Shoutbox Plugin"
-version 1.0a
-a plugin for LifeType (v1.1 and 1.0)
-Developed by Palantir, radar at netpalantir.it
-
-See the plugin in action at my blog:
-http://www.netpalantir.it
-
-This plugin is released under the terms of the LGPL
-
-++++++++++++++++++++++++++++++++++++++++++++++++
-Warning: Use at your own risk. It may work, but
-it may also kill your blog. BACK UP FIRST!!
-++++++++++++++++++++++++++++++++++++++++++++++++
-
-WHAT IT IS
-A shoutbox is an object of your page that allows your visitors to leave a comment. It differs from the usual comments that users can leave, because shoutbox items are not bound to a post, rather they are visible in every page of the site.
-
-WHAT THE PACKAGE PROVIDES (features)
- * It's a LifeType plugin, so it benefits from the LifeType archietecture and is completely integrated into the administration area
- * Full control on the shoutbox in the admin area: browse through posts and delete any of them
- * Nickname protection: you can set a password so no one ca use your nickname
- * Internationalized
- * NEW Email alerts with a link to immediately delete the post
- * NEW Can be temporarily disabled
- * NEW history: lets your users browse through all the past messages
- * Customized parts of the 'standard' template so that the plugin can be used right away. Please see the template files in the templates-sample/ folder.
-
-
-HOW TO INSTALL (from scratch)
-=== A: admin side
-1. Unpack the archive
-2. Locate the installation directory of LifeType
-3. Copy the whole "shoutbox" directory into the plugins directory
-4. Change the permissions/ownership of all the files, according to your setup.
- If you transfer files via FTP this should be unneccessary. All the files must
- be readable by the web server.
-5. Point your browser to your blog administration page, log in, click on:
- Control Center > Plugin center (lifetype 1.0) or Administration > Plugin center (lifetype 1.1). The shoutbox plugin should be on your list. If it is not, try updating the page a few times, it seems to help ;)
-6. Click on the Shoutbox tab on top of the plugin center section (lifetype 1.0) or click on Control center > Shoutbox (lifetype 1.1)
-7. The first time you access it, the plugin should autodetect if any change has to
- be done to the database and apply them, so to make it ready to use.
-8. *IMPORTANT* enter the configuration area, review the default settings, and SAVE
-
-=== B: user side
-First, integrate the plugin into the template.
-The easiest way is to modify the footer template to add the shoutbox on the right column. This procedure refers to the Standard theme, if you use your customized one, please make the according adjustments. On a multi-blog environment, you will need to customize each theme your bloggers have.
-
-1. Find the theme directory you are using. It's located in templates/
-2. Copy the following files into it, and customize them:
- shoutbox.template
- shotbox_history.template
- info.template
-3. Open the footer template, find the place where the plugin needs to be placed, and include it. For example, change the standard footer template, so it looks like this:
-
- ... (continues) ...
- <li><a title="RSS 2.0" href="{$url->rssLink("rss20")}">RSS 2.0</a></li>
- <li><a title="Atom" href="{$url->rssLink("rss20")}">Atom</a></li>
- </ul>
- </div>
-
- <h2>{$locale->tr("Shoutbox")}</h2>
- <div id="Shoutbox">
- {include file="$blogtemplate/shoutbox.template"}
- </div>
- ... (continues) ...
-
-
-HOW TO USE IT
-After the first setup, customize the options at the bottom of the page. Then,
-wait for people to leave messages. If you have enabled email notifications,
-you will receive the shouts directly into your mailbox. You can delete shouts
-from the admin interface, by selecting them and clicking the delete button, or using the link that is sent in the notification.
-You can protect one or more nicknames, by adding them into the protected nicks
-box. Separate them using spaces. Then, when you want to use them, simply enter
-the nickname followed by : and the password. Password is case sensitive.
-
-HOW TO UPGRADE
-Remove the old plugins/shoutbox directory and replace it with the new one. Then try to follow the changes on the templates. Updating from 0.13 will migrate your data automatically. Upgrading from earlier versions is not supported. Your data will not be lost however.
-
-DOESN'T WORK? BUGS? WISHES? WHO TO CONTACT
-Please, use the LifeType's bug reporting system. It's located at:
-http://bugs.lifetype.net
-Otherwise, send me a mail: radar at netpalantir.it
-I must admit I don't read LifeType forum regularly, so if you post there, please
-let me know by mail as well.
-
-+++++++++++++++++++++++++++++++++++++++++++++++
-
-TODO:
-- Restore the validation of the fields in the admin interface
-- Flooding protection
-- Spam protection
-- CAPTCHAs optional support
-
-+++++++++++++++++++++++++++++++++++++++++++++++
-
-CHANGELOG:
-v 1.0a
-- Finally 100% LifeType architecture compliant
-- Ported to LifeType 1.1
-- Added locale
-- Added shoutbox history mode
-- Now fully supports cached blogs
-- Quick delete with links in the email notification (using a public blogaction and an auth link)
-- Added the possibility to temporarily disable the shoutbox
-
-v0.13
-- Fixed password bug
-- Fixed error messages
-
-v0.12
-- Porting of the whole thing to the new pLog 1 framework. Costed A LOT of work
-so it's not such a _minor_ release ;-)
-
-v0.11x
-- Nickname password protection
-- Admin section: shout list divided in pages
-
-v0.1
-Initial release
\ No newline at end of file
Copied: plugins/trunk/shoutbox/README.txt (from rev 4487, plugins/branches/lifetype-1.1/shoutbox/README.txt)
Copied: plugins/trunk/shoutbox/class (from rev 4487, plugins/branches/lifetype-1.1/shoutbox/class)
Copied: plugins/trunk/shoutbox/class/action (from rev 4487, plugins/branches/lifetype-1.1/shoutbox/class/action)
Deleted: plugins/trunk/shoutbox/class/action/pluginshoutboxaction.class.php
===================================================================
--- plugins/branches/lifetype-1.1/shoutbox/class/action/pluginshoutboxaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/shoutbox/class/action/pluginshoutboxaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,89 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- include_once( PLOG_CLASS_PATH."class/view/admin/adminplugintemplatedview.class.php" );
- include_once( PLOG_CLASS_PATH."class/view/admin/adminmessageview.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/shoutbox/class/dao/shoutbox.class.php" );
-
- /**
- * shows a form with the current configuration
- */
- class PluginShoutboxAction extends AdminAction {
-
- function PluginShoutboxAction( $actionInfo, $request ) {
- $this->AdminAction( $actionInfo, $request );
- }
-
- function perform() {
-
- // load some configuration settings
- $blogSettings = $this->_blogInfo->getSettings();
-
- /*
- if(!$blogSettings->getValue("plugin_shoutbox_dbok") || $blogSettings->getValue( "plugin_shoutbox_version") != '0.12') {
- header('Location: admin.php?op=setupShoutbox');
- exit();
- }
- */
-
- // Get the shoutbox entries
- $s = new Shoutbox($this->_blogInfo->getId(), $blogSettings);
-
- // Check the setup of the box
- $message = $s->setup();
- if($message !== true) {
- $this->_view = new AdminMessageView($this->_blogInfo);
- $this->_view->setMessage($message);
- $this->setCommonData();
- return true;
- }
- // Check if defaults have ever been set for this blog
- if(!$blogSettings->getValue("plugin_shoutbox_defaultsset"))
- $this->setDefaults();
-
- // create a view and export the settings to the template
- $this->_view = new AdminPluginTemplatedView( $this->_blogInfo, "shoutbox", "shoutbox", true );
- $this->_view->setValue( "pluginEnabled", $pluginEnabled );
-
- $this->_view->setValue( "shouts", $s->getShoutsArray());
-
- if($s->mail_alert)
- $mail_alert_checked = "checked";
-
- $this->_view->setValue("mail_alert_checked", $mail_alert_checked);
- $this->_view->setValue("max_length", $s->max_length);
- $this->_view->setValue("shouts_per_view", $s->shouts_per_view);
- $this->_view->setValue("default_nick", $s->default_nick);
- $this->_view->setValue("default_shout", $s->default_shout);
- $this->_view->setValue("protected_nicks", $s->protected_nicks);
- $this->_view->setValue("protection_password", $s->protection_password);
- $this->_view->setValue("current_page", $s->current_page);
-
- $this->setCommonData();
-
- return true;
- }
-
- function setDefaults() {
- $blogSettings = $this->_blogInfo->getSettings();
-
- $blogSettings->setValue( "plugin_shoutbox_defaultsset", 1);
-
- $blogSettings->setValue( "plugin_shoutbox_shout_enabled", 1);
- $blogSettings->setValue( "plugin_shoutbox_mail_alert", 1);
- $blogSettings->setValue( "plugin_shoutbox_quick_delete", 0);
- $blogSettings->setValue( "plugin_shoutbox_max_length", 400);
- $blogSettings->setValue( "plugin_shoutbox_shouts_per_view", 15);
-
- $blogSettings->setValue( "plugin_shoutbox_protected_nicks", "ExampleNick");
- $blogSettings->setValue( "plugin_shoutbox_protection_password", "");
-
- $blogSettings->setValue( "plugin_shoutbox_default_nick", "Your nickname");
- $blogSettings->setValue( "plugin_shoutbox_default_shout", "Your shout here");
-
- $this->_blogInfo->setSettings( $blogSettings );
- $this->_session->setValue( "blogInfo", $this->_blogInfo );
- $this->saveSession();
- }
-}
-?>
\ No newline at end of file
Copied: plugins/trunk/shoutbox/class/action/pluginshoutboxaction.class.php (from rev 4487, plugins/branches/lifetype-1.1/shoutbox/class/action/pluginshoutboxaction.class.php)
Deleted: plugins/trunk/shoutbox/class/action/pluginshoutboxconfigaction.class.php
===================================================================
--- plugins/branches/lifetype-1.1/shoutbox/class/action/pluginshoutboxconfigaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/shoutbox/class/action/pluginshoutboxconfigaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,50 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- include_once( PLOG_CLASS_PATH."class/view/admin/adminplugintemplatedview.class.php" );
-
- include_once( PLOG_CLASS_PATH."plugins/shoutbox/class/dao/shoutbox.class.php" );
-
- /**
- * shows a form with the current configuration
- */
- class PluginShoutboxConfigAction extends AdminAction {
-
- function PluginShoutboxConfigAction( $actionInfo, $request ) {
- $this->AdminAction( $actionInfo, $request );
- }
-
- function perform() {
- // load some configuration settings
- $blogSettings = $this->_blogInfo->getSettings();
-
- // Get the shoutbox entries
- $s = new Shoutbox($this->_blogInfo->getId(), $blogSettings);
-
- // create a view and export the settings to the template
- $this->_view = new AdminPluginTemplatedView( $this->_blogInfo, "shoutbox", "shoutboxConfig" );
-
- if($s->shout_enabled)
- $shout_enabled_checked = "checked";
- if($s->mail_alert)
- $mail_alert_checked = "checked";
- if($s->quick_delete)
- $quick_delete_checked = "checked";
-
- $this->_view->setValue("shout_enabled_checked", $shout_enabled_checked);
- $this->_view->setValue("mail_alert_checked", $mail_alert_checked);
- $this->_view->setValue("quick_delete_checked", $quick_delete_checked);
- $this->_view->setValue("max_length", $s->max_length);
- $this->_view->setValue("shouts_per_view", $s->shouts_per_view);
- $this->_view->setValue("default_nick", $s->default_nick);
- $this->_view->setValue("default_shout", $s->default_shout);
- $this->_view->setValue("protected_nicks", $s->protected_nicks);
- $this->_view->setValue("protection_password", $s->protection_password);
- $this->_view->setValue("current_page", $s->current_page);
-
- $this->setCommonData();
-
- return true;
- }
-}
-?>
\ No newline at end of file
Copied: plugins/trunk/shoutbox/class/action/pluginshoutboxconfigaction.class.php (from rev 4487, plugins/branches/lifetype-1.1/shoutbox/class/action/pluginshoutboxconfigaction.class.php)
Deleted: plugins/trunk/shoutbox/class/action/pluginshoutboxdeleteshoutsaction.class.php
===================================================================
--- plugins/branches/lifetype-1.1/shoutbox/class/action/pluginshoutboxdeleteshoutsaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/shoutbox/class/action/pluginshoutboxdeleteshoutsaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,49 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- include_once( PLOG_CLASS_PATH."class/view/admin/adminerrorview.class.php" );
- include_once( PLOG_CLASS_PATH."class/view/admin/adminmessageview.class.php" );
-
- include_once( PLOG_CLASS_PATH."plugins/shoutbox/class/dao/shoutbox.class.php" );
-
- /**
- * updates the plugin configuration
- */
- class PluginShoutboxDeleteShoutsAction extends AdminAction
- {
-
- var $_pluginEnabled;
- var $_Shoutboxet;
-
- function PluginShoutboxDeleteShoutsAction( $actionInfo, $request )
- {
- $this->AdminAction( $actionInfo, $request );
- }
-
-
- function perform()
- {
- $backLink = "<br><br><a href='admin.php?op=shoutbox'>Back to the shoutbox</a>";
-
- // and check which smiley set we should be using, or if none, then the default one
- $blogSettings = $this->_blogInfo->getSettings();
-
- if(is_array($this->_request->getValue('del')) ) {
- $endMessage = "Shouts successfully deleted.";
- $s = new Shoutbox($this->_blogInfo->getId(), $blogSettings);
- foreach($this->_request->getValue('del') as $k => $v) {
- //echo("Delete $k<br>");
- $s->deleteShout($k);
- }
- }
- else
- $endMessage = "Nothing to do (no shouts selected).";
-
- $this->_view = new AdminMessageView( $this->_blogInfo );
- $this->_view->setMessage($endMessage . $backLink);
- $this->setCommonData();
-
- return true;
- }
- }
-?>
\ No newline at end of file
Copied: plugins/trunk/shoutbox/class/action/pluginshoutboxdeleteshoutsaction.class.php (from rev 4487, plugins/branches/lifetype-1.1/shoutbox/class/action/pluginshoutboxdeleteshoutsaction.class.php)
Deleted: plugins/trunk/shoutbox/class/action/pluginshoutboxhistoryaction.class.php
===================================================================
--- plugins/branches/lifetype-1.1/shoutbox/class/action/pluginshoutboxhistoryaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/shoutbox/class/action/pluginshoutboxhistoryaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,50 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/action/blogaction.class.php" );
- include_once( PLOG_CLASS_PATH."class/view/plugintemplatedview.class.php" );
-
- include_once( PLOG_CLASS_PATH."plugins/shoutbox/class/dao/shoutbox.class.php" );
-
- /**
- * shows a form with the current configuration
- */
- class PluginShoutboxHistoryAction extends BlogAction {
-
- function PluginShoutboxHistoryAction( $actionInfo, $request ) {
- $this->BlogAction( $actionInfo, $request );
- }
-
- function perform() {
- // load some configuration settings
- $blogSettings = $this->_blogInfo->getSettings();
-
- // Get the shoutbox entries
- $s = new Shoutbox($this->_blogInfo->getId(), $blogSettings);
-
- // create a view and export the settings to the template
- //$this->_view = new PluginTemplatedView($this->_blogInfo, "shoutbox", "shoutbox_history" );
- $this->_view = new BlogView($this->_blogInfo, "shoutbox_history" );
- $this->_view->setValue( "pluginEnabled", $pluginEnabled );
- //$this->_view->setValue( "Shoutboxet", $Shoutboxet );
-
- $reqPage = (int)$this->_request->getValue('page');
- if($reqPage < 1)
- $reqPage = 1;
-
- if($reqPage > 1)
- $this->_view->setValue("prev_page", $reqPage - 1);
-
- if($reqPage <= $s->getLastPage())
- $this->_view->setValue("next_page", $reqPage + 1);
-
- $this->_view->setValue("shoutsHistory", $s->getShoutsArray($reqPage));
-
-
- $this->setCommonData();
-
- CacheControl::resetBlogCache($this->_blogInfo->getId());
-
- return true;
- }
-}
-?>
\ No newline at end of file
Copied: plugins/trunk/shoutbox/class/action/pluginshoutboxhistoryaction.class.php (from rev 4487, plugins/branches/lifetype-1.1/shoutbox/class/action/pluginshoutboxhistoryaction.class.php)
Deleted: plugins/trunk/shoutbox/class/action/pluginshoutboxnewshoutaction.class.php
===================================================================
--- plugins/branches/lifetype-1.1/shoutbox/class/action/pluginshoutboxnewshoutaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/shoutbox/class/action/pluginshoutboxnewshoutaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,145 +0,0 @@
-<?php
-
-include_once( PLOG_CLASS_PATH."class/action/blogaction.class.php" );
-include_once( PLOG_CLASS_PATH."class/view/plugintemplatedview.class.php" );
-
-include_once( PLOG_CLASS_PATH."plugins/shoutbox/class/dao/shoutbox.class.php" );
-include_once( PLOG_CLASS_PATH."class/view/errorview.class.php" );
-include_once( PLOG_CLASS_PATH."class/view/redirectview.class.php" );
-
-/**
- * shows a form with the current configuration
-*/
-class PluginShoutboxNewShoutAction extends BlogAction {
-
- function PluginShoutboxNewShoutAction( $actionInfo, $request ) {
- $this->BlogAction( $actionInfo, $request );
- }
-
- function perform() {
- // load some configuration settings
- $blogSettings = $this->_blogInfo->getSettings();
-
- $locale = Locales::getPluginLocale('shoutbox', $blogSettings->getValue('locale'));
-
- // Get the shoutbox entries
- $s = new Shoutbox($this->_blogInfo->getId(), $blogSettings);
-
- $error = false;
- if(!$s->shout_enabled) {
- $error = $locale->tr("temp_disabled");
- }
-
- //$nickname = $this->_request->getValue('nickname');
- $nickname = $this->_request->getValue( 'shoutbox_nickname' );
- $nickname = strip_tags($nickname);
- $protected_nicks = $s->protected_nicks;
- $protection_password = $s->protection_password;
-
- //echo("Controllo :$protection_password contro $nickname<br>");
- $usesProtectedNick = false;
- $parts = explode(' ', $s->protected_nicks);
- //echo("PN: $protected_nicks <pre>" . print_r($parts) ."</pre>");
-
- foreach($parts as $part) {
- //echo("Controllo $part contro $nickname<br>");
- if(preg_match("/$part/i", $nickname)) {
- $usesProtectedNick = true;
- continue;
- }
- }
-
- if($usesProtectedNick && !$error) {
- if(!preg_match("/:$protection_password\$/", $nickname)) {
- $error = $locale->tr("nickname_is_protected");
- if($s->mail_alert) {
- $s->notifyUser($nickname, $shoutText, "alert");
- }
- }
- else {
- $nickname = preg_replace("/:$protection_password\$/", "", $nickname);
- }
- }
-
-
- //$shoutText = $this->_request->getValue('shoutText');
- $shoutText = $this->_request->getValue( 'shoutbox_text' );
- $shoutText = strip_tags($shoutText, '<a><br><b><i><strong>');
- if (!get_magic_quotes_gpc()) {
- $nickname = addslashes($nickname);
- $shoutText = addslashes($shoutText);
- }
- if(strlen($nickname) == 0 || strlen($shoutText) == 0) {
- if(!$error)
- $error = $locale->tr("missing_content");
- }
- else if($nickname == $s->default_nick || $shoutText == $s->default_shout) {
- if(!$error)
- $error = $locale->tr("default_shouted");
- }
- else if(strlen($shoutText) > $s->max_length) {
- if(!$error)
- $error = $locale->tr("too_long_shout");
- }
- else if(strlen($nickname) > 20) {
- if(!$error)
- $error = $locale->tr("too_long_nick");
- }
-
-
- if($error) {
- $this->_view = new ErrorView($this->_blogInfo );
- $this->_view->setErrorMessage($error);
- $this->setCommonData();
- return true;
- }
-
- $s->addShout($nickname, $shoutText);
-
- // create a view and export the settings to the template
- /*
- $this->_view = new PluginTemplatedView($this->_blogInfo, "shoutbox", "shoutbox_newshout" );
- $this->_view->setValue("returnPage", $_POST['shoutbox_return']);
- */
-
- if (array_key_exists( 'HTTP_REFERER', $_SERVER )) {
- $this->_view = new RedirectView( $_SERVER['HTTP_REFERER'] );
- }
- else {
- $this->_view = new InfoView($this->_blogInfo );
- $this->_view->setInfoMessage("shout_added");
- }
-
-
- $this->setCommonData();
-
- // Now reset this blog's cache
- CacheControl::resetBlogCache($this->_blogInfo->getId());
-
- return true;
- }
-}
-
-
-define( "INFO_TEMPLATE", "info" );
-class InfoView extends BlogView {
- function InfoView( $blogInfo, $message = null ) {
- $this->BlogView( $blogInfo, INFO_TEMPLATE, SMARTY_VIEW_CACHE_DISABLED );
-
- $this->_message = $message;
- }
-
- function setInfoMessage( $message ) {
- $this->setValue( "message", $message );
-
- return( parent::setErrorMessage( $message ));
- }
-
- function render() {
- if(!empty($this->_message))
- $this->setValue( "message", $this->_message );
-
- parent::render();
- }
-}
-?>
\ No newline at end of file
Copied: plugins/trunk/shoutbox/class/action/pluginshoutboxnewshoutaction.class.php (from rev 4487, plugins/branches/lifetype-1.1/shoutbox/class/action/pluginshoutboxnewshoutaction.class.php)
Deleted: plugins/trunk/shoutbox/class/action/pluginshoutboxquickdeleteaction.class.php
===================================================================
--- plugins/branches/lifetype-1.1/shoutbox/class/action/pluginshoutboxquickdeleteaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/shoutbox/class/action/pluginshoutboxquickdeleteaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,55 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/action/blogaction.class.php" );
- include_once( PLOG_CLASS_PATH."class/view/plugintemplatedview.class.php" );
- include_once( PLOG_CLASS_PATH."class/template/cachecontrol.class.php" );
-
- include_once( PLOG_CLASS_PATH."plugins/shoutbox/class/dao/shoutbox.class.php" );
- include_once( PLOG_CLASS_PATH."class/view/errorview.class.php" );
-
- /**
- * shows a form with the current configuration
- */
- class PluginShoutboxQuickDeleteAction extends BlogAction {
-
- function PluginShoutboxQuickDeleteAction( $actionInfo, $request ) {
- $this->BlogAction( $actionInfo, $request );
- }
-
- function perform() {
- // load some configuration settings
- $blogSettings = $this->_blogInfo->getSettings();
-
-
- // Get the shoutbox entries
- $s = new Shoutbox($this->_blogInfo->getId(), $blogSettings);
- $shoutId = (int)$this->_request->getValue('shoutId');
- $auth = $this->_request->getValue('auth');
- if($shoutId < 1 || !preg_match('/^[a-zA-Z0-9]+$/', $auth)) {
- $this->_view = new ErrorView($this->_blogInfo );
- $this->_view->setErrorMessage("Invalid parameters. Have you copied the link entirely?");
- $this->setCommonData();
- return true;
- }
- else if($blogSettings->getValue("plugin_shoutbox_quick_delete") == 1) {
- $s->deleteShout($shoutId, $auth);
-
- // Now reset this blog's cache
- CacheControl::resetBlogCache($this->_blogInfo->getId());
- }
-
- // create a view and export the settings to the template
- $this->_view = new PluginTemplatedView($this->_blogInfo, "shoutbox", "shoutbox_history" );
- $this->_view->setValue( "pluginEnabled", $pluginEnabled );
- //$this->_view->setValue( "Shoutboxet", $Shoutboxet );
-
- $reqPage = 1;
- if($reqPage <= $s->getLastPage())
- $this->_view->setValue("next_page", $reqPage + 1);
- $this->_view->setValue("shoutsHistory", $s->getShoutsArray($reqPage));
-
- $this->setCommonData();
- return true;
- }
-}
-?>
\ No newline at end of file
Copied: plugins/trunk/shoutbox/class/action/pluginshoutboxquickdeleteaction.class.php (from rev 4487, plugins/branches/lifetype-1.1/shoutbox/class/action/pluginshoutboxquickdeleteaction.class.php)
Deleted: plugins/trunk/shoutbox/class/action/pluginshoutboxsetupaction.class.php
===================================================================
--- plugins/branches/lifetype-1.1/shoutbox/class/action/pluginshoutboxsetupaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/shoutbox/class/action/pluginshoutboxsetupaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,120 +0,0 @@
-<?php
-include_once( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
-include_once( PLOG_CLASS_PATH."class/view/admin/adminerrorview.class.php" );
-include_once( PLOG_CLASS_PATH."class/view/admin/adminmessageview.class.php" );
-
-include_once( PLOG_CLASS_PATH."plugins/shoutbox/class/dao/shoutbox.class.php" );
-include_once( PLOG_CLASS_PATH."plugins/shoutbox/class/dao/shoutboxInstaller.class.php" );
-
-/**
-* creates or upgrades the shoutbox
-*/
-class PluginShoutboxSetupAction extends AdminAction
-{
-
- var $_pluginEnabled;
-
- function PluginShoutboxSetupAction($actionInfo, $request) {
- $this->AdminAction( $actionInfo, $request );
- }
-
- function perform() {
- $blogSettings = $this->_blogInfo->getSettings();
-
- $dbOk = $blogSettings->getValue("plugin_shoutbox_dbok");
- $version = $blogSettings->getValue( "plugin_shoutbox_version");
-
- if($dbOk && $version == '0.2')
- return true;
- else if($dbOk && $version < 0.2) {
- $this->confirmSetup();
- $this->finalSaveSettings();
- $this->_view = new AdminMessageView( $this->_blogInfo );
- $this->_view->setMessage("Shoutbox successfully upgraded from previous version");
- $this->setCommonData();
- }
- else if($dbOk && $version > 0.2) {
- $this->_view = new AdminErrorView( $this->_blogInfo );
- $this->_view->setValue( "message", "It seems that you are downgrading the shoutbox from version $version. Operation not supported. Maybe you have hit a bug?");
- $this->setCommonData();
- }
- else {
- $s = new Shoutbox($this->_blogInfo->getId(), $blogSettings);
-
- $tableExists = $s->checkTableExists();
- if(!$tableExists)
- $s->createTable();
- $this->setDefaults();
- $this->confirmSetup();
- $this->finalSaveSettings();
-
- if($tableExists) {
- $this->_view = new AdminErrorView( $this->_blogInfo );
- $this->_view->setValue( "message", "You have hit a (known) bug. Your shouts are intact, but the configuration options are gone. You will have to set them again :( Sorry for the inconvenience");
- $this->setCommonData();
- }
- else {
- $this->_view = new AdminMessageView( $this->_blogInfo );
- $this->_view->setMessage("Shoutbox options successfully updated");
- $this->setCommonData();
- }
- }
-
- return true;
- }
-
-
- function setDefaults() {
- $blogSettings = $this->_blogInfo->getSettings();
-
- $blogSettings->setValue( "plugin_shoutbox_shout_enabled", 1);
- $blogSettings->setValue( "plugin_shoutbox_mail_alert", 1);
- $blogSettings->setValue( "plugin_shoutbox_quick_delete", 0);
- $blogSettings->setValue( "plugin_shoutbox_max_length", 400);
- $blogSettings->setValue( "plugin_shoutbox_shouts_per_view", 15);
-
- $blogSettings->setValue( "plugin_shoutbox_protected_nicks", "ExampleNick");
- $blogSettings->setValue( "plugin_shoutbox_protection_password", "");
-
- $blogSettings->setValue( "plugin_shoutbox_default_nickname", "Your nickname");
- $blogSettings->setValue( "plugin_shoutbox_default_shout", "Your shout here");
-
- $this->_blogInfo->setSettings( $blogSettings );
- }
-
- function confirmSetup() {
- $blogSettings = $this->_blogInfo->getSettings();
-
- $blogSettings->setValue( "plugin_shoutbox_dbok", true);
- $blogSettings->setValue( "plugin_shoutbox_version", '0.12');
-
- $this->_blogInfo->setSettings( $blogSettings );
- }
-
- function finalSaveSettings() {
- $blogSettings = $this->_blogInfo->getSettings();
-
- // save the blogs settings
- $blogs = new Blogs();
- include(PLOG_CLASS_PATH ."/version.php");
- if(!preg_match('/lifetype-1.1/', $version))
- $updateResult = $blogs->updateBlog( $this->_blogInfo->getId(), $this->_blogInfo );
- else
- $updateResult = $blogs->updateBlog($this->_blogInfo);
-
- if( !$updateResult) {
- $this->_view = new AdminErrorView( $this->_blogInfo );
- $this->_view->setValue( "message", "An error occurred while saving the shoutbox options");
- $this->setCommonData();
-
- return false;
- }
-
- // if everything went ok...
- $this->_blogInfo->setSettings( $blogSettings );
- $this->_session->setValue( "blogInfo", $this->_blogInfo );
- $this->saveSession();
- }
-
-}
-?>
\ No newline at end of file
Copied: plugins/trunk/shoutbox/class/action/pluginshoutboxsetupaction.class.php (from rev 4487, plugins/branches/lifetype-1.1/shoutbox/class/action/pluginshoutboxsetupaction.class.php)
Deleted: plugins/trunk/shoutbox/class/action/pluginshoutboxupdateconfigaction.class.php
===================================================================
--- plugins/branches/lifetype-1.1/shoutbox/class/action/pluginshoutboxupdateconfigaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/shoutbox/class/action/pluginshoutboxupdateconfigaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,94 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- include_once( PLOG_CLASS_PATH."class/view/admin/adminerrorview.class.php" );
- include_once( PLOG_CLASS_PATH."class/view/admin/adminmessageview.class.php" );
-
- include_once( PLOG_CLASS_PATH."plugins/shoutbox/class/dao/shoutbox.class.php" );
-
- /**
- * updates the plugin configuration
- */
- class PluginShoutboxUpdateConfigAction extends AdminAction
- {
-
- var $_pluginEnabled;
- var $_Shoutboxet;
-
- function PluginShoutboxUpdateConfigAction( $actionInfo, $request )
- {
- $this->AdminAction( $actionInfo, $request );
- }
-
- function validate()
- {
- $this->_pluginEnabled = $this->_request->getValue( "pluginEnabled" );
- $this->_pluginEnabled = ($this->_pluginEnabled != "" );
- $this->_Shoutboxet = $this->_request->getValue( "setId" );
- if( $Shoutboxet == "" )
- $Shoutboxet = DEFAULT_SMILEY_SET;
-
- return true;
- }
-
-
- function perform()
- {
- $endMessage = "Configuration successfully updated.";
- $backLink = "<br><br><a href='admin.php?op=shoutbox'>Back to the shoutbox</a><br>" .
- "<a href='admin.php?op=shoutboxConfig'>Back to the shoutbox config page</a><br>";
-
- // and check which smiley set we should be using, or if none, then the default one
- $blogSettings = $this->_blogInfo->getSettings();
-
- if(strlen($this->_request->getValue('shout_enabled')) > 0)
- $blogSettings->setValue("plugin_shoutbox_shout_enabled", 1);
- else
- $blogSettings->setValue("plugin_shoutbox_shout_enabled", 0);
-
- if(strlen($this->_request->getValue('mail_alert')) > 0)
- $blogSettings->setValue( "plugin_shoutbox_mail_alert", 1);
- else
- $blogSettings->setValue( "plugin_shoutbox_mail_alert", 0);
-
- if(strlen($this->_request->getValue('quick_delete')) > 0)
- $blogSettings->setValue("plugin_shoutbox_quick_delete", 1);
- else
- $blogSettings->setValue("plugin_shoutbox_quick_delete", 0);
-
- $blogSettings->setValue( "plugin_shoutbox_max_length", $this->_request->getValue('max_length'));
- $blogSettings->setValue( "plugin_shoutbox_shouts_per_view", $this->_request->getValue('shouts_per_view'));
-
- $blogSettings->setValue( "plugin_shoutbox_default_nick", $this->_request->getValue('default_nick'));
- $blogSettings->setValue( "plugin_shoutbox_default_shout", $this->_request->getValue('default_shout'));
-
- $blogSettings->setValue( "plugin_shoutbox_protected_nicks", $this->_request->getValue('protected_nicks'));
- $blogSettings->setValue( "plugin_shoutbox_protection_password", $this->_request->getValue('protection_password'));
-
- $this->_blogInfo->setSettings($blogSettings );
-
- // save the blogs settings
- $blogs = new Blogs();
- $updateResult = $blogs->updateBlog($this->_blogInfo);
-
- if( !$updateResult) {
- $this->_view = new AdminErrorView( $this->_blogInfo );
- $this->_view->setValue( "message", "An error occurred! " . $backLink);
- $this->setCommonData();
-
- return false;
- }
-
- // if everything went ok...
- $this->_blogInfo->setSettings( $blogSettings );
- $this->_session->setValue( "blogInfo", $this->_blogInfo );
- $this->saveSession();
-
- $this->_view = new AdminMessageView( $this->_blogInfo );
- $this->_view->setMessage($endMessage . $backLink);
- $this->setCommonData();
-
- return true;
- }
- }
-?>
\ No newline at end of file
Copied: plugins/trunk/shoutbox/class/action/pluginshoutboxupdateconfigaction.class.php (from rev 4487, plugins/branches/lifetype-1.1/shoutbox/class/action/pluginshoutboxupdateconfigaction.class.php)
Copied: plugins/trunk/shoutbox/class/dao (from rev 4487, plugins/branches/lifetype-1.1/shoutbox/class/dao)
Deleted: plugins/trunk/shoutbox/class/dao/shoutbox.class.php
===================================================================
--- plugins/branches/lifetype-1.1/shoutbox/class/dao/shoutbox.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/shoutbox/class/dao/shoutbox.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,209 +0,0 @@
-<?php
-
-include_once( PLOG_CLASS_PATH."class/dao/model.class.php" );
-include_once( PLOG_CLASS_PATH."class/template/cachecontrol.class.php" );
-include_once( PLOG_CLASS_PATH."class/mail/emailmessage.class.php" );
-include_once( PLOG_CLASS_PATH."class/mail/emailservice.class.php" );
-
-include_once( PLOG_CLASS_PATH."plugins/shoutbox/class/dao/shoutboxInstaller.class.php" );
-
-
-class Shoutbox extends Model {
- var $blogId;
-
- var $config;
-
- var $shout_enabled;
- var $mail_alert;
- var $quick_delete;
- var $max_length;
- var $shouts_per_view;
- var $default_nick;
- var $default_shout;
- var $protected_nicks;
- var $protection_password;
- var $current_page;
-
- var $blogSettings;
-
- function Shoutbox($blogId, $blogSettings) {
- $this->blogSettings = $blogSettings;
-
- /* Modelize it! */
- $this->Model();
-
- /* Initialization */
- $this->blogId = $blogId;
-
- $this->shout_enabled = $blogSettings->getValue("plugin_shoutbox_shout_enabled");
- $this->mail_alert = $blogSettings->getValue("plugin_shoutbox_mail_alert");
- $this->mail_alert = $blogSettings->getValue("plugin_shoutbox_mail_alert");
- $this->quick_delete = $blogSettings->getValue("plugin_shoutbox_quick_delete");
- $this->max_length = $blogSettings->getValue( "plugin_shoutbox_max_length");
- $this->shouts_per_view = $blogSettings->getValue( "plugin_shoutbox_shouts_per_view", 0);
-
- $this->default_nick = $blogSettings->getValue( "plugin_shoutbox_default_nick");
- $this->default_shout = $blogSettings->getValue( "plugin_shoutbox_default_shout");
-
- $this->protected_nicks = $blogSettings->getValue( "plugin_shoutbox_protected_nicks");
- $this->protection_password = $blogSettings->getValue( "plugin_shoutbox_protection_password");
-
- //Connections and blog data
- //$this->connectDb();
- //$this->blogSettings = new Config();
- //$this->dbPrefix = $this->blogSettings->getValue( "db_prefix" );
- //$this->blogId = $this->blogInfo->getId();
- }
-
- function setup() {
- $si = new ShoutboxInstaller($this->blogId, $this->blogSettings);
- return $si->checkShoutbox();
- }
-
-
- function getShoutsArray($page = false) {
- $sql = "SELECT * FROM " . $this->getPrefix() . "shoutbox_shouts ";
- $sql .= "WHERE blog_id = {$this->blogId} ORDER BY shout_date DESC ";
-
- if($page)
- $offset = ($page-1) * $this->shouts_per_view;
- else
- $offset = 0;
-
- $sql .= "LIMIT $offset, " . $this->shouts_per_view;
-
- $this->shoutsResult = $this->Execute($sql);
- if(!$this->shoutsResult)
- return array();
-
- while($shout = $this->shoutsResult->FetchRow()) {
- $shout['shout_date'] = Date("d/m/Y G:i", strtotime($shout['shout_date']));
- $shouts[] = $shout;
- }
-
- return $shouts;
- }
-
- function addShout($nickname, $shoutText) {
- //die("Cool :D Adding shout <b>$shoutText</b> by $nickname ");
- $auth = "";
- for($i=0; $i < 12; $i++) {
- $auth .= chr((mt_rand(1, 36) <= 26) ? mt_rand(97, 122) : mt_rand(48, 57));
- }
-
- $sql = "INSERT INTO " . $this->getPrefix() . "shoutbox_shouts (nickname, shout_text, blog_id, shout_date, auth) VALUES" .
- "('$nickname', '$shoutText', {$this->blogId}, '".Date('Y-m-d H:i:s')."', '$auth')";
- $result = $this->Execute($sql);
-
- //die("<pre>$sql</pre>");
-
- if(!$result) {
- echo('Sorry, coud not add your shout.');
- return false;
- }
-
- $shoutId = $this->_db->Insert_ID();
-
- if($this->mail_alert) {
- $params = array('id' => $shoutId, 'auth' => $auth);
- $this->notifyUser($nickname, $shoutText, 'new', $params);
- }
-
- return true;
- }
-
- function deleteShout($id, $auth = false) {
- $sql = "DELETE FROM " . $this->getPrefix() . "shoutbox_shouts WHERE shout_id = $id";
- if($auth)
- $sql .= " AND auth = '$auth' AND shout_date >= DATE_SUB(CURDATE(),INTERVAL 3 DAY)";
- //echo($sql);
- $result = $this->Execute($sql);
- if(!$result) {
- return false;
- }
- return true;
- }
-
- function alterShout($id, $nickname, $shoutText) {
- $sql = "UPDATE " . $this->getPrefix() . "shoutbox_shouts SET nickname = '$nickname' , shout_text = '$shoutText' WHERE shout_id = $id";
- $result = $this->Execute($sql);
- if(!$result) {
- die('Could not slter the shout!');
- return false;
- }
- return true;
- }
-
- function getLastPage() {
- $sql = "SELECT COUNT(*) as cnt FROM " . $this->getPrefix() . "shoutbox_shouts ";
- $res = $this->Execute($sql);
- if(!$res)
- return 0;
- $cnt = $res->FetchRow();
- if($cnt['cnt'] > 0) {
- $cnt = floor($cnt['cnt'] / $this->shouts_per_view);
- }
- return $cnt;
- }
-
- ####################################################
- # Extra functions
- function notifyUser($nickname, $shout_text, $whichMail = "new", $params = false) {
- $users = new Users();
- $userInfos = $users->getBlogUsers($this->blogId);
-
- foreach($userInfos as $userInfo) {
- $message = new EmailMessage();
- $message->setFrom("LifeType Shoutbox Plugin");
- $message->addTo( $userInfo->getEmail());
-
- if($whichMail == "new") {
- $message->setSubject( "LifeType Notification system: new shout in shoutbox" );
- $body = <<<END
-There is a new shout in your shoutbox.
-From: $nickname
-Text: $shout_text
-END;
-
- if($this->quick_delete) {
- $body .= <<<END
-
-
-You can delete this shout by clicking on this link:
-XXX http://www.netpalantir.it/index.php?op=shoutboxQuickDelete&shoutId={$params['id']}&auth={$params['auth']} XXX
-Remember there is no undo.
-END;
- }
-
- }
- else if($whichMail == "alert") {
- $message->setSubject( "LifeType Notification system: shoutbox nickname protection alert" );
- $body = <<<END
-Someone has tried to use your nickname in the shoutbox. The following message has been discarded:
-Text: $shout_text
-END;
- }
-
- $message->setBody($body);
-
- $service = new EmailService();
- $service->sendMessage( $message );
- //echo('Sent mail to ' . $userInfo->getEmail() . '<br>');
- }
- }
-
- ####################################################
- # Public section.
- function thinkAndDo() {
- return $this->getShoutsArray();
- }
-
- function defaultNick() {
- return $this->default_nick;
- }
-
- function defaultShout() {
- return $this->default_shout;
- }
-}
-?>
Copied: plugins/trunk/shoutbox/class/dao/shoutbox.class.php (from rev 4487, plugins/branches/lifetype-1.1/shoutbox/class/dao/shoutbox.class.php)
Deleted: plugins/trunk/shoutbox/class/dao/shoutboxInstaller.class.php
===================================================================
--- plugins/branches/lifetype-1.1/shoutbox/class/dao/shoutboxInstaller.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/shoutbox/class/dao/shoutboxInstaller.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,86 +0,0 @@
-<?php
-
-include_once( PLOG_CLASS_PATH."class/dao/model.class.php" );
-include_once( PLOG_CLASS_PATH."class/template/cachecontrol.class.php" );
-
-class ShoutboxInstaller extends Model {
-
- function ShoutboxInstaller($blogId, $blogSettings) {
- $this->blogSettings = $blogSettings;
-
- /* Modelize it! */
- $this->Model();
-
- /* Initialization */
- $this->blogId = $blogId;
- }
-
- function checkShoutbox() {
- $dbPrefix = $this->getPrefix();
-
- $version = "1.0";
-
- $sql = "SELECT * FROM " . $this->getPrefix() . "shoutbox_shouts ";
- $this->shoutsResult = $this->Execute($sql);
- if(!$this->shoutsResult) {
- $version = "no";
- }
- else {
- $sql = "SELECT auth FROM " . $this->getPrefix() . "shoutbox_shouts ";
- $this->shoutsResult = $this->Execute($sql);
- if(!$this->shoutsResult)
- $version = "0.x";
- }
-
- if($version == "no")
- return $this->createTable();
- else if($version == "0.x")
- return $this->upgrade_0x_100();
-
- return true;
- }
-
- function createTable() {
- $dbPrefix = $this->getPrefix();
-
- $sql = "SELECT * FROM {$dbPrefix}shoutbox_shouts";
- if(!$this->_db->Execute($sql)) {
- // Make new setup
- $sql = "
-CREATE TABLE {$dbPrefix}shoutbox_shouts (
- shout_id INT(11) NOT NULL auto_increment,
- blog_id INT(11) NOT NULL,
- nickname TEXT NOT NULL,
- shout_text TEXT NOT NULL,
- shout_date DATETIME NOT NULL,
- auth CHAR(12),
- UNIQUE KEY cashout_id (shout_id)
-)
-";
- if( !$this->_db->Execute($sql) ) {
- $message = "An error occurred while trying to create the table {$dbPrefix}shoutbox_shouts. Please, create it manually. Start you favorite database manager (like phpmyadmin) and run the following code:<br><pre>$sql</pre>";
- return $message;
- }
- }
-
- return true;
- }
-
- // Upgrade from 0.x version to 1.0.0
- function upgrade_0x_100() {
- $dbPrefix = $this->getPrefix();
-
- $sql = "SELECT auth FROM {$dbPrefix}shoutbox_shouts";
- if( !$this->_db->Execute($sql) ) {
- // Make new setup
- $sql = "ALTER TABLE {$dbPrefix}shoutbox_shouts ADD COLUMN auth CHAR(12)";
- if( !$this->_db->Execute($sql) ) {
- $message = "An error occurred while trying to update the table {$dbPrefix}shoutbox_shouts. Please, update it manually. Start you favorite database manager (like phpmyadmin) and run the following code:<br><pre>$sql</pre>";
- return $message;
- }
- }
-
- return true;
- }
-}
-?>
\ No newline at end of file
Copied: plugins/trunk/shoutbox/class/dao/shoutboxInstaller.class.php (from rev 4487, plugins/branches/lifetype-1.1/shoutbox/class/dao/shoutboxInstaller.class.php)
Copied: plugins/trunk/shoutbox/locale (from rev 4487, plugins/branches/lifetype-1.1/shoutbox/locale)
Deleted: plugins/trunk/shoutbox/locale/locale_en_UK.php
===================================================================
--- plugins/branches/lifetype-1.1/shoutbox/locale/locale_en_UK.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/shoutbox/locale/locale_en_UK.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,45 +0,0 @@
-<?
-$messages["an_error_occurred"] = "An error occurred";
-
-// public template (appears on the blog)
-$messages["shoutbox"] = "The Shoutbox";
-$messages["shoutbox_history"] = "Shoutbox History";
-$messages["shoutbox_disabled"] = "Shouting is temporarily disabled";
-$messages["shout"] = "Shout!";
-
-// shoutbox.template
-$messages["nickname"] = "Nickname";
-$messages["select"] = "Select";
-$messages["configure_shoutbox"] = "Configure the shoutbox";
-$messages["delete"] = "Delete";
-
-// shoutbox history
-$messages["prev_page"] = "Previous page";
-$messages["next_page"] = "Next page";
-
-// shoutbox newshout
-$messages["shout_added"] = "Your shout has been added.";
-$messages["go_back"] = "Return to the previous page";
-
-//phuginsshoutboxnewshoutaction.class.php
-$messages["temp_disabled"] = "The shoutbox is temporary disabled. Try again later";
-$messages["nickname_is_protected"] = "This nickname is reserved. Please, use another one";
-$messages["missing_content"] = "You need to insert a nickname and a message.";
-$messages["default_shouted"] = "Shout something more original ;-)";
-$messages["too_long_shout"] = "Your shout is too long!";
-$messages["too_long_nick"] = "Your nickname is too long!";
-
-/*
-$messages[""] = "";
-$messages[""] = "";
-$messages[""] = "";
-$messages[""] = "";
-$messages[""] = "";
-$messages[""] = "";
-$messages[""] = "";
-$messages[""] = "";
-$messages[""] = "";
-$messages[""] = "";
-*/
-
-?>
\ No newline at end of file
Copied: plugins/trunk/shoutbox/locale/locale_en_UK.php (from rev 4487, plugins/branches/lifetype-1.1/shoutbox/locale/locale_en_UK.php)
Deleted: plugins/trunk/shoutbox/locale/locale_it_IT.php
===================================================================
--- plugins/branches/lifetype-1.1/shoutbox/locale/locale_it_IT.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/shoutbox/locale/locale_it_IT.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,28 +0,0 @@
-<?
-$messages["shoutbox"] = "Scatoletta";
-
-$messages["an_error_occurred"] = "E' avvenuto un errore";
-
-// shoutbox.template
-$messages["nickname"] = "Nickname";
-$messages["select"] = "Seleziona";
-$messages["configure_shoutbox"] = "Configura la shoutbox";
-$messages["delete"] = "Cancella";
-
-// shoutbox history
-$messages["prev_page"] = "Pagina precedente";
-$messages["next_page"] = "Pagina successiva";
-
-// shoutbox newshout
-$messages["shout_added"] = "Il messaggio �stato aggiunto";
-$messages["go_back"] = "Torna alla pagina precedente";
-
-//phuginsshoutboxnewshoutaction.class.php
-$messages["temp_disabled"] = "La shoutbox �momentaneamente disabilitata. Riprova pi tardi";
-$messages["nickname_is_protected"] = "Questo nickname �riservato. Scegline un altro";
-$messages["missing_content"] = "Inserisci un messaggio ed un nickname";
-$messages["default_shouted"] = "Scrivi qualcosa di pi originale ;-)";
-$messages["too_long_shout"] = "Il messaggio �troppo lungo";
-$messages["too_long_nick"] = "Il nickname �troppo lungo";
-
-?>
\ No newline at end of file
Copied: plugins/trunk/shoutbox/locale/locale_it_IT.php (from rev 4487, plugins/branches/lifetype-1.1/shoutbox/locale/locale_it_IT.php)
Deleted: plugins/trunk/shoutbox/pluginshoutbox.class.php
===================================================================
--- plugins/branches/lifetype-1.1/shoutbox/pluginshoutbox.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/shoutbox/pluginshoutbox.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,72 +0,0 @@
-<?php
-
-// -- plugin manager stuff
-include_once( PLOG_CLASS_PATH."class/plugin/pluginbase.class.php" );
-//include_once( PLOG_CLASS_PATH."class/plugin/eventpluginbase.class.php" );
-include_once( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
-
-// -- for the public side action
-include_once( PLOG_CLASS_PATH."class/action/blogaction.class.php" );
-include_once( PLOG_CLASS_PATH."class/view/errorview.class.php" );
-
-// -- for the admin side action
-include_once( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
-include_once( PLOG_CLASS_PATH."class/view/admin/adminerrorview.class.php" );
-
-include_once( PLOG_CLASS_PATH."plugins/shoutbox/class/dao/shoutbox.class.php" );
-
-class PluginShoutbox extends PluginBase {
- var $s;
-
- function PluginShoutbox()
- {
- $this->PluginBase();
-
- $this->desc = "Shoutbox plugin: unleash your visitors";
- $this->author = "Palantir (radar at netpalantir.it)";
- $this->id = "shoutbox";
- $this->locales = Array( "en_UK", "it_IT");
-
- $this->registerAdminAction("shoutbox", "PluginShoutboxAction" );
- $this->registerAdminAction("shoutboxConfig", "PluginShoutboxConfigAction" );
- $this->registerAdminAction("updateShoutboxConfig", "PluginShoutboxUpdateConfigAction" );
- $this->registerAdminAction("deleteShouts", "PluginShoutboxDeleteShoutsAction" );
-
- $this->registerBlogAction("shoutboxHistory", "PluginShoutboxHistoryAction" );
- $this->registerBlogAction("shoutboxQuickDelete", "PluginShoutboxQuickDeleteAction" );
- $this->registerBlogAction("shoutboxNewShout", "PluginShoutboxNewShoutAction" );
-
- $this->addMenuEntry("/menu/controlCenter/manageSettings", "Shoutbox", "?op=shoutbox", "" );
- }
-
- function process( $eventType, $params )
- {
- // return the content as it came, as the caller class probably expected us to do
- // something with it...
- return $params;
- }
-
- function thinkAndDo() {
- if(!$this->s)
- $this->s = new Shoutbox($this->blogInfo->getId(), $this->blogSettings, $this->config);
- return $this->s->thinkAndDo();
- }
-
- function getDefaultNick() {
- if(!$this->s)
- $this->s = new Shoutbox($this->blogInfo->getId(), $this->blogSettings, $this->config);
- return $this->s->default_nick;
- }
-
- function getDefaultShout() {
- if(!$this->s)
- $this->s = new Shoutbox($this->blogInfo->getId(), $this->blogSettings, $this->config);
- return $this->s->default_shout;
- }
-
- function isShoutboxEnabled() {
- if(!$this->s)
- $this->s = new Shoutbox($this->blogInfo->getId(), $this->blogSettings, $this->config);
- return $this->s->shout_enabled;
- }
-}
\ No newline at end of file
Copied: plugins/trunk/shoutbox/pluginshoutbox.class.php (from rev 4487, plugins/branches/lifetype-1.1/shoutbox/pluginshoutbox.class.php)
Copied: plugins/trunk/shoutbox/templates (from rev 4487, plugins/branches/lifetype-1.1/shoutbox/templates)
Deleted: plugins/trunk/shoutbox/templates/shoutbox.template
===================================================================
--- plugins/branches/lifetype-1.1/shoutbox/templates/shoutbox.template 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/shoutbox/templates/shoutbox.template 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,52 +0,0 @@
-{include file="$admintemplatepath/header.template"}
-{include file="$admintemplatepath/navigation.template" showOpt=Shoutbox title=$locale->tr("Shoutbox")}
-
-{literal}
-<SCRIPT>
-var submitUsed = '';
-function doConfirm() {
- if(submitUsed == 'del')
- if(!confirm('Are you sure to delete? There is NO undo!'))
- return false;
- return true;
-}
-</SCRIPT>
-{/literal}
-
-<FORM method="POST" onSubmit="return doConfirm()">
- <input type="hidden" name="op" value="deleteShouts" />
- <input type="hidden" name="currentPage" value="{$this->current_page}" />
-
-<table class="info">
- <thead>
- <tr>
- <!-- 775 -->
- <th style="width:10px;"><input class="checkbox" type="checkbox" name="all" id="all" value="1" onclick="toggleAllChecks('del');" /></th>
- <th style="width:140px;">{$locale->tr("nickname")}</th>
- <th>Text</th>
- </tr>
- </thead>
-
- <tbody>
-
-{foreach from=$shouts item=shout key=shoutId}
- <tr>
- <td><INPUT type='checkbox' name=del[{$shout.shout_id}]/></td>
- <td>{$shout.nickname}</td>
- <td>{$shout.shout_text}</td>
- </tr>
-{/foreach}
-
-</table>
-
-<div class="buttons">
- <INPUT type="submit" name="delShouts" value="{$locale->tr("delete")} selected" onFocus="submitUsed = 'del'"/>
-</div>
-</FORM>
-
-<br/>
-
-<a href="admin.php?op=shoutboxConfig">{$locale->tr("configure_shoutbox")}</a>
-
-{include file="$admintemplatepath/footernavigation.template"}
-{include file="$admintemplatepath/footer.template"}
\ No newline at end of file
Copied: plugins/trunk/shoutbox/templates/shoutbox.template (from rev 4487, plugins/branches/lifetype-1.1/shoutbox/templates/shoutbox.template)
Deleted: plugins/trunk/shoutbox/templates/shoutboxConfig.template
===================================================================
--- plugins/branches/lifetype-1.1/shoutbox/templates/shoutboxConfig.template 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/shoutbox/templates/shoutboxConfig.template 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,96 +0,0 @@
-{include file="$admintemplatepath/header.template"}
-{include file="$admintemplatepath/navigation.template" showOpt=Shoutbox title=$locale->tr("Shoutbox")}
-
-<FORM method="POST">
-
-<fieldset class="inputField">
- <input type="hidden" name="op" value="updateShoutboxConfig" />
- <input type="hidden" name="pluginId" value="shoutboxPlugin" />
-
- <legend>Shoutbox Settings</legend>
- <div class="field">
- <label for="shout_enabled">Posting enabled</label>
- <div class="formHelp">
- <input type="checkbox" id="shout_enabled" name="shout_enabled" {$shout_enabled_checked} value="12345" class="checkbox"/>
- Uncheck this if you want to temporary disable the posting. The shoutbox will still be displayed,
- but nobody will be able to add new shouts.
- </div>
- </div>
-
-
- <div class="field">
- <label for="mail_alert">Mail Alert</label>
- <div class="formHelp">
- <input type="checkbox" id="mail_alert" name="mail_alert" {$mail_alert_checked} value="12345" class="checkbox"/>
- Alert me whenever a new shout is added
- </div>
- </div>
-
- <div class="field">
- <label for="quick_delete">Quick delete</label>
- <div class="formHelp">
- <input type="checkbox" id="quick_delete" name="quick_delete" {$quick_delete_checked} value="12345" class="checkbox"/>
- Append a link to the notification emails, which allows to immediately delete the shout.
- It works only if the Mail Alert is enabled.
- </div>
- </div>
-
- <div class="field">
- <label for="max_length">Maximum shout length</label>
- <div class="formHelp">
- <input type="input" size="3" name="max_length" value="{$max_length}">
- Maximum lenght of a shout (number of characters)
- </div>
- </div>
-
- <div class="field">
- <label for="max_length">Visible Shouts number</label>
- <div class="formHelp">
- <input type="input" size="3" name="shouts_per_view" value="{$shouts_per_view}">
- Number of shouts to be displayed on the page
- </div>
- </div>
-
- <div class="field">
- <label for="max_length">Default Shout</label>
- <div class="formHelp">
- <input type="input" size="20" name="default_shout" value="{$default_shout}">
- Text to be written in the shout field, like: "Your shout here"
- </div>
- </div>
-
- <div class="field">
- <label for="max_length">Default Nickname</label>
- <div class="formHelp">
- <input type="input" size="20" name="default_nick" value="{$default_nick}">
- Text to be written in the nickname field, like: "Your nickname here"
- </div>
- </div>
-
- <div class="field">
- <label for="max_length">Protected Nicknames</label>
- <div class="formHelp">
- <input type="input" size="20" name="protected_nicks" value="{$protected_nicks}">
- Nicks to be password protected. Separate them by spaces. They are case insensitive
- </div>
- </div>
-
- <div class="field">
- <label for="max_length">Protection password</label>
- <div class="formHelp">
- <input type="password" size="20" name="protection_password" value="{$protection_password}">
- Password for using nicks. To use a protected nick, write it like this: Palantir:MySecretPassword
- </div>
- </div>
-</fieldset>
-
- <div class="buttons">
- <INPUT type="reset" name="reset" value="{$locale->tr("reset")}"/>
- <INPUT type="submit" name="updateOptions" value="{$locale->tr("update")}"/>
- </div>
-</FORM>
-<br/>
-
-
-{include file="$admintemplatepath/footernavigation.template"}
-{include file="$admintemplatepath/footer.template"}
\ No newline at end of file
Copied: plugins/trunk/shoutbox/templates/shoutboxConfig.template (from rev 4487, plugins/branches/lifetype-1.1/shoutbox/templates/shoutboxConfig.template)
Deleted: plugins/trunk/shoutbox/templates/shoutbox_newshout.template
===================================================================
--- plugins/branches/lifetype-1.1/shoutbox/templates/shoutbox_newshout.template 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/shoutbox/templates/shoutbox_newshout.template 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,13 +0,0 @@
-{assign var="mybase" value="http://localhost/linea/"}
-{assign var="mybase" value="http://www.netpalantir.it/"}
-
-{assign var="shoutbox_include" value="$blogtemplate/shoutbox.template"}
-
-{include file="$blogtemplate/header.template"}
-
-<br><br><br>
-
-{$locale->tr("shout_added")}
-<a href="{$returnPage}">{$locale->tr("go_back")}</a>
-
-{include file="$blogtemplate/footer.template"}
\ No newline at end of file
Copied: plugins/trunk/shoutbox/templates/shoutbox_newshout.template (from rev 4487, plugins/branches/lifetype-1.1/shoutbox/templates/shoutbox_newshout.template)
Copied: plugins/trunk/shoutbox/templates-sample (from rev 4487, plugins/branches/lifetype-1.1/shoutbox/templates-sample)
Deleted: plugins/trunk/shoutbox/templates-sample/.htaccess
===================================================================
--- plugins/branches/lifetype-1.1/shoutbox/templates-sample/.htaccess 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/shoutbox/templates-sample/.htaccess 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,6 +0,0 @@
-# If you want to prevent someone stealing your templates,
-# you can unmark the following code to enable the protection.
-#
-# <Files *.template>
-# deny from all
-# </Files>
\ No newline at end of file
Copied: plugins/trunk/shoutbox/templates-sample/.htaccess (from rev 4487, plugins/branches/lifetype-1.1/shoutbox/templates-sample/.htaccess)
Copied: plugins/trunk/shoutbox/templates-sample/standard (from rev 4487, plugins/branches/lifetype-1.1/shoutbox/templates-sample/standard)
Deleted: plugins/trunk/shoutbox/templates-sample/standard/footer.template
===================================================================
--- plugins/branches/lifetype-1.1/shoutbox/templates-sample/standard/footer.template 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/shoutbox/templates-sample/standard/footer.template 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,104 +0,0 @@
- {pager style="links"}
-
-</div>
-
-<div id="Menu">
-
-{assign var=blogOwner value=$blog->getOwnerInfo()}
-{assign var=AboutMyself value=$blogOwner->getAboutMyself()}
-{if $blogOwner->hasPicture() && $AboutMyself}
-
- <h2>{$locale->tr("about_myself")}</h2>
- <div id="AboutMyself">
- {assign var=picture value=$blogOwner->getPicture()}
- <img id="UserPicture" src="{$picture->getPreviewLink()}" alt="{$blogOwner->getUsername()}" />
- <p>{$AboutMyself}</p>
- <div class="clearer"> </div>
- </div>
-{/if}
-
-
-
- <h2>{$locale->tr("menu")}</h2>
- <div id="Sections">
- <ul>
- <li><a title="{$locale->tr("main")}" href="{$url->blogLink()}">{$locale->tr("main")}</a></li>
- <li><a title="{$locale->tr("archives")}" href="{$url->templatePage("archives")}">{$locale->tr("archives")}</a></li>
- <li><a title="{$locale->tr("albums")}" href="{$url->albumLink()}">{$locale->tr("albums")}</a></li>
-
- {foreach name=mylinkscategories from=$mylinkscategories item=panel_linkcategory}
-{if $smarty.foreach.mylinkscategories.first}
-
-<li><a title="{$locale->tr("links")}" href="{$url->templatePage("links")}">{$locale->tr("links")}</a></li>{/if}
- {/foreach}
- </ul>
- </div>
-
- <h2>{$locale->tr("search")}</h2>
- <div id="Search">
- <form id="search_form" method="post" action="{$url->getIndexUrl()}">
- <fieldset>
- <label for="searchTerms"><input type="text" id="searchTerms" name="searchTerms" value="" /></label>
- <input type="submit" name="Search" value="{$locale->tr("search_s")}" class="button" />
- <input type="hidden" name="op" value="Search" />
- <input type="hidden" name="blogId" value="{$blog->getId()}" />
- </fieldset>
- </form>
- </div>
-
- <h2>{$locale->tr("calendar")}</h2>
- <div id="Calendar">
- {$calendar}
- </div>
-
- <h2>{$locale->tr("recently")}</h2>
- <div id="Recently">
- <ul>
- {foreach from=$recentposts item=post}
- <li><a title="{$post->getTopic()}" href="{$url->postLink($post)}">{$post->getTopic()}</a></li>
- {/foreach}
- </ul>
- </div>
-
- <h2>{$locale->tr("categories")}</h2>
- <div id="Categories">
- <ul>
- {foreach from=$articlecategories item=articleCategory}
- <li><a title="{$articleCategory->getName()}" href="{$url->categoryLink($articleCategory)}">{$articleCategory->getName()} <abbr title="{$articleCategory->getNumArticles()} {$locale->tr("posts")}">[{$articleCategory->getNumArticles()}]</abbr></a></li>
- {/foreach}
- </ul>
- </div>
-
- <h2>{$locale->tr("syndicate")}</h2>
- <div id="Syndicate">
- <ul>
- <li><a title="RSS 0.90" href="{$url->rssLink("rss090")}">RSS 0.90</a></li>
- <li><a title="RSS 1.0" href="{$url->rssLink("rss10")}">RSS 1.0</a></li>
- <li><a title="RSS 2.0" href="{$url->rssLink("rss20")}">RSS 2.0</a></li>
- <li><a title="Atom" href="{$url->rssLink("rss20")}">Atom</a></li>
- </ul>
- </div>
-
-
- <h2>{$locale->tr("Shoutbox")}</h2>
- <div id="Shoutbox">
- {include file="$blogtemplate/shoutbox.template"}
- </div>
-</div>
-
-<div class="clearer"> </div>
-
-
-
-</div>
-
-<div id="Bottommenu"><a href="http://www.w3.org/WAI/">Accessible</a> and Valid <a href="http://validator.w3.org/check/referer">XHTML 1.0 Strict</a> and <a href="http://jigsaw.w3.org/css-validator/check/referer">CSS</a></div>
-
-
-<!-- Please leave the credit intact. Thank you. -->
-<div id="Bottom">Powered by <a href="http://www.lifetype.net">LifeType</a> - Design by <a href="http://www.balearweb.com/">BalearWeb</a></div>
-
-</div>
-
-</body>
-</html>
Copied: plugins/trunk/shoutbox/templates-sample/standard/footer.template (from rev 4487, plugins/branches/lifetype-1.1/shoutbox/templates-sample/standard/footer.template)
Deleted: plugins/trunk/shoutbox/templates-sample/standard/info.template
===================================================================
--- plugins/branches/lifetype-1.1/shoutbox/templates-sample/standard/info.template 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/shoutbox/templates-sample/standard/info.template 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,5 +0,0 @@
- {include file="$blogtemplate/header.template"}
- <h2>{$locale->tr("info")}</h2>
- <p>{$locale->tr($message)}</p>
- <p><a href="javascript:history.go(-1)">{$locale->tr("back")}</a></p>
- {include file="$blogtemplate/footer.template"}
Copied: plugins/trunk/shoutbox/templates-sample/standard/info.template (from rev 4487, plugins/branches/lifetype-1.1/shoutbox/templates-sample/standard/info.template)
Deleted: plugins/trunk/shoutbox/templates-sample/standard/shoutbox.template
===================================================================
--- plugins/branches/lifetype-1.1/shoutbox/templates-sample/standard/shoutbox.template 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/shoutbox/templates-sample/standard/shoutbox.template 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,52 +0,0 @@
-{assign var="deafultNick" value=$shoutbox->getDefaultNick()}
-{assign var="defaultShout" value=$shoutbox->getDefaultShout()}
-
-{assign var="shouts" value=$shoutbox->thinkAndDo()}
-{foreach from=$shouts item=shout}
- <<b>{$shout.nickname}</b>>
- {$shout.shout_text}<br />
- ({$shout.shout_date})<br />
-{/foreach}
-
-<p style="font-weight: bold;">
-<a href="{$url->getIndexUrl()}?op=shoutboxHistory&blogId={$blog->getId()}">
-{$locale->tr("shoutbox_history")}
-</a>
-</p>
-
-{literal}
-<script type="text/javascript">
-function shoutbox_clearField(el) {
- if(el.name == 'shoutbox_text' && el.value == '{/literal}{$defaultShout}{literal}')
- el.value = '';
- else if(el.name == 'shoutbox_nickname' && el.value == '{/literal}{$deafultNick}{literal}')
- el.value = '';
-}
-
-function shoutbox_resetField(el) {
- var x = el.value;
- if(el.name == 'shoutbox_text' && x.length == 0) {
- el.value = '{/literal}{$defaultShout}{literal}';
- }
- else if(el.name == 'shoutbox_nickname' && el.value == '')
- el.value = '{/literal}{$deafultNick}{literal}';
-}
-</script>
-{/literal}
-
-{assign var="shoutsEnabled" value=$shoutbox->isShoutboxEnabled()}
-{if $shoutsEnabled}
-<form method='post' action='{$url->getIndexUrl()}?op=shoutboxNewShout&blogId={$blog->getId()}'>
- <input type="hidden" name="shoutbox_return" value="{$url->blogLink()}" />
- <textarea name="shoutbox_text" cols="15" rows="2" onfocus="shoutbox_clearField(this)" onblur="shoutbox_resetField(this)">{$defaultShout}</textarea>
- <br />
- <input type="text" name="shoutbox_nickname" value="{$deafultNick}" size="15" onfocus="shoutbox_clearField(this)" onblur="shoutbox_resetField(this)"/>
- <br />
- <input type="submit" name="shoutbox_submit" value="{$locale->tr("shout")}"/>
-</form>
-<br />
-{else}
-<p style='color: red;'>
-[shouting is temporarily disabled]
-</p>
-{/if}
Copied: plugins/trunk/shoutbox/templates-sample/standard/shoutbox.template (from rev 4487, plugins/branches/lifetype-1.1/shoutbox/templates-sample/standard/shoutbox.template)
Deleted: plugins/trunk/shoutbox/templates-sample/standard/shoutbox_history.template
===================================================================
--- plugins/branches/lifetype-1.1/shoutbox/templates-sample/standard/shoutbox_history.template 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/shoutbox/templates-sample/standard/shoutbox_history.template 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,32 +0,0 @@
-{assign var="shoutbox_include" value="$blogtemplate/shoutbox.template"}
-
-{include file="$blogtemplate/header.template"}
-
-<h1>Shoutbox History</h1>
-
-{if $prev_page}
-<a href='{$url->getIndexUrl()}?op=shoutboxHistory&page={$prev_page}&blogId={$blog->getId()}'>« {$locale->tr("prev_page")}</a>
-
-{/if}
-{if $next_page}
-<a href='{$url->getIndexUrl()}?op=shoutboxHistory&page={$next_page}&blogId={$blog->getId()}'>{$locale->tr("next_page")} »</a>
-{/if}
-<br /><br />
-
-{foreach from=$shoutsHistory item=shout}
- [{$shout.shout_date}] <<b>{$shout.nickname}</b>>
- {$shout.shout_text}<br />
-{/foreach}
-
-
-<p>
-{if $prev_page}
-<a href='{$url->getIndexUrl()}?op=shoutboxHistory&page={$prev_page}&blogId={$blog->getId()}'>« {$locale->tr("prev_page")}</a>
-
-{/if}
-{if $next_page}
-<a href='{$url->getIndexUrl()}?op=shoutboxHistory&page={$next_page}&blogId={$blog->getId()}'>{$locale->tr("next_page")} »</a>
-{/if}
-</p>
-
-{include file="$blogtemplate/footer.template"}
\ No newline at end of file
Copied: plugins/trunk/shoutbox/templates-sample/standard/shoutbox_history.template (from rev 4487, plugins/branches/lifetype-1.1/shoutbox/templates-sample/standard/shoutbox_history.template)
Modified: plugins/trunk/sitemap/pluginsitemap.class.php
===================================================================
--- plugins/trunk/sitemap/pluginsitemap.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/sitemap/pluginsitemap.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -122,10 +122,7 @@
// Data from the xml file that needs to be there.
$xmlData = "<?xml version='1.0' encoding='UTF-8'?>\n".
- "<urlset xmlns=\"http://www.google.com/schemas/sitemap/0.84\"\n".
- "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n".
- "xsi:schemaLocation=\"http://www.google.com/schemas/sitemap/0.84\n".
- "http://www.google.com/schemas/sitemap/0.84/sitemap.xsd\">\n";
+ "<urlset xmlns=\"http://www.sitemaps.org/schemas/sitemap/0.9\">\n";
// Iterate over the posts and create an entry for each.
Modified: plugins/trunk/smileys/pluginsmileys.class.php
===================================================================
--- plugins/trunk/smileys/pluginsmileys.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/smileys/pluginsmileys.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -159,7 +159,7 @@
$smileys = Smileys::loadSmileySet( $this->_smileySet );
$text = "";
- $rg = $blogInfo->getBlogRequestGenerator();
+ $rg = $this->blogInfo->getBlogRequestGenerator();
$prevIcon = "";
$currentIcon = "";
foreach( $smileys as $smiley => $icon ) {
Modified: plugins/trunk/sociable/pluginsociable.class.php
===================================================================
--- plugins/trunk/sociable/pluginsociable.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/sociable/pluginsociable.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -26,11 +26,12 @@
include_once( PLOG_CLASS_PATH."class/plugin/pluginmanager.class.php" );
include_once( PLOG_CLASS_PATH."plugins/sociable/class/sociable/sociable.php" );
include_once( PLOG_CLASS_PATH."plugins/sociable/class/extra/pluginsociableextrasites.inc.php" );
+ include_once( PLOG_CLASS_PATH."class/template/menu/menu.class.php" );
class PluginSociable extends PluginBase
{
- var $pluginEnabled;
+ var $pluginEnabled;
function PluginSociable()
@@ -77,7 +78,7 @@
$rg = $this->blogInfo->getBlogRequestGenerator();
- $str .= '<link rel="stylesheet" type="text/css" media="screen" href="' . $rg->blogLink() .'/plugins/sociable/class/sociable/sociable.css" />';
+ $str .= '<link rel="stylesheet" type="text/css" media="screen" href="' . $rg->getBaseUrl() .'/plugins/sociable/class/sociable/sociable.css" />';
}
@@ -88,10 +89,10 @@
function show($postId)
{
- global $sociable_builtin_known_sites;
+ global $sociable_builtin_known_sites;
global $sociable_plugin_extra_sites;
-
+
include( PLOG_CLASS_PATH."plugins/sociable/class/sociable/sociable.php" );
include( PLOG_CLASS_PATH."plugins/sociable/class/extra/pluginsociableextrasites.inc.php" );
@@ -106,6 +107,7 @@
$rg = $this->blogInfo->getBlogRequestGenerator();
+ $rg->setXHTML( false );
$post = $articles->getBlogArticle($postId);
$blogSettings = $this->blogInfo->getSettings();
$locale =& $this->blogInfo->getLocale();
@@ -131,11 +133,11 @@
$url = str_replace('BLOGNAME', $blogname, $url);
$str .= "<a href=\"$url\" title=\"$sitename\">";
- $str .= '<img src="'. $rg->blogLink() .'/plugins/sociable/class/sociable/images/' . $site['favicon'] . '" alt="' . $sitename .'" />';
+ $str .= '<img src="'. $rg->getBaseUrl() .'/plugins/sociable/class/sociable/images/' . $site['favicon'] . '" alt="' . $sitename .'" />';
$str .= "</a></li>\n";
}
-
+
foreach($sociable_plugin_extra_sites as $sitename=>$site)
{
$siteEnabled = $blogSettings->getValue("plugin_sociable_" . $sitename . "_enabled");
@@ -149,7 +151,7 @@
$url = str_replace('BLOGNAME', $blogname, $url);
$str .= "<a href=\"$url\" title=\"$sitename\">";
- $str .= '<img src="'. $rg->blogLink() .'/plugins/sociable/class/extra/images/' . $site['favicon'] . '" alt="' . $sitename .'" />';
+ $str .= '<img src="'. $rg->getBaseUrl() .'/plugins/sociable/class/extra/images/' . $site['favicon'] . '" alt="' . $sitename .'" />';
$str .= "</a></li>\n";
}
$str .= "</ul></div>\n";
@@ -160,11 +162,11 @@
function showAdmin()
{
- global $sociable_builtin_known_sites;
+ global $sociable_builtin_known_sites;
global $sociable_plugin_extra_sites;
- include( PLOG_CLASS_PATH."plugins/sociable/class/sociable/sociable.php" );
+ include( PLOG_CLASS_PATH."plugins/sociable/class/sociable/sociable.php" );
include( PLOG_CLASS_PATH."plugins/sociable/class/extra/pluginsociableextrasites.inc.php" );
@@ -181,7 +183,7 @@
$str .= '<div class="field">';
$str .= '<label for="'. $sitename . '">'.$sitename .'</label>';
$str .= '<div class="formHelp">';
- $str .= '<img src="'. $rg->blogLink() .'/plugins/sociable/class/sociable/images/' . $site['favicon'] . '" alt="' . $sitename .'" />';
+ $str .= '<img src="'. $rg->getBaseUrl() .'/plugins/sociable/class/sociable/images/' . $site['favicon'] . '" alt="' . $sitename .'" />';
$str .= '<input class="checkbox" type="checkbox" name="'. strtr($sitename, ".", "_") .'" id="'. strtr($sitename, ".", "_") .'"';
$siteEnabled = $blogSettings->getValue("plugin_sociable_" . $sitename . "_enabled");
@@ -199,7 +201,7 @@
$str .= '<div class="field">';
$str .= '<label for="'. $sitename . '">'.$sitename .'</label>';
$str .= '<div class="formHelp">';
- $str .= '<img src="'. $rg->blogLink() .'/plugins/sociable/class/extra/images/' . $site['favicon'] . '" alt="' . $sitename .'" />';
+ $str .= '<img src="'. $rg->getBaseUrl() .'/plugins/sociable/class/extra/images/' . $site['favicon'] . '" alt="' . $sitename .'" />';
$str .= '<input class="checkbox" type="checkbox" name="'. strtr($sitename, ".", "_") .'" id="'. strtr($sitename, ".", "_") .'"';
$siteEnabled = $blogSettings->getValue("plugin_sociable_" . $sitename . "_enabled");
Copied: plugins/trunk/stickyposts (from rev 4487, plugins/branches/lifetype-1.1/stickyposts)
Copied: plugins/trunk/stickyposts/class (from rev 4487, plugins/branches/lifetype-1.1/stickyposts/class)
Copied: plugins/trunk/stickyposts/class/action (from rev 4487, plugins/branches/lifetype-1.1/stickyposts/class/action)
Deleted: plugins/trunk/stickyposts/class/action/pluginstickypostsconfigaction.class.php
===================================================================
--- plugins/branches/lifetype-1.1/stickyposts/class/action/pluginstickypostsconfigaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/stickyposts/class/action/pluginstickypostsconfigaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,27 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- include_once( PLOG_CLASS_PATH."class/view/admin/adminplugintemplatedview.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/stickyposts/class/view/pluginstickypostsconfigview.class.php" );
-
- /**
- * shows a form with the current configuration
- */
- class PluginStickyPostsConfigAction extends AdminAction
- {
-
- function PluginRecentCommentsConfigAction( $actionInfo, $request )
- {
- $this->AdminAction( $actionInfo, $request );
- }
-
- function perform()
- {
- $this->_view = new PluginStickyPostsConfigView( $this->_blogInfo );
-
- $this->setCommonData();
-
- return true;
- }
- }
-?>
\ No newline at end of file
Copied: plugins/trunk/stickyposts/class/action/pluginstickypostsconfigaction.class.php (from rev 4487, plugins/branches/lifetype-1.1/stickyposts/class/action/pluginstickypostsconfigaction.class.php)
Deleted: plugins/trunk/stickyposts/class/action/pluginstickypostsupdateconfigaction.class.php
===================================================================
--- plugins/branches/lifetype-1.1/stickyposts/class/action/pluginstickypostsupdateconfigaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/stickyposts/class/action/pluginstickypostsupdateconfigaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,103 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- include_once( PLOG_CLASS_PATH."class/view/admin/adminplugintemplatedview.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/stickyposts/class/view/pluginstickypostsconfigview.class.php" );
-
- /**
- * updates the plugin configuration
- */
- class PluginStickyPostsUpdateConfigAction extends AdminAction
- {
- var $_pluginEnabled;
- var $_maxStickys;
- var $_maxAnnounces;
- var $_stickyCategoryId;
- var $_announceCategoryId;
-
- function PluginStickyPostsUpdateConfigAction( $actionInfo, $request )
- {
- $this->AdminAction( $actionInfo, $request );
- }
-
- function validate()
- {
- $errorMessages = array();
- $this->_pluginEnabled = $this->_request->getValue( "pluginEnabled" );
- $this->_pluginEnabled = ($this->_pluginEnabled != "" );
-
- $this->_maxStickys = $this->_request->getValue( "maxStickys" );
- if( $this->_maxStickys <= 0 || !ctype_digit($this->_maxStickys) ) {
- $errorMessages[] = "stickyposts_error_maxstickys";
- $isError = true;
- }
-
- $this->_maxAnnounces = $this->_request->getValue( "maxAnnounces" );
- if( $this->_maxAnnounces <= 0 || !ctype_digit($this->_maxAnnounces) ) {
- $errorMessages[] = "stickyposts_error_maxannounces";
- $isError = true;
- }
-
- $this->_stickyCategoryId = $this->_request->getValue( "stickyCategoryId" );
- if( $this->_stickyCategoryId == ""){
- $errorMessages[] = "stickyposts_error_stickyCategoryId";
- $isError = true;
- }
-
- $this->_announceCategoryId = $this->_request->getValue( "announceCategoryId" );
- if( $this->_announceCategoryId == ""){
- $errorMessages[] = "stickyposts_error_announceCategoryId";
- $isError = true;
- }
-
- if( count($errorMessages) > 0 ) {
- $this->_view = new PluginStickyPostsConfigView( $this->_blogInfo );
- $allerror='';
- foreach( $errorMessages as $error ){
- $allerror .= $this->_locale->tr($error).'<br />';
- }
- $this->_view->setErrorMessage( $this->_locale->tr($allerror));
- $this->setCommonData();
- return false;
- }
-
- return true;
- }
-
- function perform()
- {
- // // update the plugin configurations to blog setting
- $blogSettings = $this->_blogInfo->getSettings();
- $blogSettings->setValue( "plugin_stickyposts_enabled", $this->_pluginEnabled );
- $blogSettings->setValue( "plugin_stickyposts_maxstickys", $this->_maxStickys );
- $blogSettings->setValue( "plugin_stickyposts_maxannounces", $this->_maxAnnounces );
- $blogSettings->setValue( "plugin_stickyposts_stickycategoryid", $this->_stickyCategoryId );
- $blogSettings->setValue( "plugin_stickyposts_announcecategoryid", $this->_announceCategoryId );
- $this->_blogInfo->setSettings( $blogSettings );
-
- // save the blogs settings
- $blogs = new Blogs();
- if( !$blogs->updateBlog( $this->_blogInfo)) {
- $this->_view = new PluginStickyPostsConfigView( $this->_blogInfo );
- $this->_view->setErrorMessage( $this->_locale->tr("error_updating_settings"));
- $this->setCommonData();
-
- return false;
- }
-
- // if everything went ok...
- $this->_blogInfo->setSettings( $blogSettings );
- $this->_session->setValue( "blogInfo", $this->_blogInfo );
- $this->saveSession();
-
- $this->_view = new PluginStickyPostsConfigView( $this->_blogInfo );
- $this->_view->setSuccessMessage( $this->_locale->tr("stickyposts_settings_saved_ok"));
- $this->setCommonData();
-
- // clear the cache
- CacheControl::resetBlogCache( $this->_blogInfo->getId());
-
- return true;
- }
- }
-?>
Copied: plugins/trunk/stickyposts/class/action/pluginstickypostsupdateconfigaction.class.php (from rev 4487, plugins/branches/lifetype-1.1/stickyposts/class/action/pluginstickypostsupdateconfigaction.class.php)
Copied: plugins/trunk/stickyposts/class/view (from rev 4487, plugins/branches/lifetype-1.1/stickyposts/class/view)
Deleted: plugins/trunk/stickyposts/class/view/pluginstickypostsconfigview.class.php
===================================================================
--- plugins/branches/lifetype-1.1/stickyposts/class/view/pluginstickypostsconfigview.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/stickyposts/class/view/pluginstickypostsconfigview.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,49 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/view/admin/adminplugintemplatedview.class.php" );
-
- /**
- * implements the main view of the feed reader plugin
- */
- class PluginStickyPostsConfigView extends AdminPluginTemplatedView
- {
-
- function PluginStickyPostsConfigView( $blogInfo )
- {
- $this->AdminPluginTemplatedView( $blogInfo, "stickyposts", "stickyposts" );
- }
-
- function render()
- {
- // load some configuration settings
- $blogSettings = $this->_blogInfo->getSettings();
- $pluginEnabled = $blogSettings->getValue( "plugin_stickyposts_enabled" );
- $stickyCategoryId = $blogSettings->getValue( "plugin_stickyposts_stickycategoryid");
- $announceCategoryId = $blogSettings->getValue( "plugin_stickyposts_announcecategoryid");
- $maxStickys = $blogSettings->getValue( "plugin_stickyposts_maxstickys" );
- $maxAnnounces = $blogSettings->getValue( "plugin_stickyposts_maxAnnounces" );
- if ($maxStickys == "") $maxStickys = 5;
- if ($maxAnnounces == "") $maxAnnounces = 5;
-
- include_once( PLOG_CLASS_PATH."class/dao/articlecategories.class.php" );
- //get all categories's id and name as an assoication array
- $categories = new ArticleCategories();
- $blogId = $this->_blogInfo->getId();
- $allCategories = $categories->getBlogCategories( $blogId );
- $catNameId = array();
- foreach( $allCategories as $aCategory ){
- $catNameId[$aCategory->getId()] = $aCategory->getName();
- }
-
- // create a view and export the settings to the template
- $this->setValue( "pluginEnabled", $pluginEnabled );
- $this->setValue( "stickyCategoryId", $stickyCategoryId );
- $this->setValue( "announceCategoryId", $announceCategoryId );
- $this->setValue( "catNameId", $catNameId );
- $this->setValue( "maxStickys", $maxStickys );
- $this->setValue( "maxAnnounces", $maxAnnounces );
-
- parent::render();
- }
- }
-?>
Copied: plugins/trunk/stickyposts/class/view/pluginstickypostsconfigview.class.php (from rev 4487, plugins/branches/lifetype-1.1/stickyposts/class/view/pluginstickypostsconfigview.class.php)
Copied: plugins/trunk/stickyposts/locale (from rev 4487, plugins/branches/lifetype-1.1/stickyposts/locale)
Deleted: plugins/trunk/stickyposts/locale/locale_en_UK.php
===================================================================
--- plugins/branches/lifetype-1.1/stickyposts/locale/locale_en_UK.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/stickyposts/locale/locale_en_UK.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,17 +0,0 @@
-<?php
-$messages["manageRecentPlugins"] = "Recent Activities Management";
-$messages["RecentComments"] = "Recent Comments";
-$messages["recentcomments"] = "Recent Comments";
-$messages["view_comment_by"] = "View comment by %s";
-
-$messages["recentcomments_maxcomments"] = "Maximum Showed Comments";
-$messages["recentcomments_plugin_enabled"] = "Enable this plugin";
-$messages["recentcomments_plugin"] = "Recent Comments Plugin";
-
-$messages["recentcomments_settings_saved_ok"] = "Recent Comments settings saved successfully!";
-$messages["recentcomments_error_maxcomments"] = "Maximum Showed Comments Should > 0!";
-
-$messages["label_configuration"] = "Configuration";
-$messages["label_enable"] = "Enable";
-$messages["label_maxcomments"] = "Max Comments";
-?>
\ No newline at end of file
Copied: plugins/trunk/stickyposts/locale/locale_en_UK.php (from rev 4487, plugins/branches/lifetype-1.1/stickyposts/locale/locale_en_UK.php)
Deleted: plugins/trunk/stickyposts/locale/locale_es_ES.php
===================================================================
--- plugins/branches/lifetype-1.1/stickyposts/locale/locale_es_ES.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/stickyposts/locale/locale_es_ES.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,22 +0,0 @@
-<?php
-
-// Translation by Andres Bianciotto plog at a-b.com.ar
-// Date 09/Apr/2005
-//
-
-$messages["manageRecentPlugins"] = "Actividades recientes";
-$messages["RecentComments"] = "Comentarios Recientes";
-$messages["recentcomments"] = "Comentarios recientes";
-$messages["view_comment_by"] = "Ver comentario %s";
-
-$messages["recentcomments_maxcomments"] = "Máximo de coment. a mostrar";
-$messages["recentcomments_plugin_enabled"] = "Activar este plugin";
-$messages["recentcomments_plugin"] = "Plugin Comentarios recientes";
-
-$messages["recentcomments_settings_saved_ok"] = "Los datos se han guardado con éxito";
-$messages["recentcomments_error_maxcomments"] = "El máximo debe ser mayor a 0!";
-
-$messages["label_configuration"] = "Configuración";
-$messages["label_enable"] = "Activar";
-$messages["label_maxcomments"] = "Comentarios Máx";
-?>
\ No newline at end of file
Copied: plugins/trunk/stickyposts/locale/locale_es_ES.php (from rev 4487, plugins/branches/lifetype-1.1/stickyposts/locale/locale_es_ES.php)
Deleted: plugins/trunk/stickyposts/locale/locale_zh_CN.php
===================================================================
--- plugins/branches/lifetype-1.1/stickyposts/locale/locale_zh_CN.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/stickyposts/locale/locale_zh_CN.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,25 +0,0 @@
-<?php
-$messages["manageRecentPlugins"] = "网志最近活动管ç†";
-$messages["stickyposts"] = "置顶åŠå…¬å‘Šæ–‡ç« 设定";
-$messages["StickyPosts"] = "置顶åŠå…¬å‘Šæ–‡ç« 设定";
-
-$messages["stickyposts_maxstikcys"] = "ç½®é¡¶æ–‡ç« æ˜¾ç¤ºæ•°é‡";
-$messages["stickyposts_maxannounces"] = "å…¬å‘Šæ–‡ç« æ˜¾ç¤ºæ•°é‡";
-$messages["stickyposts_stickycategory"] = "é€‰æ‹©ç½®é¡¶æ–‡ç« çš„åˆ†ç±»";
-$messages["stickyposts_announcecategory"] = "é€‰æ‹©å…¬å‘Šæ–‡ç« çš„åˆ†ç±»";
-$messages["stickyposts_plugin_enabled"] = "å¯åŠ¨å¤–挂程åº";
-$messages["stickyposts_plugin"] = "置顶åŠå…¬å‘Šæ–‡ç« 外挂程åº";
-
-$messages["stickyposts_settings_saved_ok"] = "置顶åŠå…¬å‘Šæ–‡ç« 设定储å˜æˆåŠŸã€‚";
-$messages["stickyposts_error_maxstickys"] = "ç½®é¡¶æ–‡ç« æ˜¾ç¤ºæ•°é‡å¿…é¡»è¦ > 0!";
-$messages["stickyposts_error_maxannounces"] = "å…¬å‘Šæ–‡ç« æ˜¾ç¤ºæ•°é‡å¿…é¡»è¦ > 0!";
-$messages["stickyposts_error_stickycategoryid"] = "请选择一个分类å˜æ”¾ç½®é¡¶æ–‡ç« 。";
-$messages["stickyposts_error_announcecategoryid"] = "请选择一个分类å˜æ”¾ç½®é¡¶æ–‡ç« 。";
-
-$messages["label_configuration"] = "设定";
-$messages["label_enable"] = "å¯åŠ¨";
-$messages["label_maxstickys"] = "æ˜¾ç¤ºç½®é¡¶æ–‡ç« æ•°ç›®";
-$messages["label_maxannounces"] = "æ˜¾ç¤ºå…¬å‘Šæ–‡ç« æ•°ç›®";
-$messages["label_stickycategory"] = "æ˜¾ç¤ºç½®é¡¶æ–‡ç« çš„åˆ†ç±»";
-$messages["label_announcecategory"] = "æ˜¾ç¤ºå…¬å‘Šæ–‡ç« çš„åˆ†ç±»";
-?>
\ No newline at end of file
Copied: plugins/trunk/stickyposts/locale/locale_zh_CN.php (from rev 4487, plugins/branches/lifetype-1.1/stickyposts/locale/locale_zh_CN.php)
Deleted: plugins/trunk/stickyposts/locale/locale_zh_TW.php
===================================================================
--- plugins/branches/lifetype-1.1/stickyposts/locale/locale_zh_TW.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/stickyposts/locale/locale_zh_TW.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,25 +0,0 @@
-<?php
-$messages["manageRecentPlugins"] = "網誌最近活動管ç†";
-$messages["stickyposts"] = "ç½®é ‚åŠå…¬å‘Šæ–‡ç« è¨å®š";
-$messages["StickyPosts"] = "ç½®é ‚åŠå…¬å‘Šæ–‡ç« è¨å®š";
-
-$messages["stickyposts_maxstickys"] = "ç½®é ‚æ–‡ç« é¡¯ç¤ºæ•¸é‡";
-$messages["stickyposts_maxannounces"] = "å…¬å‘Šæ–‡ç« é¡¯ç¤ºæ•¸é‡";
-$messages["stickyposts_stickycategory"] = "é¸æ“‡ç½®é ‚æ–‡ç« çš„åˆ†é¡ž";
-$messages["stickyposts_announcecategory"] = "é¸æ“‡å…¬å‘Šæ–‡ç« 的分類";
-$messages["stickyposts_plugin_enabled"] = "啟動外掛程å¼";
-$messages["stickyposts_plugin"] = "ç½®é ‚åŠå…¬å‘Šæ–‡ç« 外掛程å¼";
-
-$messages["stickyposts_settings_saved_ok"] = "ç½®é ‚åŠå…¬å‘Šæ–‡ç« è¨å®šå„²å˜æˆåŠŸã€‚";
-$messages["stickyposts_error_maxstickys"] = "ç½®é ‚æ–‡ç« é¡¯ç¤ºæ•¸é‡å¿…é ˆè¦ > 0!";
-$messages["stickyposts_error_maxannounces"] = "å…¬å‘Šæ–‡ç« é¡¯ç¤ºæ•¸é‡å¿…é ˆè¦ > 0!";
-$messages["stickyposts_error_stickycategoryid"] = "è«‹é¸æ“‡ä¸€å€‹åˆ†é¡žå˜æ”¾ç½®é ‚æ–‡ç« ã€‚";
-$messages["stickyposts_error_announcecategoryid"] = "è«‹é¸æ“‡ä¸€å€‹åˆ†é¡žå˜æ”¾ç½®é ‚æ–‡ç« ã€‚";
-
-$messages["label_configuration"] = "è¨å®š";
-$messages["label_enable"] = "å•Ÿå‹•";
-$messages["label_maxstickys"] = "é¡¯ç¤ºç½®é ‚æ–‡ç« æ•¸ç›®";
-$messages["label_maxannounces"] = "é¡¯ç¤ºå…¬å‘Šæ–‡ç« æ•¸ç›®";
-$messages["label_stickycategory"] = "é¡¯ç¤ºç½®é ‚æ–‡ç« çš„åˆ†é¡ž";
-$messages["label_announcecategory"] = "é¡¯ç¤ºå…¬å‘Šæ–‡ç« çš„åˆ†é¡ž";
-?>
Copied: plugins/trunk/stickyposts/locale/locale_zh_TW.php (from rev 4487, plugins/branches/lifetype-1.1/stickyposts/locale/locale_zh_TW.php)
Deleted: plugins/trunk/stickyposts/pluginstickyposts.class.php
===================================================================
--- plugins/branches/lifetype-1.1/stickyposts/pluginstickyposts.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/stickyposts/pluginstickyposts.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,97 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/plugin/pluginbase.class.php" );
- include_once( PLOG_CLASS_PATH."class/plugin/pluginmanager.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/articles.class.php" );
-
- /**
- * Plugin that offers features to get all articles from specific article cateogries
- * as announcements and sticky articles.
- */
- class PluginStickyPosts extends PluginBase
- {
- var $pluginEnabled;
- var $stickyCategoryId; //store stickyCategoryId
- var $announceCategoryId; //store AnnounceCategoryId
- var $maxStickys;
- var $maxAnnounces;
-
- function PluginStickyPosts()
- {
- $this->PluginBase();
-
- $this->id = "stickyposts";
- $this->author = "lss(1.0)/EagleKing(porting to 1.1)";
- $this->desc = "This plugin offers features to get all articles from specific article cateogries as announcements and sticky articles.";
-
- $this->locales = Array( "en_UK" , "zh_TW" , "zh_CN", "es_ES" );
-
- $this->init();
- }
-
- function init()
- {
- $this->registerAdminAction( "stickyposts", "PluginStickyPostsConfigAction" );
- $this->registerAdminAction( "updatestickyposts", "PluginStickyPostsUpdateConfigAction" );
-
- $menu =& Menu::getMenu();
- if( !$menu->entryExists( "/menu/controlCenter/manageRecentPlugins" ))
- $this->addMenuEntry( "/menu/controlCenter", "manageRecentPlugins", "", "", true, false );
- $this->addMenuEntry( "/menu/controlCenter/manageRecentPlugins", "StickyPosts", "?op=stickyposts");
- }
-
- function register()
- {
- $blogSettings = $this->blogInfo->getSettings();
- $this->pluginEnabled = $blogSettings->getValue( "plugin_stickyposts_enabled" );
- $this->stickyCategoryId = $blogSettings->getValue( "plugin_stickyposts_stickycategoryid" );
- $this->announceCategoryId = $blogSettings->getValue( "plugin_stickyposts_announcecategoryid" );
- $this->maxStickys = $blogSettings->getValue( "plugin_stickyposts_maxstickys" );
- $this->maxAnnounces = $blogSettings->getValue( "plugin_stickyposts_maxannounces" );
- }
-
- function isEnabled()
- {
- return $this->pluginEnabled;
- }
-
- /**
- * Returns the stickyposts articles object of current blog
- */
- function getArticles( $catId )
- {
- if ( 'sticky' == $catId ){
- $catId = $this->stickyCategoryId;
- $maxpost = $this->maxStickys;
- } else if ( 'announce' == $catId ){
- $catId = $this->announceCategoryId;
- $maxpost = $this->maxAnnounces;
- } else if ( is_numeric( $catId ) ){
- $maxpost = -1;
- }else return null;
-
- $blogId = $this->blogInfo->getId();
-
- $articles = new Articles();
- $ret_articles = $articles->getBlogArticles( $blogId, -1, $maxpost, $catId, POST_STATUS_PUBLISHED );
-
- return $ret_articles;
- }
-
- function getCategory( $catId )
- {
- if ( 'sticky' == $catId ){
- $catId = $this->stickyCategoryId;
- } else if ( 'announce' == $catId ){
- $catId = $this->announceCategoryId;
- } else if ( !is_numeric( $catId ) ) return null;
-
- $blogId = $this->blogInfo->getId();
-
- $categories = new ArticleCategories();
- $ret_category = $categories->getCategory( $catId, $blogId );
-
- return $ret_category;
- }
- }
-?>
Copied: plugins/trunk/stickyposts/pluginstickyposts.class.php (from rev 4487, plugins/branches/lifetype-1.1/stickyposts/pluginstickyposts.class.php)
Deleted: plugins/trunk/stickyposts/readme-zh_CN.txt
===================================================================
--- plugins/branches/lifetype-1.1/stickyposts/readme-zh_CN.txt 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/stickyposts/readme-zh_CN.txt 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,55 +0,0 @@
-Ãû³Æ£º ÎÄÕÂÖö¥¼°¹«¸æ
-°æ±¾£º 1.1 ( Ö§³ÖLifeType 1.1.x)
-ÏÂÔØÁ¬½á£º http://sourceforge.net/projects/lifetype/ or http://www.pactofshadow.com/lifetype/2/articleperma/40.html
-³ÌʽÊÚȨ£º GPL
-×÷Õߣº lss(1.0) / EagleKing(porting to 1.1)
-
-ÓÃ;
-
-ÌṩÍøÖ¾×öÎÄÕÂÖö¥¼°ÓÃÎÄÕÂ×öΪÍøÕ¾¹«¸æ¡£
-
-É趨
-
-ºǫ́¹ÜÀí²¿·Ý£º
-
- 1. Ê×ÏÈÇ뽨Á¢Á½¸öÎÄÕ·ÖÀà´æ·Å¹«¸æ¼°Öö¥ÎÄÕ¡£
- 2. Äã¿ÉÒÔÔÚ ¸öÈËÍøÖ¾É趨 >> Öö¥¼°¹«¸æÎÄÕÂÉ趨 ½øÐи÷ÏîÉ趨¡£
- 3. Ô¤ÉèµÄÖö¥ÎÄÕÂÊýÄ¿¼°¹«¸æÎÄÕÂÊýÄ¿ÊÇ 5 ƪÎÄÕ£¬Äã¿ÉÒÔÐ޸ijÉÄãÒªÏÔʾµÄÊýÄ¿¡£
- 4. ÔÚÑ¡µ¥ÖÐÑ¡Ôñ´æ·ÅÖö¥ÎÄÕ¼°¹«¸æÎÄÕµķÖÀà¡£
-
-ÔÚÑù°æµµ°¸ÀÄã¿ÉÒÔʹÓãº
-
- 1. $stickyposts->isEnabled() ¼ì²é plugin ÊÇ·ñÒѾÆôÓá£
- 2. $stickyposts->getArticles( 'sticky' ) ´«»ØÖö¥ÎÄÕ嵀 article ÕóÁУ¬×î¶à´«»ØËùÉ趨µÄÖö¥ÎÄÕÂÊýÄ¿¡£
- 3. $stickyposts->getArticles( 'announce' ) ´«»Ø¹«¸æÎÄÕ嵀 article ÕóÁУ¬×î¶à´«»ØËùÉ趨µÄ¹«¸æÎÄÕÂÊýÄ¿¡£
- 4. $stickyposts->getArticles( 12 ) ´«»ØÖ¸¶¨ÎÄÕ·ÖÀà ID µÄËùÓÐÎÄÕ article ÕóÁС£±¾ÀýÖÐµÄ 12 ΪÎÄÕ·ÖÀà ID¡£
- 5. $stickyposts->getCategory( 'sticky' ) ´«»ØÓÃÓÚÖö¥ÎÄÕ嵀 category Îï¼þ£¬¿ÉÓÃÀ´×ö³É¸ü¶àÖö¥ÎÄÕ³¬Á¬½á¡£
- 6. $stickyposts->getCategory( 'announce' ) ´«»ØÓÃÓÚ¹«¸æÎÄÕ嵀 category Îï¼þ£¬¿ÉÓÃÀ´×ö³É¸ü¶à¹«¸æÎÄÕ³¬Á¬½á¡£
- 7. $stickyposts->getCategory( 12 ) ´«»ØÖ¸¶¨ÎÄÕ·ÖÀà ID µÄ category Îï¼þ¡£
-
-ÆäÖÐ 'sticky' ºÍ 'announce' ÊÇ plugin µÄ±£Áô×Ö¡£
-
-Ñù°æµµ·¶Àý£º
-
-ÒÔĬÈ쵀 'standrad' Ñù°æΪÀý×öÐ޸ġ£
-
-ÔÚ{if $category}<h2>{$locale->tr("category")}: {$category->getName()}</h2>{/if}
-ÏÂÃæÌí¼Ó
-
-{if empty($showAll) && $stickyposts->isEnabled()}
- <h2>Sticky Posts</h2>
- {assign var=stickys value=$stickyposts->getArticles('sticky')}
- {foreach from=$stickys item=post}
- <h3><a href="{$url->postPermalink($post)}">{$post->getTopic()}</a></h3>
- {/foreach}
- {assign var=stickyCategory value=$stickyposts->getCategory('sticky')}
- <h4><a href="{$url->categoryLink($stickyCategory)}">More Sticky...</a></h4>
-
- <h2>Announce Posts</h2>
- {assign var=stickys value=$stickyposts->getArticles('announce')}
- {foreach from=$stickys item=post}
- <h3><a href="{$url->postPermalink($post)}">{$post->getTopic()}</a></h3>
- {/foreach}
- {assign var=announceCategory value=$stickyposts->getCategory('announce')}
- <h4><a href="{$url->categoryLink($announceCategory)}">More Announce...</a></h4>
-{/if}
\ No newline at end of file
Copied: plugins/trunk/stickyposts/readme-zh_CN.txt (from rev 4487, plugins/branches/lifetype-1.1/stickyposts/readme-zh_CN.txt)
Deleted: plugins/trunk/stickyposts/readme-zh_TW.txt
===================================================================
--- plugins/branches/lifetype-1.1/stickyposts/readme-zh_TW.txt 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/stickyposts/readme-zh_TW.txt 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,55 +0,0 @@
-Ãû·Q£º ÎÄÕÂÖÃ피°¹«¸æ
-°æ±¾£º 1.1 ( Ö§³ÖLifeType 1.1.x)
-ÏÂÝdßB½Y£º http://sourceforge.net/projects/lifetype/ or http://www.pactofshadow.com/lifetype/2/articleperma/40.html
-³ÌʽÊڙࣺ GPL
-×÷Õߣº lss(1.0) / EagleKing(porting to 1.1)
-
-ÓÃ;
-
-Ìṩ¾WÖ¾×öÎÄÕÂÖÃ피°ÓÃÎÄÕÂ×öžé¾WÕ¾¹«¸æ¡£
-
-ÔO¶¨
-
-áą́¹ÜÀí²¿·Ý£º
-
- 1. Ê×ÏÈÕˆ½¨Á¢ƒÉ‚€ÎÄÕ·Öî´æ·Å¹«¸æ¼°ÖÃí”ÎÄÕ¡£
- 2. Äã¿ÉÒÔÔÚ ‚€È˾WÖ¾ÔO¶¨ >> ÖÃ피°¹«¸æÎÄÕÂÔO¶¨ ßMÐи÷í—ÔO¶¨¡£
- 3. îAÔOµÄÖÃí”ÎÄÕ”µÄ¿¼°¹«¸æÎÄÕ”µÄ¿ÊÇ 5 ƪÎÄÕ£¬Äã¿ÉÒÔÐ޸ijÉÄãÒªï@ʾµÄ”µÄ¿¡£
- 4. ÔÚßx†ÎÖÐßx“ñ´æ·ÅÖÃí”ÎÄÕ¼°¹«¸æÎÄÕµķÖî¡£
-
-ÔÚ˜Ó°æ™n°¸Ñe£¬Äã¿ÉÒÔʹÓãº
-
- 1. $stickyposts->isEnabled() ™z²é plugin ÊÇ·ñÒѽ›†¢Óá£
- 2. $stickyposts->getArticles( 'sticky' ) ‚÷»ØÖÃí”ÎÄÕ嵀 article ê‡ÁУ¬×î¶à‚÷»ØËùÔO¶¨µÄÖÃí”ÎÄÕ”µÄ¿¡£
- 3. $stickyposts->getArticles( 'announce' ) ‚÷»Ø¹«¸æÎÄÕ嵀 article ê‡ÁУ¬×î¶à‚÷»ØËùÔO¶¨µÄ¹«¸æÎÄÕ”µÄ¿¡£
- 4. $stickyposts->getArticles( 12 ) ‚÷»ØÖ¸¶¨ÎÄÕ·Öî ID µÄËùÓÐÎÄÕ article ê‡ÁС£±¾ÀýÖÐµÄ 12 žéÎÄÕ·Öî ID¡£
- 5. $stickyposts->getCategory( 'sticky' ) ‚÷»ØÓÃì¶ÖÃí”ÎÄÕ嵀 category Îï¼þ£¬¿ÉÓÃí×ö³É¸ü¶àÖÃí”ÎÄÕ³¬ßB½Y¡£
- 6. $stickyposts->getCategory( 'announce' ) ‚÷»ØÓÃ춹«¸æÎÄÕ嵀 category Îï¼þ£¬¿ÉÓÃí×ö³É¸ü¶à¹«¸æÎÄÕ³¬ßB½Y¡£
- 7. $stickyposts->getCategory( 12 ) ‚÷»ØÖ¸¶¨ÎÄÕ·Öî ID µÄ category Îï¼þ¡£
-
-ÆäÖÐ 'sticky' ºÍ 'announce' ÊÇ plugin µÄ±£Áô×Ö¡£
-
-˜Ó°æ™n¹ Àý£º
-
-ÒÔĬÕJµÄ 'standrad' ˜Ó°æžéÀý×öÐ޸ġ£
-
-ÔÚ{if $category}<h2>{$locale->tr("category")}: {$category->getName()}</h2>{/if}
-ÏÂÃæÌí¼Ó
-
-{if empty($showAll) && $stickyposts->isEnabled()}
- <h2>Sticky Posts</h2>
- {assign var=stickys value=$stickyposts->getArticles('sticky')}
- {foreach from=$stickys item=post}
- <h3><a href="{$url->postPermalink($post)}">{$post->getTopic()}</a></h3>
- {/foreach}
- {assign var=stickyCategory value=$stickyposts->getCategory('sticky')}
- <h4><a href="{$url->categoryLink($stickyCategory)}">More Sticky...</a></h4>
-
- <h2>Announce Posts</h2>
- {assign var=stickys value=$stickyposts->getArticles('announce')}
- {foreach from=$stickys item=post}
- <h3><a href="{$url->postPermalink($post)}">{$post->getTopic()}</a></h3>
- {/foreach}
- {assign var=announceCategory value=$stickyposts->getCategory('announce')}
- <h4><a href="{$url->categoryLink($announceCategory)}">More Announce...</a></h4>
-{/if}
\ No newline at end of file
Copied: plugins/trunk/stickyposts/readme-zh_TW.txt (from rev 4487, plugins/branches/lifetype-1.1/stickyposts/readme-zh_TW.txt)
Deleted: plugins/trunk/stickyposts/readme.txt
===================================================================
--- plugins/branches/lifetype-1.1/stickyposts/readme.txt 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/stickyposts/readme.txt 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,56 +0,0 @@
-Name: stickyposts
-Latest version: 1.1 (for LifeType 1.1.x)
-Download link: http://sourceforge.net/projects/lifetype/ or http://www.pactofshadow.com/lifetype/2/articleperma/40.html
-License: GPL
-Author: lss / EagleKing(1.1 porting)
-
-Description
-
-This plugin offers features to get all articles from specific article cateogries as announcements and sticky articles.
-
-Configuration
-
-In ControlCenter:
-
- 1. Create two categories for Sticky and Annouce.
- 2. You can configure this plugin in controlcetner >> StickyPosts .
- 3. maxStickys and maxAnnouces are numbers of sticky/announce articles for display in blog. The default value is 5.
- 4. Select category for store sticky/announce articles.
-
-In tempalte file, You can use:
-
- 1. $stickyposts->isEnabled() to check the plugin is enabled or not.
- 2. $stickyposts->getArticles( 'sticky' ) to get an array of articles for sticky.
- This will get max articles you set in controlcenter.
- 3. $stickyposts->getArticles( 'announce' ) to get an array of articles for announce.
- This will get max articles you set in controlcenter.
- 4. $stickyposts->getArticles( 12 ) to get an array of all articles for categoryId = 12.
- 5. $stickyposts->getCategory( 'sticky' ) to get an category object for sticky articles.
- 6. $stickyposts->getCategory( 'announce' ) to get an category object for annuonce articles.
- 7. $stickyposts->getCategory( 12 ) to get an category object for categoryId = 12.
-
-Where the 'sticky' and 'announce' are plugin reverse string.
-
-Example:
-Modifies main.template of template 'standard'
-below
-{if $category}<h2>{$locale->tr("category")}: {$category->getName()}</h2>{/if}
-add
-{if empty($showAll) && $stickyposts->isEnabled()}
- <h2>Sticky Posts</h2>
- {assign var=stickys value=$stickyposts->getArticles('sticky')}
- {foreach from=$stickys item=post}
- <h3><a href="{$url->postPermalink($post)}">{$post->getTopic()}</a></h3>
- {/foreach}
- {assign var=stickyCategory value=$stickyposts->getCategory('sticky')}
- <h4><a href="{$url->categoryLink($stickyCategory)}">More Sticky...</a></h4>
-
- <h2>Announce Posts</h2>
- {assign var=stickys value=$stickyposts->getArticles('announce')}
- {foreach from=$stickys item=post}
- <h3><a href="{$url->postPermalink($post)}">{$post->getTopic()}</a></h3>
- {/foreach}
- {assign var=announceCategory value=$stickyposts->getCategory('announce')}
- <h4><a href="{$url->categoryLink($announceCategory)}">More Announce...</a></h4>
-{/if}
-
Copied: plugins/trunk/stickyposts/readme.txt (from rev 4487, plugins/branches/lifetype-1.1/stickyposts/readme.txt)
Copied: plugins/trunk/stickyposts/templates (from rev 4487, plugins/branches/lifetype-1.1/stickyposts/templates)
Deleted: plugins/trunk/stickyposts/templates/stickyposts.template
===================================================================
--- plugins/branches/lifetype-1.1/stickyposts/templates/stickyposts.template 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/stickyposts/templates/stickyposts.template 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,57 +0,0 @@
-{include file="$admintemplatepath/header.template"}
-{include file="$admintemplatepath/navigation.template" showOpt=StickyPosts title=$locale->tr("stickyposts_plugin")}
-<form name="stickypostsPluginConfig" method="post">
- <fieldset class="inputField">
- <legend>{$locale->tr("label_configuration")}</legend>
- {include file="$admintemplatepath/successmessage.template"}
- {include file="$admintemplatepath/errormessage.template"}
- <div class="field">
- <label for="pluginEnabled">{$locale->tr("label_enable")}</label>
- <span class="required"></span>
- <div class="formHelp">
- <input class="checkbox" type="checkbox" name="pluginEnabled" id="pluginEnabled" {if $pluginEnabled} checked="checked" {/if} value="1" />{$locale->tr("stickyposts_plugin_enabled")}
- </div>
- </div>
-
- <div class="field">
- <label for="maxStickys">{$locale->tr("label_maxstickys")}</label>
- <span class="required">*</span>
- <div class="formHelp">{$locale->tr("stickyposts_maxstickys")}</div>
- <input class="text" type="text" name="maxStickys" id="maxStickys" value="{$maxStickys}" width="10" />
- </div>
-
- <div class="field">
- <label for="StickyCategory">{$locale->tr("label_stickycategory")}</label>
- <span class="required">*</span>
- <div class="formHelp">{$locale->tr("stickyposts_stickycategory")}</div>
- <select name=stickyCategoryId>
- {html_options options=$catNameId selected=$stickyCategoryId}
- </select>
- </div>
-
- <div class="field">
- <label for="maxAnnounces">{$locale->tr("label_maxannounces")}</label>
- <span class="required">*</span>
- <div class="formHelp">{$locale->tr("stickyposts_maxannounces")}</div>
- <input class="text" type="text" name="maxAnnounces" id="maxAnnounces" value="{$maxAnnounces}" width="10" />
- </div>
-
- <div class="field">
- <label for="AnnounceCategory">{$locale->tr("label_announcecategory")}</label>
- <span class="required">*</span>
- <div class="formHelp">{$locale->tr("stickyposts_announcecategory")}</div>
- <select name=announceCategoryId>
- {html_options options=$catNameId selected=$announceCategoryId}
- </select>
- </div>
-
- </fieldset>
-
- <div class="buttons">
- <input type="hidden" name="op" value="updatestickyposts" />
- <input type="reset" name="{$locale->tr("reset")}" />
- <input type="submit" name="{$locale->tr("update_settings")}" value="{$locale->tr("update")}" />
- </div>
-</form>
-{include file="$admintemplatepath/footernavigation.template"}
-{include file="$admintemplatepath/footer.template"}
Copied: plugins/trunk/stickyposts/templates/stickyposts.template (from rev 4487, plugins/branches/lifetype-1.1/stickyposts/templates/stickyposts.template)
Modified: plugins/trunk/tagcloud/class/action/plugintagcloudupdateconfigaction.class.php
===================================================================
--- plugins/trunk/tagcloud/class/action/plugintagcloudupdateconfigaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/tagcloud/class/action/plugintagcloudupdateconfigaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -16,6 +16,7 @@
var $_minWeight;
var $_maxWeight;
var $_bannedKeywords;
+ var $_minWordLength;
function PluginTagCloudUpdateConfigAction( $actionInfo, $request )
{
@@ -40,6 +41,7 @@
$this->_maxWeight = $this->_request->getValue( "maxWeight" );
$this->_bannedKeywords = $this->_request->getValue( "bannedKeywords" );
+ $this->_minWordLength = $this->_request->getValue( "minWordLength" );
return true;
}
@@ -56,6 +58,7 @@
$blogSettings->setValue( "plugin_tagcloud_min_weight", $this->_minWeight );
$blogSettings->setValue( "plugin_tagcloud_max_weight", $this->_maxWeight );
$blogSettings->setValue( "plugin_tagcloud_banned_keywords", $this->_bannedKeywords );
+ $blogSettings->setValue( "plugin_tagcloud_min_word_length", $this->_minWordLength );
$this->_blogInfo->setSettings( $blogSettings );
// save the blogs settings
Modified: plugins/trunk/tagcloud/class/view/plugintagcloudconfigview.class.php
===================================================================
--- plugins/trunk/tagcloud/class/view/plugintagcloudconfigview.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/tagcloud/class/view/plugintagcloudconfigview.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -3,7 +3,7 @@
include_once( PLOG_CLASS_PATH."class/view/admin/adminplugintemplatedview.class.php" );
/**
- * implements the main view of the feed reader plugin
+ * implements the main view of the tag cloud plugin
*/
class PluginTagCloudConfigView extends AdminPluginTemplatedView
{
@@ -26,9 +26,11 @@
$maxSize = $blogSettings->getValue( "plugin_tagcloud_max_size" );
if ($maxSize == "") $maxSize = 3;
$minWeight = $blogSettings->getValue( "plugin_tagcloud_min_weight" );
- if ($minWeight == "") $minWeight = 3;
+ if ($minWeight == "") $minWeight = 100;
$maxWeight = $blogSettings->getValue( "plugin_tagcloud_max_weight" );
- if ($maxWeight == "") $maxWeight = 10;
+ if ($maxWeight == "") $maxWeight = 900;
+ $minWordLength = $blogSettings->getValue( "plugin_tagcloud_min_word_length" );
+ if ($minWordLength == "") $minWordLength = 3;
$bannedKeywords = $blogSettings->getValue( "plugin_tagcloud_banned_keywords" );
if ($bannedKeywords == "") $bannedKeywords = implode( ",", array( 'a', 'an', 'the', 'and', 'of', 'i', 'its' , 'to', 'is', 'in', 'with', 'for', 'as', 'that', 'on', 'at', 'this', 'my', 'was', 'our', 'it', 'you', 'we', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', '10', 'about', 'after', 'all', 'almost', 'along', 'also', 'amp', 'another', 'any', 'are', 'area', 'around', 'available', 'back', 'be', 'because', 'been', 'being', 'best', 'better', 'big', 'bit', 'both', 'but', 'by', 'c', 'came', 'can', 'capable', 'control', 'could', 'course', 'd', 'dan', 'day', 'decided', 'did', 'didn', 'different', 'div', 'do', 'doesn', 'don', 'down', 'drive', 'e', 'each', 'easily', 'easy', 'edition', 'end', 'enough', 'even', 'every', 'example', 'few', 'find', 'first', 'found', 'from', 'get', 'go', 'going', 'good', 'got', 'gt', 'had', 'hard', 'has', 'have', 'he', 'her', 'here', 'how', 'if', 'into', 'isn', 'just', 'know', 'last', 'left', 'li', 'like', 'little', 'll', 'long', 'look', 'lot', 'lt', 'm', 'made', 'make', 'many', 'mb', 'me', 'menu', 'might', 'mm', 'more', 'most', 'much', 'name', 'nbsp', 'need', 'new', 'no', 'not', 'now', 'number', 'off', 'old', 'one', 'only', 'or', 'original', 'other', 'out', 'over', 'part', 'place', 'point', 'pretty', 'probably', 'problem', 'put', 'quite', 'quot', 'r', 're', 'really', 'results', 'right', 's', 'same', 'saw', 'see', 'set', 'several', 'she', 'sherree', 'should', 'since', 'size', 'small', 'so', 'some', 'something', 'special', 'still', 'stuff', 'such', 'sure', 'system', 't', 'take', 'than', 'their', 'them', 'then', 'there', 'these', 'they', 'thing', 'things', 'think', 'those', 'though', 'through', 'time', 'today', 'together', 'too', 'took', 'two', 'up', 'us', 'use', 'used', 'using', 've', 'very', 'want', 'way', 'well', 'went', 'were', 'what', 'when', 'where', 'which', 'while', 'white', 'who', 'will', 'would', 'your'));
;
@@ -42,6 +44,7 @@
$this->setValue( "minWeight", $minWeight );
$this->setValue( "maxWeight", $maxWeight );
$this->setValue( "bannedKeywords", $bannedKeywords );
+ $this->setValue( "minWordLength", $minWordLength );
parent::render();
}
Modified: plugins/trunk/tagcloud/locale/locale_en_UK.php
===================================================================
--- plugins/trunk/tagcloud/locale/locale_en_UK.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/tagcloud/locale/locale_en_UK.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -9,19 +9,21 @@
$messages["tagcloud_keywords"] = "Number of tags in the tag cloud.";
$messages["tagcloud_min_font"] = "Minimum font size for the cloud.";
$messages["tagcloud_max_font"] = "Maximum font size for the cloud.";
-$messages["tagcloud_min_weight"] = "Minimum font size for the cloud.";
-$messages["tagcloud_max_weight"] = "Maximum font size for the cloud.";
+$messages["tagcloud_min_weight"] = "Minimum font size for the cloud. (valid values: 100, 200, ..., 900)";
+$messages["tagcloud_max_weight"] = "Maximum font size for the cloud. (valid values: 100, 200, ..., 900)";
$messages["tagcloud_banned_keywords"] = "Keywords that should not appear in the tag cloud (comma separated).";
+$messages["tagcloud_min_word_length"] = "When searching for keywords, only use words this length or greater";
$messages["tagcloud_settings_saved_ok"] = "Tag Cloud settings saved successfully!";
$messages["label_configuration"] = "Configuration";
$messages["label_enable"] = "Enable";
-$messages["max_articles"] = "Max Articles";
-$messages["max_keywords"] = "Max Keywords";
-$messages["min_font_size"] = "Min Font Size";
-$messages["max_font_size"] = "Max Font Size";
-$messages["min_font_weight"] = "Min Font Weight";
-$messages["max_font_weight"] = "Max Font Weight";
+$messages["max_articles"] = "Maximum Articles";
+$messages["max_keywords"] = "Maximum Keywords";
+$messages["min_font_size"] = "Minimum Font Size";
+$messages["max_font_size"] = "Maximum Font Size";
+$messages["min_font_weight"] = "Minimum Font Weight";
+$messages["max_font_weight"] = "Maximum Font Weight";
$messages["banned_keywords"] = "Banned Keywords";
+$messages["min_word_length"] = "Minimum Keyword Length";
?>
\ No newline at end of file
Modified: plugins/trunk/tagcloud/plugintagcloud.class.php
===================================================================
--- plugins/trunk/tagcloud/plugintagcloud.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/tagcloud/plugintagcloud.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -47,7 +47,6 @@
$this->registerAdminAction( "tagcloud", "PluginTagCloudConfigAction" );
$this->registerAdminAction( "updateTagCloudConfig", "PluginTagCloudUpdateConfigAction" );
-
include_once( PLOG_CLASS_PATH."class/template/menu/menu.class.php" );
$menu =& Menu::getMenu();
if( !$menu->entryExists( "/menu/controlCenter/manageAppearancePlugins" ))
@@ -132,11 +131,11 @@
$minSize = $blogSettings->getValue( "plugin_tagcloud_min_size" );
$minWeight = $blogSettings->getValue( "plugin_tagcloud_min_weight" );
+ $minWordLength = $blogSettings->getValue( "plugin_tagcloud_min_word_length" );
$bannedwords = $blogSettings->getValue( "plugin_tagcloud_banned_keywords" );
- $bannedwords = explode(",", $bannedwords);
-
-
+ $bannedwords = explode(",", strtolower($bannedwords));
+
$MaxArticles = mysql_escape_string($MaxArticles);
$query = "SELECT t.normalized_text,t.normalized_topic FROM " . $this->_prefix .
@@ -147,7 +146,7 @@
$result = $this->db->Execute($query);
- if(!$result || ($result->RecordCount() == 0))
+ if(!$result || ($result->RecordCount() == 0))
return false;
// get the articles content
@@ -157,16 +156,17 @@
$data = implode(' ',$data);
// Split keywords
- $words = preg_split('/\s*[\s+\.|\?|,|(|)|\-+|\'|\"|!|=|;|×|\$|\/|:|{|}]\s*/i', $data);
+ $words = preg_split('/\s*[\s+\.|\?|,|(|)|\-+|\'|\"|!|=|;|×|\$|\/|:|{|}]\s*/i', strtolower($data));
$acv = array_count_values( $words );
-
+
// Remove unwanted keywords
foreach($acv as $k=>$v) {
- if (!array_search(strtolower($k),$bannedwords) and eregi("[a-zA-Z]",$k) and strlen($k)>2) {
- if (isset($new_acv[strtolower($k)] ))
- $new_acv[strtolower($k)] += $v;
+ $found = array_search($k,$bannedwords);
+ if(($found === FALSE || $found === NULL) && (strlen($k) >= $minWordLength)) {
+ if (isset($new_acv[$k]))
+ $new_acv[$k] += $v;
else
- $new_acv[strtolower($k)] = $v;
+ $new_acv[$k] = $v;
}
}
@@ -174,22 +174,21 @@
arsort($new_acv);
// Now limit the array to $MaxKeywords
- $chunkedArray = array_chunk( $new_acv, $MaxKeywords, true);
-
- // Get the first array chunk
- $new_acv = $chunkedArray[0];
+ $new_acv = array_slice($new_acv, 0, $MaxKeywords);
- $valueArray = array_values($new_acv);
- $maxValue = current($valueArray);
-
- $minValue = end($valueArray);
-
+ // get the highest and lowest occurrences
+ $maxValue = current($new_acv);
+ $minValue = end($new_acv);
+
// Sort the keys alphabetically.
ksort( $new_acv );
// Normalize the max value
$maxValue = $maxValue - $minValue;
-
+ // avoid a divide by zero if all of the words in our group
+ // occur exactly the same number of times.
+ if($maxValue == 0)
+ $maxValue = 1;
// Create the Cloud
$Cloud = '';
@@ -202,10 +201,11 @@
if ($size > $maxSize) $size = $maxSize;
if ($weight > $maxWeight) $weight = $maxWeight;
-
+ $weight = floor($weight / 100) * 100;
+
$rg = $this->blogInfo->getBlogRequestGenerator();
- $baseUrl = $rg->getBaseUrl();
- $Cloud .= "<a href=\"{$baseUrl}?searchTerms=$k&op=Search&blogId={$blogId}\" style=\"font-size: {$size}em; font-weight: {$weight}\" title=\"$k\">$k</a> \n";
+ $baseUrl = $rg->getBaseUrl();
+ $Cloud .= "<a rel=\"nofollow\" href=\"{$baseUrl}?searchTerms=$k&op=Search&blogId={$blogId}\" style=\"font-size: {$size}em; font-weight: {$weight}; line-height: 90%\" title=\"$k\">$k</a>\n";
}
$saveFile = $this->cacheFolder."/tagcloud";
Modified: plugins/trunk/tagcloud/templates/tagcloud.template
===================================================================
--- plugins/trunk/tagcloud/templates/tagcloud.template 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/tagcloud/templates/tagcloud.template 2007-01-04 19:10:56 UTC (rev 4488)
@@ -55,6 +55,13 @@
<input class="text" type="text" name="maxWeight" id="maxWeight" value="{$maxWeight}" width="10" />
</div>
+ <div class="field">
+ <label for="width">{$locale->tr("min_word_length")}</label>
+ <span class="required">*</span>
+ <div class="formHelp">{$locale->tr("tagcloud_min_word_length")}</div>
+ <input class="text" type="text" name="minWordLength" id="minWordLength" value="{$minWordLength}" width="3" />
+ </div>
+
<div class="field">
<label for="width">{$locale->tr("banned_keywords")}</label>
@@ -73,4 +80,4 @@
</div>
</form>
{include file="$admintemplatepath/footernavigation.template"}
-{include file="$admintemplatepath/footer.template"}
\ No newline at end of file
+{include file="$admintemplatepath/footer.template"}
Copied: plugins/trunk/technorati (from rev 4487, plugins/branches/lifetype-1.1/technorati)
Copied: plugins/trunk/technorati/_notes (from rev 4487, plugins/branches/lifetype-1.1/technorati/_notes)
Deleted: plugins/trunk/technorati/_notes/dwsync.xml
===================================================================
--- plugins/branches/lifetype-1.1/technorati/_notes/dwsync.xml 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/technorati/_notes/dwsync.xml 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<dwsync>
-<file name="plugintechnorati.class.php" local="127763991571875000" remote="127763959200000000" testing="0" />
-</dwsync>
\ No newline at end of file
Copied: plugins/trunk/technorati/_notes/dwsync.xml (from rev 4487, plugins/branches/lifetype-1.1/technorati/_notes/dwsync.xml)
Copied: plugins/trunk/technorati/class (from rev 4487, plugins/branches/lifetype-1.1/technorati/class)
Copied: plugins/trunk/technorati/class/action (from rev 4487, plugins/branches/lifetype-1.1/technorati/class/action)
Copied: plugins/trunk/technorati/class/action/_notes (from rev 4487, plugins/branches/lifetype-1.1/technorati/class/action/_notes)
Deleted: plugins/trunk/technorati/class/action/_notes/dwsync.xml
===================================================================
--- plugins/branches/lifetype-1.1/technorati/class/action/_notes/dwsync.xml 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/technorati/class/action/_notes/dwsync.xml 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<dwsync>
-<file name="admintechnoratipluginsettingsaction.class.php" local="127762957655625000" remote="127763130000000000" testing="0" />
-<file name="admintechnoratipluginupdatesettingsaction.class.php" local="127763084269843750" remote="127763130000000000" testing="0" />
-</dwsync>
\ No newline at end of file
Copied: plugins/trunk/technorati/class/action/_notes/dwsync.xml (from rev 4487, plugins/branches/lifetype-1.1/technorati/class/action/_notes/dwsync.xml)
Deleted: plugins/trunk/technorati/class/action/admintechnoratipluginsettingsaction.class.php
===================================================================
--- plugins/branches/lifetype-1.1/technorati/class/action/admintechnoratipluginsettingsaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/technorati/class/action/admintechnoratipluginsettingsaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,30 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/action/admin/blogowneradminaction.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/technorati/class/view/admintechnoratipluginsettingsview.class.php" );
-
- class AdminTechnoratiPluginSettingsAction extends BlogOwnerAdminAction
- {
-
- /**
- * Constructor. If nothing else, it also has to call the constructor of the parent
- * class, BlogAction with the same parameters
- */
- function AdminTechnoratiPluginSettingsAction( $actionInfo, $request )
- {
- $this->BlogOwnerAdminAction( $actionInfo, $request );
- }
-
- /**
- * Carries out the specified action
- */
- function perform()
- {
- $this->_view = new AdminTechnoratiPluginSettingsView( $this->_blogInfo );
-
- $this->setCommonData();
-
- return true;
- }
- }
-?>
Copied: plugins/trunk/technorati/class/action/admintechnoratipluginsettingsaction.class.php (from rev 4487, plugins/branches/lifetype-1.1/technorati/class/action/admintechnoratipluginsettingsaction.class.php)
Deleted: plugins/trunk/technorati/class/action/admintechnoratipluginupdatesettingsaction.class.php
===================================================================
--- plugins/branches/lifetype-1.1/technorati/class/action/admintechnoratipluginupdatesettingsaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/technorati/class/action/admintechnoratipluginupdatesettingsaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,123 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/action/admin/blogowneradminaction.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/technorati/class/view/admintechnoratipluginsettingsview.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/customfields/customfields.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/customfields/customfield.class.php" );
- include_once( PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php" );
-
- class AdminTechnoratiPluginUpdateSettingsAction extends BlogOwnerAdminAction
- {
-
- var $_pluginEnabled;
- var $_key;
- /**
- * Constructor. If nothing else, it also has to call the constructor of the parent
- * class, BlogAction with the same parameters
- */
- function AdminTechnoratiPluginUpdateSettingsAction( $actionInfo, $request )
- {
- $this->BlogOwnerAdminAction( $actionInfo, $request );
- }
-
- function validate()
- {
- $this->_pluginEnabled = $this->_request->getValue( "pluginEnabled" );
-
- if( $this->_pluginEnabled == "" )
- $this->_pluginEnabled = false;
- else
- $this->_pluginEnabled = true;
-
- // get the parameters from the request
- $this->_key = $this->_request->getValue( "pluginKey" );
-
- return true;
- }
-
- /**
- * checks if the fields already exist and if not, creates them
- *
- * @private
- */
- function _createFields()
- {
- $customFields = new CustomFields();
- $blogFields = $customFields->getBlogCustomFields( $this->_blogInfo->getId());
-
- // check if the checkbox fields exists
- if( !array_key_exists( "technoratiTags", $blogFields )) {
- $customTechnoratiTags = new CustomField( "technoratiTags",
- $this->_locale->tr("technoratiTags_help"),
- CUSTOM_FIELD_TEXTBOX,
- $this->_blogInfo->getId(),
- false,
- true );
- $customFields->addCustomField( $customTechnoratiTags );
- }
- return true;
- }
-
- /**
- * checks if the fields already exist and if so, disables them (sets them to be "hidden")
- *
- * @private
- */
- function _updateFields()
- {
- $customFields = new CustomFields();
- $blogFields = $customFields->getBlogCustomFields( $this->_blogInfo->getId());
-
- // check if the checkbox fields exists
- if( array_key_exists( "technoratiTags", $blogFields )) {
- $customTechnoratiTags = $blogFields["technoratiTags"];
- $customTechnoratiTags->setHidden( false );
- $customFields->updateCustomField( $customTechnoratiTags );
- }
- return true;
- }
-
- /**
- * Carries out the specified action
- */
- function perform()
- {
- // save the plugin settings to the db
- $blogSettings = $this->_blogInfo->getSettings();
- $blogSettings->setValue( "plugin_technorati_enabled", $this->_pluginEnabled );
- $blogSettings->setValue( "plugin_technorati_key", $this->_key );
- $this->_blogInfo->setSettings( $blogSettings );
- $blogs = new Blogs();
-
- // update the settings in the db, and make sure that everything went fine
- if( !$blogs->updateBlog( $this->_blogInfo )) {
- $this->_view = new AdminTechnoratiPluginSettingsView( $this->_blogInfo );
- $this->_view->setErrorMessage( $this->_locale->tr("error_updating_settings"));
- $this->setCommonData();
-
- return false;
- }
-
- // check if the fields already exist and if not, create them
- if( $this->_pluginEnabled )
- $this->_createFields();
- else
- $this->_updateFields();
-
- // if everything went ok...
- $this->_blogInfo->setSettings( $blogSettings );
- $this->_session->setValue( "blogInfo", $this->_blogInfo );
- $this->saveSession();
-
- $this->_view = new AdminTechnoratiPluginSettingsView( $this->_blogInfo );
- $this->_view->setSuccessMessage( $this->_locale->tr("technorati_settings_saved_ok"));
- $this->setCommonData();
-
- // clear the cache
- CacheControl::resetBlogCache( $this->_blogInfo->getId());
-
- return true;
- }
- }
-?>
\ No newline at end of file
Copied: plugins/trunk/technorati/class/action/admintechnoratipluginupdatesettingsaction.class.php (from rev 4487, plugins/branches/lifetype-1.1/technorati/class/action/admintechnoratipluginupdatesettingsaction.class.php)
Copied: plugins/trunk/technorati/class/tests (from rev 4487, plugins/branches/lifetype-1.1/technorati/class/tests)
Deleted: plugins/trunk/technorati/class/tests/plugintechnorati_test.class.php
===================================================================
--- plugins/branches/lifetype-1.1/technorati/class/tests/plugintechnorati_test.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/technorati/class/tests/plugintechnorati_test.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,196 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/test/helpers/lifetypetestcase.class.php" );
- include_once( PLOG_CLASS_PATH."class/config/config.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/bloginfo.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/users.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/userinfo.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/articlecategories.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/articlecategory.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/articles.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/userstatus.class.php" );
- include_once( PLOG_CLASS_PATH."class/net/xmlrpc/IXR_Library.lib.php" );
- include_once( PLOG_CLASS_PATH."class/net/url.class.php" );
- include_once( PLOG_CLASS_PATH."class/locale/locales.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/customfields/customfields.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/customfields/customfield.class.php" );
-
- /**
- * Unit test cases for the technorati plugin
- */
- class PluginTechnorati_Test extends LifeTypeTestCase
- {
- /**
- * dummy blog we'll be using during the tests
- */
- var $blog;
-
- /**
- * dummy blog owner
- */
- var $owner;
-
- /**
- * dummy category
- */
- var $cat;
-
- /**
- * URL pointing to this server's xmlrpc.php
- */
-
- function setUp()
- {
- // create the blog owner
- $this->owner = new UserInfo( md5(time()), // name
- "password", // password
- "whatever at whatever.com", // email address
- "", // about
- "" );
- $users = new Users();
- if( !$users->addUser( $this->owner )) {
- throw( new Exception( "Error adding test user" ));
- die();
- }
-
- // load a UTF-8 locale
- $zhLocale =& Locales::getLocale( "zh_CN" );
-
- // create the test blog
- $blogs = new Blogs();
- $this->blog = null;
- $this->blog = new BlogInfo( "test blog",
- $this->owner->getId(),
- "",
- new BlogSettings());
- $this->blog->setLocale( $zhLocale );
- if( !$blogs->addBlog( $this->blog )) {
- throw( new Exception( "Error adding test blog!" ));
- die();
- }
-
- // add a default category
- $this->cat = new ArticleCategory( "General",
- "Description for category General",
- $this->blog->getId(),
- true );
- $cats = new ArticleCategories();
- if( !$cats->addArticleCategory( $this->cat )) {
- throw( new Exception( "Error adding test category!" ));
- die();
- }
-
-
- // Add the custom fields.
-
- // NOTE: This should really just call the perform method on the
- // Update action
- // (How can you create a actionInfo?)
- $customFields = new CustomFields();
- $blogFields = $customFields->getBlogCustomFields( $this->blog->getId());
-
- // check if the checkbox fields exists
- if( !array_key_exists( "technoratiTags", $blogFields )) {
- $customTechnoratiTags = new CustomField( "technoratiTags",
- "technoratiTags_help",
- CUSTOM_FIELD_TEXTBOX,
- $this->blog->getId(),
- false,
- true );
- $customFields->addCustomField( $customTechnoratiTags );
- }
- }
-
- function tearDown()
- {
- $users = new Users();
- $users->deleteUser( $this->owner->getId());
-
- $blogs = new Blogs();
- $blogs->deleteBlog( $this->blog->getId());
-
- $cats = new ArticleCategories();
- $cats->deleteCategory( $this->cat->getId(), $this->blog->getId());
- }
-
- /**
- * test the generating url array
- */
-
- function testGenerateTags()
- {
- // create a new post first
- $article = new Article(
- "topic",
- "text",
- Array( $this->cat->getId()),
- $this->owner->getId(),
- $this->blog->getId(),
- POST_STATUS_PUBLISHED,
- 0
- );
- $articles = new Articles();
- $this->assertTrue( $articles->addArticle( $article ), "Unable to add a new test article" );
-
- $customFieldValue = new CustomFieldValue( "technoratiTags",
- "tag1,tag2,tag 3",
- $article->getId(),
- $this->blog->getId() );
-
- $article->setFields( Array( "technoratiTags" => $customFieldValue ) );
- $this->assertTrue( $articles->updateArticle( $article ), "Unable to update test article" );
-
- // Now make sure the tags are returned
- $pm =& PluginManager::getPluginManager(PLOG_CLASS_PATH."plugins/");
- $pm->setBlogInfo($this->blog);
- $pm->loadPlugins();
- $plugins = $pm->getPlugins();
-
- $plugin = $plugins["technorati"];
- $tagArray = $plugin->getTags($article);
-
- // see that the call was successful
- $this->assertEquals( "<a href='http://technorati.com/tag/tag1' rel='tag'>tag1</a>", $tagArray["tag1"], "Wrong tag" );
- $this->assertEquals( "<a href='http://technorati.com/tag/tag2' rel='tag'>tag2</a>", $tagArray["tag2"], "Wrong tag" );
- $this->assertEquals( "<a href='http://technorati.com/tag/tag+3' rel='tag'>tag 3</a>", $tagArray["tag 3"], "Wrong tag" );
-
- $this->assertTrue( $articles->deleteArticle( $article->getId(), $this->owner->getId(), $this->blog->getId(), true ),
- "Error deleting article" );
-
- }
-
- function testGenerateNoTags()
- {
- // create a new post first
- $article = new Article(
- "topic",
- "text",
- Array( $this->cat->getId()),
- $this->owner->getId(),
- $this->blog->getId(),
- POST_STATUS_PUBLISHED,
- 0
- );
- $articles = new Articles();
- $this->assertTrue( $articles->addArticle( $article ), "Unable to add a new test article" );
-
- // Now make sure the tags are returned
- $pm =& PluginManager::getPluginManager(PLOG_CLASS_PATH."plugins/");
- $pm->setBlogInfo($this->blog);
- $pm->loadPlugins();
- $plugins = $pm->getPlugins();
-
- $plugin = $plugins["technorati"];
- $tagArray = $plugin->getTags($article);
-
- // see that the call was successful
- $this->assertTrue( count($tagArray) == 0, "UnUnexpected tag" );
-
- $this->assertTrue( $articles->deleteArticle( $article->getId(), $this->owner->getId(), $this->blog->getId(), true ),
- "Error deleting article" );
-
- }
-
- }
-?>
\ No newline at end of file
Copied: plugins/trunk/technorati/class/tests/plugintechnorati_test.class.php (from rev 4487, plugins/branches/lifetype-1.1/technorati/class/tests/plugintechnorati_test.class.php)
Copied: plugins/trunk/technorati/class/view (from rev 4487, plugins/branches/lifetype-1.1/technorati/class/view)
Copied: plugins/trunk/technorati/class/view/_notes (from rev 4487, plugins/branches/lifetype-1.1/technorati/class/view/_notes)
Deleted: plugins/trunk/technorati/class/view/_notes/dwsync.xml
===================================================================
--- plugins/branches/lifetype-1.1/technorati/class/view/_notes/dwsync.xml 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/technorati/class/view/_notes/dwsync.xml 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<dwsync>
-<file name="admintechnoratipluginsettingsview.class.php" local="127762951005312500" remote="127763130000000000" testing="0" />
-</dwsync>
\ No newline at end of file
Copied: plugins/trunk/technorati/class/view/_notes/dwsync.xml (from rev 4487, plugins/branches/lifetype-1.1/technorati/class/view/_notes/dwsync.xml)
Deleted: plugins/trunk/technorati/class/view/admintechnoratipluginsettingsview.class.php
===================================================================
--- plugins/branches/lifetype-1.1/technorati/class/view/admintechnoratipluginsettingsview.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/technorati/class/view/admintechnoratipluginsettingsview.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,31 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/view/admin/adminplugintemplatedview.class.php" );
-
- /**
- * implements the main view of the feed reader plugin
- */
- class AdminTechnoratiPluginSettingsView extends AdminPluginTemplatedView
- {
-
- function AdminTechnoratiPluginSettingsView( $blogInfo )
- {
- $this->AdminPluginTemplatedView( $blogInfo, "technorati", "pluginsettings" );
- }
-
- function render()
- {
- // load some configuration settings
- $blogSettings = $this->_blogInfo->getSettings();
- $pluginEnabled = $blogSettings->getValue( "plugin_technorati_enabled" );
- $pluginKey = $blogSettings->getValue( "plugin_technorati_key" );
-
-
- // create a view and export the settings to the template
- $this->setValue( "pluginEnabled", $pluginEnabled );
- $this->setValue( "pluginKey", $pluginKey );
-
- parent::render();
- }
- }
-?>
\ No newline at end of file
Copied: plugins/trunk/technorati/class/view/admintechnoratipluginsettingsview.class.php (from rev 4487, plugins/branches/lifetype-1.1/technorati/class/view/admintechnoratipluginsettingsview.class.php)
Copied: plugins/trunk/technorati/locale (from rev 4487, plugins/branches/lifetype-1.1/technorati/locale)
Copied: plugins/trunk/technorati/locale/_notes (from rev 4487, plugins/branches/lifetype-1.1/technorati/locale/_notes)
Deleted: plugins/trunk/technorati/locale/_notes/dwsync.xml
===================================================================
--- plugins/branches/lifetype-1.1/technorati/locale/_notes/dwsync.xml 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/technorati/locale/_notes/dwsync.xml 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<dwsync>
-<file name="locale_en_UK.php" local="127763086940156250" remote="127763130000000000" testing="0" />
-</dwsync>
\ No newline at end of file
Copied: plugins/trunk/technorati/locale/_notes/dwsync.xml (from rev 4487, plugins/branches/lifetype-1.1/technorati/locale/_notes/dwsync.xml)
Deleted: plugins/trunk/technorati/locale/locale_en_UK.php
===================================================================
--- plugins/branches/lifetype-1.1/technorati/locale/locale_en_UK.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/technorati/locale/locale_en_UK.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,22 +0,0 @@
-<?php
-$messages["manageAppearancePlugins"] = "Appearance Management";
-$messages["technoratiPluginSettings"] = "Technorati";
-$messages["technorati"] = "Technorati";
-$messages["technoratiTags_help"] = "Technorati tags seperated by comma";
-
-$messages["technorati_plugin_enabled"] = "Enable this plugin";
-$messages["technorati_plugin"] = "Technorati Plugin";
-$messages["technorati_pluginkey"] = "Technorati API Key";
-
-$messages["label_configuration"] = "Configuration";
-$messages["label_enable"] = "Enable";
-$messages["label_pluginkey"] = "Technorati API Key";
-
-
-$messages["error_technorati_blogid_not_valid"] = "The blog identifier is not valid.";
-$messages["error_technorati_articleid_not_valid"] = "The article identifier is not valid.";
-$messages["error_technorati_article_not_exist"] = "The article does not exist!";
-
-$messages["technorati_settings_saved_ok"] = "technorati settings saved successfully!";
-
-?>
\ No newline at end of file
Copied: plugins/trunk/technorati/locale/locale_en_UK.php (from rev 4487, plugins/branches/lifetype-1.1/technorati/locale/locale_en_UK.php)
Deleted: plugins/trunk/technorati/plugintechnorati.class.php
===================================================================
--- plugins/branches/lifetype-1.1/technorati/plugintechnorati.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/technorati/plugintechnorati.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,79 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/plugin/pluginbase.class.php" );
-
- /**
- * our custom status for posts
- */
-
- /**
- * implements host blocking features
- */
- class PluginTechnorati extends PluginBase
- {
- var $pluginEnabled;
-
- function PluginTechnorati()
- {
- $this->PluginBase();
-
- $this->id = "technorati";
- $this->desc =<<<EOD
-Implements technorati tagging with a custom field.
-when posting, just type in your tags seperated by commas like <strong>'tag1, tag2, tag with space, tag4'</strong><br/>
-<br/>Place this in your <em>post.template</em>:
-<pre>{if \$technorati && \$technorati->isEnabled() }
-{assign var="tagString" value=\$technorati->getTags(\$post)}
-{foreach name=tags from=\$tagString item=tagLink}
- {if \$smarty.foreach.tags.first} technorati tags: {/if}
- {\$tagLink}
- {if !\$smarty.foreach.tags.last}, {/if}
-{/foreach}{/if}</pre>
-EOD;
-
- $this->author = "augur (letch @ augurnovo.com)";
- $this->locales = Array("en_UK" );
-
- $this->init();
- }
-
- /**
- * registers all the filters and actions that we're going to use
- */
- function init()
- {
- $this->registerAdminAction( "technoratiPluginSettings", "AdminTechnoratiPluginSettingsAction" );
- $this->registerAdminAction( "technoratiUpdateSettings", "AdminTechnoratiPluginUpdateSettingsAction" );
-
- // add a menu entry pluginTechoratiUpdateSettings
- $this->addMenuEntry( "/menu/Manage/managePosts", "technoratiPluginSettings", "admin.php?op=technoratiPluginSettings", "", true, false );
-
- }
-
- function register()
- {
- $blogSettings = $this->blogInfo->getSettings();
- $this->pluginEnabled = $blogSettings->getValue( "plugin_technorati_enabled" );
- }
-
- function isEnabled()
- {
- return $this->pluginEnabled;
- }
-
- function getTags($post){
- $tagString = $post->getField("technoratiTags");
- $tags = explode( ",", $tagString );
- $tagString = Array();
-
- foreach ($tags as $tagName){
- $tagName=trim($tagName);
- if ($tagName!="")
- $tagString[$tagName] ="<a href='http://technorati.com/tag/".urlencode($tagName)."' rel='tag'>".$tagName."</a>";
- }
-
- return $tagString;
-
- }
- }
-?>
\ No newline at end of file
Copied: plugins/trunk/technorati/plugintechnorati.class.php (from rev 4487, plugins/branches/lifetype-1.1/technorati/plugintechnorati.class.php)
Copied: plugins/trunk/technorati/templates (from rev 4487, plugins/branches/lifetype-1.1/technorati/templates)
Copied: plugins/trunk/technorati/templates/_notes (from rev 4487, plugins/branches/lifetype-1.1/technorati/templates/_notes)
Deleted: plugins/trunk/technorati/templates/_notes/dwsync.xml
===================================================================
--- plugins/branches/lifetype-1.1/technorati/templates/_notes/dwsync.xml 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/technorati/templates/_notes/dwsync.xml 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<dwsync>
-<file name="pluginsettings.template" local="127763081332343750" remote="127763130000000000" testing="0" />
-</dwsync>
\ No newline at end of file
Copied: plugins/trunk/technorati/templates/_notes/dwsync.xml (from rev 4487, plugins/branches/lifetype-1.1/technorati/templates/_notes/dwsync.xml)
Deleted: plugins/trunk/technorati/templates/pluginsettings.template
===================================================================
--- plugins/branches/lifetype-1.1/technorati/templates/pluginsettings.template 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/technorati/templates/pluginsettings.template 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,32 +0,0 @@
-{include file="$admintemplatepath/header.template"}
-{include file="$admintemplatepath/navigation.template" showOpt=technoratiPluginSettings title=$locale->tr("technorati_plugin")}
-<form name="pluginTechnoratiSettings" action="admin.php" method="get">
- <fieldset class="inputField">
- <legend>{$locale->tr("label_configuration")}</legend>
- {include file="$admintemplatepath/successmessage.template"}
- {include file="$admintemplatepath/errormessage.template"}
- <div class="field">
- <label for="pluginEnabled">{$locale->tr("label_enable")}</label>
- <span class="required"></span>
- <div class="formHelp">
- <input class="checkbox" type="checkbox" name="pluginEnabled" id="pluginEnabled" {if $pluginEnabled} checked="checked" {/if} value="1" />{$locale->tr("technorati_plugin_enabled")}
- </div>
- </div>
-
-
- <div class="field">
- <label for="pluginKey">{$locale->tr("label_pluginkey")}</label>
- <span class="required">*</span>
- <div class="formHelp">{$locale->tr("technorati_pluginkey")}</div>
- <input class="text" type="text" name="pluginKey" id="pluginKey" value="{$pluginKey}" width="20" />
- </div>
- </fieldset>
-
- <div class="buttons">
- <input type="hidden" name="op" value="technoratiUpdateSettings" />
- <input type="reset" name="{$locale->tr("reset")}" />
- <input type="submit" name="{$locale->tr("update")}" value="{$locale->tr("update")}" />
- </div>
-</form>
-{include file="$admintemplatepath/footernavigation.template"}
-{include file="$admintemplatepath/footer.template"}
\ No newline at end of file
Copied: plugins/trunk/technorati/templates/pluginsettings.template (from rev 4487, plugins/branches/lifetype-1.1/technorati/templates/pluginsettings.template)
Modified: plugins/trunk/templateeditor/class/action/pluginblogcopytemplatesetaction.class.php
===================================================================
--- plugins/trunk/templateeditor/class/action/pluginblogcopytemplatesetaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/templateeditor/class/action/pluginblogcopytemplatesetaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -50,7 +50,7 @@
if ( $this->_type == 1 ) {
$ts = new TemplateSets();
$blogTemplateSets = $ts->getBlogTemplateSets( $this->_blogInfo->getId(), false );
-
+
foreach ($blogTemplateSets as $template) {
if ( $template->getName() == $this->_newTemplateId ) {
$this->_view = new PluginBlogTemplateSetsListView( $this->_blogInfo );
@@ -103,7 +103,10 @@
}
}
- // if everything went ok...
+ // if everything went ok... we need to reload the blog from disk so that we can refresh the
+ // session data or else it'll be badly out of sync
+ $blogs = new Blogs();
+ $this->_blogInfo = $blogs->getBlogInfo( $this->_blogInfo->getId());
$this->_session->setValue( "blogInfo", $this->_blogInfo );
$this->saveSession();
Modified: plugins/trunk/templateeditor/class/action/pluginblogdeletetemplatesetsaction.class.php
===================================================================
--- plugins/trunk/templateeditor/class/action/pluginblogdeletetemplatesetsaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/templateeditor/class/action/pluginblogdeletetemplatesetsaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -78,6 +78,13 @@
if( $errorMessage != "" ) $this->_view->setErrorMessage( $errorMessage );
if( $successMessage != "" ) $this->_view->setSuccessMessage( $successMessage );
$this->setCommonData();
+
+ // if everything went ok... we need to reload the blog from disk so that we can refresh the
+ // session data or else it'll be badly out of sync
+ $blogs = new Blogs();
+ $this->_blogInfo = $blogs->getBlogInfo( $this->_blogInfo->getId());
+ $this->_session->setValue( "blogInfo", $this->_blogInfo );
+ $this->saveSession();
return true;
}
Modified: plugins/trunk/templateeditor/js/editor/smartyeditor.js
===================================================================
--- plugins/trunk/templateeditor/js/editor/smartyeditor.js 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/templateeditor/js/editor/smartyeditor.js 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,54 +1,4 @@
/**
- * SmartyEditor.js (Based on pLogEditor.js)
- *
- * Non-wysiwyg javascript-based editor for textarea controls in browsers. It works in
- * exactly the same as HTMLArea control but instead of graphically showing the contents
- * of the post, works based on raw html code. It does not offer as many features as
- * htmlarea but it does offer some other things as customizable toolbars, support
- * for text selections and ranges, etc. It should work in every major browser with
- * some support for DOM and DHTML.
- * It is very loosely based on Alex King's js_quicktags.js which is also used in Wordpress.
- * However, js_quicktags has the limitation that it can only work with one textarea per page
- * and plog for example needs two in the "new post" page. The code is javascript with OOP
- * so it might look a bit weird at first...
- * This code is licensed under the terms of the GPL license.
- *
- * -- Installation and usage --
- *
- * Place this file somewhere in your web server tree and from your html files, call it like
- * <html>
- * <head>
- * <link rel="stylesheet" href="smartyeditor.css" type="text/css">
- * <script type="text/javascript" src="smartyeditor.js"></script>
- * <script type="text/javascript">
- * // define where your images are...
- * var baseImageFolder='/devel/js/htmlarea/images';
- * </script>
- * </head>
- * <body>
- * <h1>SmartyEditor Javascript Sample</h1>
- * <form name="textEditor" id="textEditor">
- * text1:<br/>
- * <script type="text/javascript">ed1 = new SmartyEditor('text1', 'ed1');</script>
- * <textarea id="text1" name="text1" rows="8" cols="60"></textarea>
- * <br/>text2:<br/>
- * <script type="text/javascript">ed2 = new SmartyEditor('text2', 'ed2');</script>
- * <textarea id="text2" name="text1" rows="8" cols="60"></textarea>
- * </form>
- * </body>
- * </html>
- *
- * Create a new SmartyEditor object in the place where you would like to show the
- * toolbar of the editor. The first paramter for the constructor is the value of the 'id'
- * attribute of the textarea that will be the content area for the toolbar. The second parameter
- * is the name of the object itself, so if you are creating an editor called 'myEditor', the second
- * parameter will be 'myEditor'
- *
- * Please set the value of baseImageFolder to the base path where your icons are stored.
- */
-
-
-/**
* please change this if your icons are somewhere else!
*/
var baseImageFolder = 'plugins/templateeditor/js/editor/images';
@@ -266,7 +216,7 @@
this.toggle();
// if everything went fine, add the link and return
- var linkTag = '<a href="' + linkDest + '">' + linkDest + '</a>';
+ var linkTag = '<a href="' + linkDest + '">' + linkText + '</a>';
return linkTag;
}
@@ -383,6 +333,39 @@
}
/**
+ * special button that only adds an resource
+ *
+ * @param id
+ * @param display
+ * @param icon
+ */
+edButtonResource = function(id, display, icon)
+{
+ //
+ // strange javascript thingies used for object inheritance...
+ //
+ this.prototype = new edButton(id, display, '', '', icon, -1 );
+ this.prototype.constructor = edButton;
+ this.superclass = edButton;
+
+ this.superclass(id, display, '', '', icon, -1 );
+
+ /**
+ * reimplemented from edButton so that we can ask for an image url and a description
+ *
+ * @param txtId
+ */
+ this.execute = function( txtId, param )
+ {
+ if ( txtId == 'postText' )
+ resource_list_window(1);
+ else
+ resource_list_window(2);
+ return '';
+ }
+}
+
+/**
* implements drop-down lists
*/
edButtonList = function( id, options )
@@ -408,6 +391,8 @@
{
selectBox = '<select class="editorDropDownList" name=\''+this.id+'\' onChange="'+objName+'.execute(\'' + txtId + '\', \'' + this.id + '\', this);">';
for( var key in this.options ) {
+ if ( prototypeCompatibabilityCheck( key ) )
+ continue;
selectBox += '<option value=\''+key+'\'>'+this.options[key]+'</option>';
}
selectBox += '</select>';
@@ -503,48 +488,47 @@
// --
// our very own toolbar
// --
- this.toolBar = Array();
- options = new Array();
- options['8'] = '8 pt';
- options['10'] = '10 pt';
- options['12'] = '12 pt';
- options['14'] = '14 pt';
- options['18'] = '18 pt';
- options['24'] = '24 pt';
- options['36'] = '36 pt';
- this.toolBar['list_font_size'] = new edFontSizeList( 'list_font_size', options );
- this.toolBar['1_but_b'] = new edButton( '1_but_b', 'bold', '<strong>', '</strong>', 'ed_format_bold.gif', 1 );
- this.toolBar['2_but_i'] = new edButton( '2_but_i', 'italics', '<em>', '</em>', 'ed_format_italic.gif', 1 );
- this.toolBar['3_but_u'] = new edButton( '3_but_u', 'underline', '<span style="text-decoration:underline">', '</span>', 'ed_format_underline.gif', 1 );
- this.toolBar['4_but_strikethrough'] = new edButton( '4_but_strikethrough', 'strikethrough', '<span style="text-decoration: line-through;">', '</span>', 'ed_format_strike.gif', 1 );
- this.toolBar['but_sep1'] = new edButtonSeparator();
- this.toolBar['but_align_left'] = new edButton( 'but_align_left', 'align center', '<div style="text-align: left;">', '</div>', 'ed_align_left.gif' );
- this.toolBar['but_align_center'] = new edButton( 'but_align_center', 'align center', '<div style="text-align: center;">', '</div>', 'ed_align_center.gif' );
- this.toolBar['but_align_right'] = new edButton( 'but_align_right', 'align center', '<div style="text-align: right;">', '</div>', 'ed_align_right.gif' );
- this.toolBar['but_align_justify'] = new edButton( 'but_align_justify', 'align center', '<div style="text-align: justify;">', '</div>', 'ed_align_justify.gif' );
- this.toolBar['but_sep2'] = new edButtonSeparator();
- this.toolBar['but_ordered_list'] = new edButton( 'but_ordered_list', 'ordered list', '<ol><li></li></ol>', '', 'ed_list_num.gif', -1 );
- this.toolBar['but_unordered_list'] = new edButton( 'but_unordered_list', 'unordered list', '<ul><li></li></ul>', '', 'ed_list_bullet.gif', -1 );
- this.toolBar['5_but_a'] = new edButtonLink( '5_but_a', 'anchor', 'ed_link.gif' );
- this.toolBar['6_but_img']= new edButtonImage( '6_but_img', 'image', 'ed_image.gif' );
+ this.toolBar = Array();
+ options = new Array();
+ options['8'] = '8 pt';
+ options['10'] = '10 pt';
+ options['12'] = '12 pt';
+ options['14'] = '14 pt';
+ options['18'] = '18 pt';
+ options['24'] = '24 pt';
+ options['36'] = '36 pt';
+ this.toolBar['list_font_size'] = new edFontSizeList( 'list_font_size', options );
+ this.toolBar['1_but_b'] = new edButton( '1_but_b', 'bold', '<strong>', '</strong>', 'ed_format_bold.gif', 1 );
+ this.toolBar['2_but_i'] = new edButton( '2_but_i', 'italics', '<em>', '</em>', 'ed_format_italic.gif', 1 );
+ this.toolBar['3_but_u'] = new edButton( '3_but_u', 'underline', '<span style="text-decoration:underline">', '</span>', 'ed_format_underline.gif', 1 );
+ this.toolBar['4_but_strikethrough'] = new edButton( '4_but_strikethrough', 'strikethrough', '<span style="text-decoration: line-through;">', '</span>', 'ed_format_strike.gif', 1 );
+ this.toolBar['but_sep1'] = new edButtonSeparator();
+ this.toolBar['but_align_left'] = new edButton( 'but_align_left', 'align center', '<div style="text-align: left;">', '</div>', 'ed_align_left.gif' );
+ this.toolBar['but_align_center'] = new edButton( 'but_align_center', 'align center', '<div style="text-align: center;">', '</div>', 'ed_align_center.gif' );
+ this.toolBar['but_align_right'] = new edButton( 'but_align_right', 'align center', '<div style="text-align: right;">', '</div>', 'ed_align_right.gif' );
+ this.toolBar['but_align_justify'] = new edButton( 'but_align_justify', 'align center', '<div style="text-align: justify;">', '</div>', 'ed_align_justify.gif' );
+ this.toolBar['but_sep2'] = new edButtonSeparator();
+ this.toolBar['but_ordered_list'] = new edButton( 'but_ordered_list', 'ordered list', '<ol><li></li></ol>', '', 'ed_list_num.gif', -1 );
+ this.toolBar['but_unordered_list'] = new edButton( 'but_unordered_list', 'unordered list', '<ul><li></li></ul>', '', 'ed_list_bullet.gif', -1 );
+ this.toolBar['5_but_a'] = new edButtonLink( '5_but_a', 'anchor', 'ed_link.gif' );
+ this.toolBar['6_but_img']= new edButtonImage( '6_but_img', 'image', 'ed_image.gif' );
- this.toolBar['but_sep3'] = new edButtonSeparator();
- this.toolBar['but_smarty_assign'] = new edButton( 'but_smarty_assign', 'assign', '{assign var="" value=""}', '', 'smarty_assign.gif', -1 );
- this.toolBar['but_smarty_capture'] = new edButton( 'but_smarty_capture', 'capture', '{capture name=""}', '{/capture}', 'smarty_capture.gif' );
- this.toolBar['but_smarty_comment'] = new edButton( 'but_smarty_comment', 'comment', '{* *}', '', 'smarty_comment.gif', -1 );
- this.toolBar['but_smarty_config_load'] = new edButton( 'but_smarty_config_load', 'config_load', '{config_load file="" section="" scope=""}', '', 'smarty_config_load.gif', -1 );
- this.toolBar['but_smarty_delimiter'] = new edButton( 'but_smarty_delimiter', 'delimiter', '{ }', '', 'smarty_delimiter.gif', -1 );
- this.toolBar['but_smarty_foreach'] = new edButton( 'but_smarty_foreach', 'foreach', '{foreach from= item= name= key=}', '{/foreach}', 'smarty_foreach.gif' );
- this.toolBar['but_smarty_if'] = new edButton( 'but_smarty_if', 'if', '{if }', '{/if}', 'smarty_if.gif' );
- this.toolBar['but_smarty_include'] = new edButton( 'but_smarty_include', 'include', '{include file=""}', '', 'smarty_include.gif', -1 );
- // this.toolBar['but_smarty_includephp'] = new edButton( 'but_smarty_includephp', 'includephp', '{include_php file=""}', '', 'smarty_includephp.gif', -1 );
- this.toolBar['but_smarty_insert'] = new edButton( 'but_smarty_insert', 'insert', '{insert name=""}', '', 'smarty_insert.gif', -1 );
- this.toolBar['but_smarty_literal'] = new edButton( 'but_smarty_literal', 'literal', '{literal}', '{/literal}', 'smarty_literal.gif' );
- // this.toolBar['but_smarty_php'] = new edButton( 'but_smarty_php', 'php', '{php}', '{/php}', 'smarty_php.gif' );
- this.toolBar['but_smarty_section'] = new edButton( 'but_smarty_section', 'section', '{section name="" loop=}', '{/section}', 'smarty_section.gif' );
- this.toolBar['but_smarty_strip'] = new edButton( 'but_smarty_strip', 'strip', '{strip}', '{/strip}', 'smarty_strip.gif' );
-
-
+ this.toolBar['but_sep3'] = new edButtonSeparator();
+ this.toolBar['but_smarty_assign'] = new edButton( 'but_smarty_assign', 'assign', '{assign var="" value=""}', '', 'smarty_assign.gif', -1 );
+ this.toolBar['but_smarty_capture'] = new edButton( 'but_smarty_capture', 'capture', '{capture name=""}', '{/capture}', 'smarty_capture.gif' );
+ this.toolBar['but_smarty_comment'] = new edButton( 'but_smarty_comment', 'comment', '{* *}', '', 'smarty_comment.gif', -1 );
+ this.toolBar['but_smarty_config_load'] = new edButton( 'but_smarty_config_load', 'config_load', '{config_load file="" section="" scope=""}', '', 'smarty_config_load.gif', -1 );
+ this.toolBar['but_smarty_delimiter'] = new edButton( 'but_smarty_delimiter', 'delimiter', '{ }', '', 'smarty_delimiter.gif', -1 );
+ this.toolBar['but_smarty_foreach'] = new edButton( 'but_smarty_foreach', 'foreach', '{foreach from= item= name= key=}', '{/foreach}', 'smarty_foreach.gif' );
+ this.toolBar['but_smarty_if'] = new edButton( 'but_smarty_if', 'if', '{if }', '{/if}', 'smarty_if.gif' );
+ this.toolBar['but_smarty_include'] = new edButton( 'but_smarty_include', 'include', '{include file=""}', '', 'smarty_include.gif', -1 );
+// toolBar['but_smarty_includephp'] = new edButton( 'but_smarty_includephp', 'includephp', '{include_php file=""}', '', 'smarty_includephp.gif', -1 );
+ this.toolBar['but_smarty_insert'] = new edButton( 'but_smarty_insert', 'insert', '{insert name=""}', '', 'smarty_insert.gif', -1 );
+ this.toolBar['but_smarty_literal'] = new edButton( 'but_smarty_literal', 'literal', '{literal}', '{/literal}', 'smarty_literal.gif' );
+// toolBar['but_smarty_php'] = new edButton( 'but_smarty_php', 'php', '{php}', '{/php}', 'smarty_php.gif' );
+ this.toolBar['but_smarty_section'] = new edButton( 'but_smarty_section', 'section', '{section name="" loop=}', '{/section}', 'smarty_section.gif' );
+ this.toolBar['but_smarty_strip'] = new edButton( 'but_smarty_strip', 'strip', '{strip}', '{/strip}', 'smarty_strip.gif' );
+
/**
* returns whether our browser supports the features that we are going
* to use or not
@@ -571,11 +555,12 @@
markup = '';
- this.toolBar.sort();
document.write('<div class="textEditorToolbar" id="textEditorToolbar">');
for( var buttonId in this.toolBar ) {
- button = this.toolBar[buttonId];
- markup += button.show(this.txtId, this.objName);
+ if ( prototypeCompatibabilityCheck( buttonId ) )
+ continue;
+ button = this.toolBar[buttonId];
+ markup += button.show(this.txtId, this.objName);
}
document.write(markup);
document.write('</div>');
@@ -745,4 +730,50 @@
return selection;
}
+}
+
+// Add this function to Prototype Lib Compatibability Check
+function prototypeCompatibabilityCheck( str )
+{
+ if ( str == '_each' ||
+ str == '_reverse' ||
+ str == 'all' ||
+ str == 'any' ||
+ str == 'clear' ||
+ str == 'collect' ||
+ str == 'compact' ||
+ str == 'detect' ||
+ str == 'each' ||
+ str == 'entries' ||
+ str == 'extend' ||
+ str == 'find' ||
+ str == 'findAll' ||
+ str == 'first' ||
+ str == 'flatten' ||
+ str == 'grep' ||
+ str == 'include' ||
+ str == 'indices' ||
+ str == 'indexOf' ||
+ str == 'inject' ||
+ str == 'inspect' ||
+ str == 'invoke' ||
+ str == 'last' ||
+ str == 'map' ||
+ str == 'max' ||
+ str == 'member' ||
+ str == 'min' ||
+ str == 'partition' ||
+ str == 'pluck' ||
+ str == 'reject' ||
+ str == 'remove' ||
+ str == 'removeItem' ||
+ str == 'select' ||
+ str == 'shift' ||
+ str == 'sortBy' ||
+ str == 'toArray' ||
+ str == 'without' ||
+ str == 'zip')
+ return true;
+ else
+ return false;
}
\ No newline at end of file
Copied: plugins/trunk/templatefilter (from rev 4487, plugins/branches/lifetype-1.1/templatefilter)
Deleted: plugins/trunk/templatefilter/plugintemplatefilter.class.php
===================================================================
--- plugins/branches/lifetype-1.1/templatefilter/plugintemplatefilter.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/templatefilter/plugintemplatefilter.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,251 +0,0 @@
-<?php
-
-/*
- * Plugin: Template Filter Prototype (for Life Type 1.1)
- * Version: 1.0
- * Author: Pan Ying(http://www.pactofshadow.com/lifetype/~nest)
- * Contact: panying2000 at gmail.com
- * Release: 2006.10.4
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- */
-
- include_once( PLOG_CLASS_PATH."class/plugin/pluginbase.class.php" );
- //include_once( PLOG_CLASS_PATH."class/template/menu/menu.class.php" );
-
- //var $arrayPluginTemplateFilterSmartyPostFilter;
- //var $arrayPluginTemplateFilterSmartyPreFilter;
-
-
- class PluginTemplateFilter extends PluginBase
- {
-
- function PluginTemplateFilter()
- {
-
- global $arrayPluginTemplateFilterSmartyPostFilter;
- global $arrayPluginTemplateFilterSmartyPreFilter;
-
- $this->PluginBase();
-
- $this->id = "templatefilter";
- $this->author = "EagleKing";
-
- //no menu now ...
-
- if (!isset($arrayPluginTemplateFilterSmartyPostFilter))
- $arrayPluginTemplateFilterSmartyPostFilter = array();
-
- //this is after compile
-
- //test only , for test the plugin is work or not
- $arrayPluginTemplateFilterSmartyPostFilter[] = Array(
- "pattern" => "'</head>'",
- "replace" => "</head>PluginTemplateFilterSmartyPostFilter Apllyed here",
- "templatename" => "all",
- "group" => 0 ,
- "onlymatch" => false,
- "disabled" => true
- );
-
- //add text before document end , could add Google Analytics here
- $arrayPluginTemplateFilterSmartyPostFilter[] = Array(
- "pattern" => "/<\/body>/i",
- "replace" => "<script src=\"http://www.google-analytics.com/urchin.js\" type=\"text/javascript\">
-</script>
-<script type=\"text/javascript\">
-_uacct = \"type your own code\";
-urchinTracker();
-</script></body>",
- "templatename" => "footer.template",
- "group" => 0,
- "onlymatch" => false ,
- "disabled" => false
- );
-
- if (!isset($arrayPluginTemplateFilterSmartyPreFilter))
- $arrayPluginTemplateFilterSmartyPreFilter = array();
-
- //this is before complie
-
- //replace <!-- \[authImage plugin\] --> to AuthImage
- $arrayPluginTemplateFilterSmartyPreFilter[] = Array(
- "pattern" => "'<!-- \[authImage plugin\] -->'",
- "replace" => "{if \$authimage->isEnabled()}
-<div><label for=\"authImage\">authImage</label><input type=\"text\" name=\"authImage\" id=\"authImage\" value=\"\" /> {\$authimage->show()}</div>
-{/if}",
- "templatename" => "commentform.template",
- "group" => 5 ,
- "onlymatch" => false,
- "disabled" => false
- );
-
- //has install authImage in template ?
- $arrayPluginTemplateFilterSmartyPreFilter[] = Array(
- "pattern" => "/authImage/i",
- "replace" => "",
- "templatename" => "commentform.template",
- "group" => 5,
- "onlymatch" => true,
- "disabled" => false
- );
-
- //try to find a correct postion to put AuthImage anyway
- $arrayPluginTemplateFilterSmartyPreFilter[] = Array(
- "pattern" => "/<\/form>/i",
- "replace" => "{if \$authimage->isEnabled()}
-<div><label for=\"authImage\">authImage</label><input type=\"text\" name=\"authImage\" id=\"authImage\" value=\"\" /> {\$authimage->show()}</div>
-{/if}
-</form>",
- "templatename" => "commentform.template",
- "group" => 5 ,
- "onlymatch" => false,
- "disabled" => false
- );
-
- }
- }
-
- function PluginTemplateFilterSmartyPostFilter($tpl_output, &$smarty)
- {
- global $arrayPluginTemplateFilterSmartyPostFilter;
-
- //echo "PluginTemplateFilterSmartyPostFilter call here".$smarty->_current_file;
-
- if (!is_array($arrayPluginTemplateFilterSmartyPostFilter))
- return $tpl_output;
-
- $patharray = explode ('/', $smarty->_current_file);
- if (count($patharray)<=0)
- $templatename = "";
- else
- $templatename = $patharray[count($patharray)-1];
-
- if (count($patharray)<=1)
- $templatedir = "";
- else
- $templatedir = $patharray[count($patharray)-2];
-
- if ($templatedir == "wizard" ||
- $templatedir == "admin" ||
- $templatedir == "rss")
- return $tpl_output;
-
- $proccessedgroup = Array();
-
- foreach ($arrayPluginTemplateFilterSmartyPostFilter as $filter)
- {
-
- //var_dump($filter);
-
- if ( $filter["group"] != 0
- && isset($proccessedgroup[$filter["group"]])
- && $proccessedgroup[$filter["group"]] == "1")
- continue;
-
- if ($filter["disabled"])
- continue;
-
- if ($filter["templatename"] == "all" ||
- $filter["templatename"] == $templatename)
- {
-
- if ($filter["onlymatch"])
- {
- if (preg_match($filter["pattern"],$tpl_output) >0)
- $proccessedgroup[$filter["group"]] = "1";
- }
- else
- {
- $tpl_output_after =
- preg_replace($filter["pattern"],
- $filter["replace"], $tpl_output);
-
- if ($filter["group"] == 0 || $tpl_output_after != $tpl_output)
- {
-
- $tpl_output = $tpl_output_after;
- $proccessedgroup[$filter["group"]] = "1";
- }
- }
-
- }
- }
-
-
- return $tpl_output;
- }
-
- function PluginTemplateFilterSmartyPreFilter($tpl_output, &$smarty)
- {
- global $arrayPluginTemplateFilterSmartyPreFilter;
-
- //echo "PluginTemplateFilterSmartyPreFilter call here".$smarty->_current_file;
-
- if (!is_array($arrayPluginTemplateFilterSmartyPreFilter))
- return $tpl_output;
-
- $patharray = explode ('/', $smarty->_current_file);
- if (count($patharray)<=0)
- $templatename = "";
- else
- $templatename = $patharray[count($patharray)-1];
-
- if (count($patharray)<=1)
- $templatedir = "";
- else
- $templatedir = $patharray[count($patharray)-2];
-
- if ($templatedir == "wizard" ||
- $templatedir == "admin" ||
- $templatedir == "rss")
- return $tpl_output;
-
- $proccessedgroup = Array();
-
- foreach ($arrayPluginTemplateFilterSmartyPreFilter as $filter)
- {
-
- //var_dump($filter);
-
- if ( $filter["group"] != 0
- && isset($proccessedgroup[$filter["group"]])
- && $proccessedgroup[$filter["group"]] == "1")
- continue;
-
- if ($filter["disabled"])
- continue;
-
- if ($filter["templatename"] == "all" ||
- $filter["templatename"] == $templatename)
- {
-
- if ($filter["onlymatch"])
- {
- if (preg_match($filter["pattern"],$tpl_output) >0)
- $proccessedgroup[$filter["group"]] = "1";
- }
- else
- {
- $tpl_output_after =
- preg_replace($filter["pattern"],
- $filter["replace"], $tpl_output);
-
- if ($filter["group"] == 0 || $tpl_output_after != $tpl_output)
- {
-
- $tpl_output = $tpl_output_after;
- $proccessedgroup[$filter["group"]] = "1";
- }
- }
-
- }
- }
-
-
-
- return $tpl_output;
- }
-
-?>
\ No newline at end of file
Copied: plugins/trunk/templatefilter/plugintemplatefilter.class.php (from rev 4487, plugins/branches/lifetype-1.1/templatefilter/plugintemplatefilter.class.php)
Deleted: plugins/trunk/templatefilter/readme.txt
===================================================================
--- plugins/branches/lifetype-1.1/templatefilter/readme.txt 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/templatefilter/readme.txt 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,17 +0,0 @@
-Plugin: Template Filter(Prototype Version)
-Author: Pan Ying(panying2000 at gmail.com)
-Version: 1.0
-Release Date: 2006/10/04
-Chinese Note: http://www.pactofshadow.com/lifetype/2/articleperma/15.html
-
-
-This plugin provide a globe method to insernt code in every template before their render.
-
-Setup:
-1.Insernt these code inside <lifetype>\class\template\template.class.php after line 95:
-
-include_once( PLOG_CLASS_PATH."plugins/templatefilter/plugintemplatefilter.class.php" );
-Smarty::register_postfilter('PluginTemplateFilterSmartyPostFilter');
-Smarty::register_prefilter('PluginTemplateFilterSmartyPreFilter');
-
-2.Copy the file in the zip to <lifetype>\plugins\templatefilter\
\ No newline at end of file
Copied: plugins/trunk/templatefilter/readme.txt (from rev 4487, plugins/branches/lifetype-1.1/templatefilter/readme.txt)
Copied: plugins/trunk/topcommentposts (from rev 4487, plugins/branches/lifetype-1.1/topcommentposts)
Copied: plugins/trunk/topcommentposts/class (from rev 4487, plugins/branches/lifetype-1.1/topcommentposts/class)
Copied: plugins/trunk/topcommentposts/class/action (from rev 4487, plugins/branches/lifetype-1.1/topcommentposts/class/action)
Deleted: plugins/trunk/topcommentposts/class/action/plugintopcommentpostsconfigaction.class.php
===================================================================
--- plugins/branches/lifetype-1.1/topcommentposts/class/action/plugintopcommentpostsconfigaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/topcommentposts/class/action/plugintopcommentpostsconfigaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,27 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- include_once( PLOG_CLASS_PATH."class/view/admin/adminplugintemplatedview.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/topcommentposts/class/view/plugintopcommentpostsconfigview.class.php" );
-
- /**
- * shows a form with the current configuration
- */
- class PluginTopCommentPostsConfigAction extends AdminAction
- {
-
- function PluginTopCommentPostsConfigAction( $actionInfo, $request )
- {
- $this->AdminAction( $actionInfo, $request );
- }
-
- function perform()
- {
- $this->_view = new PluginTopCommentPostsConfigView( $this->_blogInfo );
-
- $this->setCommonData();
-
- return true;
- }
- }
-?>
\ No newline at end of file
Copied: plugins/trunk/topcommentposts/class/action/plugintopcommentpostsconfigaction.class.php (from rev 4487, plugins/branches/lifetype-1.1/topcommentposts/class/action/plugintopcommentpostsconfigaction.class.php)
Deleted: plugins/trunk/topcommentposts/class/action/plugintopcommentpostsupdateconfigaction.class.php
===================================================================
--- plugins/branches/lifetype-1.1/topcommentposts/class/action/plugintopcommentpostsupdateconfigaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/topcommentposts/class/action/plugintopcommentpostsupdateconfigaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,69 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- include_once( PLOG_CLASS_PATH."class/view/admin/adminplugintemplatedview.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/topcommentposts/class/view/plugintopcommentpostsconfigview.class.php" );
-
- /**
- * updates the plugin configuration
- */
- class PluginTopCommentPostsUpdateConfigAction extends AdminAction
- {
- var $_pluginEnabled;
- var $_maxPosts;
-
- function PluginRTopCommentPostsUpdateConfigAction( $actionInfo, $request )
- {
- $this->AdminAction( $actionInfo, $request );
- }
-
- function validate()
- {
- $this->_pluginEnabled = $this->_request->getValue( "pluginEnabled" );
- $this->_pluginEnabled = ($this->_pluginEnabled != "" );
- $this->_maxPosts = $this->_request->getValue( "maxPosts" );
- if( $this->_maxPosts <= 0 || !ctype_digit($this->_maxPosts) ) {
- $this->_view = new PluginTopCommentPostsConfigView( $this->_blogInfo );
- $this->_view->setErrorMessage( $this->_locale->tr("topcommentposts_error_maxposts"));
- $this->setCommonData();
-
- return false;
- }
-
- return true;
- }
-
- function perform()
- {
- // // update the plugin configurations to blog setting
- $blogSettings = $this->_blogInfo->getSettings();
- $blogSettings->setValue( "plugin_topcommentposts_enabled", $this->_pluginEnabled );
- $blogSettings->setValue( "plugin_topcommentposts_maxposts", $this->_maxPosts );
- $this->_blogInfo->setSettings( $blogSettings );
-
- // save the blogs settings
- $blogs = new Blogs();
- if( !$blogs->updateBlog( $this->_blogInfo )) {
- $this->_view = new PluginTopCommentPostsConfigView( $this->_blogInfo );
- $this->_view->setErrorMessage( $this->_locale->tr("error_updating_settings"));
- $this->setCommonData();
-
- return false;
- }
-
- // if everything went ok...
- $this->_blogInfo->setSettings( $blogSettings );
- $this->_session->setValue( "blogInfo", $this->_blogInfo );
- $this->saveSession();
-
- $this->_view = new PluginTopCommentPostsConfigView( $this->_blogInfo );
- $this->_view->setSuccessMessage( $this->_locale->tr("topcommentposts_settings_saved_ok"));
- $this->setCommonData();
-
- // clear the cache
- CacheControl::resetBlogCache( $this->_blogInfo->getId());
-
- return true;
- }
- }
-?>
\ No newline at end of file
Copied: plugins/trunk/topcommentposts/class/action/plugintopcommentpostsupdateconfigaction.class.php (from rev 4487, plugins/branches/lifetype-1.1/topcommentposts/class/action/plugintopcommentpostsupdateconfigaction.class.php)
Copied: plugins/trunk/topcommentposts/class/view (from rev 4487, plugins/branches/lifetype-1.1/topcommentposts/class/view)
Deleted: plugins/trunk/topcommentposts/class/view/plugintopcommentpostsconfigview.class.php
===================================================================
--- plugins/branches/lifetype-1.1/topcommentposts/class/view/plugintopcommentpostsconfigview.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/topcommentposts/class/view/plugintopcommentpostsconfigview.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,31 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/view/admin/adminplugintemplatedview.class.php" );
-
- /**
- * implements the main view of the feed reader plugin
- */
- class PluginTopCommentPostsConfigView extends AdminPluginTemplatedView
- {
-
- function PluginTopCommentPostsConfigView( $blogInfo )
- {
- $this->AdminPluginTemplatedView( $blogInfo, "topcommentposts", "topcommentposts" );
- }
-
- function render()
- {
- // load some configuration settings
- $blogSettings = $this->_blogInfo->getSettings();
- $pluginEnabled = $blogSettings->getValue( "plugin_topcommentposts_enabled" );
- $maxPosts = $blogSettings->getValue( "plugin_topcommentposts_maxposts" );
- if ($maxPosts == "") $maxPosts = 10;
-
- // create a view and export the settings to the template
- $this->setValue( "pluginEnabled", $pluginEnabled );
- $this->setValue( "maxPosts", $maxPosts );
-
- parent::render();
- }
- }
-?>
\ No newline at end of file
Copied: plugins/trunk/topcommentposts/class/view/plugintopcommentpostsconfigview.class.php (from rev 4487, plugins/branches/lifetype-1.1/topcommentposts/class/view/plugintopcommentpostsconfigview.class.php)
Copied: plugins/trunk/topcommentposts/locale (from rev 4487, plugins/branches/lifetype-1.1/topcommentposts/locale)
Deleted: plugins/trunk/topcommentposts/locale/locale_en_UK.php
===================================================================
--- plugins/branches/lifetype-1.1/topcommentposts/locale/locale_en_UK.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/topcommentposts/locale/locale_en_UK.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,16 +0,0 @@
-<?php
-$messages["manageTopPlugins"] = "Top Activities Management";
-$messages["TopCommentPosts"] = "Top Comment Posts";
-$messages["topcommentposts"] = "Top Comment Posts";
-
-$messages["topcommentposts_maxposts"] = "Maximum Showed Posts";
-$messages["topcommentposts_plugin_enabled"] = "Enable this plugin";
-$messages["topcommentposts_plugin"] = "Top Comment Posts Plugin";
-
-$messages["topcommentposts_settings_saved_ok"] = "Top Comment Posts settings saved successfully!";
-$messages["topcommentposts_error_maxposts"] = "Maximum Showed Posts Should > 0!";
-
-$messages["label_configuration"] = "Configuration";
-$messages["label_enable"] = "Enable";
-$messages["label_maxposts"] = "Max Comments";
-?>
\ No newline at end of file
Copied: plugins/trunk/topcommentposts/locale/locale_en_UK.php (from rev 4487, plugins/branches/lifetype-1.1/topcommentposts/locale/locale_en_UK.php)
Deleted: plugins/trunk/topcommentposts/locale/locale_zh_CN.php
===================================================================
--- plugins/branches/lifetype-1.1/topcommentposts/locale/locale_zh_CN.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/topcommentposts/locale/locale_zh_CN.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,16 +0,0 @@
-<?php
-$messages["manageTopPlugins"] = "åšå®¢æŽ’å管ç†";
-$messages["TopCommentPosts"] = "最多回å¤æ–‡ç« 设置";
-$messages["topcommentposts"] = "最多回å¤æ–‡ç« ";
-
-$messages["topcommentposts_maxposts"] = "最多回å¤æ–‡ç« 显示数é‡";
-$messages["topcommentposts_plugin_enabled"] = "å¯ç”¨æ’件";
-$messages["topcommentposts_plugin"] = "最多回å¤æ–‡ç« æ’件";
-
-$messages["topcommentposts_settings_saved_ok"] = "最多回å¤æ–‡ç« 设置储å˜æˆåŠŸã€‚";
-$messages["topcommentposts_error_maxposts"] = "最多回å¤æ–‡ç« 显示数é‡å¿…é¡»è¦å¤§äºŽ0!";
-
-$messages["label_configuration"] = "设置";
-$messages["label_enable"] = "å¯ç”¨";
-$messages["label_maxposts"] = "显示数目";
-?>
Copied: plugins/trunk/topcommentposts/locale/locale_zh_CN.php (from rev 4487, plugins/branches/lifetype-1.1/topcommentposts/locale/locale_zh_CN.php)
Deleted: plugins/trunk/topcommentposts/locale/locale_zh_TW.php
===================================================================
--- plugins/branches/lifetype-1.1/topcommentposts/locale/locale_zh_TW.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/topcommentposts/locale/locale_zh_TW.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,16 +0,0 @@
-<?php
-$messages["manageTopPlugins"] = "網誌排å管ç†";
-$messages["TopCommentPosts"] = "æœ€å¤šè¿´éŸ¿æ–‡ç« è¨å®š";
-$messages["topcommentposts"] = "æœ€å¤šè¿´éŸ¿æ–‡ç« ";
-
-$messages["topcommentposts_maxposts"] = "æœ€å¤šè¿´éŸ¿æ–‡ç« é¡¯ç¤ºæ•¸é‡";
-$messages["topcommentposts_plugin_enabled"] = "啟動外掛程å¼";
-$messages["topcommentposts_plugin"] = "æœ€å¤šè¿´éŸ¿æ–‡ç« å¤–æŽ›ç¨‹å¼";
-
-$messages["topcommentposts_settings_saved_ok"] = "æœ€å¤šè¿´éŸ¿æ–‡ç« è¨å®šå„²å˜æˆåŠŸã€‚";
-$messages["topcommentposts_error_maxposts"] = "æœ€å¤šè¿´éŸ¿æ–‡ç« é¡¯ç¤ºæ•¸é‡å¿…é ˆè¦ > 0!";
-
-$messages["label_configuration"] = "è¨å®š";
-$messages["label_enable"] = "å•Ÿå‹•";
-$messages["label_maxposts"] = "顯示數目";
-?>
\ No newline at end of file
Copied: plugins/trunk/topcommentposts/locale/locale_zh_TW.php (from rev 4487, plugins/branches/lifetype-1.1/topcommentposts/locale/locale_zh_TW.php)
Deleted: plugins/trunk/topcommentposts/plugintopcommentposts.class.php
===================================================================
--- plugins/branches/lifetype-1.1/topcommentposts/plugintopcommentposts.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/topcommentposts/plugintopcommentposts.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,122 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/plugin/pluginbase.class.php" );
- include_once( PLOG_CLASS_PATH."class/plugin/pluginmanager.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/articlecomments.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/articles.class.php" );
-
- /**
- * Plugin that offers features to returns the top comment posts object of current blog
- */
- class PluginTopCommentPosts extends PluginBase
- {
- var $prefix;
- var $pluginEnabled;
- var $maxPosts;
-
- function PluginTopCommentPosts()
- {
- $this->PluginBase();
-
- $this->id = "topcommentposts";
- $this->author = "Mark Wu";
- $this->desc = "This plugin offers the rank list of articles by number of comments.";
-
- $this->prefix = Db::getPrefix();
-
- $this->locales = Array( "en_UK" , "zh_TW" , "zh_CN" );
-
- $this->init();
- }
-
- function init()
- {
- include_once( PLOG_CLASS_PATH."class/template/menu/menu.class.php" );
- $this->registerAdminAction( "topcommentposts", "PluginTopCommentPostsConfigAction" );
- $this->registerAdminAction( "updateTopCommentPostsConfig", "PluginTopCommentPostsUpdateConfigAction" );
-
- $menu =& Menu::getMenu();
- if( !$menu->entryExists( "/menu/controlCenter/manageTopPlugins" ))
- $this->addMenuEntry( "/menu/controlCenter", "manageTopPlugins", "", "", true, false );
- $this->addMenuEntry( "/menu/controlCenter/manageTopPlugins", "TopCommentPosts", "?op=topcommentposts", "" );
- }
-
- function register()
- {
- $blogSettings = $this->blogInfo->getSettings();
- $this->pluginEnabled = $blogSettings->getValue( "plugin_topcommentposts_enabled" );
- $this->maxPosts = $blogSettings->getValue( "plugin_topcommentposts_maxposts" );
- }
-
- function isEnabled()
- {
- return $this->pluginEnabled;
- }
-
- /**
- * Returns the top comment posts object of current blog
- */
- function getTopCommentPosts($maxPosts = 0, $based = 'BLOG')
- {
- $comments = new ArticleComments();
- $blogId = $this->blogInfo->getId();
-
- $query = "SELECT id, num_nonspam_comments ".
- "FROM ".$this->prefix."articles WHERE ";
- if ($based == 'BLOG')
- $query .= "blog_id='".$blogId."' ";
- $query .= "AND status=1 AND num_nonspam_comments != 0 ".
- "ORDER BY num_nonspam_comments DESC";
-
- if( $maxPosts > 0 )
- {
- $query .= " LIMIT " . $maxPosts;
- } else {
- $query .= " LIMIT " . $this->maxPosts;
- }
-
- $db =& Db::getDb();
- $result = $db->Execute( $query );
-
- if( !$result )
- return false;
-
- $topcommentposts = Array();
- while( $row = $result->FetchRow()) {
- $article = $this->getArticle($row["id"]);
- array_push( $topcommentposts, $article);
- }
-
- return $topcommentposts;
- }
-
- function getArticle( $artId )
- {
- $articles = new Articles();
- $blogId = $this->blogInfo->getId();
-
- $query = "SELECT * FROM ".$this->prefix."articles WHERE id = ".$artId;
-
- $query .= " AND blog_id = ".$blogId;
-
- $query .= ";";
-
- // we send the query and then fetch the first array with the result
- $db =& Db::getDb();
- $result = $db->Execute( $query );
-
- if( $result == false )
- return false;
-
- if ( $result->RecordCount() == 0)
- return false;
-
- $row = $result->FetchRow( $result );
-
- $article = $articles->mapRow( $row );
-
- return $article;
- }
- }
-
-?>
\ No newline at end of file
Copied: plugins/trunk/topcommentposts/plugintopcommentposts.class.php (from rev 4487, plugins/branches/lifetype-1.1/topcommentposts/plugintopcommentposts.class.php)
Deleted: plugins/trunk/topcommentposts/readme.txt
===================================================================
--- plugins/branches/lifetype-1.1/topcommentposts/readme.txt 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/topcommentposts/readme.txt 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,26 +0,0 @@
-Plugin: Top Comment Posts
-Author: Mark Wu
-Release Date: 2006/11/07
-Version: 1.1
-
-This plugin offers the rank list of articles by number of comments. Usage as follow:
-
-You can use:
-1. $topcommentposts->isEnabled() to check the plugin is enabled or not.
-2. $topcommentposts->getTopCommentPosts( $maxPosts , $based ) to get the top comment posts.
-
-Where:
-1. $maxPosts is the the max posts you want to show. Default is 10.
-2. $based is return the site-wide or blog-wide posts. "BLOG" means blog-wide, and "SITE" means site-wide. Default is "BLOG".
-
-Example:
-{if $topcommentposts && $topcommentposts->isEnabled()}
-<h2>Top Comment Posts</h2>
-<ul>
-{assign var=commentposts value=$topcommentposts->getTopCommentPosts()}
-{foreach from=$commentposts item=commentpost}
-<li><a href="{$url->postLink($commentpost)}">{$commentpost->getTopic()}
- ({$commentpost->getTotalComments()} Posts)</a></li>
-{/foreach}
-</ul>
-{/if}
Copied: plugins/trunk/topcommentposts/readme.txt (from rev 4487, plugins/branches/lifetype-1.1/topcommentposts/readme.txt)
Copied: plugins/trunk/topcommentposts/templates (from rev 4487, plugins/branches/lifetype-1.1/topcommentposts/templates)
Deleted: plugins/trunk/topcommentposts/templates/topcommentposts.template
===================================================================
--- plugins/branches/lifetype-1.1/topcommentposts/templates/topcommentposts.template 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/topcommentposts/templates/topcommentposts.template 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,32 +0,0 @@
-{include file="$admintemplatepath/header.template"}
-{include file="$admintemplatepath/navigation.template" showOpt=TopCommentPosts title=$locale->tr("topcommentposts_plugin")}
-<form name="topcommentpostsPluginConfig" method="post">
- <fieldset class="inputField">
- <legend>{$locale->tr("label_configuration")}</legend>
- {include file="$admintemplatepath/successmessage.template"}
- {include file="$admintemplatepath/errormessage.template"}
- <div class="field">
- <label for="pluginEnabled">{$locale->tr("label_enable")}</label>
- <span class="required"></span>
- <div class="formHelp">
- <input class="checkbox" type="checkbox" name="pluginEnabled" id="pluginEnabled" {if $pluginEnabled} checked="checked" {/if} value="1" />{$locale->tr("topcommentposts_plugin_enabled")}
- </div>
- </div>
-
- <div class="field">
- <label for="maxPosts">{$locale->tr("label_maxposts")}</label>
- <span class="required">*</span>
- <div class="formHelp">{$locale->tr("topcommentposts_maxposts")}</div>
- <input class="text" type="text" name="maxPosts" id="maxPosts" value="{$maxPosts}"width="10" />
- </div>
-
- </fieldset>
-
- <div class="buttons">
- <input type="hidden" name="op" value="updateTopCommentPostsConfig" />
- <input type="reset" name="{$locale->tr("reset")}" />
- <input type="submit" name="{$locale->tr("update_settings")}" value="{$locale->tr("update")}" />
- </div>
-</form>
-{include file="$admintemplatepath/footernavigation.template"}
-{include file="$admintemplatepath/footer.template"}
\ No newline at end of file
Copied: plugins/trunk/topcommentposts/templates/topcommentposts.template (from rev 4487, plugins/branches/lifetype-1.1/topcommentposts/templates/topcommentposts.template)
Copied: plugins/trunk/topcommentvisitors (from rev 4487, plugins/branches/lifetype-1.1/topcommentvisitors)
Copied: plugins/trunk/topcommentvisitors/class (from rev 4487, plugins/branches/lifetype-1.1/topcommentvisitors/class)
Copied: plugins/trunk/topcommentvisitors/class/action (from rev 4487, plugins/branches/lifetype-1.1/topcommentvisitors/class/action)
Deleted: plugins/trunk/topcommentvisitors/class/action/plugintopcommentvisitorsconfigaction.class.php
===================================================================
--- plugins/branches/lifetype-1.1/topcommentvisitors/class/action/plugintopcommentvisitorsconfigaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/topcommentvisitors/class/action/plugintopcommentvisitorsconfigaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,27 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- include_once( PLOG_CLASS_PATH."class/view/admin/adminplugintemplatedview.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/topcommentvisitors/class/view/plugintopcommentvisitorsconfigview.class.php" );
-
- /**
- * shows a form with the current configuration
- */
- class PluginTopCommentVisitorsConfigAction extends AdminAction
- {
-
- function PluginTopCommentVisitorsConfigAction( $actionInfo, $request )
- {
- $this->AdminAction( $actionInfo, $request );
- }
-
- function perform()
- {
- $this->_view = new PluginTopCommentVisitorsConfigView( $this->_blogInfo );
-
- $this->setCommonData();
-
- return true;
- }
- }
-?>
\ No newline at end of file
Copied: plugins/trunk/topcommentvisitors/class/action/plugintopcommentvisitorsconfigaction.class.php (from rev 4487, plugins/branches/lifetype-1.1/topcommentvisitors/class/action/plugintopcommentvisitorsconfigaction.class.php)
Deleted: plugins/trunk/topcommentvisitors/class/action/plugintopcommentvisitorsupdateconfigaction.class.php
===================================================================
--- plugins/branches/lifetype-1.1/topcommentvisitors/class/action/plugintopcommentvisitorsupdateconfigaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/topcommentvisitors/class/action/plugintopcommentvisitorsupdateconfigaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,69 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- include_once( PLOG_CLASS_PATH."class/view/admin/adminplugintemplatedview.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/topcommentvisitors/class/view/plugintopcommentvisitorsconfigview.class.php" );
-
- /**
- * updates the plugin configuration
- */
- class PluginTopCommentVisitorsUpdateConfigAction extends AdminAction
- {
- var $_pluginEnabled;
- var $_maxVisitors;
-
- function PluginRTopCommentVisitorsUpdateConfigAction( $actionInfo, $request )
- {
- $this->AdminAction( $actionInfo, $request );
- }
-
- function validate()
- {
- $this->_pluginEnabled = $this->_request->getValue( "pluginEnabled" );
- $this->_pluginEnabled = ($this->_pluginEnabled != "" );
- $this->_maxVisitors = $this->_request->getValue( "maxVisitors" );
- if( $this->_maxVisitors <= 0 || !ctype_digit($this->_maxVisitors) ) {
- $this->_view = new PluginTopCommentVisitorsConfigView( $this->_blogInfo );
- $this->_view->setErrorMessage( $this->_locale->tr("topcommentvisitors_error_maxvisitors"));
- $this->setCommonData();
-
- return false;
- }
-
- return true;
- }
-
- function perform()
- {
- // // update the plugin configurations to blog setting
- $blogSettings = $this->_blogInfo->getSettings();
- $blogSettings->setValue( "plugin_topcommentvisitors_enabled", $this->_pluginEnabled );
- $blogSettings->setValue( "plugin_topcommentvisitors_maxvisitors", $this->_maxVisitors );
- $this->_blogInfo->setSettings( $blogSettings );
-
- // save the blogs settings
- $blogs = new Blogs();
- if( !$blogs->updateBlog( $this->_blogInfo )) {
- $this->_view = new PluginTopCommentVisitorsConfigView( $this->_blogInfo );
- $this->_view->setErrorMessage( $this->_locale->tr("error_updating_settings"));
- $this->setCommonData();
-
- return false;
- }
-
- // if everything went ok...
- $this->_blogInfo->setSettings( $blogSettings );
- $this->_session->setValue( "blogInfo", $this->_blogInfo );
- $this->saveSession();
-
- $this->_view = new PluginTopCommentVisitorsConfigView( $this->_blogInfo );
- $this->_view->setSuccessMessage( $this->_locale->tr("topcommentvisitors_settings_saved_ok"));
- $this->setCommonData();
-
- // clear the cache
- CacheControl::resetBlogCache( $this->_blogInfo->getId());
-
- return true;
- }
- }
-?>
\ No newline at end of file
Copied: plugins/trunk/topcommentvisitors/class/action/plugintopcommentvisitorsupdateconfigaction.class.php (from rev 4487, plugins/branches/lifetype-1.1/topcommentvisitors/class/action/plugintopcommentvisitorsupdateconfigaction.class.php)
Copied: plugins/trunk/topcommentvisitors/class/view (from rev 4487, plugins/branches/lifetype-1.1/topcommentvisitors/class/view)
Deleted: plugins/trunk/topcommentvisitors/class/view/plugintopcommentvisitorsconfigview.class.php
===================================================================
--- plugins/branches/lifetype-1.1/topcommentvisitors/class/view/plugintopcommentvisitorsconfigview.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/topcommentvisitors/class/view/plugintopcommentvisitorsconfigview.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,31 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/view/admin/adminplugintemplatedview.class.php" );
-
- /**
- * implements the main view of the feed reader plugin
- */
- class PluginTopCommentVisitorsConfigView extends AdminPluginTemplatedView
- {
-
- function PluginTopCommentVisitorsConfigView( $blogInfo )
- {
- $this->AdminPluginTemplatedView( $blogInfo, "topcommentvisitors", "topcommentvisitors" );
- }
-
- function render()
- {
- // load some configuration settings
- $blogSettings = $this->_blogInfo->getSettings();
- $pluginEnabled = $blogSettings->getValue( "plugin_topcommentvisitors_enabled" );
- $maxVisitors = $blogSettings->getValue( "plugin_topcommentvisitors_maxvisitors" );
- if ($maxVisitors == "") $maxVisitors = 10;
-
- // create a view and export the settings to the template
- $this->setValue( "pluginEnabled", $pluginEnabled );
- $this->setValue( "maxVisitors", $maxVisitors );
-
- parent::render();
- }
- }
-?>
\ No newline at end of file
Copied: plugins/trunk/topcommentvisitors/class/view/plugintopcommentvisitorsconfigview.class.php (from rev 4487, plugins/branches/lifetype-1.1/topcommentvisitors/class/view/plugintopcommentvisitorsconfigview.class.php)
Copied: plugins/trunk/topcommentvisitors/locale (from rev 4487, plugins/branches/lifetype-1.1/topcommentvisitors/locale)
Deleted: plugins/trunk/topcommentvisitors/locale/locale_en_UK.php
===================================================================
--- plugins/branches/lifetype-1.1/topcommentvisitors/locale/locale_en_UK.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/topcommentvisitors/locale/locale_en_UK.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,16 +0,0 @@
-<?php
-$messages["manageTopPlugins"] = "Top Activities Management";
-$messages["TopCommentVisitors"] = "Top Comment Visitors";
-$messages["topcommentvisitors"] = "Top Comment Visitors";
-
-$messages["topcommentvisitors_maxvisitors"] = "Maximum Showed Visitors";
-$messages["topcommentvisitors_plugin_enabled"] = "Enable this plugin";
-$messages["topcommentvisitors_plugin"] = "Top Comment Visitors Plugin";
-
-$messages["topcommentvisitors_settings_saved_ok"] = "Top Comment Visitors settings saved successfully!";
-$messages["topcommentvisitors_error_maxvisitors"] = "Maximum Showed Visitors Should > 0!";
-
-$messages["label_configuration"] = "Configuration";
-$messages["label_enable"] = "Enable";
-$messages["label_maxvisitors"] = "Max Visitors";
-?>
\ No newline at end of file
Copied: plugins/trunk/topcommentvisitors/locale/locale_en_UK.php (from rev 4487, plugins/branches/lifetype-1.1/topcommentvisitors/locale/locale_en_UK.php)
Deleted: plugins/trunk/topcommentvisitors/locale/locale_zh_CN.php
===================================================================
--- plugins/branches/lifetype-1.1/topcommentvisitors/locale/locale_zh_CN.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/topcommentvisitors/locale/locale_zh_CN.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,16 +0,0 @@
-<?php
-$messages["manageTopPlugins"] = "åšå®¢æŽ’å管ç†";
-$messages["TopCommentVisitors"] = "最多回å¤è®¿å®¢è®¾ç½®";
-$messages["topcommentvisitors"] = "最多回å¤è®¿å®¢";
-
-$messages["topcommentvisitors_maxvisitors"] = "最多回å¤è®¿å®¢æ˜¾ç¤ºæ•°é‡";
-$messages["topcommentvisitors_plugin_enabled"] = "å¯ç”¨æ’件";
-$messages["topcommentvisitors_plugin"] = "最多回å¤è®¿å®¢æ’件";
-
-$messages["topcommentvisitors_settings_saved_ok"] = "最多回å¤è®¿å®¢è®¾ç½®å‚¨å˜æˆåŠŸã€‚";
-$messages["topcommentvisitors_error_maxvisitors"] = "最多回å¤è®¿å®¢æ˜¾ç¤ºæ•°é‡å¿…é¡»è¦å¤§äºŽ0!";
-
-$messages["label_configuration"] = "设置";
-$messages["label_enable"] = "å¯ç”¨";
-$messages["label_maxvisitors"] = "显示数目";
-?>
Copied: plugins/trunk/topcommentvisitors/locale/locale_zh_CN.php (from rev 4487, plugins/branches/lifetype-1.1/topcommentvisitors/locale/locale_zh_CN.php)
Deleted: plugins/trunk/topcommentvisitors/locale/locale_zh_TW.php
===================================================================
--- plugins/branches/lifetype-1.1/topcommentvisitors/locale/locale_zh_TW.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/topcommentvisitors/locale/locale_zh_TW.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,16 +0,0 @@
-<?php
-$messages["manageTopPlugins"] = "網誌排å管ç†";
-$messages["TopCommentVisitors"] = "最多迴響訪客è¨å®š";
-$messages["topcommentvisitors"] = "最多迴響訪客";
-
-$messages["topcommentvisitors_maxvisitors"] = "最多迴響訪客顯示數é‡";
-$messages["topcommentvisitors_plugin_enabled"] = "啟動外掛程å¼";
-$messages["topcommentvisitors_plugin"] = "最多迴響訪客外掛程å¼";
-
-$messages["topcommentvisitors_settings_saved_ok"] = "最多迴響訪客è¨å®šå„²å˜æˆåŠŸã€‚";
-$messages["topcommentvisitors_error_maxvisitors"] = "最多迴響訪客顯示數é‡å¿…é ˆè¦ > 0!";
-
-$messages["label_configuration"] = "è¨å®š";
-$messages["label_enable"] = "å•Ÿå‹•";
-$messages["label_maxvisitors"] = "顯示數目";
-?>
\ No newline at end of file
Copied: plugins/trunk/topcommentvisitors/locale/locale_zh_TW.php (from rev 4487, plugins/branches/lifetype-1.1/topcommentvisitors/locale/locale_zh_TW.php)
Deleted: plugins/trunk/topcommentvisitors/plugintopcommentvisitors.class.php
===================================================================
--- plugins/branches/lifetype-1.1/topcommentvisitors/plugintopcommentvisitors.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/topcommentvisitors/plugintopcommentvisitors.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,90 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/plugin/pluginbase.class.php" );
- include_once( PLOG_CLASS_PATH."class/plugin/pluginmanager.class.php" );
-
- /**
- * Plugin that offers features to returns the top comment visitors object of current blog
- */
- class PluginTopCommentVisitors extends PluginBase
- {
- var $pluginEnabled;
- var $maxVisitors;
-
- function PluginTopCommentVisitors()
- {
- $this->PluginBase();
-
- $this->id = "topcommentvisitors";
- $this->author = "Mark Wu";
- $this->desc = "This plugin offers the rank list of visitors by number of comments.";
-
- $this->locales = Array( "en_UK" , "zh_TW" , "zh_CN" );
-
- $this->init();
- }
-
- function init()
- {
- include_once( PLOG_CLASS_PATH."class/template/menu/menu.class.php" );
- $this->registerAdminAction( "topcommentvisitors", "PluginTopCommentVisitorsConfigAction" );
- $this->registerAdminAction( "updateTopCommentVisitorsConfig", "PluginTopCommentVisitorsUpdateConfigAction" );
-
- $menu =& Menu::getMenu();
- if( !$menu->entryExists( "/menu/controlCenter/manageTopPlugins" ))
- $this->addMenuEntry( "/menu/controlCenter", "manageTopPlugins", "", "", true, false );
- $this->addMenuEntry( "/menu/controlCenter/manageTopPlugins", "TopCommentVisitors", "?op=topcommentvisitors", "" );
- }
-
- function register()
- {
- $blogSettings = $this->blogInfo->getSettings();
- $this->pluginEnabled = $blogSettings->getValue( "plugin_topcommentvisitors_enabled" );
- $this->maxVisitors = $blogSettings->getValue( "plugin_topcommentvisitors_maxvisitors" );
- }
-
- function isEnabled()
- {
- return $this->pluginEnabled;
- }
-
- /**
- * Returns the top comment visitors of current blog
- */
- function getTopCommentVisitors($maxVisitors = 0, $based = 'BLOG')
- {
- $blogId = $this->blogInfo->getId();
- $prefix = Db::getPrefix();
-
- $query = "SELECT ".$prefix."articles_comments.user_name, ".
- "max(".$prefix."articles_comments.user_url) AS user_url, ".
- "count(".$prefix."articles_comments.user_name) AS user_count ".
- "FROM ".$prefix."articles_comments,".$prefix."articles WHERE ";
- if ($based == 'BLOG')
- $query .= $prefix."articles.blog_id=".$blogId." AND ";
- $query .= $prefix."articles_comments.article_id=".$prefix."articles.id ".
- "AND ".$prefix."articles.status=1 ".
- "GROUP BY ".$prefix."articles_comments.user_name ORDER BY user_count DESC";
-
- if( $maxVisitors > 0 )
- {
- $query .= " LIMIT " . $maxVisitors;
- } else {
- $query .= " LIMIT " . $this->maxVisitors;
- }
-
- $db =& Db::getDb();
- $result = $db->Execute( $query );
-
- if( !$result )
- return false;
-
- $topcommentvisitors = Array();
- while( $row = $result->FetchRow()) {
- array_push( $topcommentvisitors, $row);
- }
-
- return $topcommentvisitors;
- }
- }
-?>
\ No newline at end of file
Copied: plugins/trunk/topcommentvisitors/plugintopcommentvisitors.class.php (from rev 4487, plugins/branches/lifetype-1.1/topcommentvisitors/plugintopcommentvisitors.class.php)
Deleted: plugins/trunk/topcommentvisitors/readme.txt
===================================================================
--- plugins/branches/lifetype-1.1/topcommentvisitors/readme.txt 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/topcommentvisitors/readme.txt 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,25 +0,0 @@
-Plugin: Top Comment Visitors
-Author: Mark Wu
-Release Date: 2006/11/07
-Version: 1.1
-
-This plugin offers the rank list of visitors by number of comments. Usage as follow:
-
-You can use:
-1. $topcommentvisitors->isEnabled() to check the plugin is enabled or not.
-2. $topcommentvisitors->getTopCommentVisitors( $maxVisitors , $based ) to get the top comment visitors.
-
-Where:
-1. $maxVisitors is the the max visitors you want to show. Default is 10.
-2. $based is return the site-wide or blog-wide visitors. "BLOG" means blog-wide, and "SITE" means site-wide. Default is "BLOG".
-
-Example:
-{if $topcommentvisitors && $topcommentvisitors->isEnabled()}
-<h2>Top Comment Visitors</h2>
-<ul>
-{assign var=commentvisitors value=$topcommentvisitors->getTopCommentVisitors()}
-{foreach from=$commentvisitors item=commentvisitor}
-<li><a href="{$commentvisitor.user_url}">{$commentvisitor.user_name} ({$commentvisitor.user_count} Comments)</a></li>
-{/foreach}
-</ul>
-{/if}
Copied: plugins/trunk/topcommentvisitors/readme.txt (from rev 4487, plugins/branches/lifetype-1.1/topcommentvisitors/readme.txt)
Copied: plugins/trunk/topcommentvisitors/templates (from rev 4487, plugins/branches/lifetype-1.1/topcommentvisitors/templates)
Deleted: plugins/trunk/topcommentvisitors/templates/topcommentvisitors.template
===================================================================
--- plugins/branches/lifetype-1.1/topcommentvisitors/templates/topcommentvisitors.template 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/topcommentvisitors/templates/topcommentvisitors.template 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,32 +0,0 @@
-{include file="$admintemplatepath/header.template"}
-{include file="$admintemplatepath/navigation.template" showOpt=TopCommentVisitors title=$locale->tr("topcommentvisitors_plugin")}
-<form name="topcommentvisitorsPluginConfig" method="post">
- <fieldset class="inputField">
- <legend>{$locale->tr("label_configuration")}</legend>
- {include file="$admintemplatepath/successmessage.template"}
- {include file="$admintemplatepath/errormessage.template"}
- <div class="field">
- <label for="pluginEnabled">{$locale->tr("label_enable")}</label>
- <span class="required"></span>
- <div class="formHelp">
- <input class="checkbox" type="checkbox" name="pluginEnabled" id="pluginEnabled" {if $pluginEnabled} checked="checked" {/if} value="1" />{$locale->tr("topcommentvisitors_plugin_enabled")}
- </div>
- </div>
-
- <div class="field">
- <label for="maxVisitors">{$locale->tr("label_maxvisitors")}</label>
- <span class="required">*</span>
- <div class="formHelp">{$locale->tr("topcommentvisitors_maxvisitors")}</div>
- <input class="text" type="text" name="maxVisitors" id="maxVisitors" value="{$maxVisitors}" width="10" />
- </div>
-
- </fieldset>
-
- <div class="buttons">
- <input type="hidden" name="op" value="updateTopCommentVisitorsConfig" />
- <input type="reset" name="{$locale->tr("reset")}" />
- <input type="submit" name="{$locale->tr("update_settings")}" value="{$locale->tr("update")}" />
- </div>
-</form>
-{include file="$admintemplatepath/footernavigation.template"}
-{include file="$admintemplatepath/footer.template"}
\ No newline at end of file
Copied: plugins/trunk/topcommentvisitors/templates/topcommentvisitors.template (from rev 4487, plugins/branches/lifetype-1.1/topcommentvisitors/templates/topcommentvisitors.template)
Copied: plugins/trunk/topreadposts (from rev 4487, plugins/branches/lifetype-1.1/topreadposts)
Copied: plugins/trunk/topreadposts/class (from rev 4487, plugins/branches/lifetype-1.1/topreadposts/class)
Copied: plugins/trunk/topreadposts/class/action (from rev 4487, plugins/branches/lifetype-1.1/topreadposts/class/action)
Deleted: plugins/trunk/topreadposts/class/action/plugintopreadpostsconfigaction.class.php
===================================================================
--- plugins/branches/lifetype-1.1/topreadposts/class/action/plugintopreadpostsconfigaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/topreadposts/class/action/plugintopreadpostsconfigaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,27 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- include_once( PLOG_CLASS_PATH."class/view/admin/adminplugintemplatedview.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/topreadposts/class/view/plugintopreadpostsconfigview.class.php" );
-
- /**
- * shows a form with the current configuration
- */
- class PluginTopReadPostsConfigAction extends AdminAction
- {
-
- function PluginTopReadPostsConfigAction( $actionInfo, $request )
- {
- $this->AdminAction( $actionInfo, $request );
- }
-
- function perform()
- {
- $this->_view = new PluginTopReadPostsConfigView( $this->_blogInfo );
-
- $this->setCommonData();
-
- return true;
- }
- }
-?>
\ No newline at end of file
Copied: plugins/trunk/topreadposts/class/action/plugintopreadpostsconfigaction.class.php (from rev 4487, plugins/branches/lifetype-1.1/topreadposts/class/action/plugintopreadpostsconfigaction.class.php)
Deleted: plugins/trunk/topreadposts/class/action/plugintopreadpostsupdateconfigaction.class.php
===================================================================
--- plugins/branches/lifetype-1.1/topreadposts/class/action/plugintopreadpostsupdateconfigaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/topreadposts/class/action/plugintopreadpostsupdateconfigaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,69 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- include_once( PLOG_CLASS_PATH."class/view/admin/adminplugintemplatedview.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/topreadposts/class/view/plugintopreadpostsconfigview.class.php" );
-
- /**
- * updates the plugin configuration
- */
- class PluginTopReadPostsUpdateConfigAction extends AdminAction
- {
- var $_pluginEnabled;
- var $_maxPosts;
-
- function PluginRTopReadPostsUpdateConfigAction( $actionInfo, $request )
- {
- $this->AdminAction( $actionInfo, $request );
- }
-
- function validate()
- {
- $this->_pluginEnabled = $this->_request->getValue( "pluginEnabled" );
- $this->_pluginEnabled = ($this->_pluginEnabled != "" );
- $this->_maxPosts = $this->_request->getValue( "maxPosts" );
- if( $this->_maxPosts <= 0 || !ctype_digit($this->_maxPosts) ) {
- $this->_view = new PluginTopReadPostsConfigView( $this->_blogInfo );
- $this->_view->setErrorMessage( $this->_locale->tr("topreadposts_error_maxposts"));
- $this->setCommonData();
-
- return false;
- }
-
- return true;
- }
-
- function perform()
- {
- // // update the plugin configurations to blog setting
- $blogSettings = $this->_blogInfo->getSettings();
- $blogSettings->setValue( "plugin_topreadposts_enabled", $this->_pluginEnabled );
- $blogSettings->setValue( "plugin_topreadposts_maxposts", $this->_maxPosts );
- $this->_blogInfo->setSettings( $blogSettings );
-
- // save the blogs settings
- $blogs = new Blogs();
- if( !$blogs->updateBlog( $this->_blogInfo )) {
- $this->_view = new PluginTopReadPostsConfigView( $this->_blogInfo );
- $this->_view->setErrorMessage( $this->_locale->tr("error_updating_settings"));
- $this->setCommonData();
-
- return false;
- }
-
- // if everything went ok...
- $this->_blogInfo->setSettings( $blogSettings );
- $this->_session->setValue( "blogInfo", $this->_blogInfo );
- $this->saveSession();
-
- $this->_view = new PluginTopReadPostsConfigView( $this->_blogInfo );
- $this->_view->setSuccessMessage( $this->_locale->tr("topreadposts_settings_saved_ok"));
- $this->setCommonData();
-
- // clear the cache
- CacheControl::resetBlogCache( $this->_blogInfo->getId());
-
- return true;
- }
- }
-?>
\ No newline at end of file
Copied: plugins/trunk/topreadposts/class/action/plugintopreadpostsupdateconfigaction.class.php (from rev 4487, plugins/branches/lifetype-1.1/topreadposts/class/action/plugintopreadpostsupdateconfigaction.class.php)
Copied: plugins/trunk/topreadposts/class/view (from rev 4487, plugins/branches/lifetype-1.1/topreadposts/class/view)
Deleted: plugins/trunk/topreadposts/class/view/plugintopreadpostsconfigview.class.php
===================================================================
--- plugins/branches/lifetype-1.1/topreadposts/class/view/plugintopreadpostsconfigview.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/topreadposts/class/view/plugintopreadpostsconfigview.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,31 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/view/admin/adminplugintemplatedview.class.php" );
-
- /**
- * implements the main view of the feed reader plugin
- */
- class PluginTopReadPostsConfigView extends AdminPluginTemplatedView
- {
-
- function PluginTopReadPostsConfigView( $blogInfo )
- {
- $this->AdminPluginTemplatedView( $blogInfo, "topreadposts", "topreadposts" );
- }
-
- function render()
- {
- // load some configuration settings
- $blogSettings = $this->_blogInfo->getSettings();
- $pluginEnabled = $blogSettings->getValue( "plugin_topreadposts_enabled" );
- $maxPosts = $blogSettings->getValue( "plugin_topreadposts_maxposts" );
- if ($maxPosts == "") $maxPosts = 10;
-
- // create a view and export the settings to the template
- $this->setValue( "pluginEnabled", $pluginEnabled );
- $this->setValue( "maxPosts", $maxPosts );
-
- parent::render();
- }
- }
-?>
\ No newline at end of file
Copied: plugins/trunk/topreadposts/class/view/plugintopreadpostsconfigview.class.php (from rev 4487, plugins/branches/lifetype-1.1/topreadposts/class/view/plugintopreadpostsconfigview.class.php)
Copied: plugins/trunk/topreadposts/locale (from rev 4487, plugins/branches/lifetype-1.1/topreadposts/locale)
Deleted: plugins/trunk/topreadposts/locale/locale_en_UK.php
===================================================================
--- plugins/branches/lifetype-1.1/topreadposts/locale/locale_en_UK.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/topreadposts/locale/locale_en_UK.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,16 +0,0 @@
-<?php
-$messages["manageTopPlugins"] = "Top Activities Management";
-$messages["TopReadPosts"] = "Top Read Posts";
-$messages["topreadposts"] = "Top Read Posts";
-
-$messages["topreadposts_maxposts"] = "Maximum Showed Posts";
-$messages["topreadposts_plugin_enabled"] = "Enable this plugin";
-$messages["topreadposts_plugin"] = "Top Read Posts Plugin";
-
-$messages["topreadposts_settings_saved_ok"] = "Top Read Posts settings saved successfully!";
-$messages["topreadposts_error_maxposts"] = "Maximum Showed Posts Should > 0!";
-
-$messages["label_configuration"] = "Configuration";
-$messages["label_enable"] = "Enable";
-$messages["label_maxposts"] = "Max Comments";
-?>
\ No newline at end of file
Copied: plugins/trunk/topreadposts/locale/locale_en_UK.php (from rev 4487, plugins/branches/lifetype-1.1/topreadposts/locale/locale_en_UK.php)
Deleted: plugins/trunk/topreadposts/locale/locale_zh_CN.php
===================================================================
--- plugins/branches/lifetype-1.1/topreadposts/locale/locale_zh_CN.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/topreadposts/locale/locale_zh_CN.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,16 +0,0 @@
-<?php
-$messages["manageTopPlugins"] = "åšå®¢æŽ’å管ç†";
-$messages["TopReadPosts"] = "æœ€å¤šé˜…è¯»æ–‡ç« è®¾ç½®";
-$messages["topreadposts"] = "æœ€å¤šé˜…è¯»æ–‡ç« ";
-
-$messages["topreadposts_maxposts"] = "æœ€å¤šé˜…è¯»æ–‡ç« æ˜¾ç¤ºæ•°é‡";
-$messages["topreadposts_plugin_enabled"] = "å¯ç”¨æ’件";
-$messages["topreadposts_plugin"] = "æœ€å¤šé˜…è¯»æ–‡ç« æ’件";
-
-$messages["topreadposts_settings_saved_ok"] = "æœ€å¤šé˜…è¯»æ–‡ç« è®¾ç½®å‚¨å˜æˆåŠŸã€‚";
-$messages["topreadposts_error_maxposts"] = "æœ€å¤šé˜…è¯»æ–‡ç« æ˜¾ç¤ºæ•°é‡å¿…é¡»è¦å¤§äºŽ0!";
-
-$messages["label_configuration"] = "设置";
-$messages["label_enable"] = "å¯ç”¨";
-$messages["label_maxposts"] = "显示数目";
-?>
Copied: plugins/trunk/topreadposts/locale/locale_zh_CN.php (from rev 4487, plugins/branches/lifetype-1.1/topreadposts/locale/locale_zh_CN.php)
Deleted: plugins/trunk/topreadposts/locale/locale_zh_TW.php
===================================================================
--- plugins/branches/lifetype-1.1/topreadposts/locale/locale_zh_TW.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/topreadposts/locale/locale_zh_TW.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,16 +0,0 @@
-<?php
-$messages["manageTopPlugins"] = "網誌排å管ç†";
-$messages["TopReadPosts"] = "æœ€å¤šé–±è®€æ–‡ç« è¨å®š";
-$messages["topreadposts"] = "æœ€å¤šé–±è®€æ–‡ç« ";
-
-$messages["topreadposts_maxposts"] = "æœ€å¤šé–±è®€æ–‡ç« é¡¯ç¤ºæ•¸é‡";
-$messages["topreadposts_plugin_enabled"] = "啟動外掛程å¼";
-$messages["topreadposts_plugin"] = "æœ€å¤šé–±è®€æ–‡ç« å¤–æŽ›ç¨‹å¼";
-
-$messages["topreadposts_settings_saved_ok"] = "æœ€å¤šé–±è®€æ–‡ç« è¨å®šå„²å˜æˆåŠŸã€‚";
-$messages["topreadposts_error_maxposts"] = "æœ€å¤šé–±è®€æ–‡ç« é¡¯ç¤ºæ•¸é‡å¿…é ˆè¦ > 0!";
-
-$messages["label_configuration"] = "è¨å®š";
-$messages["label_enable"] = "å•Ÿå‹•";
-$messages["label_maxposts"] = "顯示數目";
-?>
\ No newline at end of file
Copied: plugins/trunk/topreadposts/locale/locale_zh_TW.php (from rev 4487, plugins/branches/lifetype-1.1/topreadposts/locale/locale_zh_TW.php)
Deleted: plugins/trunk/topreadposts/plugintopreadposts.class.php
===================================================================
--- plugins/branches/lifetype-1.1/topreadposts/plugintopreadposts.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/topreadposts/plugintopreadposts.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,99 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/plugin/pluginbase.class.php" );
- include_once( PLOG_CLASS_PATH."class/plugin/pluginmanager.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/articles.class.php" );
-
- /**
- * Plugin that offers features to returns the top read posts object of current blog
- */
- class PluginTopReadPosts extends PluginBase
- {
-
- var $prefix;
- var $pluginEnabled;
- var $maxPosts;
-
- function PluginTopReadPosts()
- {
- $this->PluginBase();
-
- $this->id = "topreadposts";
- $this->author = "Mark Wu";
- $this->desc = "This plugin offers the rank list of articles by ".
- "number of times read.";
-
- $this->prefix = Db::getPrefix();
-
- $this->locales = Array( "en_UK" , "zh_TW" , "zh_CN" );
-
- $this->init();
- }
-
- function init()
- {
- include_once( PLOG_CLASS_PATH."class/template/menu/menu.class.php" );
- $this->registerAdminAction( "topreadposts", "PluginTopReadPostsConfigAction" );
- $this->registerAdminAction( "updateTopReadPostsConfig", "PluginTopReadPostsUpdateConfigAction" );
-
- $menu =& Menu::getMenu();
- if( !$menu->entryExists( "/menu/controlCenter/manageTopPlugins" ))
- $this->addMenuEntry( "/menu/controlCenter", "manageTopPlugins", "", "", true, false );
- $this->addMenuEntry( "/menu/controlCenter/manageTopPlugins", "TopReadPosts", "?op=topreadposts", "" );
- }
-
- function register()
- {
- $blogSettings = $this->blogInfo->getSettings();
- $this->pluginEnabled = $blogSettings->getValue( "plugin_topreadposts_enabled" );
- $this->maxPosts = $blogSettings->getValue( "plugin_topreadposts_maxposts" );
- }
-
- function isEnabled()
- {
- return $this->pluginEnabled;
- }
-
- /**
- * Returns the top read posts object of current blog
- */
- function getTopReadPosts($maxPosts = 0, $based = 'BLOG')
- {
- $articles = new Articles();
- $blogId = $this->blogInfo->getId();
-
- if ($based == 'BLOG') {
- $query = "SELECT * FROM ".$this->prefix."articles";
- $query .= " WHERE blog_id = ".$blogId." AND status = 1";
- $query .= " ORDER BY num_reads DESC";
- } elseif ($based == 'SITE') {
- $query = "SELECT * FROM ".$this->prefix."articles";
- $query .= " WHERE status = 1";
- $query .= " ORDER BY num_reads DESC";
- } else {
- return false;
- }
-
- if( $maxPosts > 0 )
- {
- $query .= " LIMIT " . $maxPosts;
- } else {
- $query .= " LIMIT " . $this->maxPosts;
- }
-
- $db =& Db::getDb();
- $result = $db->Execute( $query );
-
- if( !$result )
- return false;
-
- $topreadposts = Array();
- while( $row = $result->FetchRow()) {
- $article = $articles->mapRow( $row );
- array_push( $topreadposts, $article);
- }
-
- return $topreadposts;
- }
- }
-?>
\ No newline at end of file
Copied: plugins/trunk/topreadposts/plugintopreadposts.class.php (from rev 4487, plugins/branches/lifetype-1.1/topreadposts/plugintopreadposts.class.php)
Deleted: plugins/trunk/topreadposts/readme.txt
===================================================================
--- plugins/branches/lifetype-1.1/topreadposts/readme.txt 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/topreadposts/readme.txt 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,25 +0,0 @@
-Plugin: Top Read Posts
-Author: Mark Wu
-Release Date: 2006/11/07
-Version: 1.1
-
-This plugin offers the rank list of articles by number of reads. Usage as follow:
-
-You can use:
-1. $topreadposts->isEnabled() to check the plugin is enabled or not.
-2. $topreadposts->getTopReadPosts( $maxPosts , $based ) to get the top read posts.
-
-Where:
-1. $$maxPosts is the the max posts you want to show. Default is 10.
-2. $based is return the site-wide or blog-wide posts. "BLOG" means blog-wide, and "SITE" means site-wide. Default is "BLOG".
-
-Example:
-{if $topreadposts && $topreadposts->isEnabled()}
-<h2>Top Read Posts</h2>
-<ul>
-{assign var=readposts value=$topreadposts->getTopReadPosts()}
-{foreach from=$readposts item=readpost}
-<li><a href="{$url->postLink($readpost)}">{$readpost->getTopic()} ({$readpost->getNumReads()} Times)</a></li>
-{/foreach}
-</ul>
-{/if}
Copied: plugins/trunk/topreadposts/readme.txt (from rev 4487, plugins/branches/lifetype-1.1/topreadposts/readme.txt)
Copied: plugins/trunk/topreadposts/templates (from rev 4487, plugins/branches/lifetype-1.1/topreadposts/templates)
Deleted: plugins/trunk/topreadposts/templates/topreadposts.template
===================================================================
--- plugins/branches/lifetype-1.1/topreadposts/templates/topreadposts.template 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/topreadposts/templates/topreadposts.template 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,32 +0,0 @@
-{include file="$admintemplatepath/header.template"}
-{include file="$admintemplatepath/navigation.template" showOpt=TopReadPosts title=$locale->tr("topreadposts_plugin")}
-<form name="topreadpostsPluginConfig" method="post">
- <fieldset class="inputField">
- <legend>{$locale->tr("label_configuration")}</legend>
- {include file="$admintemplatepath/successmessage.template"}
- {include file="$admintemplatepath/errormessage.template"}
- <div class="field">
- <label for="pluginEnabled">{$locale->tr("label_enable")}</label>
- <span class="required"></span>
- <div class="formHelp">
- <input class="checkbox" type="checkbox" name="pluginEnabled" id="pluginEnabled" {if $pluginEnabled} checked="checked" {/if} value="1" />{$locale->tr("topreadposts_plugin_enabled")}
- </div>
- </div>
-
- <div class="field">
- <label for="maxPosts">{$locale->tr("label_maxposts")}</label>
- <span class="required">*</span>
- <div class="formHelp">{$locale->tr("topreadposts_maxposts")}</div>
- <input class="text" type="text" name="maxPosts" id="maxPosts" value="{$maxPosts}" width="10" />
- </div>
-
- </fieldset>
-
- <div class="buttons">
- <input type="hidden" name="op" value="updateTopReadPostsConfig" />
- <input type="reset" name="{$locale->tr("reset")}" />
- <input type="submit" name="{$locale->tr("update_settings")}" value="{$locale->tr("update")}" />
- </div>
-</form>
-{include file="$admintemplatepath/footernavigation.template"}
-{include file="$admintemplatepath/footer.template"}
\ No newline at end of file
Copied: plugins/trunk/topreadposts/templates/topreadposts.template (from rev 4487, plugins/branches/lifetype-1.1/topreadposts/templates/topreadposts.template)
Copied: plugins/trunk/toptrackbackposts (from rev 4487, plugins/branches/lifetype-1.1/toptrackbackposts)
Copied: plugins/trunk/toptrackbackposts/class (from rev 4487, plugins/branches/lifetype-1.1/toptrackbackposts/class)
Copied: plugins/trunk/toptrackbackposts/class/action (from rev 4487, plugins/branches/lifetype-1.1/toptrackbackposts/class/action)
Deleted: plugins/trunk/toptrackbackposts/class/action/plugintoptrackbackpostsconfigaction.class.php
===================================================================
--- plugins/branches/lifetype-1.1/toptrackbackposts/class/action/plugintoptrackbackpostsconfigaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/toptrackbackposts/class/action/plugintoptrackbackpostsconfigaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,27 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- include_once( PLOG_CLASS_PATH."class/view/admin/adminplugintemplatedview.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/toptrackbackposts/class/view/plugintoptrackbackpostsconfigview.class.php" );
-
- /**
- * shows a form with the current configuration
- */
- class PluginTopTrackbackPostsConfigAction extends AdminAction
- {
-
- function PluginTopTrackbackPostsConfigAction( $actionInfo, $request )
- {
- $this->AdminAction( $actionInfo, $request );
- }
-
- function perform()
- {
- $this->_view = new PluginTopTrackbackPostsConfigView( $this->_blogInfo );
-
- $this->setCommonData();
-
- return true;
- }
- }
-?>
\ No newline at end of file
Copied: plugins/trunk/toptrackbackposts/class/action/plugintoptrackbackpostsconfigaction.class.php (from rev 4487, plugins/branches/lifetype-1.1/toptrackbackposts/class/action/plugintoptrackbackpostsconfigaction.class.php)
Deleted: plugins/trunk/toptrackbackposts/class/action/plugintoptrackbackpostsupdateconfigaction.class.php
===================================================================
--- plugins/branches/lifetype-1.1/toptrackbackposts/class/action/plugintoptrackbackpostsupdateconfigaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/toptrackbackposts/class/action/plugintoptrackbackpostsupdateconfigaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,69 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- include_once( PLOG_CLASS_PATH."class/view/admin/adminplugintemplatedview.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/toptrackbackposts/class/view/plugintoptrackbackpostsconfigview.class.php" );
-
- /**
- * updates the plugin configuration
- */
- class PluginTopTrackbackPostsUpdateConfigAction extends AdminAction
- {
- var $_pluginEnabled;
- var $_maxPosts;
-
- function PluginRTopTrackbackPostsUpdateConfigAction( $actionInfo, $request )
- {
- $this->AdminAction( $actionInfo, $request );
- }
-
- function validate()
- {
- $this->_pluginEnabled = $this->_request->getValue( "pluginEnabled" );
- $this->_pluginEnabled = ($this->_pluginEnabled != "" );
- $this->_maxPosts = $this->_request->getValue( "maxPosts" );
- if( $this->_maxPosts <= 0 || !ctype_digit($this->_maxPosts) ) {
- $this->_view = new PluginTopTrackbackPostsConfigView( $this->_blogInfo );
- $this->_view->setErrorMessage( $this->_locale->tr("toptrackbackposts_error_maxposts"));
- $this->setCommonData();
-
- return false;
- }
-
- return true;
- }
-
- function perform()
- {
- // // update the plugin configurations to blog setting
- $blogSettings = $this->_blogInfo->getSettings();
- $blogSettings->setValue( "plugin_toptrackbackposts_enabled", $this->_pluginEnabled );
- $blogSettings->setValue( "plugin_toptrackbackposts_maxposts", $this->_maxPosts );
- $this->_blogInfo->setSettings( $blogSettings );
-
- // save the blogs settings
- $blogs = new Blogs();
- if( !$blogs->updateBlog( $this->_blogInfo )) {
- $this->_view = new PluginTopTrackbackPostsConfigView( $this->_blogInfo );
- $this->_view->setErrorMessage( $this->_locale->tr("error_updating_settings"));
- $this->setCommonData();
-
- return false;
- }
-
- // if everything went ok...
- $this->_blogInfo->setSettings( $blogSettings );
- $this->_session->setValue( "blogInfo", $this->_blogInfo );
- $this->saveSession();
-
- $this->_view = new PluginTopTrackbackPostsConfigView( $this->_blogInfo );
- $this->_view->setSuccessMessage( $this->_locale->tr("toptrackbackposts_settings_saved_ok"));
- $this->setCommonData();
-
- // clear the cache
- CacheControl::resetBlogCache( $this->_blogInfo->getId());
-
- return true;
- }
- }
-?>
\ No newline at end of file
Copied: plugins/trunk/toptrackbackposts/class/action/plugintoptrackbackpostsupdateconfigaction.class.php (from rev 4487, plugins/branches/lifetype-1.1/toptrackbackposts/class/action/plugintoptrackbackpostsupdateconfigaction.class.php)
Copied: plugins/trunk/toptrackbackposts/class/view (from rev 4487, plugins/branches/lifetype-1.1/toptrackbackposts/class/view)
Deleted: plugins/trunk/toptrackbackposts/class/view/plugintoptrackbackpostsconfigview.class.php
===================================================================
--- plugins/branches/lifetype-1.1/toptrackbackposts/class/view/plugintoptrackbackpostsconfigview.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/toptrackbackposts/class/view/plugintoptrackbackpostsconfigview.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,31 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/view/admin/adminplugintemplatedview.class.php" );
-
- /**
- * implements the main view of the feed reader plugin
- */
- class PluginTopTrackbackPostsConfigView extends AdminPluginTemplatedView
- {
-
- function PluginTopTrackbackPostsConfigView( $blogInfo )
- {
- $this->AdminPluginTemplatedView( $blogInfo, "toptrackbackposts", "toptrackbackposts" );
- }
-
- function render()
- {
- // load some configuration settings
- $blogSettings = $this->_blogInfo->getSettings();
- $pluginEnabled = $blogSettings->getValue( "plugin_toptrackbackposts_enabled" );
- $maxPosts = $blogSettings->getValue( "plugin_toptrackbackposts_maxposts" );
- if ($maxPosts == "") $maxPosts = 10;
-
- // create a view and export the settings to the template
- $this->setValue( "pluginEnabled", $pluginEnabled );
- $this->setValue( "maxPosts", $maxPosts );
-
- parent::render();
- }
- }
-?>
\ No newline at end of file
Copied: plugins/trunk/toptrackbackposts/class/view/plugintoptrackbackpostsconfigview.class.php (from rev 4487, plugins/branches/lifetype-1.1/toptrackbackposts/class/view/plugintoptrackbackpostsconfigview.class.php)
Copied: plugins/trunk/toptrackbackposts/locale (from rev 4487, plugins/branches/lifetype-1.1/toptrackbackposts/locale)
Deleted: plugins/trunk/toptrackbackposts/locale/locale_en_UK.php
===================================================================
--- plugins/branches/lifetype-1.1/toptrackbackposts/locale/locale_en_UK.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/toptrackbackposts/locale/locale_en_UK.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,16 +0,0 @@
-<?php
-$messages["manageTopPlugins"] = "Top Activities Management";
-$messages["TopTrackbackPosts"] = "Top Trackback Posts";
-$messages["toptrackbackposts"] = "Top Trackback Posts";
-
-$messages["toptrackbackposts_maxposts"] = "Maximum Showed Posts";
-$messages["toptrackbackposts_plugin_enabled"] = "Enable this plugin";
-$messages["toptrackbackposts_plugin"] = "Top Trackback Posts Plugin";
-
-$messages["toptrackbackposts_settings_saved_ok"] = "Top Trackback Posts settings saved successfully!";
-$messages["toptrackbackposts_error_maxposts"] = "Maximum Showed Posts Should > 0!";
-
-$messages["label_configuration"] = "Configuration";
-$messages["label_enable"] = "Enable";
-$messages["label_maxposts"] = "Max Comments";
-?>
\ No newline at end of file
Copied: plugins/trunk/toptrackbackposts/locale/locale_en_UK.php (from rev 4487, plugins/branches/lifetype-1.1/toptrackbackposts/locale/locale_en_UK.php)
Deleted: plugins/trunk/toptrackbackposts/locale/locale_zh_CN.php
===================================================================
--- plugins/branches/lifetype-1.1/toptrackbackposts/locale/locale_zh_CN.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/toptrackbackposts/locale/locale_zh_CN.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,16 +0,0 @@
-<?php
-$messages["manageTopPlugins"] = "åšå®¢æŽ’å管ç†";
-$messages["TopTrackbackPosts"] = "æœ€å¤šå¼•ç”¨æ–‡ç« è®¾ç½®";
-$messages["toptrackbackposts"] = "æœ€å¤šå¼•ç”¨æ–‡ç« ";
-
-$messages["toptrackbackposts_maxposts"] = "æœ€å¤šå¼•ç”¨æ–‡ç« æ˜¾ç¤ºæ•°é‡";
-$messages["toptrackbackposts_plugin_enabled"] = "å¯ç”¨æ’件";
-$messages["toptrackbackposts_plugin"] = "æœ€å¤šå¼•ç”¨æ–‡ç« æ’件";
-
-$messages["toptrackbackposts_settings_saved_ok"] = "æœ€å¤šå¼•ç”¨æ–‡ç« è®¾ç½®å‚¨å˜æˆåŠŸã€‚";
-$messages["toptrackbackposts_error_maxposts"] = "æœ€å¤šå¼•ç”¨æ–‡ç« æ˜¾ç¤ºæ•°é‡å¿…é¡»è¦å¤§äºŽ0!";
-
-$messages["label_configuration"] = "设置";
-$messages["label_enable"] = "å¯ç”¨";
-$messages["label_maxposts"] = "显示数目";
-?>
\ No newline at end of file
Copied: plugins/trunk/toptrackbackposts/locale/locale_zh_CN.php (from rev 4487, plugins/branches/lifetype-1.1/toptrackbackposts/locale/locale_zh_CN.php)
Deleted: plugins/trunk/toptrackbackposts/locale/locale_zh_TW.php
===================================================================
--- plugins/branches/lifetype-1.1/toptrackbackposts/locale/locale_zh_TW.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/toptrackbackposts/locale/locale_zh_TW.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,16 +0,0 @@
-<?php
-$messages["manageTopPlugins"] = "網誌排å管ç†";
-$messages["TopTrackbackPosts"] = "æœ€å¤šå¼•ç”¨æ–‡ç« è¨å®š";
-$messages["toptrackbackposts"] = "æœ€å¤šå¼•ç”¨æ–‡ç« ";
-
-$messages["toptrackbackposts_maxposts"] = "æœ€å¤šå¼•ç”¨æ–‡ç« é¡¯ç¤ºæ•¸é‡";
-$messages["toptrackbackposts_plugin_enabled"] = "啟動外掛程å¼";
-$messages["toptrackbackposts_plugin"] = "æœ€å¤šå¼•ç”¨æ–‡ç« å¤–æŽ›ç¨‹å¼";
-
-$messages["toptrackbackposts_settings_saved_ok"] = "æœ€å¤šå¼•ç”¨æ–‡ç« è¨å®šå„²å˜æˆåŠŸã€‚";
-$messages["toptrackbackposts_error_maxposts"] = "æœ€å¤šå¼•ç”¨æ–‡ç« é¡¯ç¤ºæ•¸é‡å¿…é ˆè¦ > 0!";
-
-$messages["label_configuration"] = "è¨å®š";
-$messages["label_enable"] = "å•Ÿå‹•";
-$messages["label_maxposts"] = "顯示數目";
-?>
\ No newline at end of file
Copied: plugins/trunk/toptrackbackposts/locale/locale_zh_TW.php (from rev 4487, plugins/branches/lifetype-1.1/toptrackbackposts/locale/locale_zh_TW.php)
Deleted: plugins/trunk/toptrackbackposts/plugintoptrackbackposts.class.php
===================================================================
--- plugins/branches/lifetype-1.1/toptrackbackposts/plugintoptrackbackposts.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/toptrackbackposts/plugintoptrackbackposts.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,122 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/plugin/pluginbase.class.php" );
- include_once( PLOG_CLASS_PATH."class/plugin/pluginmanager.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/trackbacks.class.php" );
- include_once( PLOG_CLASS_PATH."class/dao/articles.class.php" );
-
- /**
- * Plugin that offers features to returns the top trackback posts object of current blog
- */
- class PluginTopTrackbackPosts extends PluginBase
- {
- var $prefix;
- var $pluginEnabled;
- var $maxPosts;
-
- function PluginTopTrackbackPosts()
- {
- $this->PluginBase();
-
- $this->id = "toptrackbackposts";
- $this->author = "Mark Wu";
- $this->desc = "This plugin offers the rank list of articles by number of trackbacks.";
-
- $this->prefix = Db::getPrefix();
-
- $this->locales = Array( "en_UK" , "zh_TW" , "zh_CN" );
-
- $this->init();
- }
-
- function init()
- {
- include_once( PLOG_CLASS_PATH."class/template/menu/menu.class.php" );
- $this->registerAdminAction( "toptrackbackposts", "PluginTopTrackbackPostsConfigAction" );
- $this->registerAdminAction( "updateTopTrackbackPostsConfig", "PluginTopTrackbackPostsUpdateConfigAction" );
-
- $menu =& Menu::getMenu();
- if( !$menu->entryExists( "/menu/controlCenter/manageTopPlugins" ))
- $this->addMenuEntry( "/menu/controlCenter", "manageTopPlugins", "", "", true, false );
- $this->addMenuEntry( "/menu/controlCenter/manageTopPlugins", "TopTrackbackPosts", "?op=toptrackbackposts", "" );
- }
-
- function register()
- {
- $blogSettings = $this->blogInfo->getSettings();
- $this->pluginEnabled = $blogSettings->getValue( "plugin_toptrackbackposts_enabled" );
- $this->maxPosts = $blogSettings->getValue( "plugin_toptrackbackposts_maxposts" );
- }
-
- function isEnabled()
- {
- return $this->pluginEnabled;
- }
-
- /**
- * Returns the top trackback posts object of current blog
- */
- function getTopTrackbackPosts($maxPosts = 0, $based = 'BLOG')
- {
- $trackbacks = new Trackbacks();
- $blogId = $this->blogInfo->getId();
-
- $query = "SELECT id, num_nonspam_trackbacks ".
- "FROM ".$this->prefix."articles WHERE ";
- if ($based == 'BLOG')
- $query .= "blog_id='".$blogId."' ";
- $query .= "AND status=1 AND num_nonspam_trackbacks != 0 ".
- "ORDER BY num_nonspam_trackbacks DESC";
-
- if( $maxPosts > 0 )
- {
- $query .= " LIMIT " . $maxPosts;
- } else {
- $query .= " LIMIT " . $this->maxPosts;
- }
-
- $db =& Db::getDb();
- $result = $db->Execute( $query );
- print $query;
- if( !$result )
- return false;
-
- $toptrackbackposts = Array();
- while( $row = $result->FetchRow()) {
- $article = $this->getArticle($row["id"]);
- array_push( $toptrackbackposts, $article);
- }
-
- return $toptrackbackposts;
- }
-
- function getArticle( $artId )
- {
- $articles = new Articles();
- $blogId = $this->blogInfo->getId();
-
- $query = "SELECT * FROM ".$this->prefix."articles WHERE id = ".$artId;
-
- $query .= " AND blog_id = ".$blogId;
-
- $query .= ";";
-
- // we send the query and then fetch the first array with the result
- $db =& Db::getDb();
- $result = $db->Execute( $query );
-
- if( $result == false )
- return false;
-
- if ( $result->RecordCount() == 0)
- return false;
-
- $row = $result->FetchRow( $result );
-
- $article = $articles->mapRow( $row );
-
- return $article;
- }
- }
-
-?>
\ No newline at end of file
Copied: plugins/trunk/toptrackbackposts/plugintoptrackbackposts.class.php (from rev 4487, plugins/branches/lifetype-1.1/toptrackbackposts/plugintoptrackbackposts.class.php)
Deleted: plugins/trunk/toptrackbackposts/readme.txt
===================================================================
--- plugins/branches/lifetype-1.1/toptrackbackposts/readme.txt 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/toptrackbackposts/readme.txt 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,25 +0,0 @@
-Plugin: Top Trackback Posts
-Author: Mark Wu
-Release Date: 2006/11/07
-Version: 1.1
-
-This plugin offers the rank list of articles by number of trackbacks. Usage as follow:
-
-You can use:
-1. $toptrackbackposts->isEnabled() to check the plugin is enabled or not.
-2. $toptrackbackposts->getTopTrackbackPosts( $maxPosts , $based ) to get the top trackback posts.
-
-Where:
-1. $$maxPosts is the the max posts you want to show. Default is 10.
-2. $based is return the site-wide or blog-wide posts. "BLOG" means blog-wide, and "SITE" means site-wide. Default is "BLOG".
-
-Example:
-{if $toptrackbackposts && $toptrackbackposts->isEnabled()}
-<h2>Top Trackback Posts</h2>
-<ul>
-{assign var=trackbackposts value=$toptrackbackposts->getTopTrackbackPosts()}
-{foreach from=$trackbackposts item=trackbackpost}
-<li><a href="{$url->postLink($trackbackpost)}">{$trackbackpost->getTopic()} ({$trackbackpost->getNumTrackbacks()} Trackbacks)</a></li>
-{/foreach}
-</ul>
-{/if}
Copied: plugins/trunk/toptrackbackposts/readme.txt (from rev 4487, plugins/branches/lifetype-1.1/toptrackbackposts/readme.txt)
Copied: plugins/trunk/toptrackbackposts/templates (from rev 4487, plugins/branches/lifetype-1.1/toptrackbackposts/templates)
Deleted: plugins/trunk/toptrackbackposts/templates/toptrackbackposts.template
===================================================================
--- plugins/branches/lifetype-1.1/toptrackbackposts/templates/toptrackbackposts.template 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/toptrackbackposts/templates/toptrackbackposts.template 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,32 +0,0 @@
-{include file="$admintemplatepath/header.template"}
-{include file="$admintemplatepath/navigation.template" showOpt=TopTrackbackPosts title=$locale->tr("toptrackbackposts_plugin")}
-<form name="toptrackbackpostsPluginConfig" method="post">
- <fieldset class="inputField">
- <legend>{$locale->tr("label_configuration")}</legend>
- {include file="$admintemplatepath/successmessage.template"}
- {include file="$admintemplatepath/errormessage.template"}
- <div class="field">
- <label for="pluginEnabled">{$locale->tr("label_enable")}</label>
- <span class="required"></span>
- <div class="formHelp">
- <input class="checkbox" type="checkbox" name="pluginEnabled" id="pluginEnabled" {if $pluginEnabled} checked="checked" {/if} value="1" />{$locale->tr("toptrackbackposts_plugin_enabled")}
- </div>
- </div>
-
- <div class="field">
- <label for="maxPosts">{$locale->tr("label_maxposts")}</label>
- <span class="required">*</span>
- <div class="formHelp">{$locale->tr("toptrackbackposts_maxposts")}</div>
- <input class="text" type="text" name="maxPosts" id="maxPosts" value="{$maxPosts}" width="10" />
- </div>
-
- </fieldset>
-
- <div class="buttons">
- <input type="hidden" name="op" value="updateTopTrackbackPostsConfig" />
- <input type="reset" name="{$locale->tr("reset")}" />
- <input type="submit" name="{$locale->tr("update_settings")}" value="{$locale->tr("update")}" />
- </div>
-</form>
-{include file="$admintemplatepath/footernavigation.template"}
-{include file="$admintemplatepath/footer.template"}
\ No newline at end of file
Copied: plugins/trunk/toptrackbackposts/templates/toptrackbackposts.template (from rev 4487, plugins/branches/lifetype-1.1/toptrackbackposts/templates/toptrackbackposts.template)
Copied: plugins/trunk/unported/currentlyaddictedto (from rev 4487, plugins/branches/lifetype-1.1/unported/currentlyaddictedto)
Deleted: plugins/trunk/unported/currentlyaddictedto/README.txt
===================================================================
--- plugins/branches/lifetype-1.1/unported/currentlyaddictedto/README.txt 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/unported/currentlyaddictedto/README.txt 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,89 +0,0 @@
-++++++++++++++++++++++++++++++++++++++++++++++++
-Readme for the "CurrentlyAddictedTo Plugin"
-version 1.0
-a plugin for pLog (v1.0)
-Developed by Palantir, radar at netpalantir.it
-
-See the plugin in action at my blog:
-http://www.netpalantir.it
-
-This plugin is released under the terms of the LGPL
-
-++++++++++++++++++++++++++++++++++++++++++++++++
-Warning: This is a pre version. It may work, but
-it may also nuke your blog. BACK UP FIRST!!
-++++++++++++++++++++++++++++++++++++++++++++++++
-
-WHAT IT IS
-This is a plugin for pLog version 1. It will NOT work on any other pLog
-previous version, in particular 0.3x series. It will display a new
-administration section, called CAT, which will allow you to create lists of
-things you like, or music you are currently listening to, or books you are
-"addicted to". You will then change your templates, so to make them display
-those lists on your blog.
-
-HOW TO INSTALL (from scratch)
-1. Unpack the archive
-2. Locate the installation directory of your plog
-3. Copy the whole "currentlyaddictedto" directory into the plugin directory
-4. Change the permissions/ownership of all the files, according to your setup.
- If you transfer files via FTP this could be unneccessary. All the files must
- be readable by the web server.
-5. Point your browser to your blog administration page, log in, click on:
- Control Center > Plugin center. The shoutbox plugin should be on your
- list. If it is not, try updating the page a few times, it seems to help ;)
-6. The first time you run it, the plugin should autodetect that a database setup
- is neccessary, and create the table.
-
-HOW TO UPGRADE FROM 0.x VERSION (pLog 0.3x)
-This is currently not supported. However, your previous data are NOT lost, so
-if you need this, let me know, and I will show you how to retrieve your old
-data.
-
-HOW TO MAKE IT WORK
-First, integrate the plugin into the template.
-I am using the grey template, so this example refers to it.
-
-HOW TO USE IT
-There are some pre-defined typed lists, including books and music items. You
-can create your own lists, refer to lists.txt in the distribution. The user
-side of the plugin has no interaction with your visitors. It is just to display
-things. In the admin side, you setup your items.
-Access the CAT plugin from the Plugin Center in the Admin panel. A list of the
-present list is shown. Click on one of them. Your current items are presented.
-On the top, you can add a new item.
-- To add an item, clic on the Add New Item button. A new yellow item will
-appear on the top of the list. Fill in the form, and click on save. The item
-will become blue, this means that it has been saved.
-- To remove an item, use the expire button. The item will be hidden in the user
-area, and will be folded and listed at the bottom of the page. Those items are
-NOT deleted.
-- To get an expired item back, just click on it, in the list at the bottom of
-the page
-
-DOESN'T WORK? BUGS? WISHES? WHO TO CONTACT
-Please, use the pLog's bug reporting system. It's located at:
-http://bugs.plogworld.net
-Otherwise, send me a mail: radar at netpalantir.it
-I must admit I don't read plogworld forum regularly, so if you post there,
-please let me know by mail as well.
-
-+++++++++++++++++++++++++++++++++++++++++++++++
-
-TODO:
-- connection to resources (in particular, book and album covers)
-- communication with Amazon, for ISBN quick lookup
-- better handling of "banner" and "category has no items" messages (now they are
- hardcoded in the classes!)
-- error hadling on the admin side (for now there is no error handling at all)
-- permanent deletion of items
-
-+++++++++++++++++++++++++++++++++++++++++++++++
-
-CHANGELOG:
-v1.00 For pLog 1.0 Rewritten from scratch. New architecture.
-
-v0.x for pLog 0.3
-
-
-
Copied: plugins/trunk/unported/currentlyaddictedto/README.txt (from rev 4487, plugins/branches/lifetype-1.1/unported/currentlyaddictedto/README.txt)
Deleted: plugins/trunk/unported/currentlyaddictedto/cat-presentation.txt
===================================================================
--- plugins/branches/lifetype-1.1/unported/currentlyaddictedto/cat-presentation.txt 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/unported/currentlyaddictedto/cat-presentation.txt 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,18 +0,0 @@
-Great news ;-)
-I have an untested version ready. Untested means that I have installed in on my local development site and on my public website without problems, but I have not used it exstensively, so I can't be sure that there are no bugs. I am starting using it now, so if you can, wait a week or so... I've made this in a hurry, so probably there _are_.
-
-The plugin has been rewritten *from scratch* in order to make it *much* more flexible, and as similar as possible to the screenshots I have found of MovableType TypePad (I hope I am not infringing any copyright, anyway AFAIK a site layout is not copyrigtable...)
-
-This plugin features something very unique (and quite crazy, I know) which is "plugins for plugin": you can create your own "typed list" in a relatively easy way. Do you want a list to feature your stamps collection, your favourite pets, or your girlfiends? All you have to do is to write a very simple stub class, with the data you want to save, and to write the template of the input form (this is very easy since you have the music template at hand, and for simple things all you have to do is to change the fields names). If this sounds strange to you, try following the readme included in the distribution, or just drop me a (detailed!!) description of the class you need, and (sooner or later ;-) I will write it for you.
-
-Installation steps are as easy as unpacking the archive and altering your templates. As always, DO backup your database first: a dump will save your data ;) I have not followed the previous version naming, but even if I did, you would have to change everything anyway, because of the new structure of the plugin. As usual, I am including the gray template example.
-
-Any feedback is appreciated. Please let me know if you have problems, and about the bugs you have found. I will try to fix them quickly.
-
-To be done for the next versions:
-- connection to resources (in particular, book and albums covers)
-- communication with Amazon, for ISBN quick lookup
-- better handling of "banner" and "category has no items" messages (now they are hardcoded!)
-- error hadling on the admin side (for now there is no error handling at all)
-- permanent deletion of items
-
Copied: plugins/trunk/unported/currentlyaddictedto/cat-presentation.txt (from rev 4487, plugins/branches/lifetype-1.1/unported/currentlyaddictedto/cat-presentation.txt)
Copied: plugins/trunk/unported/currentlyaddictedto/class (from rev 4487, plugins/branches/lifetype-1.1/unported/currentlyaddictedto/class)
Copied: plugins/trunk/unported/currentlyaddictedto/class/action (from rev 4487, plugins/branches/lifetype-1.1/unported/currentlyaddictedto/class/action)
Deleted: plugins/trunk/unported/currentlyaddictedto/class/action/plugincurrentlyaddictedtoaction.class.php
===================================================================
--- plugins/branches/lifetype-1.1/unported/currentlyaddictedto/class/action/plugincurrentlyaddictedtoaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/unported/currentlyaddictedto/class/action/plugincurrentlyaddictedtoaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,91 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- include_once( PLOG_CLASS_PATH."class/view/admin/adminplugintemplatedview.class.php" );
- include_once( PLOG_CLASS_PATH."plugins/currentlyaddictedto/class/dao/cat_item.class.php" );
-
- foreach (glob(PLOG_CLASS_PATH . "/plugins/currentlyaddictedto/class/dao/cat_*.php") as $filename) {
- include_once($filename);
- }
-
- class PluginCurrentlyaddictedtoAction extends AdminAction {
-
- function PluginCurrentlyaddictedtoAction( $actionInfo, $request ) {
- $this->AdminAction( $actionInfo, $request );
- }
-
- function perform() {
- // ok, I know, I KNOW! :D
- global $_POST, $_GET;
-
- //print_r($_POST);
-
- // load some configuration settings
- $blogSettings = $this->_blogInfo->getSettings();
-
- $classType = $this->_request->getValue('class_type');
-
- if(!$classType)
- die('No class type set!');
-
- //if(!$blogSettings->getValue("plugin_shoutbox_dbok") || $blogSettings->getValue( "plugin_shoutbox_version") != '0.12') {
- // header('Location: admin.php?op=setupShoutbox');
- // exit();
- //}
-
- if($this->_request->getValue('sub_op') == 'modifyCATItem') {
- eval("\$item = new $classType();");
- $item->fromForm($_POST);
- $item->init($_POST, $this->_blogInfo->getId(), $this->blogId, $blogSettings);
- $item->save();
- }
- else if($this->_request->getValue('sub_op') == 'expireCATItem') {
- eval("\$item = new $classType();");
- $item->fromForm($_POST);
- $item->init($_POST, $this->_blogInfo->getId(), $this->blogId, $blogSettings);
- $item->expire();
- }
- else if($this->_request->getValue('sub_op') == 'unexpire') {
- $itemFetcher = new CAT_ItemsFetcher($this->_blogInfo->getId(), $blogSettings);
- $itemsFetched = $itemFetcher->getItems($classType, false, $this->_request->getValue('id'));
- $item = $itemsFetched[0];
- $item->unexpire();
- }
- else if($this->_request->getValue('sub_op') == 'rate') {
- eval("\$item = new $classType();");
- $item->init($_GET, $this->_blogInfo->getId(), $this->blogId, $blogSettings);
- $item->setRate($this->_request->getValue('rate'));
- }
- else if($this->_request->getValue('sub_op') == 'additem') {
- eval("\$item = new $classType();");
-
- $item->init(array('id'=>0), $this->_blogInfo->getId(), $this->blogId, $blogSettings);
- $addArray = array($item);
- }
-
- // Get the entries
- $itemFetcher = new CAT_ItemsFetcher($this->_blogInfo->getId(), $blogSettings);
-
- $itemsFetched = array_merge($addArray, $itemFetcher->getItems($classType, true));
- //print_r($itemsFetched);
- //$itemsFetched[0]->save();
-
- $expiredItems = $itemFetcher->getItems($classType, false);
-
- $fullQuery = "class_type=$classType&" .
- "op=Currentlyaddictedto";
-
- // create a view and export the settings to the template
- $this->_view = new AdminPluginTemplatedView( $this->_blogInfo, "currentlyaddictedto", strtolower($classType), true );
-
- $this->_view->setValue("items", $itemsFetched);
- $this->_view->setValue("classType", $classType);
- $this->_view->setValue("expiredItems", $expiredItems);
- $this->_view->setValue("fullQuery", $fullQuery);
-
- $this->setCommonData();
-
- return true;
- }
-}
-?>
\ No newline at end of file
Copied: plugins/trunk/unported/currentlyaddictedto/class/action/plugincurrentlyaddictedtoaction.class.php (from rev 4487, plugins/branches/lifetype-1.1/unported/currentlyaddictedto/class/action/plugincurrentlyaddictedtoaction.class.php)
Deleted: plugins/trunk/unported/currentlyaddictedto/class/action/plugincurrentlyaddictedtoselectaction.class.php
===================================================================
--- plugins/branches/lifetype-1.1/unported/currentlyaddictedto/class/action/plugincurrentlyaddictedtoselectaction.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/unported/currentlyaddictedto/class/action/plugincurrentlyaddictedtoselectaction.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,38 +0,0 @@
-<?php
-
- include_once( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
- include_once( PLOG_CLASS_PATH."class/view/admin/adminplugintemplatedview.class.php" );
-
- include_once( PLOG_CLASS_PATH."plugins/currentlyaddictedto/class/dao/cat_item.class.php" );
-
- foreach (glob(PLOG_CLASS_PATH . "/plugins/currentlyaddictedto/class/dao/cat_*.php") as $filename) {
- include_once($filename);
- }
-
- class PluginCurrentlyaddictedtoSelectAction extends AdminAction {
-
-
- function PluginCurrentlyaddictedtoSelectAction( $actionInfo, $request ) {
- $this->AdminAction( $actionInfo, $request );
- }
-
- function perform() {
- // create a view and export the settings to the template
- $this->_view = new AdminPluginTemplatedView( $this->_blogInfo, "currentlyaddictedto", "select", true );
-
- foreach (glob(PLOG_CLASS_PATH . "/plugins/currentlyaddictedto/class/dao/cat_*.php") as $filename) {
- $className = "CAT_" . ucfirst(str_replace('cat_', '', basename(str_replace('.class.php', '', $filename))));
- if($className != 'CAT_Item') {
- eval("\$item = new $className();");
- $banners[$className] = $item->getBanner();
- }
- }
-
- $this->_view->setValue("banners", $banners);
-
- $this->setCommonData();
-
- return true;
- }
-}
-?>
\ No newline at end of file
Copied: plugins/trunk/unported/currentlyaddictedto/class/action/plugincurrentlyaddictedtoselectaction.class.php (from rev 4487, plugins/branches/lifetype-1.1/unported/currentlyaddictedto/class/action/plugincurrentlyaddictedtoselectaction.class.php)
Copied: plugins/trunk/unported/currentlyaddictedto/class/dao (from rev 4487, plugins/branches/lifetype-1.1/unported/currentlyaddictedto/class/dao)
Deleted: plugins/trunk/unported/currentlyaddictedto/class/dao/cat_book.class.php
===================================================================
--- plugins/branches/lifetype-1.1/unported/currentlyaddictedto/class/dao/cat_book.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/unported/currentlyaddictedto/class/dao/cat_book.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,71 +0,0 @@
-<?
-
-class CAT_Book extends CAT_Item {
- var $title;
- var $author;
- var $year;
- var $publisher;
- var $notes;
- var $amazonLink;
-
- function CAT_Book() {
- }
-
- function getBanner() {
- return 'My books';
- }
-
- function getEmptyMessage() {
- return "No items for the moment";
- }
-
- function getClass() {
- return 'CAT_Book';
- }
-
- function isRateable() {
- return true;
- }
-
- function getData() {
- $a = array();
-
- $a['title'] = $this->title;
- $a['author'] = $this->author;
- $a['year'] = $this->year;
- $a['publisher'] = $this->publisher;
- $a['notes'] = $this->notes;
- $a['amazonLink'] = $this->amazonLink;
-
- return serialize($a);
- }
-
- function setData($s) {
- $a = unserialize($s);
-
- $this->title = $a['title'];
- $this->author = $a['author'];
- $this->year = $a['year'];
- $this->publisher = $a['publisher'];
- $this->notes = $a['notes'];
- $this->amazonLink = $a['amazonLink'];
-
- // do NOT set the permalink here!!
- // NO: ---> $this->permalink = $a['permalink']; !!!
- }
-
- function fromForm($a) {
- $this->title = $a['title'];
- $this->author = $a['author'];
- $this->year = $a['year'];
- $this->publisher = $a['publisher'];
- $this->notes = $a['notes'];
- $this->amazonLink = $a['amazonLink'];
-
- // must be here, if you want a permalink.
- // inherited from superclass
- $this->permalink = $a['permalink'];
- }
-}
-
-?>
\ No newline at end of file
Copied: plugins/trunk/unported/currentlyaddictedto/class/dao/cat_book.class.php (from rev 4487, plugins/branches/lifetype-1.1/unported/currentlyaddictedto/class/dao/cat_book.class.php)
Deleted: plugins/trunk/unported/currentlyaddictedto/class/dao/cat_item.class.php
===================================================================
--- plugins/branches/lifetype-1.1/unported/currentlyaddictedto/class/dao/cat_item.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/unported/currentlyaddictedto/class/dao/cat_item.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,255 +0,0 @@
-<?php
-
-include_once( PLOG_CLASS_PATH."class/dao/model.class.php" );
-
-include_once( PLOG_CLASS_PATH."plugins/currentlyaddictedto/class/dao/cat_music.class.php" );
-
-/**
-* schema of the table, so that we can tell ADOdb to create it
-* automatically for us
-*/
-/*
-define( ATOM_PASSWORDS_DB_SCHEMA,
- "user_id I(10) NOTNULL,
- password C(32) NOTNULL DEFAULT ''" );
-*/
-
-
-class CAT_ItemsFetcher extends Model {
-
- var $id;
- var $blogId;
-
- var $blogSettings;
-
- var $resultCounter;
- var $itemsResult;
- var $currentPage;
-
- function CAT_ItemsFetcher($blogId, $blogSettings) {
- $this->blogSettings = $blogSettings;
-
- /* Modelize it! */
- $this->Model();
-
- /* Check Setup */
- $this->createTable();
-
- /* Initialization */
- $this->blogId = $blogId;
- }
-
-
- ###########################################################
- # Database setup section. To be migrated to ADODB, but for the moment I can't get
- # it working :(
- function createTable() {
- $dbPrefix = $this->getPrefix();
-
- $sql = "SELECT * FROM {$dbPrefix}cat_items";
- if( !$this->_db->Execute($sql) ) {
- //echo("Seems there is no such a table! $sql");
- // Make new setup
- $sql = "
-CREATE TABLE {$dbPrefix}cat_items (
- id INT(11) PRIMARY KEY auto_increment,
- blogid INT(11) NOT NULL,
- startdate DATETIME,
- enddate DATETIME DEFAULT NULL,
- permalink TEXT,
- reslink TEXT,
- rate INT NOT NULL DEFAULT 3,
- data TEXT,
- class TEXT
-);
-";
- if( !$this->_db->Execute($sql) ) {
- die("The database setup failed!<br> <pre>". $sql . '</pre>');
- }
- }
- }
-
-
- function getItems($classType, $notExpired = true, $ids = false) {
-
- $sql = "SELECT * FROM " . $this->getPrefix() . "cat_items ";
- $sql .= "WHERE blogid = {$this->blogId} AND class = '$classType' ";
- if($notExpired)
- $sql .= "AND endDate IS NULL ";
- else
- $sql .= "AND endDate IS NOT NULL ";
-
- if($ids)
- $sql .= "AND id IN($ids) ";
-
- $sql .= "ORDER BY enddate, startdate DESC";
-
- //echo($sql . '<br>');
-
- $this->itemsResult = $this->Execute($sql);
- if(!$this->itemsResult)
- die("Grr $sql");
-
- while($itemData = $this->itemsResult->FetchRow()) {
- eval("\$item = new $classType();");
- $item->init($itemData, $this->blogId, $this->blogSettings);
- $item->setData($itemData['data']);
- $res[] = $item;
- }
-
- return $res;
- }
-
- function getLastPage() {
- $sql = "SELECT COUNT(*) as cnt FROM " . $this->getPrefix() . "cat_items ";
- $res = $this->Execute($sql);
- if(!$res)
- return 0;
- $cnt = $res->FetchRow();
- if($cnt['cnt'] > 0)
- $cnt = floor($cnt['cnt'] / 15);
- return $cnt;
- }
-
-
- function thinkAndDo() {
- return $this->getItemsArray();
- }
-}
-
-class CAT_Item extends Model {
- var $id;
- var $blogId;
- var $startDate;
- var $endDate;
- var $permalink;
- var $reslink;
- var $rate;
-
- var $blogSettings;
- var $blogId;
-
- function init($itemData, $blogId, $blogSettings) {
- $this->id = $itemData['id'];
- $this->startDate = $itemData['startdate'];
- $this->endDate = $itemData['enddate'];
- $this->permalink = $itemData['permalink'];
- $this->reslink = $itemData['reslink'];
- $this->rate = $itemData['rate'];
-
- $this->blogSettings = $blogSettings;
-
- /* Modelize it! */
- $this->Model();
-
- /* Initialization */
- $this->blogId = $blogId;
- }
-
- function expire() {
- $this->endDate = date('Y-m-d H:m');
- $this->save();
- }
- function unexpire() {
- $this->endDate = false;
- $this->save();
- }
-
- function setRate($r) {
- if(!$this->isRateable())
- return false;
-
- $sql = "UPDATE " . $this->getPrefix() . "cat_items SET rate = $r WHERE id = {$this->id}";
- $result = $this->Execute($sql);
- if(!$result) {
- die("Sorry, coud not alter your item. $sql");
- }
- }
-
- function save() {
- if($this->id == 0)
- $this->_saveNew();
- else
- $this->_update();
- }
-
- function _saveNew() {
- $data = $this->getData();
- $class = $this->getClass();
-
- $this->startDate = date('Y-m-d H:m');
-
- if(!$this->rate)
- $this->rate = 3;
-
- $sql = "INSERT INTO " . $this->getPrefix() . "cat_items (".
- "blogId,
- permalink,
- reslink,
- rate,
- data,
- class,
- startdate
- ) VALUES (
- {$this->blogId},
- '{$this->permalink}',
- '{$this->reslink}',
- {$this->rate},
- '$data',
- '$class',
- '{$this->startDate}'
- )";
- //echo($sql);
- $result = $this->Execute($sql);
- if(!$result) {
- echo("Sorry, coud not add your item. $sql");
- return false;
- }
- }
-
- function _update() {
- $data = $this->getData();
- $class = $this->getClass();
-
- if(!$this->endDate || $this->endDate == '')
- $endDate = 'NULL';
- else
- $endDate = "'{$this->endDate}'";
-
- if(!$this->rate)
- $this->rate = 3;
-
- $sql = "UPDATE " . $this->getPrefix() . "cat_items SET ".
- "permalink = '{$this->permalink}',
- reslink = '{$this->reslink}',
- rate = {$this->rate},
- data = '$data',
- enddate = $endDate
- WHERE id = {$this->id}";
- $result = $this->Execute($sql);
- //echo($sql);
- if(!$result) {
- echo("Sorry, coud not alter your item. $sql");
- return false;
- }
- }
-
-
- function remove() {}
-
- //function getData() {}
- function getClass() {}
- function isRateable() {}
-
- function getRatingHtml() {
- for($i = 1; $i <= 5; $i++) {
- if($i != $this->rate)
- $res .= '<a href="?op=Currentlyaddictedto&sub_op=rate&class_type=' . $this->getClass() . '&rate=' .$i.'&id='.$this->id.'">' .$i.'</a> ';
- else
- $res .= "<b>{$this->rate}</b> ";
- }
- return $res;
- }
-}
-
-?>
Copied: plugins/trunk/unported/currentlyaddictedto/class/dao/cat_item.class.php (from rev 4487, plugins/branches/lifetype-1.1/unported/currentlyaddictedto/class/dao/cat_item.class.php)
Deleted: plugins/trunk/unported/currentlyaddictedto/class/dao/cat_music.class.php
===================================================================
--- plugins/branches/lifetype-1.1/unported/currentlyaddictedto/class/dao/cat_music.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/unported/currentlyaddictedto/class/dao/cat_music.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,61 +0,0 @@
-<?
-
-class CAT_Music extends CAT_Item {
- var $title;
- var $album;
- var $author;
- var $notes;
-
- function CAT_Music() {
- //die('OK');
- }
-
- function getBanner() {
- return 'Music';
- }
-
- function getEmptyMessage() {
- return "No items for the moment";
- }
-
- function getClass() {
- return 'CAT_Music';
- }
-
- function isRateable() {
- return true;
- }
-
- function getData() {
- $a = array();
-
- $a['title'] = $this->title;
- $a['album'] = $this->album;
- $a['author'] = $this->author;
- $a['notes'] = $this->notes;
-
- return serialize($a);
- }
-
- function setData($s) {
- $a = unserialize($s);
-
- $this->title = $a['title'];
- $this->album = $a['album'];
- $this->author = $a['author'];
- $this->notes = $a['notes'];
- }
-
- function fromForm($a) {
- $this->title = $a['title'];
- $this->album = $a['album'];
- $this->author = $a['author'];
- $this->notes = $a['notes'];
-
- // must be here, if you want a permalink.
- // inherited from superclass
- $this->permalink = $a['permalink'];
- }
-}
-
-?>
\ No newline at end of file
Copied: plugins/trunk/unported/currentlyaddictedto/class/dao/cat_music.class.php (from rev 4487, plugins/branches/lifetype-1.1/unported/currentlyaddictedto/class/dao/cat_music.class.php)
Deleted: plugins/trunk/unported/currentlyaddictedto/lists.txt
===================================================================
--- plugins/branches/lifetype-1.1/unported/currentlyaddictedto/lists.txt 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/unported/currentlyaddictedto/lists.txt 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,83 +0,0 @@
-How to create your own typed list
-This will illustrate all the steps needed to create a Books collection. It may
-seem to be a lot of work, but it's only becausa I have tried to explain this in
-detail :)
-
-*Important Note*: case IS important. CAT_Music is DIFFERENT from cat_music!!!
-
-1. Copy plugins/currentlyaddictedto/class/dao/cat_music.class.php to
-cat_book.class.php
-(at this point, your web site gets down until either you complete this procedure
-or you delete CAT_books.class.php)
-
-2. Open cat_book.class.php and change line 2 to:
-class CAT_Book extends CAT_Item {
-
-3. Now decide which data you want to save. Delete lines 4 to 7, and replace them
-with a list of your data. For example:
-var $title;
-var $author;
-var $year;
-var $publisher;
-var $notes;
-var $amazonLink;
-
-We have added year and publisher, and deleted author. Some fields come for free
-(you don't have to add them) like the first permalink. You can add more links if
-you want: we will add an amazonLink pointing to the amazon book entry.
-
-4. Now, replace line 11 with
-function CAT_Book() {
-
-5. Change the banner, the empty message and the class type:
-Line 15: return 'My books';
-Line 19: return "Not reading anything now";
-Line 23: return 'CAT_Book';
-
-6. Change the remaining functions so that all the data you have added are
-listed. For example:
- function getData() {
- $a = array();
-
- $a['title'] = $this->title;
- $a['author'] = $this->author;
- $a['year'] = $this->year;
- $a['publisher'] = $this->publisher;
- $a['notes'] = $this->notes;
- $a['amazonLink'] = $this->amazonLink;
-
- return serialize($a);
- }
-
- The rest should be as straightforward! Just pay attention to the permalinks,
-this is explained directly in the comments in the code.
-
-7. Now you have to make the template for the admin area. Copy
-plugins/currentlyaddictedto/templates/cat_music.template to cat_book.template
-and open it.
-Then, locate this line: <h2>Music items</h2> and replace it with:
-<h2>My books</h2>
-
-8. You just have to change the fields listed there. A field is composed by a
-snippet like the followind. Delete it from the original, as it is refering to a
-field we have deleted:
-<tr>
- <td>Album</td>
- <td><input type="text" name="album" value="{$item->album}" /></td>
-</tr>
-
-and add instead the other fields we've added, like:
-<tr>
- <td>Publisher</td>
- <td><input type="text" name="publisher" value="{$item->publisher}" size=4
-/></td>
-</tr>
-
-9. Now you should see an item called like the banner you've set before in the
-CAT plugin items selection. If you do, try adding some items to see if
-everything works. Then move ahead to write the template on the user side. Just
-follow the gray example, it should be easy enough.
-
-For your reference, the books list is included in the distribution.
-
-*******************************************************************
\ No newline at end of file
Copied: plugins/trunk/unported/currentlyaddictedto/lists.txt (from rev 4487, plugins/branches/lifetype-1.1/unported/currentlyaddictedto/lists.txt)
Deleted: plugins/trunk/unported/currentlyaddictedto/plugincurrentlyaddictedto.class.php
===================================================================
--- plugins/branches/lifetype-1.1/unported/currentlyaddictedto/plugincurrentlyaddictedto.class.php 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/unported/currentlyaddictedto/plugincurrentlyaddictedto.class.php 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,81 +0,0 @@
-<?php
-
-// -- plugin manager stuff
-include_once( PLOG_CLASS_PATH."class/plugin/pluginbase.class.php" );
-include_once( PLOG_CLASS_PATH."class/dao/blogs.class.php" );
-
-// for the public side action
-include_once( PLOG_CLASS_PATH."class/action/blogaction.class.php" );
-include_once( PLOG_CLASS_PATH."class/view/errorview.class.php" );
-
-// for the admin side action
-include_once( PLOG_CLASS_PATH."class/action/admin/adminaction.class.php" );
-include_once( PLOG_CLASS_PATH."class/view/admin/adminerrorview.class.php" );
-
-// plugin self inclusions
-include_once( PLOG_CLASS_PATH."plugins/currentlyaddictedto/class/dao/cat_item.class.php" );
-foreach (glob(PLOG_CLASS_PATH . "/plugins/currentlyaddictedto/class/dao/cat_*.php") as $filename) {
- include_once($filename);
-}
-
-class PluginCurrentlyaddictedto extends PluginBase {
- var $s;
-
- function PluginCurrentlyaddictedto()
- {
-
- $this->PluginBase();
-
- $this->desc = "Currentlyaddictedto plugin: tell me more about you";
- $this->author = "Palantir (radar at netpalantir.it)";
- $this->id = "Currentlyaddictedto";
- $this->locales = Array();
-
- $this->registerAdminAction("Currentlyaddictedto", "PluginCurrentlyaddictedtoAction" );
- $this->registerAdminAction("CurrentlyaddictedtoSelect", "PluginCurrentlyaddictedtoSelectAction" );
- //$this->registerAdminAction("modifyCATItem", "PluginCurrentlyaddictedtoAction" );
- //$this->registerAdminAction( "deleteCATItem", "PluginCurrentlyaddictedtoUpdateConfigAction" );
- //$this->registerAdminAction( "deleteShouts", "PluginCurrentlyaddictedtoDeleteShoutsAction" );
- //$this->registerAdminAction( "setupCurrentlyaddictedto", "PluginCurrentlyaddictedtoSetupAction" );
-
- $this->addMenuEntry( "/menu/controlCenter/manageSettings", "CAT", "?op=CurrentlyaddictedtoSelect", "" );
- }
-
- function getItems() {
- foreach (glob(PLOG_CLASS_PATH . "/plugins/currentlyaddictedto/class/dao/cat_*.php") as $filename) {
- if(ereg('cat\_([a-zA-Z]+)\.class\.php', basename($filename), $regs)) {
- $className = $regs[1];
- if($className != 'item') {
- $className = $regs[1];
- $if = new CAT_ItemsFetcher($this->blogInfo->getId(),
- $this->blogSettings);
- $items[$className] = $if->getItems('CAT_' . ucfirst($className), true);
- }
- }
- }
- return $items;
- }
-
- function getItemsByCategory($className) {
- $if = new CAT_ItemsFetcher($this->blogInfo->getId(), $this->blogSettings);
- $items = $if->getItems('CAT_' . ucfirst($className), true);
- return $items;
- }
-
- function getBanner($className) {
- eval ('$tmp = new ' . 'CAT_' . ucfirst($className) . "();");
- return $tmp->getBanner();
- }
-
- function getEmptyMessage($className) {
- eval ('$tmp = new ' . 'CAT_' . ucfirst($className) . "();");
- return $tmp->getEmptyMessage();
- }
-
- function process( $eventType, $params )
- {
- // return the content as it came, as the caller class probably expected us to do
- // something with it...
- return $params;
- }
-}
\ No newline at end of file
Copied: plugins/trunk/unported/currentlyaddictedto/plugincurrentlyaddictedto.class.php (from rev 4487, plugins/branches/lifetype-1.1/unported/currentlyaddictedto/plugincurrentlyaddictedto.class.php)
Copied: plugins/trunk/unported/currentlyaddictedto/template-example (from rev 4487, plugins/branches/lifetype-1.1/unported/currentlyaddictedto/template-example)
Copied: plugins/trunk/unported/currentlyaddictedto/template-example/grey (from rev 4487, plugins/branches/lifetype-1.1/unported/currentlyaddictedto/template-example/grey)
Deleted: plugins/trunk/unported/currentlyaddictedto/template-example/grey/header.template
===================================================================
--- plugins/branches/lifetype-1.1/unported/currentlyaddictedto/template-example/grey/header.template 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/unported/currentlyaddictedto/template-example/grey/header.template 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,101 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="{$locale->getLanguageId()}"
- lang="{$locale->getLanguageId()}" dir="{$locale->getDirection()}">
-<head>
- <meta http-equiv="Content-Type" content="text/html;charset={$locale->getCharset()}" />
- <meta name="generator" content="{$version}" />
- <meta http-equiv="Content-Language" content="{$locale->getLanguageId()}" />
- <title>{$blog->getBlog()}{$postPageTitle}</title>
- <link rel="stylesheet" title="Default" href="{$url->getTemplateFile("grey.css")}" type="text/css" />
- <link rel="alternate" type="text/xml" title="RSS 2.0" href="{$url->rssLink("rss20")}" />
- <link rel="alternate" type="text/xml" title="RSS 1.0" href="{$url->rssLink("rss10")}" />
- <link rel="alternate" type="text/xml" title="RSS 0.90" href="{$url->rssLink("rss090")}" />
- <link rel="alternate" type="application/atom+xml" title="Atom 0.3" href="{$url->rssLink("atom")}" />
-</head>
- <body>
- <p class="Upgrade">This page looks plain and unstyled because you're using a non-standard compliant browser. To see it in its best form, please <a href="http://www.webstandards.org/upgrade/" title="The Web Standards Project's Browser Upgrade initiative">upgrade</a> to a browser that supports web standards. It's free and painless.</p>
- <div id="Container">
- <div id="Top"><h1>{$blog->getBlog()}</h1></div>
- <div id="Topmenu">
- <a href="{$url->blogLink()}">{$locale->tr("main")}</a> |
- <a href="{$url->albumLink()}">{$locale->tr("albums")}</a> |
- <a href="{$url->getAdminUrl()}">{$locale->tr("admin")}</a>
- </div>
- <div id="Main">
- <div id="Sidebar-l">
- <div class="Sidetitle">
- <h4>{$locale->tr("calendar")}</h4>
- </div>
- <div class="calendar">
- {$calendar}
- </div>
- <div class="Sidetitle">
- <h4>{$locale->tr("recently")}</h4>
- </div>
- <p>
- {foreach from=$recentposts item=recentpost}
- <a title="{$recentpost->getText()|truncate:150:"..."|strip_tags|escape}" href="{$url->postLink($recentpost)}">{$recentpost->getTopic()}</a><br/>
- {/foreach}
- </p>
-
-
- {assign var="music_items" value=$currentlyaddictedto->getItemsByCategory('music')}
- <div class="Sidetitle">
- <h4>{$currentlyaddictedto->getBanner('music')}</h4>
- </div>
- <p>
- {if count($music_items) == 0}
- $currentlyaddictedto->getEmptyMessage('music')
- {/if}
-
- {foreach from=$music_items item=anitem}
- "<b>{$anitem->title}"</B>
- {if $anitem->author != ""}
- by {$anitem->author}
- {/if}
-
- {if $anitem->album != ""}
- on {$anitem->album}
- {/if}
-
- ({$anitem->rate}*)<br/>
-
- {if $anitem->notes != ""}
- <font color="#8B917B">{$anitem->notes}</font><br/>
- {/if}
-
- {if $anitem->permalink != ""}
- <A href="{$anitem->permalink}">(More)</A><br/>
- {/if}
- {/foreach}
- </p>
-
- {assign var="books" value=$currentlyaddictedto->getItemsByCategory('book')}
- <div class="Sidetitle">
- <h4>{$currentlyaddictedto->getBanner('music')}</h4>
- </div>
- <p>
- {if count($books) == 0}
- {$currentlyaddictedto->getEmptyMessage('book')}
- {/if}
-
- {foreach from=$books item=anitem}
- "<b>{$anitem->title}"</B>
- {if $anitem->author != ""}
- by {$anitem->author}
- {/if}
-
- ({$anitem->rate}*)<br/>
-
- {if $anitem->notes != ""}
- <font color="#8B917B">{$anitem->notes}</font><br/>
- {/if}
-
- {if $anitem->permalink != ""}
- <A href="{$anitem->permalink}">(More)</A><br/>
- {/if}
- {/foreach}
- </p>
-
- </div>
- <div id="Content">
\ No newline at end of file
Copied: plugins/trunk/unported/currentlyaddictedto/template-example/grey/header.template (from rev 4487, plugins/branches/lifetype-1.1/unported/currentlyaddictedto/template-example/grey/header.template)
Copied: plugins/trunk/unported/currentlyaddictedto/templates (from rev 4487, plugins/branches/lifetype-1.1/unported/currentlyaddictedto/templates)
Deleted: plugins/trunk/unported/currentlyaddictedto/templates/cat_book.template
===================================================================
--- plugins/branches/lifetype-1.1/unported/currentlyaddictedto/templates/cat_book.template 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/unported/currentlyaddictedto/templates/cat_book.template 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,147 +0,0 @@
-{include file="$admintemplatepath/header.template"}
-{include file="$admintemplatepath/navigation.template" showOpt=CAT title=$locale->tr("CAT")}
-
-{literal}
-<SCRIPT>
-var submitUsed = '';
-function doConfirm() {
- if(submitUsed == 'del')
- if(!confirm('Are you sure to delete? There is NO undo!'))
- return false;
- return true;
-}
-
-function selectOp(id, w) {
- document.getElementById("sub_op" + id).value = w;
-}
-</SCRIPT>
-
-<style>
-.alternate1 {
- background-color: #DBE6FF;
-}
-
-.alternate2 {
- background-color: white;
-}
-.alternate_new {
- background-color: #FFF6B8;
-}
-</style>
-{/literal}
-
-<h2>My books</h2>
-
-<!--
-<fieldset class="inputField">
- <legend>Nuova Risorsa</legend>
- <div class="field" id="fileFields">
- <label for="resourceFile_1">File</label>
- <span class="required">*</span>
- <div class="formHelp">File that will be added to the current blog. Use the "Add field" link to upload more than one file at the same time</div>
- <input type="file" id="resourceFile_1" name="resourceFile_1" />
- <div id="marker" style="clear:none;"></div>
- <a href="javascript:addElementToForm('fileFields','file','resourceFile','')">Add field</a>
-
- </div>
--->
-
-<form method="post">
- <fieldset class="inputField">
- <legend>New item</legend>
- <input type="hidden" id="sub_op" name="sub_op" value="additem" />
- <input type="hidden" name="op" value="Currentlyaddictedto" />
- <input type="submit" name="ok" value="Add a new item here">
- </fieldset>
-</form>
-
-<br>
-
-
-
-{assign var="altern" value="2"}
-{foreach from=$items item=item key=itemId}
- {if $altern == 1}
- {assign var="altern" value="2"}
- {else}
- {assign var="altern" value="1"}
- {/if}
-
- {if $item->id == 0}
- {assign var="altern" value="_new"}
- {/if}
-
- <fieldset class="inputField ">
- <legend>Item</legend>
- <table>
- <tr class="alternate{$altern}">
- <FORM method="POST">
- <td width="150">
- Image here (to be implemented)<br><br>
- Rate this item:<br>
- {$item->getRatingHtml()}
- </td>
- <td>
- <table>
- <tr>
- <td width="80">Title</td>
- <td><input type="text" name="title" value="{$item->title}" /></td>
- </tr>
- <tr>
- <td>Author</td>
- <td><input type="text" name="author" value="{$item->author}" /></td>
- </tr>
- <tr>
- <td>Year</td>
- <td><input type="text" name="year" value="{$item->year}" size=4 /></td>
- </tr>
- <tr>
- <td>Publisher</td>
- <td><input type="text" name="publisher" value="{$item->publisher}" size=4 /></td>
- </tr>
- <tr>
- <td>Link / permalink</td>
- <td><input type="text" name="permalink" value="{$item->permalink}" /></td>
- </tr>
- <tr>
- <td>Amazon Link</td>
- <td><input type="text" name="amazonLink" value="{$item->amazonLink}" /></td>
- </tr>
- <tr>
- <td>Notes</td>
- <td><textarea name="notes" rows="4" cols="50">{$item->notes}</textarea></td>
- </tr>
- <tr>
- <td colspan="2" align="center">
- <input type="hidden" name="id" value="{$item->id}" />
- <input type="hidden" name="class_type" value="{$classType}" />
- <input type="hidden" id="sub_op{$item->id}" name="sub_op" value="" />
- <input type="hidden" name="op" value="Currentlyaddictedto" />
- <input type="submit" name="add" value="Save" onClick='selectOp({$item->id}, "modifyCATItem")' />
- <input type="submit" name="del" value="Expire" onClick='selectOp({$item->id}, "expireCATItem")' />
- </td>
- </tr>
- </table>
-
-
- </td>
-
- </FORM>
- </tr>
- </table>
- </fieldset>
-{/foreach}
-
-<b>Expired items list</b> (click on an item to unexpire)<br>
-<ul>
-{foreach from=$expiredItems item=item key=itemId}
- <li><a href="?{$fullQuery}&sub_op=unexpire&id={$item->id}">{$item->title} - {$item->author}</a></li>
-{/foreach}
-</ul>
-
-{if count($expiredItems) == 0}
- No expired items
-{/if}
-
-{include file="$admintemplatepath/footernavigation.template"}
-{include file="$admintemplatepath/footer.template"}
\ No newline at end of file
Copied: plugins/trunk/unported/currentlyaddictedto/templates/cat_book.template (from rev 4487, plugins/branches/lifetype-1.1/unported/currentlyaddictedto/templates/cat_book.template)
Deleted: plugins/trunk/unported/currentlyaddictedto/templates/cat_music.template
===================================================================
--- plugins/branches/lifetype-1.1/unported/currentlyaddictedto/templates/cat_music.template 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/unported/currentlyaddictedto/templates/cat_music.template 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,139 +0,0 @@
-{include file="$admintemplatepath/header.template"}
-{include file="$admintemplatepath/navigation.template" showOpt=CAT title=$locale->tr("CAT")}
-
-{literal}
-<SCRIPT>
-var submitUsed = '';
-function doConfirm() {
- if(submitUsed == 'del')
- if(!confirm('Are you sure to delete? There is NO undo!'))
- return false;
- return true;
-}
-
-function selectOp(id, w) {
- document.getElementById("sub_op" + id).value = w;
-}
-</SCRIPT>
-
-<style>
-.alternate1 {
- background-color: #DBE6FF;
-}
-
-.alternate2 {
- background-color: white;
-}
-.alternate_new {
- background-color: #FFF6B8;
-}
-</style>
-{/literal}
-
-<h2>Music items</h2>
-
-<!--
-<fieldset class="inputField">
- <legend>Nuova Risorsa</legend>
- <div class="field" id="fileFields">
- <label for="resourceFile_1">File</label>
- <span class="required">*</span>
- <div class="formHelp">File that will be added to the current blog. Use the "Add field" link to upload more than one file at the same time</div>
- <input type="file" id="resourceFile_1" name="resourceFile_1" />
- <div id="marker" style="clear:none;"></div>
- <a href="javascript:addElementToForm('fileFields','file','resourceFile','')">Add field</a>
-
- </div>
--->
-
-<form method="post">
- <fieldset class="inputField">
- <legend>New item</legend>
- <input type="hidden" id="sub_op" name="sub_op" value="additem" />
- <input type="hidden" name="op" value="Currentlyaddictedto" />
- <input type="submit" name="ok" value="Add a new item here">
- </fieldset>
-</form>
-
-<br>
-
-
-
-{assign var="altern" value="2"}
-{foreach from=$items item=item key=itemId}
- {if $altern == 1}
- {assign var="altern" value="2"}
- {else}
- {assign var="altern" value="1"}
- {/if}
-
- {if $item->id == 0}
- {assign var="altern" value="_new"}
- {/if}
-
- <fieldset class="inputField ">
- <legend>Item</legend>
- <table>
- <tr class="alternate{$altern}">
- <FORM method="POST">
- <td width="150">
- Image here (to be implemented)<br><br>
- Rate this item:<br>
- {$item->getRatingHtml()}
- </td>
- <td>
- <table>
- <tr>
- <td width="80">Title</td>
- <td><input type="text" name="title" value="{$item->title}" /></td>
- </tr>
- <tr>
- <td>Album</td>
- <td><input type="text" name="album" value="{$item->album}" /></td>
- </tr>
- <tr>
- <td>Author</td>
- <td><input type="text" name="author" value="{$item->author}" /></td>
- </tr>
- <tr>
- <td>Link / permalink</td>
- <td><input type="text" name="permalink" value="{$item->permalink}" /></td>
- </tr>
- <tr>
- <td>Notes</td>
- <td><textarea name="notes" rows="4" cols="50">{$item->notes}</textarea></td>
- </tr>
- <tr>
- <td colspan="2" align="center">
- <input type="hidden" name="id" value="{$item->id}" />
- <input type="hidden" name="class_type" value="CAT_Music" />
- <input type="hidden" id="sub_op{$item->id}" name="sub_op" value="" />
- <input type="hidden" name="op" value="Currentlyaddictedto" />
- <input type="submit" name="add" value="Save" onClick='selectOp({$item->id}, "modifyCATItem")' />
- <input type="submit" name="del" value="Expire" onClick='selectOp({$item->id}, "expireCATItem")' />
- </td>
- </tr>
- </table>
-
-
- </td>
-
- </FORM>
- </tr>
- </table>
- </fieldset>
-{/foreach}
-
-<b>Expired items list</b> (click on an item to unexpire)<br>
-<ul>
-{foreach from=$expiredItems item=item key=itemId}
- <li><a href="?{$fullQuery}&sub_op=unexpire&id={$item->id}">{$item->title} - {$item->author}</a></li>
-{/foreach}
-</ul>
-
-{if count($expiredItems) == 0}
- No expired items
-{/if}
-
-{include file="$admintemplatepath/footernavigation.template"}
-{include file="$admintemplatepath/footer.template"}
\ No newline at end of file
Copied: plugins/trunk/unported/currentlyaddictedto/templates/cat_music.template (from rev 4487, plugins/branches/lifetype-1.1/unported/currentlyaddictedto/templates/cat_music.template)
Deleted: plugins/trunk/unported/currentlyaddictedto/templates/select.template
===================================================================
--- plugins/branches/lifetype-1.1/unported/currentlyaddictedto/templates/select.template 2007-01-04 14:29:05 UTC (rev 4487)
+++ plugins/trunk/unported/currentlyaddictedto/templates/select.template 2007-01-04 19:10:56 UTC (rev 4488)
@@ -1,16 +0,0 @@
-{include file="$admintemplatepath/header.template"}
-{include file="$admintemplatepath/navigation.template" showOpt=CAT title=$locale->tr("CAT")}
-
-<ul class="menuTop">
- <li class="Level_1">Select the list you want to edit</li>
- <ul class="menuTop">
- {foreach from=$banners item=item key=itemId}
- <li class="Level_0"><a href="?op=Currentlyaddictedto&class_type={$itemId}">{$item}</a></li>
- {/foreach}
- </ul>
-</ul>
-
-
-
-{include file="$admintemplatepath/footernavigation.template"}
-{include file="$admintemplatepath/footer.template"}
\ No newline at end of file
Copied: plugins/trunk/unported/currentlyaddictedto/templates/select.template (from rev 4487, plugins/branches/lifetype-1.1/unported/currentlyaddictedto/templates/select.template)
Copied: plugins/trunk/validatetrackback/locale/locale_ca_ES.php (from rev 4487, plugins/branches/lifetype-1.1/validatetrackback/locale/locale_ca_ES.php)
More information about the pLog-svn
mailing list