From dd88022a7010d6840f305423cb631c7c3e658f7f Mon Sep 17 00:00:00 2001
From: Tristan Darricau <github@nicofuma.fr>
Date: Fri, 8 Aug 2014 18:22:11 +0200
Subject: [ticket/11854] Add a migration to update the captcha_plugin setting

PHPBB3-11854
---
 .../db/migration/data/v310/captcha_plugins.php     | 43 ++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 phpBB/phpbb/db/migration/data/v310/captcha_plugins.php

(limited to 'phpBB/phpbb/db')

diff --git a/phpBB/phpbb/db/migration/data/v310/captcha_plugins.php b/phpBB/phpbb/db/migration/data/v310/captcha_plugins.php
new file mode 100644
index 0000000000..8fe52355a9
--- /dev/null
+++ b/phpBB/phpbb/db/migration/data/v310/captcha_plugins.php
@@ -0,0 +1,43 @@
+<?php
+/**
+*
+* This file is part of the phpBB Forum Software package.
+*
+* @copyright (c) phpBB Limited <https://www.phpbb.com>
+* @license GNU General Public License, version 2 (GPL-2.0)
+*
+* For full copyright and license information, please see
+* the docs/CREDITS.txt file.
+*
+*/
+
+namespace phpbb\db\migration\data\v310;
+
+class captcha_plugins extends \phpbb\db\migration\migration
+{
+	static public function depends_on()
+	{
+		return array(
+			'\phpbb\db\migration\data\v310\dev',
+		);
+	}
+
+	public function update_data()
+	{
+		if (strpos($this->config['captcha_plugin'], 'phpbb_captcha_') === 0)
+		{
+			$captcha_plugin = substr(strlen('phpbb_captcha_'), $this->config['captcha_plugin']);
+		}
+
+		return array(
+			array('if', array(
+				(is_file($this->phpbb_root_path . 'phpbb/captcha/plugins/' . $captcha_plugin . $this->php_ext)),
+				array('config.update', array('captcha_plugin', 'core.captcha.plugins.' . $captcha_plugin)),
+			)),
+			array('if', array(
+				(!is_file($this->phpbb_root_path . 'phpbb/captcha/plugins/' . $captcha_plugin . $this->php_ext)),
+				array('config.update', array('captcha_plugin', 'core.captcha.plugins.nogd')),
+			)),
+		);
+	}
+}
-- 
cgit v1.2.1


From a1d5ad8a37144aaa1b5d32b3e61afc895cc60bfb Mon Sep 17 00:00:00 2001
From: Tristan Darricau <github@nicofuma.fr>
Date: Fri, 8 Aug 2014 19:04:26 +0200
Subject: [ticket/11854] Add missing dot in the migration file

PHPBB3-11854
---
 phpBB/phpbb/db/migration/data/v310/captcha_plugins.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'phpBB/phpbb/db')

diff --git a/phpBB/phpbb/db/migration/data/v310/captcha_plugins.php b/phpBB/phpbb/db/migration/data/v310/captcha_plugins.php
index 8fe52355a9..5e0a09e75a 100644
--- a/phpBB/phpbb/db/migration/data/v310/captcha_plugins.php
+++ b/phpBB/phpbb/db/migration/data/v310/captcha_plugins.php
@@ -31,11 +31,11 @@ class captcha_plugins extends \phpbb\db\migration\migration
 
 		return array(
 			array('if', array(
-				(is_file($this->phpbb_root_path . 'phpbb/captcha/plugins/' . $captcha_plugin . $this->php_ext)),
+				(is_file($this->phpbb_root_path . 'phpbb/captcha/plugins/' . $captcha_plugin . '.' . $this->php_ext)),
 				array('config.update', array('captcha_plugin', 'core.captcha.plugins.' . $captcha_plugin)),
 			)),
 			array('if', array(
-				(!is_file($this->phpbb_root_path . 'phpbb/captcha/plugins/' . $captcha_plugin . $this->php_ext)),
+				(!is_file($this->phpbb_root_path . 'phpbb/captcha/plugins/' . $captcha_plugin . '.' . $this->php_ext)),
 				array('config.update', array('captcha_plugin', 'core.captcha.plugins.nogd')),
 			)),
 		);
-- 
cgit v1.2.1


From 6e4991093ae8f4ce22cc5bdf8b5bd8dcf42c14f3 Mon Sep 17 00:00:00 2001
From: Tristan Darricau <github@nicofuma.fr>
Date: Sat, 9 Aug 2014 10:41:56 +0200
Subject: [ticket/11854] Fix migration

PHPBB3-11854
---
 phpBB/phpbb/db/migration/data/v310/captcha_plugins.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'phpBB/phpbb/db')

diff --git a/phpBB/phpbb/db/migration/data/v310/captcha_plugins.php b/phpBB/phpbb/db/migration/data/v310/captcha_plugins.php
index 5e0a09e75a..e6f15ca407 100644
--- a/phpBB/phpbb/db/migration/data/v310/captcha_plugins.php
+++ b/phpBB/phpbb/db/migration/data/v310/captcha_plugins.php
@@ -24,9 +24,10 @@ class captcha_plugins extends \phpbb\db\migration\migration
 
 	public function update_data()
 	{
+		$captcha_plugin = $this->config['captcha_plugin'];
 		if (strpos($this->config['captcha_plugin'], 'phpbb_captcha_') === 0)
 		{
-			$captcha_plugin = substr(strlen('phpbb_captcha_'), $this->config['captcha_plugin']);
+			$captcha_plugin = substr($this->config['captcha_plugin'], strlen('phpbb_captcha_'));
 		}
 
 		return array(
-- 
cgit v1.2.1


From 351a6dcad245ce302def5952e631df6bad9c694d Mon Sep 17 00:00:00 2001
From: Tristan Darricau <github@nicofuma.fr>
Date: Sun, 10 Aug 2014 14:58:48 +0200
Subject: [ticket/11854] Base the migration on rc2

PHPBB3-11854
---
 phpBB/phpbb/db/migration/data/v310/captcha_plugins.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/phpbb/db')

diff --git a/phpBB/phpbb/db/migration/data/v310/captcha_plugins.php b/phpBB/phpbb/db/migration/data/v310/captcha_plugins.php
index e6f15ca407..13071e9891 100644
--- a/phpBB/phpbb/db/migration/data/v310/captcha_plugins.php
+++ b/phpBB/phpbb/db/migration/data/v310/captcha_plugins.php
@@ -18,7 +18,7 @@ class captcha_plugins extends \phpbb\db\migration\migration
 	static public function depends_on()
 	{
 		return array(
-			'\phpbb\db\migration\data\v310\dev',
+			'\phpbb\db\migration\data\v310\rc2',
 		);
 	}
 
-- 
cgit v1.2.1