From c1bb1df2b3c0e860a29282ec00e74630133742c3 Mon Sep 17 00:00:00 2001 From: canyonknight Date: Fri, 29 Jun 2012 16:52:45 -0400 Subject: acctfuncs.inc.php: Move XHTML to account_details.php template XHTML should be eliminated from lib/ as much as possible. This pulls the XHTML out of the display_account_info function that echoes the code, and moves it to the new account_details.php template file. Signed-off-by: canyonknight Signed-off-by: Lukas Fleischer --- web/html/account.php | 4 +-- web/lib/acctfuncs.inc.php | 70 ---------------------------------------- web/template/account_details.php | 57 ++++++++++++++++++++++++++++++++ 3 files changed, 58 insertions(+), 73 deletions(-) create mode 100644 web/template/account_details.php diff --git a/web/html/account.php b/web/html/account.php index 2a96845..ce3f777 100644 --- a/web/html/account.php +++ b/web/html/account.php @@ -68,9 +68,7 @@ if (isset($_COOKIE["AURSID"])) { if (empty($row)) { print __("Could not retrieve information for the specified user."); } else { - display_account_info($row["Username"], - $row["AccountType"], $row["Email"], $row["RealName"], - $row["IRCNick"], $row["PGPKey"], $row["LastVoted"]); + include("account_details.php"); } } elseif ($action == "UpdateAccount") { diff --git a/web/lib/acctfuncs.inc.php b/web/lib/acctfuncs.inc.php index 0cb4d72..a46c9df 100644 --- a/web/lib/acctfuncs.inc.php +++ b/web/lib/acctfuncs.inc.php @@ -337,76 +337,6 @@ function search_results_page($UTYPE,$O=0,$SB="",$U="",$T="", return; } -# Display non-editable account info -# -function display_account_info($U="", $T="", $E="", $R="", $I="", $K="", $LV="") { - # U: value to display for username - # T: value to display for account type - # E: value to display for email address - # R: value to display for RealName - # I: value to display for IRC nick - # LV: value to display for last voted - - global $SUPPORTED_LANGS; - - print "\n"; - print " \n"; - print " \n"; - print " \n"; - - print " \n"; - print " \n"; - print " \n"; - print " \n"; - - print " \n"; - print " \n"; - print " \n"; - print " \n"; - - print " \n"; - print " \n"; - print " \n"; - print " \n"; - - print " \n"; - print " \n"; - print " \n"; - print " \n"; - - print " \n"; - print " \n"; - print " \n"; - print " \n"; - - print " \n"; - print " \n"; - print " \n"; - print " \n"; - - print " \n"; - print " \n"; - print " \n"; - print " \n"; - - print " \n"; - print " \n"; - print " \n"; - - print "
 
".__("Username").":".$U."
".__("Account Type").":"; - if ($T == "User") { - print __("User"); - } elseif ($T == "Trusted User") { - print __("Trusted User"); - } elseif ($T == "Developer") { - print __("Developer"); - } - print "
".__("Email Address").":".htmlspecialchars($E,ENT_QUOTES)."
".__("Real Name").":".htmlspecialchars($R,ENT_QUOTES)."
".__("IRC Nick").":".htmlspecialchars($I,ENT_QUOTES)."
".__("PGP Key Fingerprint").":".html_format_pgp_fingerprint($K)."
".__("Last Voted").":"; - print $LV ? date("Y-m-d", $LV) : __("Never"); - print "
".__("View this user's packages")."
\n"; - return; -} - /* * Returns SID (Session ID) and error (error message) in an array * SID of 0 means login failed. diff --git a/web/template/account_details.php b/web/template/account_details.php new file mode 100644 index 0000000..f4c31c6 --- /dev/null +++ b/web/template/account_details.php @@ -0,0 +1,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
 
+ +
">
+ +
-- cgit v1.2.3-54-g00ecf