[pLog-svn] r7269 - in plugins/branches/lifetype-1.2/subscribe: . class/action class/dao class/security class/view
jondaley at devel.lifetype.net
jondaley at devel.lifetype.net
Thu Feb 8 05:07:33 EST 2024
Author: jondaley
Date: 2024-02-08 05:07:33 -0500 (Thu, 08 Feb 2024)
New Revision: 7269
Modified:
plugins/branches/lifetype-1.2/subscribe/class/action/pluginsubscribeconfirmaction.class.php
plugins/branches/lifetype-1.2/subscribe/class/action/pluginsubscriberegisteraction.class.php
plugins/branches/lifetype-1.2/subscribe/class/action/pluginsubscriberemoveaction.class.php
plugins/branches/lifetype-1.2/subscribe/class/action/pluginsubscribeshowaction.class.php
plugins/branches/lifetype-1.2/subscribe/class/action/pluginsubscribeshowconfigaction.class.php
plugins/branches/lifetype-1.2/subscribe/class/action/pluginsubscribeupdateconfigaction.class.php
plugins/branches/lifetype-1.2/subscribe/class/dao/codevalidator.class.php
plugins/branches/lifetype-1.2/subscribe/class/dao/subscriptions.class.php
plugins/branches/lifetype-1.2/subscribe/class/security/subscribefilter.class.php
plugins/branches/lifetype-1.2/subscribe/class/view/pluginsubscriberequestconfirmationview.class.php
plugins/branches/lifetype-1.2/subscribe/class/view/pluginsubscribeshowconfigview.class.php
plugins/branches/lifetype-1.2/subscribe/class/view/pluginsubscribeshowview.class.php
plugins/branches/lifetype-1.2/subscribe/pluginsubscribe.class.php
Log:
whitespace only
Modified: plugins/branches/lifetype-1.2/subscribe/class/action/pluginsubscribeconfirmaction.class.php
===================================================================
--- plugins/branches/lifetype-1.2/subscribe/class/action/pluginsubscribeconfirmaction.class.php 2024-01-14 20:47:34 UTC (rev 7268)
+++ plugins/branches/lifetype-1.2/subscribe/class/action/pluginsubscribeconfirmaction.class.php 2024-02-08 10:07:33 UTC (rev 7269)
@@ -1,51 +1,49 @@
<?php
+lt_include( PLOG_CLASS_PATH."class/action/blogaction.class.php" );
+lt_include( PLOG_CLASS_PATH."plugins/subscribe/class/view/pluginsubscribeshowview.class.php" );
+lt_include( PLOG_CLASS_PATH."class/view/errorview.class.php" );
+lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
+lt_include( PLOG_CLASS_PATH."plugins/subscribe/class/dao/codevalidator.class.php" );
- lt_include( PLOG_CLASS_PATH."class/action/blogaction.class.php" );
- lt_include( PLOG_CLASS_PATH."plugins/subscribe/class/view/pluginsubscribeshowview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/view/errorview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
- lt_include( PLOG_CLASS_PATH."plugins/subscribe/class/dao/codevalidator.class.php" );
+class PluginSubscribeConfirmAction extends BlogAction
+{
+ function PluginSubscribeConfirmAction($actionInfo, $request){
+ $this->BlogAction($actionInfo, $request);
- class PluginSubscribeConfirmAction extends BlogAction
- {
- function PluginSubscribeConfirmAction($actionInfo, $request){
- $this->BlogAction($actionInfo, $request);
+ $this->registerFieldValidator("code", new CodeValidator());
- $this->registerFieldValidator("code", new CodeValidator());
+ $view = new ErrorView($this->_blogInfo);
+ $view->setErrorMessage($this->_locale->tr("subscribe_error_incorrect_confirmation_code"));
+ $this->setValidationErrorView($view);
+ return true;
+ }
- $view = new ErrorView($this->_blogInfo);
- $view->setErrorMessage($this->_locale->tr("subscribe_error_incorrect_confirmation_code"));
- $this->setValidationErrorView($view);
- return true;
- }
+ function perform(){
+ $blogSettings = $this->_blogInfo->getSettings();
+ $enabled = $blogSettings->getValue("plugin_subscribe_enabled", false);
+ if(!$enabled){
+ $this->_view = new ErrorView($this->_blogInfo);
+ $this->_view->setErrorMessage($this->_locale->tr("subscribe_disabled"));
+ $this->setCommonData();
+ return false;
+ }
- function perform(){
- $blogSettings = $this->_blogInfo->getSettings();
- $enabled = $blogSettings->getValue("plugin_subscribe_enabled", false);
- if(!$enabled){
- $this->_view = new ErrorView($this->_blogInfo);
- $this->_view->setErrorMessage($this->_locale->tr("subscribe_disabled"));
- $this->setCommonData();
- return false;
- }
+ $confirmation = $this->_request->getValue("code");
- $confirmation = $this->_request->getValue("code");
+ if(!Subscriptions::confirmSubscription($confirmation)){
+ $this->_view = new ErrorView($this->_blogInfo);
+ $this->_view->setErrorMessage(
+ $this->_locale->tr("subscribe_error_confirming"));
+ $this->setCommonData();
+ return false;
- if(!Subscriptions::confirmSubscription($confirmation)){
- $this->_view = new ErrorView($this->_blogInfo);
- $this->_view->setErrorMessage(
- $this->_locale->tr("subscribe_error_confirming"));
- $this->setCommonData();
- return false;
+ }
- }
-
- $this->_view = new PluginSubscribeShowView($this->_blogInfo, false);
- $this->_view->setSuccessMessage(
- $this->_locale->tr("subscribe_subscription_saved_ok"));
- $this->setCommonData();
+ $this->_view = new PluginSubscribeShowView($this->_blogInfo, false);
+ $this->_view->setSuccessMessage(
+ $this->_locale->tr("subscribe_subscription_saved_ok"));
+ $this->setCommonData();
- return true;
- }
- }
-?>
\ No newline at end of file
+ return true;
+ }
+}
Modified: plugins/branches/lifetype-1.2/subscribe/class/action/pluginsubscriberegisteraction.class.php
===================================================================
--- plugins/branches/lifetype-1.2/subscribe/class/action/pluginsubscriberegisteraction.class.php 2024-01-14 20:47:34 UTC (rev 7268)
+++ plugins/branches/lifetype-1.2/subscribe/class/action/pluginsubscriberegisteraction.class.php 2024-02-08 10:07:33 UTC (rev 7269)
@@ -1,68 +1,66 @@
<?php
+lt_include(PLOG_CLASS_PATH."class/action/blogaction.class.php");
+lt_include(PLOG_CLASS_PATH."plugins/subscribe/class/view/pluginsubscriberequestconfirmationview.class.php");
+lt_include(PLOG_CLASS_PATH."class/view/errorview.class.php");
+lt_include(PLOG_CLASS_PATH."class/config/config.class.php");
+lt_include(PLOG_CLASS_PATH."class/data/validator/emailvalidator.class.php");
+lt_include(PLOG_CLASS_PATH."class/data/validator/arrayvalidator.class.php");
- lt_include(PLOG_CLASS_PATH."class/action/blogaction.class.php");
- lt_include(PLOG_CLASS_PATH."plugins/subscribe/class/view/pluginsubscriberequestconfirmationview.class.php");
- lt_include(PLOG_CLASS_PATH."class/view/errorview.class.php");
- lt_include(PLOG_CLASS_PATH."class/config/config.class.php");
- lt_include(PLOG_CLASS_PATH."class/data/validator/emailvalidator.class.php");
- lt_include(PLOG_CLASS_PATH."class/data/validator/arrayvalidator.class.php");
+class PluginSubscribeRegisterAction extends BlogAction
+{
+ function PluginSubscribeRegisterAction($actionInfo, $request){
+ $this->BlogAction($actionInfo, $request);
- class PluginSubscribeRegisterAction extends BlogAction
- {
- function PluginSubscribeRegisterAction($actionInfo, $request){
- $this->BlogAction($actionInfo, $request);
+ $this->registerFieldValidator("subscribeEmail", new EmailValidator());
+ $this->registerFieldValidator("subscribeCategories", new ArrayValidator());
+ // todo: check if at least one category is selected
- $this->registerFieldValidator("subscribeEmail", new EmailValidator());
- $this->registerFieldValidator("subscribeCategories", new ArrayValidator());
- // todo: check if at least one category is selected
+ $view = new ErrorView($this->_blogInfo);
+ $view->setErrorMessage($this->_locale->tr("subscribe_missing_required_info"));
+ $this->setValidationErrorView($view);
+ return true;
+ }
- $view = new ErrorView($this->_blogInfo);
- $view->setErrorMessage($this->_locale->tr("subscribe_missing_required_info"));
- $this->setValidationErrorView($view);
- return true;
- }
+ function perform(){
+ $blogSettings = $this->_blogInfo->getSettings();
+ $enabled = $blogSettings->getValue("plugin_subscribe_enabled", false);
+ if(!$enabled){
+ $this->_view = new ErrorView($this->_blogInfo);
+ $this->_view->setErrorMessage($this->_locale->tr("subscribe_disabled"));
+ $this->setCommonData();
+ return false;
+ }
- function perform(){
- $blogSettings = $this->_blogInfo->getSettings();
- $enabled = $blogSettings->getValue("plugin_subscribe_enabled", false);
- if(!$enabled){
- $this->_view = new ErrorView($this->_blogInfo);
- $this->_view->setErrorMessage($this->_locale->tr("subscribe_disabled"));
- $this->setCommonData();
- return false;
- }
+ $registerCategories = $this->_request->getValue("subscribeCategories");
+ $emailAddress = $this->_request->getValue("subscribeEmail");
- $registerCategories = $this->_request->getValue("subscribeCategories");
- $emailAddress = $this->_request->getValue("subscribeEmail");
+ // save subscription info to database
+ if(!Subscriptions::addSubscriptions($this->_blogInfo,
+ $registerCategories,
+ SUBSCRIBE_POSTS_IN_CATEGORY,
+ $emailAddress)){
+ $this->_view = new ErrorView($this->_blogInfo);
+ $this->_view->setErrorMessage($this->_locale->tr("subscribe_error_subscribing"));
+ $this->setCommonData();
+ return false;
- // save subscription info to database
- if(!Subscriptions::addSubscriptions($this->_blogInfo,
- $registerCategories,
- SUBSCRIBE_POSTS_IN_CATEGORY,
- $emailAddress)){
- $this->_view = new ErrorView($this->_blogInfo);
- $this->_view->setErrorMessage($this->_locale->tr("subscribe_error_subscribing"));
- $this->setCommonData();
- return false;
+ }
- }
-
- if(Subscriptions::sendConfirmationEmail($this->_blogInfo,
- $emailAddress))
- {
- $this->_view = new PluginSubscribeRequestConfirmationView($this->_blogInfo);
- $this->_view->setSuccessMessage(
- $this->_locale->tr("subscribe_confirm_subscription"));
- $this->setCommonData();
- return true;
- }
- else{
- $this->_view = new ErrorView($this->_blogInfo);
- $this->_view->setErrorMessage(
- $this->_locale->tr("subscribe_couldnt_send_confirmation"));
- $this->setCommonData();
- return false;
- }
- }
+ if(Subscriptions::sendConfirmationEmail($this->_blogInfo,
+ $emailAddress))
+ {
+ $this->_view = new PluginSubscribeRequestConfirmationView($this->_blogInfo);
+ $this->_view->setSuccessMessage(
+ $this->_locale->tr("subscribe_confirm_subscription"));
+ $this->setCommonData();
+ return true;
}
-?>
\ No newline at end of file
+ else{
+ $this->_view = new ErrorView($this->_blogInfo);
+ $this->_view->setErrorMessage(
+ $this->_locale->tr("subscribe_couldnt_send_confirmation"));
+ $this->setCommonData();
+ return false;
+ }
+ }
+}
Modified: plugins/branches/lifetype-1.2/subscribe/class/action/pluginsubscriberemoveaction.class.php
===================================================================
--- plugins/branches/lifetype-1.2/subscribe/class/action/pluginsubscriberemoveaction.class.php 2024-01-14 20:47:34 UTC (rev 7268)
+++ plugins/branches/lifetype-1.2/subscribe/class/action/pluginsubscriberemoveaction.class.php 2024-02-08 10:07:33 UTC (rev 7269)
@@ -1,51 +1,50 @@
<?php
- lt_include(PLOG_CLASS_PATH."class/action/blogaction.class.php");
- lt_include(PLOG_CLASS_PATH."plugins/subscribe/class/view/pluginsubscribeshowview.class.php");
- lt_include(PLOG_CLASS_PATH."class/view/errorview.class.php");
- lt_include(PLOG_CLASS_PATH."class/config/config.class.php");
- lt_include(PLOG_CLASS_PATH."plugins/subscribe/class/dao/codevalidator.class.php");
+lt_include(PLOG_CLASS_PATH."class/action/blogaction.class.php");
+lt_include(PLOG_CLASS_PATH."plugins/subscribe/class/view/pluginsubscribeshowview.class.php");
+lt_include(PLOG_CLASS_PATH."class/view/errorview.class.php");
+lt_include(PLOG_CLASS_PATH."class/config/config.class.php");
+lt_include(PLOG_CLASS_PATH."plugins/subscribe/class/dao/codevalidator.class.php");
- class PluginSubscribeRemoveAction extends BlogAction
- {
- function PluginSubscribeRemoveAction($actionInfo, $request){
- $this->BlogAction($actionInfo, $request);
+class PluginSubscribeRemoveAction extends BlogAction
+{
+ function PluginSubscribeRemoveAction($actionInfo, $request){
+ $this->BlogAction($actionInfo, $request);
- $this->registerFieldValidator("code", new CodeValidator());
+ $this->registerFieldValidator("code", new CodeValidator());
- $view = new ErrorView($this->_blogInfo);
- $view->setErrorMessage($this->_locale->tr("subscribe_error_incorrect_confirmation_code"));
- $this->setValidationErrorView($view);
- return true;
- }
+ $view = new ErrorView($this->_blogInfo);
+ $view->setErrorMessage($this->_locale->tr("subscribe_error_incorrect_confirmation_code"));
+ $this->setValidationErrorView($view);
+ return true;
+ }
- function perform(){
- $blogSettings = $this->_blogInfo->getSettings();
- $enabled = $blogSettings->getValue("plugin_subscribe_enabled", false);
- if(!$enabled){
- $this->_view = new ErrorView($this->_blogInfo);
- $this->_view->setErrorMessage($this->_locale->tr("subscribe_disabled"));
- $this->setCommonData();
- return false;
- }
+ function perform(){
+ $blogSettings = $this->_blogInfo->getSettings();
+ $enabled = $blogSettings->getValue("plugin_subscribe_enabled", false);
+ if(!$enabled){
+ $this->_view = new ErrorView($this->_blogInfo);
+ $this->_view->setErrorMessage($this->_locale->tr("subscribe_disabled"));
+ $this->setCommonData();
+ return false;
+ }
- $confirmation = $this->_request->getValue("code");
+ $confirmation = $this->_request->getValue("code");
- if(!Subscriptions::removeSubscriptions($confirmation)){
- $this->_view = new ErrorView($this->_blogInfo);
- $this->_view->setErrorMessage(
- $this->_locale->tr("subscribe_error_incorrect_confirmation_code"));
- $this->setCommonData();
- return false;
+ if(!Subscriptions::removeSubscriptions($confirmation)){
+ $this->_view = new ErrorView($this->_blogInfo);
+ $this->_view->setErrorMessage(
+ $this->_locale->tr("subscribe_error_incorrect_confirmation_code"));
+ $this->setCommonData();
+ return false;
- }
+ }
- $this->_view = new PluginSubscribeShowView($this->_blogInfo, false);
- $this->_view->setSuccessMessage(
- $this->_locale->tr("subscribe_subscription_removed_ok"));
- $this->setCommonData();
+ $this->_view = new PluginSubscribeShowView($this->_blogInfo, false);
+ $this->_view->setSuccessMessage(
+ $this->_locale->tr("subscribe_subscription_removed_ok"));
+ $this->setCommonData();
- return true;
- }
- }
-?>
\ No newline at end of file
+ return true;
+ }
+}
Modified: plugins/branches/lifetype-1.2/subscribe/class/action/pluginsubscribeshowaction.class.php
===================================================================
--- plugins/branches/lifetype-1.2/subscribe/class/action/pluginsubscribeshowaction.class.php 2024-01-14 20:47:34 UTC (rev 7268)
+++ plugins/branches/lifetype-1.2/subscribe/class/action/pluginsubscribeshowaction.class.php 2024-02-08 10:07:33 UTC (rev 7269)
@@ -1,17 +1,16 @@
<?php
- lt_include(PLOG_CLASS_PATH."class/action/blogaction.class.php");
- lt_include(PLOG_CLASS_PATH."plugins/subscribe/class/view/pluginsubscribeshowview.class.php");
+lt_include(PLOG_CLASS_PATH."class/action/blogaction.class.php");
+lt_include(PLOG_CLASS_PATH."plugins/subscribe/class/view/pluginsubscribeshowview.class.php");
- class PluginSubscribeShowAction extends BlogAction
- {
- function PluginSubscribeShowAction($actionInfo, $request){
- $this->BlogAction($actionInfo, $request);
- }
+class PluginSubscribeShowAction extends BlogAction
+{
+ function PluginSubscribeShowAction($actionInfo, $request){
+ $this->BlogAction($actionInfo, $request);
+ }
- function perform(){
- $this->_view = new PluginSubscribeShowView($this->_blogInfo, true);
- $this->setCommonData();
- return true;
- }
- }
-?>
\ No newline at end of file
+ function perform(){
+ $this->_view = new PluginSubscribeShowView($this->_blogInfo, true);
+ $this->setCommonData();
+ return true;
+ }
+}
Modified: plugins/branches/lifetype-1.2/subscribe/class/action/pluginsubscribeshowconfigaction.class.php
===================================================================
--- plugins/branches/lifetype-1.2/subscribe/class/action/pluginsubscribeshowconfigaction.class.php 2024-01-14 20:47:34 UTC (rev 7268)
+++ plugins/branches/lifetype-1.2/subscribe/class/action/pluginsubscribeshowconfigaction.class.php 2024-02-08 10:07:33 UTC (rev 7269)
@@ -1,26 +1,25 @@
<?php
- lt_include(PLOG_CLASS_PATH."class/action/admin/adminaction.class.php");
- lt_include(PLOG_CLASS_PATH."plugins/subscribe/class/view/pluginsubscribeshowconfigview.class.php");
+lt_include(PLOG_CLASS_PATH."class/action/admin/adminaction.class.php");
+lt_include(PLOG_CLASS_PATH."plugins/subscribe/class/view/pluginsubscribeshowconfigview.class.php");
- class PluginSubscribeShowConfigAction extends AdminAction{
- function PluginSubscribeShowConfigAction($actionInfo, $request){
- $this->AdminAction($actionInfo, $request);
- }
-
- function perform(){
- $blogSettings = $this->_blogInfo->getSettings();
- $key = $blogSettings->getValue( "plugin_subscribe_key" );
-
- // If the user never set the configuration key, set it now
- if($key == ""){
- $key = Subscriptions::generateNewKey($this->_blogInfo);
- }
-
-
- $this->_view = new PluginSubscribeShowConfigView($this->_blogInfo);
- $this->setCommonData();
- return true;
- }
+class PluginSubscribeShowConfigAction extends AdminAction{
+ function PluginSubscribeShowConfigAction($actionInfo, $request){
+ $this->AdminAction($actionInfo, $request);
+ }
+
+ function perform(){
+ $blogSettings = $this->_blogInfo->getSettings();
+ $key = $blogSettings->getValue( "plugin_subscribe_key" );
+
+ // If the user never set the configuration key, set it now
+ if($key == ""){
+ $key = Subscriptions::generateNewKey($this->_blogInfo);
}
-?>
\ No newline at end of file
+
+
+ $this->_view = new PluginSubscribeShowConfigView($this->_blogInfo);
+ $this->setCommonData();
+ return true;
+ }
+}
Modified: plugins/branches/lifetype-1.2/subscribe/class/action/pluginsubscribeupdateconfigaction.class.php
===================================================================
--- plugins/branches/lifetype-1.2/subscribe/class/action/pluginsubscribeupdateconfigaction.class.php 2024-01-14 20:47:34 UTC (rev 7268)
+++ plugins/branches/lifetype-1.2/subscribe/class/action/pluginsubscribeupdateconfigaction.class.php 2024-02-08 10:07:33 UTC (rev 7269)
@@ -1,72 +1,71 @@
<?php
- lt_include(PLOG_CLASS_PATH."class/action/admin/adminaction.class.php");
- lt_include(PLOG_CLASS_PATH."plugins/subscribe/class/view/pluginsubscribeshowconfigview.class.php");
- lt_include(PLOG_CLASS_PATH."plugins/subscribe/class/dao/subscriptions.class.php");
- lt_include(PLOG_CLASS_PATH."class/config/config.class.php");
- lt_include(PLOG_CLASS_PATH."class/view/admin/adminerrorview.class.php");
- lt_include(PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php");
+lt_include(PLOG_CLASS_PATH."class/action/admin/adminaction.class.php");
+lt_include(PLOG_CLASS_PATH."plugins/subscribe/class/view/pluginsubscribeshowconfigview.class.php");
+lt_include(PLOG_CLASS_PATH."plugins/subscribe/class/dao/subscriptions.class.php");
+lt_include(PLOG_CLASS_PATH."class/config/config.class.php");
+lt_include(PLOG_CLASS_PATH."class/view/admin/adminerrorview.class.php");
+lt_include(PLOG_CLASS_PATH."class/data/validator/integervalidator.class.php");
- class PluginSubscribeUpdateConfigAction extends AdminAction
- {
- var $_pluginEnabled;
- var $_key;
+class PluginSubscribeUpdateConfigAction extends AdminAction
+{
+ var $_pluginEnabled;
+ var $_key;
- function PluginSubscribeUpdateConfigAction($actionInfo, $request){
- $this->AdminAction( $actionInfo, $request );
- }
+ function PluginSubscribeUpdateConfigAction($actionInfo, $request){
+ $this->AdminAction( $actionInfo, $request );
+ }
- function validate(){
- $this->_pluginEnabled = $this->_request->getValue("pluginEnabled");
- $this->_pluginEnabled = ($this->_pluginEnabled != "");
+ function validate(){
+ $this->_pluginEnabled = $this->_request->getValue("pluginEnabled");
+ $this->_pluginEnabled = ($this->_pluginEnabled != "");
- $this->_key = $this->_request->getValue( "key" );
+ $this->_key = $this->_request->getValue( "key" );
/* if( $this->_key == "" ) {
- $this->_view = new PluginSubscribeShowConfigView( $this->_blogInfo );
- $this->_view->setErrorMessage( $this->_locale->tr("subscribe_error_key"));
- $this->setCommonData();
- return false;
- }
+ $this->_view = new PluginSubscribeShowConfigView( $this->_blogInfo );
+ $this->_view->setErrorMessage( $this->_locale->tr("subscribe_error_key"));
+ $this->setCommonData();
+ return false;
+ }
*/
- return true;
- }
+ return true;
+ }
- function perform(){
- // update the plugin configurations to blog setting
- $blogSettings = $this->_blogInfo->getSettings();
+ function perform(){
+ // update the plugin configurations to blog setting
+ $blogSettings = $this->_blogInfo->getSettings();
- $oldKey = $blogSettings->getValue("plugin_subscribe_key");
- $oldEnabled = $blogSettings->getValue("plugin_subscribe_enabled");
+ $oldKey = $blogSettings->getValue("plugin_subscribe_key");
+ $oldEnabled = $blogSettings->getValue("plugin_subscribe_enabled");
- $blogSettings->setValue("plugin_subscribe_enabled", $this->_pluginEnabled);
- $blogSettings->setValue("plugin_subscribe_key", $this->_key);
- $this->_blogInfo->setSettings( $blogSettings );
+ $blogSettings->setValue("plugin_subscribe_enabled", $this->_pluginEnabled);
+ $blogSettings->setValue("plugin_subscribe_key", $this->_key);
+ $this->_blogInfo->setSettings( $blogSettings );
- // save the blog's settings
- $blogs = new Blogs();
- if( !$blogs->updateBlog( $this->_blogInfo )) {
- $this->_view = new PluginSubscribeShowConfigView( $this->_blogInfo );
- $this->_view->setErrorMessage( $this->_locale->tr("error_updating_settings"));
- $this->setCommonData();
+ // save the blog's settings
+ $blogs = new Blogs();
+ if( !$blogs->updateBlog( $this->_blogInfo )) {
+ $this->_view = new PluginSubscribeShowConfigView( $this->_blogInfo );
+ $this->_view->setErrorMessage( $this->_locale->tr("error_updating_settings"));
+ $this->setCommonData();
- return false;
- }
+ return false;
+ }
- // if everything went ok...
- $this->_session->setValue( "blogInfo", $this->_blogInfo );
- $this->saveSession();
+ // if everything went ok...
+ $this->_session->setValue( "blogInfo", $this->_blogInfo );
+ $this->saveSession();
- $this->_view = new PluginSubscribeShowConfigView($this->_blogInfo);
- $this->_view->setSuccessMessage( $this->_locale->tr("subscribe_settings_saved_ok"));
- $this->setCommonData();
+ $this->_view = new PluginSubscribeShowConfigView($this->_blogInfo);
+ $this->_view->setSuccessMessage( $this->_locale->tr("subscribe_settings_saved_ok"));
+ $this->setCommonData();
- // clear the cache and reset confirmation codes if something changed
- if(($oldKey != $this->_key) || ($oldEnabled != $this->_pluginEnabled)){
- Subscriptions::resetConfirmationCodes($this->_blogInfo);
- CacheControl::resetBlogCache($this->_blogInfo->getId());
- }
+ // clear the cache and reset confirmation codes if something changed
+ if(($oldKey != $this->_key) || ($oldEnabled != $this->_pluginEnabled)){
+ Subscriptions::resetConfirmationCodes($this->_blogInfo);
+ CacheControl::resetBlogCache($this->_blogInfo->getId());
+ }
- return true;
- }
- }
-?>
\ No newline at end of file
+ return true;
+ }
+}
Modified: plugins/branches/lifetype-1.2/subscribe/class/dao/codevalidator.class.php
===================================================================
--- plugins/branches/lifetype-1.2/subscribe/class/dao/codevalidator.class.php 2024-01-14 20:47:34 UTC (rev 7268)
+++ plugins/branches/lifetype-1.2/subscribe/class/dao/codevalidator.class.php 2024-02-08 10:07:33 UTC (rev 7269)
@@ -1,9 +1,9 @@
<?php
- lt_include(PLOG_CLASS_PATH."class/data/validator/validator.class.php");
- lt_include(PLOG_CLASS_PATH."class/data/validator/rules/regexprule.class.php");
+lt_include(PLOG_CLASS_PATH."class/data/validator/validator.class.php");
+lt_include(PLOG_CLASS_PATH."class/data/validator/rules/regexprule.class.php");
- define("HEXADECIMAL_RULE_REG_EXP", "^[a-z0-9]+$");
+define("HEXADECIMAL_RULE_REG_EXP", "^[a-z0-9]+$");
/**
* \ingroup Validator
@@ -12,10 +12,9 @@
*
* @see RegExpRule
*/
- class CodeValidator extends Validator {
- function CodeValidator(){
- $this->Validator();
- $this->addRule(new RegExpRule(HEXADECIMAL_RULE_REG_EXP));
- }
- }
-?>
\ No newline at end of file
+class CodeValidator extends Validator {
+ function CodeValidator(){
+ $this->Validator();
+ $this->addRule(new RegExpRule(HEXADECIMAL_RULE_REG_EXP));
+ }
+}
Modified: plugins/branches/lifetype-1.2/subscribe/class/dao/subscriptions.class.php
===================================================================
--- plugins/branches/lifetype-1.2/subscribe/class/dao/subscriptions.class.php 2024-01-14 20:47:34 UTC (rev 7268)
+++ plugins/branches/lifetype-1.2/subscribe/class/dao/subscriptions.class.php 2024-02-08 10:07:33 UTC (rev 7269)
@@ -1,234 +1,232 @@
<?php
+lt_include( PLOG_CLASS_PATH."class/net/client.class.php" );
- lt_include( PLOG_CLASS_PATH."class/net/client.class.php" );
-
define("SUBSCRIBE_POSTS_IN_CATEGORY", 0);
define("SUBSCRIBE_COMMENTS_IN_POST", 1);
class Subscriptions{
- /**
- * Generate confirmation URL and send confirmation email
- */
- function sendConfirmationEmail($blogInfo, $emailAddress){
- $confirmationUrl = Subscriptions::generateConfirmUrl($blogInfo,
- "subscribeConfirm",
- $emailAddress);
- $confirmationCode = Subscriptions::_getConfirmationCode($blogInfo,
- $emailAddress);
+ /**
+ * Generate confirmation URL and send confirmation email
+ */
+ function sendConfirmationEmail($blogInfo, $emailAddress){
+ $confirmationUrl = Subscriptions::generateConfirmUrl($blogInfo,
+ "subscribeConfirm",
+ $emailAddress);
+ $confirmationCode = Subscriptions::_getConfirmationCode($blogInfo,
+ $emailAddress);
- $locale = $blogInfo->getLocale();
- $ipAddress = Client::getIp();
- if(!$ipAddress)
- $ipAddress = "Unknown";
- $ret = Subscriptions::sendMessage($emailAddress,
- $locale->tr("subscribe_email_confirm_subject"),
- $locale->pr("subscribe_email_confirm_body",
- $confirmationCode,
- $confirmationUrl,
- $ipAddress));
- return $ret;
- }
+ $locale = $blogInfo->getLocale();
+ $ipAddress = Client::getIp();
+ if(!$ipAddress)
+ $ipAddress = "Unknown";
+ $ret = Subscriptions::sendMessage($emailAddress,
+ $locale->tr("subscribe_email_confirm_subject"),
+ $locale->pr("subscribe_email_confirm_body",
+ $confirmationCode,
+ $confirmationUrl,
+ $ipAddress));
+ return $ret;
+ }
- /**
- * Generate confirmation URL
- */
- function generateConfirmUrl($blogInfo, $op, $address){
- $confirmationCode = Subscriptions::_getConfirmationCode($blogInfo, $address);
+ /**
+ * Generate confirmation URL
+ */
+ function generateConfirmUrl($blogInfo, $op, $address){
+ $confirmationCode = Subscriptions::_getConfirmationCode($blogInfo, $address);
- lt_include(PLOG_CLASS_PATH."class/net/rawrequestgenerator.class.php");
- $rg = new RawRequestGenerator($blogInfo);
- $rg->addParameter("op", $op);
- $rg->addParameter("blogId", $blogInfo->getId());
- $rg->addParameter("code", $confirmationCode);
- $rg->setXHTML(false);
- return ($rg->getIndexUrl().$rg->getRequest());
- }
+ lt_include(PLOG_CLASS_PATH."class/net/rawrequestgenerator.class.php");
+ $rg = new RawRequestGenerator($blogInfo);
+ $rg->addParameter("op", $op);
+ $rg->addParameter("blogId", $blogInfo->getId());
+ $rg->addParameter("code", $confirmationCode);
+ $rg->setXHTML(false);
+ return ($rg->getIndexUrl().$rg->getRequest());
+ }
- /**
- * Reset all confirmation codes in the database
- * Note, this will cause all previously emailed confirmation codes to no longer work,
- * so, this operation should not be called often
- */
- function resetConfirmationCodes($blogInfo){
- lt_include( PLOG_CLASS_PATH."class/database/db.class.php" );
- $prefix = Db::getPrefix();
+ /**
+ * Reset all confirmation codes in the database
+ * Note, this will cause all previously emailed confirmation codes to no longer work,
+ * so, this operation should not be called often
+ */
+ function resetConfirmationCodes($blogInfo){
+ lt_include( PLOG_CLASS_PATH."class/database/db.class.php" );
+ $prefix = Db::getPrefix();
- $query = "SELECT type,address ".
- "FROM {$prefix}subscribe";
+ $query = "SELECT type,address ".
+ "FROM {$prefix}subscribe";
- $db =& Db::getDb();
+ $db =& Db::getDb();
- $result = $db->Execute($query);
- if(!$result)
- return false;
+ $result = $db->Execute($query);
+ if(!$result)
+ return false;
- while($row = $result->FetchRow()){
- $address = $row["address"];
- if(!$code = Subscriptions::_getConfirmationCode($blogInfo, $address))
- return false;
- $query = "UPDATE ${prefix}subscribe SET confirm='$code' WHERE address='$address'";
- if(!$db->Execute($query))
- return false;
- }
+ while($row = $result->FetchRow()){
+ $address = $row["address"];
+ if(!$code = Subscriptions::_getConfirmationCode($blogInfo, $address))
+ return false;
+ $query = "UPDATE ${prefix}subscribe SET confirm='$code' WHERE address='$address'";
+ if(!$db->Execute($query))
+ return false;
+ }
- return true;
- }
+ return true;
+ }
- /**
- * User never typed in a security code, let's make one for him
- */
- function generateNewKey($blogInfo){
- $key = md5(rand().time().filectime(__FILE__));
- $blogSettings = $blogInfo->getSettings();
- $blogSettings->setValue( "plugin_subscribe_key", $key );
+ /**
+ * User never typed in a security code, let's make one for him
+ */
+ function generateNewKey($blogInfo){
+ $key = md5(rand().time().filectime(__FILE__));
+ $blogSettings = $blogInfo->getSettings();
+ $blogSettings->setValue( "plugin_subscribe_key", $key );
- $blogInfo->setSettings( $blogSettings );
+ $blogInfo->setSettings( $blogSettings );
- // save the blog's settings
- $blogs = new Blogs();
- if(!$blogs->updateBlog($blogInfo))
- return false;
+ // save the blog's settings
+ $blogs = new Blogs();
+ if(!$blogs->updateBlog($blogInfo))
+ return false;
- Subscriptions::resetConfirmationCodes($blogInfo);
- return $key;
- }
+ Subscriptions::resetConfirmationCodes($blogInfo);
+ return $key;
+ }
- /**
- * calculate a secret hash used for confirmation of the email address
- */
- function _getConfirmationCode($blogInfo, $address){
- $blogSettings = $blogInfo->getSettings();
- $key = $blogSettings->getValue( "plugin_subscribe_key" );
+ /**
+ * calculate a secret hash used for confirmation of the email address
+ */
+ function _getConfirmationCode($blogInfo, $address){
+ $blogSettings = $blogInfo->getSettings();
+ $key = $blogSettings->getValue( "plugin_subscribe_key" );
- if($key == ""){
- if(!($key = Subscriptions::generateNewKey($blogInfo)))
- return false;
- }
+ if($key == ""){
+ if(!($key = Subscriptions::generateNewKey($blogInfo)))
+ return false;
+ }
// TODO: once we are on PHP5, use hash() instead
- return md5($address . $key);
- }
+ return md5($address . $key);
+ }
- /**
- * Activate a given subscription
- */
- function confirmSubscription($confirmation){
- lt_include( PLOG_CLASS_PATH."class/database/db.class.php" );
- $db =& Db::getDb();
- $prefix = Db::getPrefix();
+ /**
+ * Activate a given subscription
+ */
+ function confirmSubscription($confirmation){
+ lt_include( PLOG_CLASS_PATH."class/database/db.class.php" );
+ $db =& Db::getDb();
+ $prefix = Db::getPrefix();
- $query = "UPDATE ${prefix}subscribe SET active=1 WHERE confirm='$confirmation'";
- if(!$db->Execute($query))
- return false;
+ $query = "UPDATE ${prefix}subscribe SET active=1 WHERE confirm='$confirmation'";
+ if(!$db->Execute($query))
+ return false;
- // check to make sure that at least one row was updated
- if($db->Affected_Rows() < 1)
- return false;
+ // check to make sure that at least one row was updated
+ if($db->Affected_Rows() < 1)
+ return false;
- return true;
- }
+ return true;
+ }
- /**
- * add an email address to the database with the
- * associated type, for each id, but leave it disabled
- * until it is confirmed later
- */
- function addSubscriptions($blogInfo, $ids, $type, $address){
- lt_include( PLOG_CLASS_PATH."class/database/db.class.php" );
+ /**
+ * add an email address to the database with the
+ * associated type, for each id, but leave it disabled
+ * until it is confirmed later
+ */
+ function addSubscriptions($blogInfo, $ids, $type, $address){
+ lt_include( PLOG_CLASS_PATH."class/database/db.class.php" );
- $confirmation = Subscriptions::_getConfirmationCode($blogInfo, $address);
+ $confirmation = Subscriptions::_getConfirmationCode($blogInfo, $address);
- foreach($ids as $id){
- $db =& Db::getDb();
- $prefix = Db::getPrefix();
+ foreach($ids as $id){
+ $db =& Db::getDb();
+ $prefix = Db::getPrefix();
- $query = "INSERT IGNORE INTO ${prefix}subscribe (objid, active, type, address, confirm) ".
- "VALUES('$id', 0, '$type', '$address', '$confirmation')";
- $result = $db->Execute($query);
- if(!$result)
- return false;
- }
-
- return true;
+ $query = "INSERT IGNORE INTO ${prefix}subscribe (objid, active, type, address, confirm) ".
+ "VALUES('$id', 0, '$type', '$address', '$confirmation')";
+ $result = $db->Execute($query);
+ if(!$result)
+ return false;
}
+ return true;
+ }
+
- /**
- * remove all subscriptions sent using this confirmation code
- */
- function removeSubscriptions($confirmation){
- lt_include( PLOG_CLASS_PATH."class/database/db.class.php" );
+ /**
+ * remove all subscriptions sent using this confirmation code
+ */
+ function removeSubscriptions($confirmation){
+ lt_include( PLOG_CLASS_PATH."class/database/db.class.php" );
- $db =& Db::getDb();
- $prefix = Db::getPrefix();
- $query = "DELETE FROM ${prefix}subscribe WHERE confirm='$confirmation'";
- $result = $db->Execute($query);
- if(!$result)
- return false;
+ $db =& Db::getDb();
+ $prefix = Db::getPrefix();
+ $query = "DELETE FROM ${prefix}subscribe WHERE confirm='$confirmation'";
+ $result = $db->Execute($query);
+ if(!$result)
+ return false;
- // check to make sure that at least one row was updated
- if($db->Affected_Rows() < 1)
- return false;
+ // check to make sure that at least one row was updated
+ if($db->Affected_Rows() < 1)
+ return false;
- return true;
- }
+ return true;
+ }
- /**
- * Based on the $type of object, search for $ids
- * and return an array of subscribed email addresses
- */
- function getSubscriptions($ids, $type){
- lt_include( PLOG_CLASS_PATH."class/database/db.class.php" );
- $prefix = Db::getPrefix();
+ /**
+ * Based on the $type of object, search for $ids
+ * and return an array of subscribed email addresses
+ */
+ function getSubscriptions($ids, $type){
+ lt_include( PLOG_CLASS_PATH."class/database/db.class.php" );
+ $prefix = Db::getPrefix();
- $query = "SELECT DISTINCT address ".
- "FROM {$prefix}subscribe ".
- "WHERE active=1 AND ".
- "type=".$type." AND (";
- foreach($ids as $id)
- $query .= "objid=$id OR ";
- $query .= "objid=0)";
+ $query = "SELECT DISTINCT address ".
+ "FROM {$prefix}subscribe ".
+ "WHERE active=1 AND ".
+ "type=".$type." AND (";
+ foreach($ids as $id)
+ $query .= "objid=$id OR ";
+ $query .= "objid=0)";
- $db =& Db::getDb();
+ $db =& Db::getDb();
- $result = $db->Execute($query);
- if( !$result )
- return Array();
+ $result = $db->Execute($query);
+ if( !$result )
+ return Array();
- $addresses = Array();
- while($row = $result->FetchRow()){
- $addresses[] = $row["address"];
- }
+ $addresses = Array();
+ while($row = $result->FetchRow()){
+ $addresses[] = $row["address"];
+ }
- return($addresses);
- }
+ return($addresses);
+ }
- /**
- * Sends an email
- * @param to The address to send the email to
- * @param subject The subject of the email
- * @param text The message to be sent
- */
- function sendMessage($to, $subject, $text){
- lt_include(PLOG_CLASS_PATH."class/mail/emailservice.class.php");
- lt_include(PLOG_CLASS_PATH."class/mail/emailmessage.class.php");
- lt_include(PLOG_CLASS_PATH."class/config/config.class.php");
+ /**
+ * Sends an email
+ * @param to The address to send the email to
+ * @param subject The subject of the email
+ * @param text The message to be sent
+ */
+ function sendMessage($to, $subject, $text){
+ lt_include(PLOG_CLASS_PATH."class/mail/emailservice.class.php");
+ lt_include(PLOG_CLASS_PATH."class/mail/emailmessage.class.php");
+ lt_include(PLOG_CLASS_PATH."class/config/config.class.php");
- // build the message
- $message = new EmailMessage();
- $config =& Config::getConfig();
- $message->setFrom($config->getValue("post_notification_source_address"));
- $message->setSubject($subject);
- $message->setBody($text);
- $message->addTo($to);
+ // build the message
+ $message = new EmailMessage();
+ $config =& Config::getConfig();
+ $message->setFrom($config->getValue("post_notification_source_address"));
+ $message->setSubject($subject);
+// $message->setMimeType("text/html");
+ $message->setBody($text);
+ $message->addTo($to);
- // once the message is ready, send it out
- $service = new EmailService();
- return($service->sendMessage($message));
- }
+ // once the message is ready, send it out
+ $service = new EmailService();
+ return($service->sendMessage($message));
+ }
}
-
-?>
\ No newline at end of file
Modified: plugins/branches/lifetype-1.2/subscribe/class/security/subscribefilter.class.php
===================================================================
--- plugins/branches/lifetype-1.2/subscribe/class/security/subscribefilter.class.php 2024-01-14 20:47:34 UTC (rev 7268)
+++ plugins/branches/lifetype-1.2/subscribe/class/security/subscribefilter.class.php 2024-02-08 10:07:33 UTC (rev 7269)
@@ -1,10 +1,8 @@
<?php
+lt_include( PLOG_CLASS_PATH."class/security/pipelinefilter.class.php" );
+lt_include( PLOG_CLASS_PATH."class/file/file.class.php" );
+lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
- lt_include( PLOG_CLASS_PATH."class/security/pipelinefilter.class.php" );
- lt_include( PLOG_CLASS_PATH."class/file/file.class.php" );
- lt_include( PLOG_CLASS_PATH."class/config/config.class.php" );
-
-
/**
* Checks to see if the subscription checkbox was checked, and if so,
* requires the email address to be valid. This
@@ -12,55 +10,54 @@
* "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 SubscribeFilter extends PipelineFilter{
- function SubscribeFilter($pipelineRequest){
- $this->PipelineFilter($pipelineRequest);
- }
+class SubscribeFilter extends PipelineFilter{
+ function SubscribeFilter($pipelineRequest){
+ $this->PipelineFilter($pipelineRequest);
+ }
- function filter(){
- // get some info
- $blogInfo = $this->_pipelineRequest->getBlogInfo();
- $request = $this->_pipelineRequest->getHttpRequest();
+ function filter(){
+ // get some info
+ $blogInfo = $this->_pipelineRequest->getBlogInfo();
+ $request = $this->_pipelineRequest->getHttpRequest();
- // check if this section has been enabled or disabled
- $blogSettings = $blogInfo->getSettings();
- $pluginEnabled = $blogSettings->getValue( "plugin_subscribe_enabled" );
- if(!$pluginEnabled)
- return new PipelineResult();
+ // check if this section has been enabled or disabled
+ $blogSettings = $blogInfo->getSettings();
+ $pluginEnabled = $blogSettings->getValue( "plugin_subscribe_enabled" );
+ if(!$pluginEnabled)
+ return new PipelineResult();
- // 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") != "AddComment")
- return new PipelineResult();
+ // 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") != "AddComment")
+ return new PipelineResult();
- // if this is already rejected, there is no reason to do anything here
- if($this->_pipelineRequest->getRejectedState())
- return new PipelineResult();
+ // if this is already rejected, there is no reason to do anything here
+ if($this->_pipelineRequest->getRejectedState())
+ return new PipelineResult();
- // checkbox not active, don't do anything
- if(!$request->getValue("subscribe"))
- return new PipelineResult();
+ // checkbox not active, don't do anything
+ if(!$request->getValue("subscribe"))
+ return new PipelineResult();
- // email is required: validate it.
- $emailAddress = $request->getValue("userEmail");
+ // email is required: validate it.
+ $emailAddress = $request->getValue("userEmail");
- // check if they are already logged in (ie. an authenticated commenter)
- $userInfo = SessionManager::getUserInfoFromSession();
- if($emailAddress == "" && $userInfo){
- $emailAddress = $userInfo->getEmail();
- }
- lt_include( PLOG_CLASS_PATH."class/data/validator/emailvalidator.class.php" );
+ // check if they are already logged in (ie. an authenticated commenter)
+ $userInfo = SessionManager::getUserInfoFromSession();
+ if($emailAddress == "" && $userInfo){
+ $emailAddress = $userInfo->getEmail();
+ }
+ lt_include( PLOG_CLASS_PATH."class/data/validator/emailvalidator.class.php" );
- $emailValidator = new EmailValidator();
- if(!$emailValidator->validate($emailAddress)){
- $locale = $blogInfo->getLocale();
- return new PipelineResult(false, 500,
- $locale->tr("error_incorrect_email_address"));
- }
+ $emailValidator = new EmailValidator();
+ if(!$emailValidator->validate($emailAddress)){
+ $locale = $blogInfo->getLocale();
+ return new PipelineResult(false, 500,
+ $locale->tr("error_incorrect_email_address"));
+ }
- // if everything went fine, we can say so by returning
- // a positive PipelineResult object
- return new PipelineResult();
- }
- }
-?>
+ // if everything went fine, we can say so by returning
+ // a positive PipelineResult object
+ return new PipelineResult();
+ }
+}
Modified: plugins/branches/lifetype-1.2/subscribe/class/view/pluginsubscriberequestconfirmationview.class.php
===================================================================
--- plugins/branches/lifetype-1.2/subscribe/class/view/pluginsubscriberequestconfirmationview.class.php 2024-01-14 20:47:34 UTC (rev 7268)
+++ plugins/branches/lifetype-1.2/subscribe/class/view/pluginsubscriberequestconfirmationview.class.php 2024-02-08 10:07:33 UTC (rev 7269)
@@ -1,20 +1,19 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/plugintemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/plugin/pluginmanager.class.php" );
+lt_include( PLOG_CLASS_PATH."class/view/plugintemplatedview.class.php" );
+lt_include( PLOG_CLASS_PATH."class/plugin/pluginmanager.class.php" );
- class PluginSubscribeRequestConfirmationView extends PluginTemplatedView{
- function PluginSubscribeRequestConfirmationView($blogInfo){
- $this->PluginTemplatedView($blogInfo, "subscribe", "requestconfirmation",
- SMARTY_VIEW_CACHE_DISABLED);
- }
+class PluginSubscribeRequestConfirmationView extends PluginTemplatedView{
+ function PluginSubscribeRequestConfirmationView($blogInfo){
+ $this->PluginTemplatedView($blogInfo, "subscribe", "requestconfirmation",
+ SMARTY_VIEW_CACHE_DISABLED);
+ }
- function render(){
- $blogSettings = $this->_blogInfo->getSettings();
- $pluginEnabled = $blogSettings->getValue("plugin_subscribe_enabled");
+ function render(){
+ $blogSettings = $this->_blogInfo->getSettings();
+ $pluginEnabled = $blogSettings->getValue("plugin_subscribe_enabled");
- $this->setValue("pluginEnabled", $pluginEnabled);
+ $this->setValue("pluginEnabled", $pluginEnabled);
- parent::render();
- }
- }
-?>
\ No newline at end of file
+ parent::render();
+ }
+}
Modified: plugins/branches/lifetype-1.2/subscribe/class/view/pluginsubscribeshowconfigview.class.php
===================================================================
--- plugins/branches/lifetype-1.2/subscribe/class/view/pluginsubscribeshowconfigview.class.php 2024-01-14 20:47:34 UTC (rev 7268)
+++ plugins/branches/lifetype-1.2/subscribe/class/view/pluginsubscribeshowconfigview.class.php 2024-02-08 10:07:33 UTC (rev 7269)
@@ -1,24 +1,23 @@
<?php
- lt_include(PLOG_CLASS_PATH."class/view/admin/adminplugintemplatedview.class.php");
- lt_include(PLOG_CLASS_PATH."class/plugin/pluginmanager.class.php");
- lt_include(PLOG_CLASS_PATH."plugins/subscribe/class/dao/subscriptions.class.php");
+lt_include(PLOG_CLASS_PATH."class/view/admin/adminplugintemplatedview.class.php");
+lt_include(PLOG_CLASS_PATH."class/plugin/pluginmanager.class.php");
+lt_include(PLOG_CLASS_PATH."plugins/subscribe/class/dao/subscriptions.class.php");
- class PluginSubscribeShowConfigView extends AdminPluginTemplatedView
- {
+class PluginSubscribeShowConfigView extends AdminPluginTemplatedView
+{
- function PluginSubscribeShowConfigView($blogInfo){
- $this->AdminPluginTemplatedView($blogInfo, "subscribe", "config");
- }
+ function PluginSubscribeShowConfigView($blogInfo){
+ $this->AdminPluginTemplatedView($blogInfo, "subscribe", "config");
+ }
- function render(){
- $blogSettings = $this->_blogInfo->getSettings();
- $pluginEnabled = $blogSettings->getValue( "plugin_subscribe_enabled" );
- $key = $blogSettings->getValue( "plugin_subscribe_key" );
+ function render(){
+ $blogSettings = $this->_blogInfo->getSettings();
+ $pluginEnabled = $blogSettings->getValue( "plugin_subscribe_enabled" );
+ $key = $blogSettings->getValue( "plugin_subscribe_key" );
- $this->setValue( "pluginEnabled", $pluginEnabled );
- $this->setValue( "key", $key );
+ $this->setValue( "pluginEnabled", $pluginEnabled );
+ $this->setValue( "key", $key );
- parent::render();
- }
- }
-?>
\ No newline at end of file
+ parent::render();
+ }
+}
Modified: plugins/branches/lifetype-1.2/subscribe/class/view/pluginsubscribeshowview.class.php
===================================================================
--- plugins/branches/lifetype-1.2/subscribe/class/view/pluginsubscribeshowview.class.php 2024-01-14 20:47:34 UTC (rev 7268)
+++ plugins/branches/lifetype-1.2/subscribe/class/view/pluginsubscribeshowview.class.php 2024-02-08 10:07:33 UTC (rev 7269)
@@ -1,22 +1,21 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/view/plugintemplatedview.class.php" );
- lt_include( PLOG_CLASS_PATH."class/plugin/pluginmanager.class.php" );
+lt_include( PLOG_CLASS_PATH."class/view/plugintemplatedview.class.php" );
+lt_include( PLOG_CLASS_PATH."class/plugin/pluginmanager.class.php" );
- class PluginSubscribeShowView extends PluginTemplatedView{
- function PluginSubscribeShowView($blogInfo){
- $this->PluginTemplatedView($blogInfo, "subscribe", "register", SMARTY_VIEW_CACHE_DISABLED);
- }
+class PluginSubscribeShowView extends PluginTemplatedView{
+ function PluginSubscribeShowView($blogInfo){
+ $this->PluginTemplatedView($blogInfo, "subscribe", "register", SMARTY_VIEW_CACHE_DISABLED);
+ }
- function render(){
- $blogSettings = $this->_blogInfo->getSettings();
+ function render(){
+ $blogSettings = $this->_blogInfo->getSettings();
- $pluginEnabled = $blogSettings->getValue("plugin_subscribe_enabled");
- $this->setValue("pluginEnabled", $pluginEnabled);
+ $pluginEnabled = $blogSettings->getValue("plugin_subscribe_enabled");
+ $this->setValue("pluginEnabled", $pluginEnabled);
- $categories = $this->_getArticleCategories();
- $this->setValue("availableCategories", $categories);
+ $categories = $this->_getArticleCategories();
+ $this->setValue("availableCategories", $categories);
- parent::render();
- }
- }
-?>
\ No newline at end of file
+ parent::render();
+ }
+}
Modified: plugins/branches/lifetype-1.2/subscribe/pluginsubscribe.class.php
===================================================================
--- plugins/branches/lifetype-1.2/subscribe/pluginsubscribe.class.php 2024-01-14 20:47:34 UTC (rev 7268)
+++ plugins/branches/lifetype-1.2/subscribe/pluginsubscribe.class.php 2024-02-08 10:07:33 UTC (rev 7269)
@@ -1,247 +1,245 @@
<?php
- lt_include( PLOG_CLASS_PATH."class/plugin/pluginbase.class.php" );
- lt_include( PLOG_CLASS_PATH."plugins/subscribe/class/dao/subscriptions.class.php" );
- lt_include( PLOG_CLASS_PATH."plugins/subscribe/class/security/subscribefilter.class.php" );
+lt_include( PLOG_CLASS_PATH."class/plugin/pluginbase.class.php" );
+lt_include( PLOG_CLASS_PATH."plugins/subscribe/class/dao/subscriptions.class.php" );
+lt_include( PLOG_CLASS_PATH."plugins/subscribe/class/security/subscribefilter.class.php" );
/**
* Sends notifications to visitors if they sign up for them, such as
* new comments to a post, new post to a particular category, etc.
*/
- class PluginSubscribe extends PluginBase
- {
- var $_pluginEnabled;
+class PluginSubscribe extends PluginBase
+{
+ var $_pluginEnabled;
- function PluginSubscribe($source = ""){
- $this->PluginBase($source);
+ function PluginSubscribe($source = ""){
+ $this->PluginBase($source);
- $this->id = "subscribe";
- $this->desc = "Sends email notifications to visitors if they ".
- "sign up for them.";
- $this->author = "Jon Daley";
- $this->locales = Array("en_UK");
- $this->version = "20120912";
- if( $source == "admin" )
- $this->initAdmin();
- else
- $this->init();
- }
+ $this->id = "subscribe";
+ $this->desc = "Sends email notifications to visitors if they ".
+ "sign up for them.";
+ $this->author = "Jon Daley";
+ $this->locales = Array("en_UK");
+ $this->version = "20240208";
+ if( $source == "admin" )
+ $this->initAdmin();
+ else
+ $this->init();
+ }
- function initAdmin(){
- // register our actions
- $this->registerAdminAction("subscribe",
- "PluginSubscribeShowConfigAction");
- $this->registerAdminAction("subscribeUpdate",
- "PluginSubscribeUpdateConfigAction");
- // register our menu options
- $menu =& Menu::getMenu();
- if(!$menu->entryExists("/menu/controlCenter/manageRecentPlugins"))
- $this->addMenuEntry("/menu/controlCenter",
- "manageRecentPlugins", "", "",
- true, false);
- $this->addMenuEntry("/menu/controlCenter/manageRecentPlugins",
- "subscribe_subscriptions",
- "?op=subscribe", "");
- $this->registerNotification(EVENT_POST_POST_ADD);
- }
+ function initAdmin(){
+ // register our actions
+ $this->registerAdminAction("subscribe",
+ "PluginSubscribeShowConfigAction");
+ $this->registerAdminAction("subscribeUpdate",
+ "PluginSubscribeUpdateConfigAction");
+ // register our menu options
+ $menu =& Menu::getMenu();
+ if(!$menu->entryExists("/menu/controlCenter/manageRecentPlugins"))
+ $this->addMenuEntry("/menu/controlCenter",
+ "manageRecentPlugins", "", "",
+ true, false);
+ $this->addMenuEntry("/menu/controlCenter/manageRecentPlugins",
+ "subscribe_subscriptions",
+ "?op=subscribe", "");
+ $this->registerNotification(EVENT_POST_POST_ADD);
+ }
- function init(){
- $this->registerBlogAction("subscribe",
- "PluginSubscribeShowAction");
- $this->registerBlogAction("subscribeRegister",
- "PluginSubscribeRegisterAction");
- $this->registerBlogAction("subscribeConfirm",
- "PluginSubscribeConfirmAction");
- $this->registerBlogAction("subscribeRemove",
- "PluginSubscribeRemoveAction");
- // we care about when posts and comments are posted
- $this->registerNotification(EVENT_POST_POST_ADD);
- $this->registerNotification(EVENT_POST_COMMENT_ADD);
- // We need a filter because the email address is required
- // if the subscribe checkbox is checked.
- $this->registerFilter("SubscribeFilter");
- }
+ function init(){
+ $this->registerBlogAction("subscribe",
+ "PluginSubscribeShowAction");
+ $this->registerBlogAction("subscribeRegister",
+ "PluginSubscribeRegisterAction");
+ $this->registerBlogAction("subscribeConfirm",
+ "PluginSubscribeConfirmAction");
+ $this->registerBlogAction("subscribeRemove",
+ "PluginSubscribeRemoveAction");
+ // we care about when posts and comments are posted
+ $this->registerNotification(EVENT_POST_POST_ADD);
+ $this->registerNotification(EVENT_POST_COMMENT_ADD);
+ // We need a filter because the email address is required
+ // if the subscribe checkbox is checked.
+ $this->registerFilter("SubscribeFilter");
+ }
- function isEnabled(){
- return $this->_pluginEnabled;
- }
+ function isEnabled(){
+ return $this->_pluginEnabled;
+ }
- function register(){
- $this->_pluginEnabled = $this->blogSettings->getValue("plugin_subscribe_enabled");
- return true;
- }
+ function register(){
+ $this->_pluginEnabled = $this->blogSettings->getValue("plugin_subscribe_enabled");
+ return true;
+ }
- // create the sql table
- function install(){
- lt_include( PLOG_CLASS_PATH."class/database/db.class.php" );
+ // create the sql table
+ function install(){
+ lt_include( PLOG_CLASS_PATH."class/database/db.class.php" );
- $fields = "objid INT(10) UNSIGNED NOTNULL,
+ $fields = "objid INT(10) UNSIGNED NOTNULL,
active TINYINT(1) DEFAULT 0,
type TINYINT(1) NOTNULL,
address VARCHAR(255) NOTNULL,
confirm VARCHAR(32)";
- $db =& Db::getDb();
- $tableName = Db::getPrefix()."subscribe";
+ $db =& Db::getDb();
+ $tableName = Db::getPrefix()."subscribe";
- // create the data dictionary and create
- // the table if necessary
- $dict = NewPDbDataDictionary($db);
- $sqlArray = $dict->ChangeTableSQL($tableName, $fields);
- $result = $dict->ExecuteSQLArray($sqlArray);
- if(!$result)
- die("There was an error creating the tables ".
- "for the subscribe plugin!");
+ // create the data dictionary and create
+ // the table if necessary
+ $dict = NewPDbDataDictionary($db);
+ $sqlArray = $dict->ChangeTableSQL($tableName, $fields);
+ $result = $dict->ExecuteSQLArray($sqlArray);
+ if(!$result)
+ die("There was an error creating the tables ".
+ "for the subscribe plugin!");
- $sqlArray = $dict->CreateIndexSQL("id_type_address",
- $tableName,
- array("objid","type","address"),
- array("REPLACE", "UNIQUE"));
- // create the primary key
- $result = $dict->ExecuteSQLArray($sqlArray);
- if(!$result)
- die("There was an error creating the index ".
- "for the subscribe plugin!");
+ $sqlArray = $dict->CreateIndexSQL("id_type_address",
+ $tableName,
+ array("objid","type","address"),
+ array("REPLACE", "UNIQUE"));
+ // create the primary key
+ $result = $dict->ExecuteSQLArray($sqlArray);
+ if(!$result)
+ die("There was an error creating the index ".
+ "for the subscribe plugin!");
- return true;
- }
+ return true;
+ }
-
- /**
- * This method processes our event notifications
- */
- function process($eventType, $params){
- $this->register();
- lt_include( PLOG_CLASS_PATH."class/logger/loggermanager.class.php" );
- $logger =& LoggerManager::getLogger( "debug" );
+ /**
+ * This method processes our event notifications
+ */
+ function process($eventType, $params){
+ $this->register();
+ lt_include( PLOG_CLASS_PATH."class/logger/loggermanager.class.php" );
+ $logger =& LoggerManager::getLogger( "debug" );
- lt_include(PLOG_CLASS_PATH."class/data/textfilter.class.php");
- lt_include(PLOG_CLASS_PATH."class/dao/article.class.php");
- lt_include(PLOG_CLASS_PATH."class/net/requestgenerator.class.php" );
+ lt_include(PLOG_CLASS_PATH."class/data/textfilter.class.php");
+ lt_include(PLOG_CLASS_PATH."class/dao/article.class.php");
+ lt_include(PLOG_CLASS_PATH."class/net/requestgenerator.class.php" );
- $locale = $this->blogInfo->getLocale();
+ $locale = $this->blogInfo->getLocale();
- switch($eventType){
- case EVENT_POST_POST_ADD:
- if(!$this->isEnabled())
- return true;
+ switch($eventType){
+ case EVENT_POST_POST_ADD:
+ if(!$this->isEnabled())
+ return true;
- $article = $params["article"];
- if(!$article || $article->getStatus() != POST_STATUS_PUBLISHED)
- return;
+ $article = $params["article"];
+ if(!$article || $article->getStatus() != POST_STATUS_PUBLISHED)
+ return;
- // don't send notifications for future posts
- $now = new Timestamp();
- if($article->getDateObject() > $now)
- return;
+ // don't send notifications for future posts
+ $now = new Timestamp();
+ if($article->getDateObject() > $now)
+ return;
- $rg = RequestGenerator::getRequestGenerator($this->blogInfo);
- $arr = Subscriptions::getSubscriptions($article->getCategoryIds(),
- SUBSCRIBE_POSTS_IN_CATEGORY);
+ $rg = RequestGenerator::getRequestGenerator($this->blogInfo);
+ $arr = Subscriptions::getSubscriptions($article->getCategoryIds(),
+ SUBSCRIBE_POSTS_IN_CATEGORY);
- foreach($arr as $email){
- // TODO: provide a templating
- // mechanism for the body of the email
- Subscriptions::sendMessage($email,
- $locale->pr("subscribe_article_published",
- $article->getTopic()),
- Textfilter::htmlDecode(
- Textfilter::filterAllHTML(
- $article->getIntroText())) .
- "\n\n".$rg->postPermalink($article).
- "\n\n".
- $locale->pr("subscribe_email_removal",
- Subscriptions::generateConfirmUrl(
- $this->blogInfo,
- "subscribeRemove",
- $email)));
- }
- break;
+ foreach($arr as $email){
+ // TODO: provide a templating
+ // mechanism for the body of the email
+ Subscriptions::sendMessage($email,
+ $locale->pr("subscribe_article_published",
+ $article->getTopic()),
+ Textfilter::htmlDecode(
+ Textfilter::filterAllHTML(
+ $article->getIntroText())) .
+ "\n\n".$rg->postPermalink($article).
+ "\n\n".
+ $locale->pr("subscribe_email_removal",
+ Subscriptions::generateConfirmUrl(
+ $this->blogInfo,
+ "subscribeRemove",
+ $email)));
+ }
+ break;
- case EVENT_POST_COMMENT_ADD:
- if(!$this->isEnabled())
- return;
+ case EVENT_POST_COMMENT_ADD:
+ if(!$this->isEnabled())
+ return;
- lt_include(PLOG_CLASS_PATH.
- "class/dao/usercomment.class.php");
- lt_include(PLOG_CLASS_PATH.
- "class/net/requestgenerator.class.php");
- $comment = $params["comment"];
- if($comment->getStatus() != COMMENT_STATUS_NONSPAM)
- return;
- $article = $comment->getArticle();
+ lt_include(PLOG_CLASS_PATH.
+ "class/dao/usercomment.class.php");
+ lt_include(PLOG_CLASS_PATH.
+ "class/net/requestgenerator.class.php");
+ $comment = $params["comment"];
+ if($comment->getStatus() != COMMENT_STATUS_NONSPAM)
+ return;
+ $article = $comment->getArticle();
- $rg = RequestGenerator::getRequestGenerator($this->blogInfo);
- $arr = Subscriptions::getSubscriptions(
- array($comment->getArticleId()),
- SUBSCRIBE_COMMENTS_IN_POST);
+ $rg = RequestGenerator::getRequestGenerator($this->blogInfo);
+ $arr = Subscriptions::getSubscriptions(
+ array($comment->getArticleId()),
+ SUBSCRIBE_COMMENTS_IN_POST);
- foreach($arr as $email){
- // TODO: provide a templating
- // mechanism for the body of the email
- Subscriptions::sendMessage($email,
- $locale->pr("subscribe_comment_on",
- $article->getTopic()),
- $locale->pr("subscribe_posted_by",
- $comment->getUserName())."\n".
- Textfilter::htmlDecode(
- Textfilter::filterAllHTML(
- $comment->getText())) .
- "\n\n".$rg->postPermalink($article).
- "\n\n".
- $locale->pr("subscribe_email_removal",
- Subscriptions::generateConfirmUrl(
- $this->blogInfo,
- "subscribeRemove",
- $email)));
- }
+ foreach($arr as $email){
+ // TODO: provide a templating
+ // mechanism for the body of the email
+ Subscriptions::sendMessage($email,
+ $locale->pr("subscribe_comment_on",
+ $article->getTopic()),
+ $locale->pr("subscribe_posted_by",
+ $comment->getUserName())."\n".
+ Textfilter::htmlDecode(
+ Textfilter::filterAllHTML(
+ $comment->getText())) .
+ "\n\n".$rg->postPermalink($article).
+ "\n\n".
+ $locale->pr("subscribe_email_removal",
+ Subscriptions::generateConfirmUrl(
+ $this->blogInfo,
+ "subscribeRemove",
+ $email)));
+ }
- $request = HttpVars::getRequest();
+ $request = HttpVars::getRequest();
- // Now check to see if this guy wants to receive
- // future notifications of comments
- if(isset($request["subscribe"])){
- // We already validated this
- $emailAddress = $request["userEmail"];
+ // Now check to see if this guy wants to receive
+ // future notifications of comments
+ if(isset($request["subscribe"])){
+ // We already validated this
+ $emailAddress = $request["userEmail"];
- // check if they are already logged in (ie. an authenticated commenter)
- $userInfo = SessionManager::getUserInfoFromSession();
- if($emailAddress == "" && $userInfo){
- $emailAddress = $userInfo->getEmail();
- }
+ // check if they are already logged in (ie. an authenticated commenter)
+ $userInfo = SessionManager::getUserInfoFromSession();
+ if($emailAddress == "" && $userInfo){
+ $emailAddress = $userInfo->getEmail();
+ }
- // save subscription info to database
- if(Subscriptions::addSubscriptions($this->blogInfo,
- array($comment->getArticleId()),
- SUBSCRIBE_COMMENTS_IN_POST,
- $emailAddress))
- {
- // send confirmation email
- if(!Subscriptions::sendConfirmationEmail($this->blogInfo,
- $emailAddress)){
- // TODO: can we do anything if there was an error?
- }
- }
- else{
- // TODO: can we do anything if there was an error?
- }
- }
+ // save subscription info to database
+ if(Subscriptions::addSubscriptions($this->blogInfo,
+ array($comment->getArticleId()),
+ SUBSCRIBE_COMMENTS_IN_POST,
+ $emailAddress))
+ {
+ // send confirmation email
+ if(!Subscriptions::sendConfirmationEmail($this->blogInfo,
+ $emailAddress)){
+ // TODO: can we do anything if there was an error?
+ }
+ }
+ else{
+ // TODO: can we do anything if there was an error?
+ }
+ }
- break;
- default:
- return;
- }
- }
+ break;
+ default:
+ return;
+ }
+ }
- function getPluginConfigurationKeys(){
- lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
+ function getPluginConfigurationKeys(){
+ lt_include( PLOG_CLASS_PATH."class/data/validator/stringvalidator.class.php" );
- return(
- Array(
- Array( "name" => "plugin_subscribe_enabled", "type" => "boolean"),
- Array( "name" => "plugin_subscribe_key", "validator" => new StringValidator(), "type" => "string", "allowEmpty" => true ),
- )
- );
- }
+ return(
+ Array(
+ Array( "name" => "plugin_subscribe_enabled", "type" => "boolean"),
+ Array( "name" => "plugin_subscribe_key", "validator" => new StringValidator(), "type" => "string", "allowEmpty" => true ),
+ )
+ );
+ }
- }
-?>
+}
More information about the pLog-svn
mailing list