Merge Seperate Tree

SQL/mysql.initial.sql

@@ -1,6 +1,6 @@
 -- MySQL table for rcguard
 
-CREATE TABLE `rcguard` (
+CREATE TABLE IF NOT EXISTS `rcguard` (
   `ip` VARCHAR(40) NOT NULL,
   `first` DATETIME NOT NULL,
   `last` DATETIME NOT NULL,

composer.json

@@ -0,0 +1,32 @@
+{
+    "name": "dsoares/rcguard",
+    "type": "roundcube-plugin",
+    "description": "Roundcube plugin that enforces reCAPTCHA for users that have too many failed logins",
+    "keywords": ["mail","security","captcha"],
+    "homepage": "https://github.com/dsoares/rcguard/",
+    "license": "GPL-3.0+",
+    "authors": [
+        {
+            "name": "Denny Lin",
+	    "email": "dennylin93@hs.ntnu.edu.tw",
+            "homepage": "https://github.com/dennylin93",
+            "role": "Developer"
+        }
+    ],
+    "repositories": [
+        {
+            "type": "composer",
+            "url": "http://plugins.roundcube.net"
+        }
+    ],
+    "require": {
+	"php": ">=5.2.1",
+        "roundcube/plugin-installer": ">=0.1.2"
+    },
+    "extra": {
+	"roundcube": {
+	    "min-version": "1.0",
+	    "sql-dir": "SQL"
+	}
+    }
+}

config.inc.php.dist

@@ -10,10 +10,14 @@ $rcmail_config['failed_attempts'] = 5;
 // Release IP after how many minutes (after last failed attempt)
 $rcmail_config['expire_time'] = 30;
 
+// reCAPTCHA API
+$rcmail_config['recaptcha_api']        = 'http://www.google.com/recaptcha/api.js';
+$rcmail_config['recaptcha_api_secure'] = 'https://www.google.com/recaptcha/api.js';
+
 // Use HTTPS for reCAPTCHA
 $rcmail_config['recaptcha_https'] = false;
 
-// Keys can be obtained from http://recaptcha.net/whyrecaptcha.html
+// Keys can be obtained from http://www.google.com/recaptcha/
 
 // Public key for reCAPTCHA
 $rcmail_config['recaptcha_publickey'] = '';