Changeset 791560

Timestamp:

10/21/2013 11:47:01 PM (11 years ago)

Author:

tha_sun

Message:

Preparing release 2.2.

Location:

mollom/trunk

Files:

• includes/Admin.php (modified) (4 diffs)
• includes/Entity.php (modified) (7 diffs)
• includes/EntityComment.php (modified) (1 diff)
• includes/EntityUser.php (added)
• includes/Moderation.php (modified) (2 diffs)
• mollom.php (modified) (7 diffs)
• readme.txt (modified) (4 diffs)

mollom/trunk/includes/Admin.php

@@ -78 +78 @@
     ));
     // Protection options section.
-    add_settings_field('mollom_unsure', __('When text analysis is unsure', MOLLOM_L10N), array('MollomForm', 'printItemsArray'), 'mollom', 'mollom_options', array(
+    add_settings_field('mollom_unsure', __('When  is unsure', MOLLOM_L10N), array('MollomForm', 'printItemsArray'), 'mollom', 'mollom_options', array(
       'type' => 'radios',
       'name' => 'mollom_unsure',
       'options' => array(
-        'captcha' => __('Show a CAPTCHA', MOLLOM_L10N),
+        'captcha' => __('Show a CAPTCHA', MOLLOM_L10N),
         'binary' => __('Accept the post', MOLLOM_L10N),
       ),
       'value' => get_option('mollom_unsure', 'captcha'),
+
+
+
+
     ));
     add_settings_field('mollom_bypass_roles', __('Bypass roles', MOLLOM_L10N), array('MollomForm', 'printItemsArray'), 'mollom', 'mollom_options', array(
@@ -103 +107 @@
       'value' => get_option('mollom_fallback_mode', 'accept'),
       'description' => vsprintf(__('In case Mollom services are unreachable, no text analysis can be performed and no CAPTCHAs can be generated. Customers on <a href="%s">paid plans</a> have access to <a href="%s">Mollom\'s high-availability backend infrastructure</a>, not available to free users, reducing potential downtime.', MOLLOM_L10N), array(
-        'https://mollom.com/web-service-privacy-policy',
-        'https://mollom.com/terms-of-service',
+        'https://mollom.com/',
+        'https://mollom.com/',
       )),
     ));
@@ -111 +115 @@
       'name' => 'mollom_privacy_link',
       'label' => __("Link to Mollom's privacy policy", MOLLOM_L10N),
-      'value' => get_option('mollom_privacy_link'),
+      'value' => get_option('mollom_privacy_link'),
       'description' => vsprintf(__('Displays a link to the recommended <a href="%s">privacy policy on mollom.com</a> on all protected forms. When disabling this option, you are required to inform visitors about data privacy through other means, as stated in the <a href="%s">terms of service</a>.', MOLLOM_L10N), array(
-        '@privacy-policy-url' => 'https://mollom.com/web-service-privacy-policy',
-        '@terms-of-service-url' => 'https://mollom.com/terms-of-service',
+        'https://mollom.com/web-service-privacy-policy',
+        'https://mollom.com/terms-of-service',
       )),
     ));
@@ -131 +135 @@
       'label' => __('Enable Mollom testing mode', MOLLOM_L10N),
       'value' => get_option('mollom_testing_mode'),
-      // @todo Sanitize.
       'description' => __('Submitting "ham", "unsure", or "spam" on a protected form will trigger the corresponding behavior. Image CAPTCHAs will only respond to "correct" and audio CAPTCHAs only respond to "demo". This option should be disabled in production environments.', MOLLOM_L10N),
     ));

mollom/trunk/includes/Entity.php

@@ -81 +81 @@
    * @see MollomEntity::alterFormAction()
    */
-  public function buildForm() {
+  public function buildForm() {
     if ($this->isPrivileged()) {
       return '';
@@ -95 +95 @@
     $output .= MollomForm::formatInput('hidden', 'mollom[captchaId]', $values['captchaId']);
 
-    $output .= '<div class="hidden">';
+    $output .= '<div ">';
     $output .= MollomForm::formatInput('text', 'mollom[homepage]', $values['homepage']);
     $output .= '</div>';
@@ -117 +117 @@
 
       $output .= "\n";
-      $output .= MollomForm::formatItem('text', __('Word verification', MOLLOM_L10N), $captcha);
+      $output .= MollomForm::formatItem('text', __('Word verification', MOLLOM_L10N), $captcha, __('Type the characters in the image above (not case-sensitive).', MOLLOM_L10N), array(
+        'item' => array('class' => array('mollom-captcha'))
+      ));
     }
 
     if (get_option('mollom_privacy_link', TRUE)) {
       $output .= "\n";
-      $output .= '<p class="description">';
+      $output .= '<p class="description mollom-privacy-policy">';
+      $output .= '<small>';
       $output .= vsprintf(__('By submitting this form, you accept the <a href="%s" target="_blank" rel="nofollow">Mollom privacy policy</a>.', MOLLOM_L10N), array(
         'https://mollom.com/web-service-privacy-policy',
       ));
+
       $output .= '</p>';
     }
@@ -173 +177 @@
     $data = MollomForm::unescapeUserInput($data);
 
-    $data['authorIp'] = self::getAuthorIp();
+    $data();
 
     if (isset($_POST['mollom']['homepage']) && $_POST['mollom']['homepage'] !== '') {
@@ -179 +183 @@
     }
 
-    $author_data = array_intersect_key($data, array_flip(array('authorName', 'authorMail', 'authorUrl', 'authorIp', 'authorId', 'honeypot')));
+    $author_data = array_intersect_key($data, array_flip(array('author', 'honeypot')));
 
     // Check (unsure) CAPTCHA solution.
@@ -403 +407 @@
       'stored' => 1,
     );
+
+
+
+
     mollom()->checkContent($data);
     // Save meta data.
@@ -490 +498 @@
 
   /**
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
    * Returns the IP address of the client.
    *

mollom/trunk/includes/EntityComment.php

@@ -44 +44 @@
    */
   public function buildForm($fields) {
-    $fields['comment_notes_after'] .= parent::buildForm();
+    $fields['comment_notes_after'] .= parent::buildForm();
     return $fields;
   }

mollom/trunk/includes/Moderation.php

@@ -33 +33 @@
     self::$contentId = $contentId;
     self::$action = $action;
+
+
+
     // Verify the action.
     if (!in_array($action, array('approve', 'spam', 'delete'))) {
       header($_SERVER['SERVER_PROTOCOL'] . ' 400 Bad Request');
+
+
+
       return FALSE;
     }
@@ -46 +52 @@
       return FALSE;
     }
+
+
+
     // Validate OAuth Authorization header.
     if (!self::validateAuth()) {
       header($_SERVER['SERVER_PROTOCOL'] . ' 401 Unauthorized');
-      return FALSE;
-    }
-    do_action('mollom_moderate_' . self::$entityType, self::$entityId, $action);
-    return TRUE;
+      self::log(array(
+        'message' => 'Invalid authentication',
+      ));
+      return FALSE;
+    }
+    // The actual moderation callback is part of the filter chain and returns
+    // TRUE on success, FALSE on failure.
+    return apply_filters('mollom_moderate_' . self::$entityType, self::$entityId, $action);
   }
 

mollom/trunk/mollom.php

@@ -4 +4 @@
   Plugin Name: Mollom
   Plugin URI: https://mollom.com
-  Version: 2.1
+  Version: 2.
   Text Domain: mollom
   Description: Protects you from spam and unwanted posts. <strong>Get started:</strong> 1) <em>Activate</em>, 2) <a href="https://mollom.com/pricing">Sign up</a> and create API keys, 3) Set them in <a href="options-general.php?page=mollom">settings</a>.
@@ -55 +55 @@
 // Note the priority argument semantics (4th argument to add_filter/add_action):
 //   WordPress $priority == Drupal $weight != Symfony $priority
+
 add_action('plugins_loaded', 'mollom_plugins_loaded');
 add_action('init', 'mollom_moderate');
@@ -65 +66 @@
 }
 
+
 add_filter('comment_form_defaults', 'mollom_dispatch_hook');
 add_filter('preprocess_comment', 'mollom_dispatch_hook', 0);
@@ -71 +73 @@
 add_action('wp_set_comment_status', 'mollom_dispatch_hook', 10, 2);
 add_action('transition_comment_status', 'mollom_dispatch_hook', 10, 3);
-add_action('mollom_moderate_comment', 'mollom_dispatch_hook', 10, 2);
+add_filter('mollom_moderate_comment', 'mollom_dispatch_hook', 10, 2);
+
+// Users.
+// @todo Multisite uses wp-signup.php.
+// @see register_new_user(), wp-login.php
+add_action('register_form', 'mollom_dispatch_hook');
+add_filter('registration_errors', 'mollom_dispatch_hook', 10, 3);
+// @see wp_create_user(), wp_insert_user(), wp-includes/user.php
+add_action('user_register', 'mollom_dispatch_hook');
+// @see wp_delete_user(), wp-admin/includes/user.php
+add_action('delete_user', 'mollom_dispatch_hook');
+add_filter('mollom_moderate_user', 'mollom_dispatch_hook', 10, 2);
 
 add_filter('wp_die_handler', 'mollom_die_handler_callback', 100);
@@ -100 +113 @@
   static $instances = array();
   static $mapping = array(
+
     'comment_form_defaults' => array('MollomEntityComment', 'buildForm'),
     'preprocess_comment' => array('MollomEntityComment', 'validateForm'),
@@ -107 +121 @@
     'transition_comment_status' => array('MollomEntityComment', 'transitionStatus'),
     'mollom_moderate_comment' => array('MollomEntityComment', 'moderate'),
+
+
+
+
+
+
   );
 
@@ -179 +199 @@
   if (preg_match('@/mollom/moderate/(?P<contentId>[^/]+)/(?P<action>[^/]+)$@', $_SERVER['REQUEST_URI'], $args)) {
     echo (int) MollomModeration::handleRequest($args['contentId'], $args['action']);
-    //error_log(var_export(MollomModeration::$log, TRUE), 3, __DIR__ . '/includes/log.log');
+    //error_log(var_export(MollomModeration::$log, TRUE), 3, __DIR__ . '/includes/log.log');
     exit;
   }

mollom/trunk/readme.txt

@@ -4 +4 @@
 Tags: comments, spam, social, content, moderation, captcha, mollom
 Requires at least: 3.1.0
-Tested up to: 3.5.1
-Stable tag: 2.1
+Tested up to: 3.
+Stable tag: 2.
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -130 +130 @@
 
 
+
+
+
+
+
+
+
+
+
 == Upgrade Notice ==
 
@@ -138 +147 @@
 == Changelog ==
 
+
+
+
+
+
+
 = 2.1 =
+
 
 * Fixed comment reply form is not positioned below parent comment when form is re-rendered.
@@ -146 +162 @@
 
 = 2.0 =
+
 
 * Rewritten and re-architected for Mollom's new [REST API](http://mollom.com/api).
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+