From 3fc48d57e44aec36f8edc4574c4e7cdf18bb49de Mon Sep 17 00:00:00 2001
From: =?utf8?q?Roland=20H=C3=A4der?= <roland@mxchange.org>
Date: Thu, 9 Oct 2008 20:10:05 +0000
Subject: [PATCH] Admin login form with reset link, guest welcome page with
 dynamic data

---
 inc/databases.php                            |  2 +-
 inc/language/de.php                          |  1 +
 inc/modules/guest/what-welcome.php           | 18 +++++++++++++++++-
 templates/de/html/admin/admin_login_form.tpl | 13 +++++++------
 templates/de/html/welcome.tpl                | 15 ++++++---------
 5 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/inc/databases.php b/inc/databases.php
index 97c646e602..2ba324390a 100644
--- a/inc/databases.php
+++ b/inc/databases.php
@@ -113,7 +113,7 @@ define('USAGE_BASE', "usage");
 define('SERVER_URL', "http://www.mxchange.org");
 
 // This current patch level
-define('CURR_SVN_REVISION', "484");
+define('CURR_SVN_REVISION', "485");
 
 // Take a prime number which is long (if you know a longer one please try it out!)
 define('_PRIME', 591623);
diff --git a/inc/language/de.php b/inc/language/de.php
index d9ba218111..6345663b6b 100644
--- a/inc/language/de.php
+++ b/inc/language/de.php
@@ -1177,6 +1177,7 @@ define('ADMIN_CONFIG_SESSION_SAVE_PATH', "Speicherpfad f. Sitzungsdateien");
 define('ADMIN_BASE_PATH', "Absoluter Server-Pfad");
 define('ADMIN_SESSION_SAVE_PATH_NOTE', "Sie sollten f&uuml;r Sitzungsdateien einen Pfad w&auml;hlen der ausserhalb des Server-Pfades liegt, da sonst eventuell die Sitzungsdateien vom Web erreichbar sind, was ein hohes Sicherheitsrisiko darstellt.");
 define('MEMBER_NO_MAILS_IN_STATS', "Keine versandten Buchungen gefunden!");
+define('ADMIN_RESET_PASSWORD', "Passwort vergessen?");
 
 //
 ?>
diff --git a/inc/modules/guest/what-welcome.php b/inc/modules/guest/what-welcome.php
index c8e885c4a0..51e3c47f4b 100644
--- a/inc/modules/guest/what-welcome.php
+++ b/inc/modules/guest/what-welcome.php
@@ -40,8 +40,24 @@ if (!defined('__SECURITY')) {
 // Add description as navigation point
 ADD_DESCR("guest", basename(__FILE__));
 
+// Count referal levels
+$result = SQL_QUERY("SELECT COUNT(id) FROM "._MYSQL_PREFIX."_refdepths WHERE level>0", __FILE__, __LINE__);
+
+// Fetch rows
+list($cnt) = SQL_FETCHROW($result);
+
+// Free result
+SQL_FREERESULT($result);
+
+// Prepare content
+$content = array(
+	'register'   => TRANSLATE_COMMA($_CONFIG['points_register']),
+	'ref_levels' => $cnt,
+	'ref_points' => TRANSLATE_COMMA($_CONFIG['points_ref'])
+);
+
 // Load default template
-LOAD_TEMPLATE(substr(basename(__FILE__), 5, -4));
+LOAD_TEMPLATE(substr(basename(__FILE__), 5, -4), false, $content);
 
 //
 ?>
diff --git a/templates/de/html/admin/admin_login_form.tpl b/templates/de/html/admin/admin_login_form.tpl
index 136ea4b2e1..64c7209052 100644
--- a/templates/de/html/admin/admin_login_form.tpl
+++ b/templates/de/html/admin/admin_login_form.tpl
@@ -26,9 +26,11 @@
 		<TD colspan="2" height="14" class="seperator">&nbsp;</TD>
 	</TR>
 	<TR>
-		<TD width="50%" align="right">{--ENTER_ADMIN_PASS--}:&nbsp;&nbsp;</TD>
-		<TD width="50%"><INPUT type="password" name="pass" size="10"
-			maxlength="100" class="admin_normal"></TD>
+		<TD width="50%" valign="top" align="right">{--ENTER_ADMIN_PASS--}:&nbsp;&nbsp;</TD>
+		<TD width="50%" valign="top">
+			<INPUT type="password" name="pass" size="10" maxlength="100" class="admin_normal" />
+			<DIV class="admin_note">[<A href="{!URL!}/modules.php?module=admin&amp;reset_pass=1">{--ADMIN_RESET_PASSWORD--}</A>]</DIV>
+		</TD>
 	</TR>
 	{!__MSG_PASS!}
 	<TR>
@@ -36,8 +38,7 @@
 	</TR>
 	<TR>
 		<TD width="50%" align="right">{--SELECT_TIMEOUT--}:&nbsp;&nbsp;</TD>
-		<TD width="50%"><SELECT name="timeout" size="1"
-			class="admin_select">
+		<TD width="50%"><SELECT name="timeout" size="1" class="admin_select">
 			<OPTION value="86400">{--TIMEOUT_ONE_DAY--}</OPTION>
 			<OPTION value="172800">{--TIMEOUT_TWO_DAYS--}</OPTION>
 			<OPTION value="259200">{--TIMEOUT_THREE_DAYS--}</OPTION>
@@ -62,4 +63,4 @@
 		<TD colspan="2" height="14" class="seperator">&nbsp;</TD>
 	</TR>
 </TABLE>
-</FORM>
\ No newline at end of file
+</FORM>
diff --git a/templates/de/html/welcome.tpl b/templates/de/html/welcome.tpl
index 7db32d2ca2..a693cb5829 100644
--- a/templates/de/html/welcome.tpl
+++ b/templates/de/html/welcome.tpl
@@ -1,5 +1,4 @@
-<DIV align="center"><STRONG>Willkommen zu unserem
-{!MT_WORD!}!</STRONG></DIV>
+<div align="center"><strong>Willkommen zu unserem {!MT_WORD!}!</strong></div>
 <br />
 Nach der Anmeldung bei uns, bekommen Sie in regelm&auml;&szlig;igen
 Abst&auml;nden Webtipps und Produktinformationen per Email zugesendet.
@@ -17,13 +16,11 @@ Als Startguthaben erhalten Sie von uns f&uuml;r Ihre kostenlose
 Anmeldung derzeit
 <br />
 <br />
-<DIV align="center"><BIG><BIG>2000</BIG>&nbsp;{!POINTS!}!</BIG></DIV>
+<div align="center"><big><big>$content[register]</big>&nbsp;{!POINTS!}!</big></div>
 <br />
-F&uuml;r jeden User, den Sie geworben haben erhalten Sie
-<STRONG>200</STRONG>
-&nbsp;{!POINTS!} plus prozentualen Verdienst &uuml;ber 5 Referal-Ebenen
-hinweg!
+F&uuml;r jeden User, den Sie geworben haben erhalten Sie <strong>$content[ref_points]</strong>&nbsp;{!POINTS!}
+plus prozentualen Verdienst &uuml;ber <strong>$content[ref_levels]</strong>
+Referal-Ebenen hinweg!<br />
 <br />
-<br />
-Angesammelte {!POINTS!} k&ouml;nnen Versteigert oder Verkauft werden Der
+Angesammelte {!POINTS!} k&ouml;nnen versteigert oder verkauft werden Der
 K&auml;ufer muss dabei jedoch Mitglied bei uns sein oder werden..
-- 
2.39.5