acctfuncs.inc.php: Move XHTML to account_edit_form.php template

XHTML should be eliminated from lib/ as much as possible. This pulls the XHTML
out of a function that simply echoes the code, and moves it into a more
reasonable template file in account_edit_form.php

Signed-off-by: canyonknight <canyonknight@gmail.com>
Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>

1 files changed, 1 insertions, 123 deletions

diff --git a/web/lib/acctfuncs.inc.php b/web/lib/acctfuncs.inc.php
index da10f320..034bc480 100644
--- a/web/lib/acctfuncs.inc.php
+++ b/web/lib/acctfuncs.inc.php
@@ -46,129 +46,7 @@ function display_account_form($UTYPE,$A,$U="",$T="",$S="",
 
 	global $SUPPORTED_LANGS;
 
-	print "<form action='account.php' method='post'>\n";
-	print "<fieldset>";
-	print "<input type='hidden' name='Action' value='".$A."' />\n";
-	if ($UID) {
-		print "<input type='hidden' name='ID' value='".$UID."' />\n";
-	}
-	print "</fieldset>";
-	print "<table>\n";
-	print "<tr><td colspan='2'>&nbsp;</td></tr>\n";
-
-	print "<tr>";
-	print "<td align='left'>".__("Username").":</td>";
-	print "<td align='left'><input type='text' size='30' maxlength='64'";
-	print " name='U' value='".htmlspecialchars($U,ENT_QUOTES)."' /> (".__("required").")</td>";
-	print "</tr>\n";
-
-	# Only TUs or Devs can promote/demote/suspend a user
-	if ($UTYPE == "Trusted User" || $UTYPE == "Developer") {
-		print "<tr>";
-		print "<td align='left'>".__("Account Type").":</td>";
-		print "<td align='left'><select name=T>\n";
-		print "<option value='1'";
-		$T == "User" ? print " selected>" : print ">";
-		print __("Normal user")."\n";
-		print "<option value='2'";
-		$T == "Trusted User" ? print " selected>" : print ">";
-		print __("Trusted user")."\n";
-
-		# Only developers can make another account a developer
-		if ($UTYPE == "Developer") {
-			print "<option value='3'";
-			$T == "Developer" ? print " selected>" : print ">";
-			print __("Developer")."\n";
-		}
-		print "</select></td>";
-		print "</tr>\n";
-
-		print "<tr>";
-		print "<td align='left'>".__("Account Suspended").":</td>";
-		print "<td align='left'><input type='checkbox' name='S'";
-		if ($S) {
-			print " checked=\"checked\" />";
-		} else {
-			print " />";
-		}
-		print "</tr>\n";
-	}
-
-	print "<tr>";
-	print "<td align='left'>".__("Email Address").":</td>";
-	print "<td align='left'><input type='text' size='30' maxlength='64'";
-	print " name='E' value='".htmlspecialchars($E,ENT_QUOTES)."' /> (".__("required").")</td>";
-	print "</tr>\n";
-
-	print "<tr>";
-	print "<td align='left'>".__("Password").":</td>";
-	print "<td align='left'><input type='password' size='30' maxlength='32'";
-	print " name='P' value='".$P."' />";
-	if ($A != "UpdateAccount") {
-		print " (".__("required").")";
-	}
-	print "</td></tr>\n";
-
-	print "<tr>";
-	print "<td align='left'>".__("Re-type password").":</td>";
-	print "<td align='left'><input type='password' size='30' maxlength='32'";
-	print " name='C' value='".$C."' />";
-	if ($A != "UpdateAccount") {
-		print " (".__("required").")";
-	}
-	print "</td></tr>\n";
-
-	print "<tr>";
-	print "<td align='left'>".__("Real Name").":</td>";
-	print "<td align='left'><input type='text' size='30' maxlength='32'";
-	print " name='R' value='".htmlspecialchars($R,ENT_QUOTES)."' /></td>";
-	print "</tr>\n";
-
-	print "<tr>";
-	print "<td align='left'>".__("IRC Nick").":</td>";
-	print "<td align='left'><input type='text' size='30' maxlength='32'";
-	print " name='I' value='".htmlspecialchars($I,ENT_QUOTES)."' /></td>";
-	print "</tr>\n";
-
-	print "<tr>";
-	print "<td align='left'>".__("PGP Key Fingerprint").":</td>";
-	print "<td align='left'><input type='text' size='30' maxlength='50'";
-	print " name='K' value='".html_format_pgp_fingerprint($K)."' /></td>";
-	print "</tr>\n";
-
-	print "<tr>";
-	print "<td align='left'>".__("Language").":</td>";
-	print "<td align='left'><select name=L>\n";
-
-	reset($SUPPORTED_LANGS);
-	while (list($code, $lang) = each($SUPPORTED_LANGS)) {
-		if ($L == $code) {
-			print "<option value=".$code." selected> ".$lang."\n";
-		} else {
-			print "<option value=".$code."> ".$lang."\n";
-		}
-	}
-	print "</select></td>";
-	print "</tr>\n";
-
-	print "<tr><td colspan='2'>&nbsp;</td></tr>\n";
-	print "<tr>";
-	print "<td>&nbsp;</td>";
-	print "<td align='left'>";
-
-	if ($A == "UpdateAccount") {
-		print "<input type='submit' class='button'";
-		print " value='".__("Update")."' /> &nbsp; ";
-	} else {
-		print "<input type='submit' class='button'";
-		print " value='".__("Create")."' /> &nbsp; ";
-	}
-	print "<input type='reset' class='button' value='".__("Reset")."' />";
-	print "</td>";
-	print "</tr>\n";
-
-	print "</table>\n";
-	print "</form>\n";
+	include("account_edit_form.php");
 	return;
 } # function display_account_form()