From 3b5299b5ca327bab1013e23b6284ce92bea6db04 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Wed, 6 Jan 2010 00:20:15 -0500
Subject: [PATCH] Use plugin configuration instead of common_config()

---
 plugins/Mollom/MollomPlugin.php | 16 ++++++++--------
 plugins/Mollom/README           | 14 +++++++++-----
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/plugins/Mollom/MollomPlugin.php b/plugins/Mollom/MollomPlugin.php
index f89910ae59..4c82c481ae 100644
--- a/plugins/Mollom/MollomPlugin.php
+++ b/plugins/Mollom/MollomPlugin.php
@@ -69,13 +69,13 @@ define('MOLLOM_REDIRECT', 1200);
 
 class MollomPlugin extends Plugin
 {
-    function __construct($url=null) {
-        parent::__construct();
-    }
+    public $public_key;
+    public $private_key;
+    public $servers;
 
     function onStartNoticeSave($notice)
     {
-      if (common_config('mollom', 'public_key')) {
+      if ( $this->public_key ) {
         //Check spam
         $data = array(
             'post_body'      => $notice->content,
@@ -123,9 +123,9 @@ class MollomPlugin extends Plugin
         }
     
       // Construct the server URL:
-      $public_key = common_config('mollom', 'public_key');
+      $public_key = $this->public_key;
       // Retrieve the list of Mollom servers from the database:
-      $servers = common_config('mollom', 'servers');
+      $servers = $this->servers;
     
       if ($servers == NULL) {
         // Retrieve a list of valid Mollom servers from mollom.com:
@@ -205,8 +205,8 @@ class MollomPlugin extends Plugin
     */
     private function authentication() {
     
-      $public_key = common_config('mollom', 'public_key');
-      $private_key = common_config('mollom', 'private_key');
+      $public_key = $this->public_key;
+      $private_key = $this->private_key;
     
       // Generate a timestamp according to the dateTime format (http://www.w3.org/TR/xmlschema-2/#dateTime):
       $time = gmdate("Y-m-d\TH:i:s.\\0\\0\\0O", time());
diff --git a/plugins/Mollom/README b/plugins/Mollom/README
index 210e9000bf..2b8c2d8a0f 100644
--- a/plugins/Mollom/README
+++ b/plugins/Mollom/README
@@ -1,3 +1,5 @@
+The mollom plugin uses mollom.com to filter SN notices for spam.
+
 == Dependencies ==
 Your webserver needs to have xmlrpc php extention loaded.
 This is called php5-xmlrpc in Debian/Ubuntu
@@ -5,11 +7,13 @@ This is called php5-xmlrpc in Debian/Ubuntu
 == Installation ==
 Add the following to your config.php
 <?php
-addPlugin('Mollom');
-
-$config['mollom']['public_key'] = '...';
-$config['mollom']['private_key'] = '...';
-$config['mollom']['servers'] = array('http://88.151.243.81', 'http://82.103.131.136');
+addPlugin('Mollom',
+    array(
+        'public_key' => '...',
+        'private_key' => '...',
+        'servers' => array('http://88.151.243.81', 'http://82.103.131.136')
+    )
+);
 
 ?>