From 461be11e8d0f5d4bd879cf95bd1472dbe985e0b6 Mon Sep 17 00:00:00 2001
From: Henry Sudhof <kellanved@phpbb.com>
Date: Fri, 19 Sep 2008 13:17:30 +0000
Subject: Okay, that is pretty raw, but better to have it in place than trying
 to play catch-up. Introducing an early stage of CAPTCHA modules.

git-svn-id: file:///svn/phpbb/trunk@8889 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/styles/prosilver/template/captcha_default.html |  8 ++++++++
 phpBB/styles/prosilver/template/login_body.html      | 10 +++-------
 phpBB/styles/prosilver/template/posting_editor.html  |  6 +-----
 phpBB/styles/prosilver/template/ucp_register.html    | 12 +++---------
 4 files changed, 15 insertions(+), 21 deletions(-)
 create mode 100755 phpBB/styles/prosilver/template/captcha_default.html

(limited to 'phpBB/styles')

diff --git a/phpBB/styles/prosilver/template/captcha_default.html b/phpBB/styles/prosilver/template/captcha_default.html
new file mode 100755
index 0000000000..2cfc41338d
--- /dev/null
+++ b/phpBB/styles/prosilver/template/captcha_default.html
@@ -0,0 +1,8 @@
+
+	<dl>
+		<dt><label for="confirm_code">{L_CONFIRM_CODE}:</label></dt>
+		<dd><img src="{CONFIRM_IMAGE}" alt="" /></dd>
+		<dd><input type="text" name="confirm_code" id="confirm_code" size="8" maxlength="8" class="inputbox narrow" title="{L_CONFIRM_CODE}" />
+		<input type="hidden" name="confirm_id" id="confirm_id" value="{CONFIRM_ID}" /></dd>
+		<dd>{L_CONFIRM_CODE_EXPLAIN}</dd>
+	</dl>
\ No newline at end of file
diff --git a/phpBB/styles/prosilver/template/login_body.html b/phpBB/styles/prosilver/template/login_body.html
index ac7ada28c9..a32c2d1e42 100644
--- a/phpBB/styles/prosilver/template/login_body.html
+++ b/phpBB/styles/prosilver/template/login_body.html
@@ -21,21 +21,16 @@
 				<!-- IF U_RESEND_ACTIVATION --><dd><a href="{U_RESEND_ACTIVATION}">{L_RESEND_ACTIVATION}</a></dd><!-- ENDIF -->
 			<!-- ENDIF -->
 		</dl>
-		
 		<!-- IF S_CONFIRM_CODE -->
-		<dl>
-			<dt><label for="confirm_code">{L_CONFIRM_CODE}:</label><br /><span>{L_CONFIRM_CODE_EXPLAIN}</span></dt>
-				<dd><input type="hidden" name="confirm_id" value="{CONFIRM_ID}" />{CONFIRM_IMAGE}</dd>
-				<dd><input type="text" name="confirm_code" id="confirm_code" size="8" maxlength="8" tabindex="3" class="inputbox narrow" title="{L_CONFIRM_CODE}" /></dd>
-		</dl>
+		{CONFIRM}
 		<!-- ENDIF -->
-		
 		<!-- IF S_DISPLAY_FULL_LOGIN -->
 		<dl>
 			<!-- IF S_AUTOLOGIN_ENABLED --><dd><label for="autologin"><input type="checkbox" name="autologin" id="autologin" tabindex="4" /> {L_LOG_ME_IN}</label></dd><!-- ENDIF -->
 			<dd><label for="viewonline"><input type="checkbox" name="viewonline" id="viewonline" tabindex="5" /> {L_HIDE_ME}</label></dd>
 		</dl>
 		<!-- ENDIF -->
+
 		<dl>
 			<dt>&nbsp;</dt>
 			<dd>{S_HIDDEN_FIELDS}<input type="submit" name="login" tabindex="6" value="{L_LOGIN}" class="button1" /></dd>
@@ -46,6 +41,7 @@
 	<span class="corners-bottom"><span></span></span></div>
 </div>
 
+
 <!-- IF not S_ADMIN_AUTH and S_REGISTER_ENABLED -->
 	<div class="panel">
 		<div class="inner"><span class="corners-top"><span></span></span>
diff --git a/phpBB/styles/prosilver/template/posting_editor.html b/phpBB/styles/prosilver/template/posting_editor.html
index f255862430..89c11703b7 100644
--- a/phpBB/styles/prosilver/template/posting_editor.html
+++ b/phpBB/styles/prosilver/template/posting_editor.html
@@ -100,11 +100,7 @@
 		<dd><input type="text" name="subject" id="subject" size="45" maxlength="<!-- IF S_NEW_MESSAGE -->60<!-- ELSE -->64<!-- ENDIF -->" tabindex="2" value="{SUBJECT}{DRAFT_SUBJECT}" class="inputbox autowidth" /></dd>
 	</dl>
 		<!-- IF S_CONFIRM_CODE -->
-		<dl>
-			<dt><label for="confirm_code">{L_CONFIRM_CODE}:</label><br /><span>{L_CONFIRM_CODE_EXPLAIN}</span></dt>
-				<dd><input type="hidden" name="confirm_id" value="{CONFIRM_ID}" />{CONFIRM_IMAGE}</dd>
-				<dd><input type="text" name="confirm_code" id="confirm_code" size="8" maxlength="8" tabindex="3" class="inputbox narrow" title="{L_CONFIRM_CODE}" /></dd>
-		</dl>
+		{CONFIRM}
 		<!-- ENDIF -->
 	<!-- ENDIF -->
 
diff --git a/phpBB/styles/prosilver/template/ucp_register.html b/phpBB/styles/prosilver/template/ucp_register.html
index 721028cef6..8d635198d3 100644
--- a/phpBB/styles/prosilver/template/ucp_register.html
+++ b/phpBB/styles/prosilver/template/ucp_register.html
@@ -71,8 +71,7 @@
 		</dl>
 	<!-- END profile_fields -->
 	</fieldset>
-
-<!-- IF S_CONFIRM_CODE -->
+<!-- IF S_CAPTCHA -->
 	<span class="corners-bottom"><span></span></span></div>
 </div>
 
@@ -83,15 +82,10 @@
 	<p>{L_CONFIRM_EXPLAIN}</p>
 
 	<fieldset class="fields2">
-	<dl>
-		<dt><label for="confirm_code">{L_CONFIRM_CODE}:</label></dt>
-		<dd>{CONFIRM_IMG}</dd>
-		<dd><input type="text" name="confirm_code" id="confirm_code" size="8" maxlength="8" class="inputbox narrow" title="{L_CONFIRM_CODE}" /></dd>
-		<dd>{L_CONFIRM_CODE_EXPLAIN}</dd>
-	</dl>
+		{S_CAPTCHA}
 	</fieldset>
-<!-- ENDIF -->
 
+<!-- ENDIF -->
 <!-- IF S_COPPA -->
 	<span class="corners-bottom"><span></span></span></div>
 </div>
-- 
cgit v1.2.1