Changeset 2354

Timestamp:

06/12/10 10:04:27 (13 years ago)

Author:

franck

Message:

DC 2.2 compliance : New settings system

Location:

plugins/contactMe

Files:

• . (modified) (1 prop)
• _define.php (modified) (1 diff)
• _public.php (modified) (7 diffs)
• index.php (modified) (2 diffs)

plugins/contactMe/_define.php

@@ -15 +15 @@
      /* Name */          "ContactMe",
      /* Description*/    "Add a simple contact form on your blog",
-     /* Author */        "Olivier Meunier",
-     /* Version */       '1.0',
+     /* Author */        "Olivier Meunier and contributors",
+     /* Version */       '1.1',
      /* Permissions */   'admin'
 );

plugins/contactMe/_public.php

@@ -37 +37 @@
           global $core, $_ctx;
           
-          if (!$core->blog->settings->cm_recipients) {
+          if (!$core->blog->settings->contactme->cm_recipients) {
                self::p404();
                exit;
@@ -98 +98 @@
                     
                     # Checks recipients addresses
-                    $recipients = explode(',',$core->blog->settings->cm_recipients);
+                    $recipients = explode(',',$core->blog->settings->contactme->cm_recipients);
                     $rc2 = array();
                     foreach ($recipients as $v) {
@@ -114 +114 @@
                     
                     # Check message form spam
-                    if ($core->blog->settings->cm_use_antispam && class_exists('dcAntispam') && isset($core->spamfilters))
+                    if ($core->blog->settings->contactme->cm_use_antispam && class_exists('dcAntispam') && isset($core->spamfilters))
                     {
                          # Fake cursor to check spam
@@ -148 +148 @@
                     
                     $subject = $_ctx->contactme['subject'];
-                    if ($core->blog->settings->cm_subject_prefix) {
-                         $subject = $core->blog->settings->cm_subject_prefix.' '.$subject;
+                    if ($core->blog->settings->contactme->cm_subject_prefix) {
+                         $subject = $core->blog->settings->contactme->cm_subject_prefix.' '.$subject;
                     }
                     $subject = mail::B64Header($subject);
@@ -215 +215 @@
      {
           $f = $GLOBALS['core']->tpl->getFilters($attr);
-          return '<?php echo '.sprintf($f,'$core->blog->settings->cm_page_title').'; ?>';
+          return '<?php echo '.sprintf($f,'$core->blog->settings->contactme->cm_page_title').'; ?>';
      }
      
      public static function ContactMeFormCaption($attr)
      {
-          return '<?php echo $core->blog->settings->cm_form_caption; ?>';
+          return '<?php echo $core->blog->settings->contactme->cm_form_caption; ?>';
      }
      
      public static function ContactMeMsgSuccess($attr)
      {
-          return '<?php echo $core->blog->settings->cm_msg_success; ?>';
+          return '<?php echo $core->blog->settings->contactme->cm_msg_success; ?>';
      }
      
      public static function ContactMeMsgError($attr)
      {
-          return '<?php echo sprintf($core->blog->settings->cm_msg_error,html::escapeHTML($_ctx->contactme["error_msg"])); ?>';
+          return '<?php echo sprintf($core->blog->settings->contactme->cm_msg_error,html::escapeHTML($_ctx->contactme["error_msg"])); ?>';
      }
      
@@ -264 +264 @@
      
      # Widget function
-     public static function contactMeWidget(&$w)
+     public static function contactMeWidget($w)
      {
           global $core;
@@ -272 +272 @@
           }
           
-          if (!$core->blog->settings->cm_recipients) {
+          if (!$core->blog->settings->contactme->cm_recipients) {
                return;
           }

plugins/contactMe/index.php

@@ -11 +11 @@
 # -- END LICENSE BLOCK ------------------------------------
 
-$cm_recipients      = $core->blog->settings->cm_recipients;
-$cm_subject_prefix  = $core->blog->settings->cm_subject_prefix;
-$cm_page_title      = $core->blog->settings->cm_page_title;
-$cm_form_caption    = $core->blog->settings->cm_form_caption;
-$cm_msg_success     = $core->blog->settings->cm_msg_success;
-$cm_msg_error       = $core->blog->settings->cm_msg_error;
-$cm_use_antispam    = $core->blog->settings->cm_use_antispam;
+$cm_recipients      = $core->blog->settings->contactme->cm_recipients;
+$cm_subject_prefix  = $core->blog->settings->contactme->cm_subject_prefix;
+$cm_page_title      = $core->blog->settings->contactme->cm_page_title;
+$cm_form_caption    = $core->blog->settings->contactme->cm_form_caption;
+$cm_msg_success          = $core->blog->settings->contactme->cm_msg_success;
+$cm_msg_error       = $core->blog->settings->contactme->cm_msg_error;
+$cm_use_antispam    = $core->blog->settings->contactme->cm_use_antispam;
 
 $antispam_enabled = $core->plugins->moduleExists('antispam');
@@ -78 +78 @@
           
           # Everything's fine, save options
-          $core->blog->settings->setNamespace('contactme');
-          $core->blog->settings->put('cm_recipients',$cm_recipients,'string','ContactMe recipients');
-          $core->blog->settings->put('cm_subject_prefix',$cm_subject_prefix,'string','ContactMe subject prefix');
-          $core->blog->settings->put('cm_page_title',$cm_page_title,'string','ContactMe page title');
-          $core->blog->settings->put('cm_form_caption',$cm_form_caption,'string','ContactMe form caption');
-          $core->blog->settings->put('cm_msg_success',$cm_msg_success,'string','ContactMe success message');
-          $core->blog->settings->put('cm_msg_error',$cm_msg_error,'string','ContactMe error message');
+          $core->blog->settings->addNamespace('contactme');
+          $core->blog->settings->contactme->put('cm_recipients',$cm_recipients,'string','ContactMe recipients');
+          $core->blog->settings->contactme->put('cm_subject_prefix',$cm_subject_prefix,'string','ContactMe subject prefix');
+          $core->blog->settings->contactme->put('cm_page_title',$cm_page_title,'string','ContactMe page title');
+          $core->blog->settings->contactme->put('cm_form_caption',$cm_form_caption,'string','ContactMe form caption');
+          $core->blog->settings->contactme->put('cm_msg_success',$cm_msg_success,'string','ContactMe success message');
+          $core->blog->settings->contactme->put('cm_msg_error',$cm_msg_error,'string','ContactMe error message');
           
           if ($antispam_enabled) {
-               $core->blog->settings->put('cm_use_antispam',!empty($_POST['cm_use_antispam']),'boolean','ContactMe should use comments spam filter');
+               $core->blog->settings->contactme->put('cm_use_antispam',!empty($_POST['cm_use_antispam']),'boolean','ContactMe should use comments spam filter');
           }