Changeset 737526

Timestamp:

07/07/2013 11:14:17 PM (11 years ago)

Author:

tha_sun

Message:

Preparing release 2.0.

Location:

mollom/trunk

Files:

• assets/mollom-captcha-player.swf (deleted)
• includes/Admin.php (modified) (1 diff)
• includes/Moderation.php (modified) (7 diffs)
• includes/Schema.php (modified) (4 diffs)
• readme.txt (modified) (5 diffs)
• uninstall.php (modified) (2 diffs)

mollom/trunk/includes/Admin.php

@@ -99 +99 @@
       'type' => 'checkbox',
       'name' => 'mollom_privacy_link',
-      'label' => __('Link to Mollom\'s privacy policy', MOLLOM_L10N),
+      'label' => __(, MOLLOM_L10N),
       '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(

mollom/trunk/includes/Moderation.php

@@ -42 +42 @@
       header($_SERVER['SERVER_PROTOCOL'] . ' 410 Gone');
       self::log(array(
-        'message' => __('Not Found', MOLLOM_L10N),
+        'message' => ,
       ));
       return FALSE;
@@ -90 +90 @@
     if ($publicKey === '' || $privateKey === '') {
       self::log(array(
-        'message' => __('Missing module configuration', MOLLOM_L10N),
+        'message' => ,
       ));
       return FALSE;
@@ -102 +102 @@
     if (!isset($header['oauth_consumer_key'], $header['oauth_nonce'], $header['oauth_timestamp'], $header['oauth_signature_method'], $header['oauth_signature'])) {
       self::log(array(
-        'message' => __('Missing protocol parameters', MOLLOM_L10N),
+        'message' => ,
         'Request:' => $_SERVER['REQUEST_METHOD'] . ' ' . $_SERVER['REQUEST_URI'],
         'Request headers:' => $header,
@@ -117 +117 @@
     if ($header['oauth_consumer_key'] !== $publicKey) {
       self::log(array(
-        'message' => __('Invalid public/consumer key', MOLLOM_L10N),
+        'message' => ,
         'Request:' => $_SERVER['REQUEST_METHOD'] . ' ' . $_SERVER['REQUEST_URI'],
         'Request headers:' => $header,
@@ -133 +133 @@
       }
       self::log(array(
-        'message' => __('Outdated authentication timestamp', MOLLOM_L10N),
+        'message' => ,
         'Request:' => $_SERVER['REQUEST_METHOD'] . ' ' . $_SERVER['REQUEST_URI'],
         'Request headers:' => $header,
@@ -144 +144 @@
     if (empty($header['oauth_nonce'])) {
       self::log(array(
-        'message' => __('Missing authentication nonce', MOLLOM_L10N),
+        'message' => ,
         'Request:' => $_SERVER['REQUEST_METHOD'] . ' ' . $_SERVER['REQUEST_URI'],
         'Request headers:' => $header,
@@ -183 +183 @@
     if (!$valid) {
       self::log(array(
-        'message' => __('Invalid authentication signature', MOLLOM_L10N),
+        'message' => ,
         'Request:' => $_SERVER['REQUEST_METHOD'] . ' ' . $_SERVER['REQUEST_URI'],
         'Request headers:' => $header + array('oauth_signature' => $sent_signature),

mollom/trunk/includes/Schema.php

@@ -31 +31 @@
   public static function getSchema() {
     global $wpdb;
-    $table = $wpdb->prefix . 'mollom';
+    $;
 
     // Note: dbDelta() requires no spaces between column names in the primary
     // key definition.
-    return "CREATE TABLE $table (
+    $table = $wpdb->prefix . 'mollom';
+    $schema[$table] = "
   entity_type VARCHAR(32) DEFAULT '' NOT NULL,
   entity_id BIGINT DEFAULT 0 NOT NULL,
@@ -43 +44 @@
   KEY content_id (content_id),
   KEY created (created)
-)";
+";
+    return $schema;
   }
 
@@ -51 +53 @@
   public static function install() {
     require_once ABSPATH . 'wp-admin/includes/upgrade.php';
-    dbDelta(self::getSchema());
+    $schema = self::getSchema();
+    foreach ($schema as $table => $spec) {
+      dbDelta("CREATE TABLE $table ($spec)");
+    }
+
+    // Do not autoload the schema version option.
+    // Mind the WPWTF: No, not FALSE, but "no".
+    add_option('mollom_schema_version', 0, '', 'no');
 
     update_option('mollom_schema_version', self::getVersion());
@@ -66 +75 @@
   }
 
+
+
+
+
+
+
+
+
+
+
+
 }

mollom/trunk/readme.txt

@@ -1 +1 @@
 === Mollom ===
 Contributors: Netsensei, tha_sun
-Donate link: http://mollom.com
+Donate link: http
 Tags: comments, spam, social, content, moderation, captcha, mollom
 Requires at least: 3.1.0
@@ -13 +13 @@
 == Description ==
 
-[Mollom](http://mollom.com) protects you from spam and unwanted posts.  Mollom enables you to focus on quality content, and to embrace social, user-contributed content and public engagement.
+[Mollom](http://mollom.com) protects you user-contributed content and public engagement.
 
-Mollom blocks all bad spam, accepts the good user-contributed content, and honestly admits when it is _unsure_ — asking the author to solve a [CAPTCHA](http://en.wikipedia.org/wiki/CAPTCHA) to be sure.  To learn more, check [how Mollom works](http://mollom.com/how-mollom-works).
+Mollom .  To learn more, check [how Mollom works](http://mollom.com/how-mollom-works).
 
-Obvious spam does not even enter your site; it's outright discarded instead.  You should not have to deal with spam.  Mollom supplies a cutting-edge content classification technology that learns and automatically adapts — to allow you to focus on content:  Quality content.
+s — to allow you to focus on content:  Quality content.
 
-You have multiple WordPress blogs and potentially other sites that need your attention and moderation?  This plugin integrates with Mollom's [Content Moderation Platform](http://mollom.com/moderation) out of the box — Moderate them all at once.  Focus on important topics instead.
+.
 
-Note:  Mollom is an all-in-one solution.  To get the best performance out of Mollom, ensure to disable all other spam protection plugins.
+Do you have multiple WordPress and other sites that need moderation?  Mollom's [Content Moderation Platform](http://mollom.com/moderation) is supported out of the box — Save time & moderate them all at once.
+
+If you like Mollom, consider to [write a review](http://wordpress.org/support/view/plugin-reviews/mollom) and blog about it! :)
+
+= Support =
+
+To get the best performance out of Mollom, ensure to disable other spam filter plugins.
+
+* Contact [Mollom Support](http://mollom.com/contact) for issues pertaining to the Mollom service; e.g., uncaught spam posts, inappropriately classified posts, etc.
+* Use the [issue queue](https://github.com/Mollom/wordpress-mollom/issues) for bug reports and feature requests pertaining to the WordPress plugin.
+
+= Development =
+
+This plugin is maintained on [GitHub](https://github.com/Mollom/wordpress-mollom).  Contributions are welcome!
 
 
@@ -27 +40 @@
 
 1. Install and activate the plugin.
-1. [Sign up](https://mollom.com/pricing) to create Mollom API keys for your site.
-1. Enter them on the settings page of the Mollom plugin on your site.
+1. [Sign up API keys for your site.
+1. Enter them on the  on your site.
 
 
@@ -38 +51 @@
 = Requirements for Content Moderation Platform =
 
-Optionally, to enable the [Content Moderation Platform (CMP)](http://mollom.com/moderation) integration:
+Optionally, to enable the [Content Moderation Platform (CMP)](http://mollom.com/moderation):
 
 * [Pretty Permalinks](http://codex.wordpress.org/Using_Permalinks#Using_.22Pretty.22_permalinks) must be enabled.
-* On servers running PHP <5.4 as CGI, ensure the Apache `mod_rewrite` module is enabled and add the following lines to your `.htaccess` file:
+* On servers running PHP <5.4 , ensure the Apache `mod_rewrite` module is enabled and add the following lines to your `.htaccess` file:
 
         RewriteEngine On
         RewriteRule .* - [E=HTTP_AUTHORIZATION:%{HTTP:Authorization}]
+
+
+
+
+
+
+
 
 
@@ -57 +77 @@
 = 2.0 =
 
-* Rewritten and re-architected for Mollom's new REST API.
+* Rewritten and re-architected for Mollom's new .
 

mollom/trunk/uninstall.php

@@ -11 +11 @@
 }
 
-// @todo Delete mollom table.
-// @todo Delete meta data.
+// Delete content meta data.
+delete_metadata('comment', 0, 'mollom', NULL, TRUE);
+delete_metadata('comment', 0, 'mollom_content_id', NULL, TRUE);
+delete_metadata('post', 0, 'mollom', NULL, TRUE);
+delete_metadata('post', 0, 'mollom_content_id', NULL, TRUE);
+delete_metadata('user', 0, 'mollom', NULL, TRUE);
+delete_metadata('user', 0, 'mollom_content_id', NULL, TRUE);
+
+// Drop database tables.
+require_once dirname(__FILE__) . '/includes/Schema.php';
+MollomSchema::uninstall();
+
+delete_option('mollom_schema_version');
 
 delete_option('mollom_public_key');
@@ -24 +35 @@
 delete_option('mollom_reverse_proxy_addresses');
 delete_option('mollom_testing_mode');
+
+
+
+
+