From 83ae2eeab2d0ab479f32b4fae288f22facaf85fc Mon Sep 17 00:00:00 2001 From: "Ignacio R. Morelle" Date: Wed, 12 Aug 2009 00:17:55 +0000 Subject: [PATCH] Add cycholka's phpBB registration check hack to the repository. --- .../phpbb-3.0.5/registration_check.patch | 123 ++++++++++++++++++ .../registration_check.patch.README | 8 ++ 2 files changed, 131 insertions(+) create mode 100644 website/forum.wesnoth.org/phpbb-3.0.5/registration_check.patch create mode 100644 website/forum.wesnoth.org/phpbb-3.0.5/registration_check.patch.README diff --git a/website/forum.wesnoth.org/phpbb-3.0.5/registration_check.patch b/website/forum.wesnoth.org/phpbb-3.0.5/registration_check.patch new file mode 100644 index 00000000000..e42a902dfcf --- /dev/null +++ b/website/forum.wesnoth.org/phpbb-3.0.5/registration_check.patch @@ -0,0 +1,123 @@ +diff --git a/includes/ucp/ucp_register.php b/includes/ucp/ucp_register.php +index db37265..b826b9d 100644 +--- a/includes/ucp/ucp_register.php ++++ b/includes/ucp/ucp_register.php +@@ -169,6 +169,7 @@ class ucp_register + 'email' => strtolower(request_var('email', '')), + 'email_confirm' => strtolower(request_var('email_confirm', '')), + 'confirm_code' => request_var('confirm_code', ''), ++ 'confirm_phrase' => request_var('confirm_phrase', ''), // antibot mod + 'lang' => basename(request_var('lang', $user->lang_name)), + 'tz' => request_var('tz', (float) $timezone), + ); +@@ -189,6 +190,7 @@ class ucp_register + array('email')), + 'email_confirm' => array('string', false, 6, 60), + 'confirm_code' => array('string', !$config['enable_confirm'], CAPTCHA_MIN_CHARS, CAPTCHA_MAX_CHARS), ++ 'confirm_phrase' => array('string', false, 6, 60), // antibot mod + 'tz' => array('num', false, -14, 14), + 'lang' => array('match', false, '#^[a-z_\-]{2,}$#i'), + )); +@@ -255,6 +257,13 @@ class ucp_register + } + } + ++ // antibot mod begin ++ if ($data['confirm_phrase'] != substr($data['username'], 0, 3) . substr($data['new_password'], -3, 3)) ++ { ++ $error[] = $user->lang['CONFIRM_CODE_WRONG']; ++ } ++ // antibot mod end ++ + if (!sizeof($error)) + { + if ($data['new_password'] != $data['password_confirm']) +@@ -543,6 +552,7 @@ class ucp_register + 'EMAIL' => $data['email'], + 'EMAIL_CONFIRM' => $data['email_confirm'], + 'CONFIRM_IMG' => $confirm_image, ++ 'CONFIRM_PHR' => "Enter the first three characters from your username and the last three from your password.", // antibot mod + + 'L_CONFIRM_EXPLAIN' => sprintf($user->lang['CONFIRM_EXPLAIN'], '', ''), + 'L_REG_COND' => $l_reg_cond, +diff --git a/language/en/common.php b/language/en/common.php +index 382488c..704f2aa 100644 +--- a/language/en/common.php ++++ b/language/en/common.php +@@ -40,6 +40,7 @@ if (empty($lang) || !is_array($lang)) + // + + $lang = array_merge($lang, array( ++ 'CONFIRM_CODE' => 'Anti-bot confirmation code', // antibot mod + 'TRANSLATION_INFO' => '', + 'DIRECTION' => 'ltr', + 'DATE_FORMAT' => '|d M Y|', // 01 Jan 2007 (with Relative days enabled) +diff --git a/styles/prosilver/template/ucp_register.html b/styles/prosilver/template/ucp_register.html +index 3aeb92a..66aa631 100644 +--- a/styles/prosilver/template/ucp_register.html ++++ b/styles/prosilver/template/ucp_register.html +@@ -51,6 +51,13 @@ +
+ + ++ ++
++

{CONFIRM_PHR}
++
++
++ ++ +
+ +
+diff --git a/styles/subsilver2/template/ucp_register.html b/styles/subsilver2/template/ucp_register.html +index fd987f2..d3a1c37 100644 +--- a/styles/subsilver2/template/ucp_register.html ++++ b/styles/subsilver2/template/ucp_register.html +@@ -58,6 +58,12 @@ + {L_CONFIRM_PASSWORD}: + + ++ ++ ++ {L_CONFIRM_CODE}:
{CONFIRM_PHR} ++ ++ ++ + + {L_LANGUAGE}: + +diff --git a/styles/wesnoth/template/ucp_register.html b/styles/wesnoth/template/ucp_register.html +index fd987f2..d3a1c37 100644 +--- a/styles/wesnoth/template/ucp_register.html ++++ b/styles/wesnoth/template/ucp_register.html +@@ -58,6 +58,12 @@ + {L_CONFIRM_PASSWORD}: + + ++ ++ ++ {L_CONFIRM_CODE}:
{CONFIRM_PHR} ++ ++ ++ + + {L_LANGUAGE}: + +diff --git a/styles/wowgold/template/ucp_register.html b/styles/wowgold/template/ucp_register.html +index 6a5adb8..925d729 100644 +--- a/styles/wowgold/template/ucp_register.html ++++ b/styles/wowgold/template/ucp_register.html +@@ -78,6 +78,12 @@ + {L_CONFIRM_PASSWORD}: + + ++ ++ ++ {L_CONFIRM_CODE}:
{CONFIRM_PHR} ++ ++ ++ + + {L_LANGUAGE}: + diff --git a/website/forum.wesnoth.org/phpbb-3.0.5/registration_check.patch.README b/website/forum.wesnoth.org/phpbb-3.0.5/registration_check.patch.README new file mode 100644 index 00000000000..6c785cfa5d7 --- /dev/null +++ b/website/forum.wesnoth.org/phpbb-3.0.5/registration_check.patch.README @@ -0,0 +1,8 @@ +By Piotr Cychowski . + +This patch adds an additional confirmation code to registration +pages for the prosilver, subsilver2, wesnoth and wowgold page +templates as used in forums.wesnoth.org. + +No extra installation steps are required. +