diff options
| -rw-r--r-- | support/schema/aur-schema.sql | 4 | ||||
| -rw-r--r-- | web/html/account.php | 396 | ||||
| -rw-r--r-- | web/html/css/containers.css | 5 | ||||
| -rw-r--r-- | web/lang/account_po.inc | 45 | ||||
| -rw-r--r-- | web/lang/acctfuncs_po.inc | 194 | ||||
| -rw-r--r-- | web/lib/acctfuncs.inc | 552 | ||||
| -rw-r--r-- | web/lib/aur.inc | 13 |
7 files changed, 828 insertions, 381 deletions
diff --git a/support/schema/aur-schema.sql b/support/schema/aur-schema.sql index 8ed407c7..ede9e6ea 100644 --- a/support/schema/aur-schema.sql +++ b/support/schema/aur-schema.sql @@ -38,8 +38,8 @@ CREATE TABLE Users ( FOREIGN KEY (AccountTypeID) REFERENCES AccountTypes(ID) ON DELETE NO ACTION ); -- A default developer account for testing purposes -INSERT INTO Users (ID, AccountTypeID, Email, Passwd) VALUES ( - 1, 3, 'root@localhost', 'changeme'); +INSERT INTO Users (ID, AccountTypeID, Username, Email, Passwd) VALUES ( + 1, 3, 'root', 'root@localhost', 'changeme'); -- Track Users logging in/out of AUR web site. diff --git a/web/html/account.php b/web/html/account.php index b03aee55..b0452c5b 100644 --- a/web/html/account.php +++ b/web/html/account.php @@ -1,144 +1,11 @@ <? include("aur.inc"); # access AUR common functions +include("acctfuncs.inc"); # access Account specific functions include("account_po.inc"); # use some form of this for i18n support set_lang(); # this sets up the visitor's language check_sid(); # see if they're still logged in html_header(); # print out the HTML header -# Display the standard Account form -# SID: the session id cookie value (if any) -# A: what "form" name to use -# U: value to display for username -# T: value to display for account type -# S: value to display for account suspended -# E: value to display for email address -# P: password value -# C: confirm password value -# R: value to display for RealName -# L: value to display for Language preference -# I: value to display for IRC nick -# N: new package notify value -function display_account_form($SID,$A,$U="",$T="",$S="",$E="",$P="",$C="",$R="",$L="",$I="",$N="") { - global $SUPPORTED_LANGS; - - print "<form action='/account.php' method='post'>\n"; - print "<input type='hidden' name='Action' value='".$A."'>\n"; - print "<center>\n"; - print "<table border='0' cellpadding='0' cellspacing='0' width='80%'>\n"; - print "<tr><td colspan='2'> </td></tr>\n"; - - # figure out what account type the visitor is - # - if ($SID) { - $atype = account_from_sid($SID); - } else { - $atype = ""; - } - - print "<tr>"; - print "<td align='left'>".__("Username:")."</td>"; - print "<td align='left'><input type='text' size='30' maxlength='64'"; - print " name='U' value='".$U."'> (".__("required").")</td>"; - print "</tr>\n"; - - if ($atype == "Trusted User" || $atype == "Developer") { - # only TUs or Devs can promote/demote/suspend a user - # - print "<tr>"; - print "<td align='left'>".__("Account Type:")."</td>"; - print "<td align='left'><select name=T>\n"; - print "<option value='u'> ".__("Normal user")."\n"; - print "<option value='t'> ".__("Trusted user")."\n"; - if ($atype == "Developer") { - # only developers can make another account a developer - # - print "<option value='d'> ".__("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>"; - } 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='".$E."'> (".__("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."'> (".__("required").")</td>"; - print "</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."'> (".__("required").")</td>"; - print "</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='".$R."'></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='".$I."'></td>"; - print "</tr>\n"; - - print "<tr>"; - print "<td align='left'>".__("Language:")."</td>"; - print "<td align='left'><select name=L>\n"; - 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>"; - print "<td align='left'>".__("New Package Notify:")."</td>"; - print "<td align='left'><input type='checkbox' name='N'"; - if ($N) { - print " checked>"; - } else { - print ">"; - } - print "</tr>\n"; - - print "<tr><td colspan='2'> </td></tr>\n"; - print "<tr>"; - print "<td> </td>"; - print "<td align='left'>"; - if ($A == "ModifyAccount") { - print "<input type='submit' value='".__("Update")."'> "; - } else { - print "<input type='submit' value='".__("Create")."'> "; - } - print "<input type='reset' value='".__("Reset")."'>"; - print "</td>"; - print "</tr>\n"; - - print "</table>\n"; - print "</center>\n"; - print "</form>\n"; -} # function display_account_form() - # Main page processing here # @@ -146,109 +13,25 @@ if (isset($_COOKIE["AURSID"])) { # visitor is logged in # $dbh = db_connect(); + $atype = account_from_sid($_COOKIE["AURSID"]); if ($_REQUEST["Action"] == "SearchAccounts") { - # the user has entered search criteria, find any matching accounts + + # security check # - $HITS_PER_PAGE = 50; - $OFFSET = 0; + if ($atype == "Trusted user" || $atype == "Developer") { + # the user has entered search criteria, find any matching accounts + # + search_results_page($_REQUEST["O"], $_REQUEST["SB"], + $_REQUEST["U"], $_REQUEST["T"], $_REQUEST["S"], + $_REQUEST["E"], $_REQUEST["R"], $_REQUEST["I"]); - $q = "SELECT Users.*, AccountTypes.AccountType "; - $q.= "FROM Users, AccountTypes "; - $q.= "WHERE AccountTypes.ID = Users.AccountTypeID "; - if ($_REQUEST["T"] == "u") { - $q.= "AND AccountTypes.ID = 1 "; - } elseif ($_REQUEST["T"] == "t") { - $q.= "AND AccountTypes.ID = 2 "; - } elseif ($_REQUEST["T"] == "d") { - $q.= "AND AccountTypes.ID = 3 "; - } - if ($_REQUEST["S"]) { - $q.= "AND Users.Suspended = 1 "; - } - if ($_REQUEST["U"]) { - $q.= "AND Username LIKE '%".mysql_escape_string($_REQUEST["U"])."%' "; - } - if ($_REQUEST["E"]) { - $q.= "AND Email LIKE '%".mysql_escape_string($_REQUEST["E"])."%' "; - } - if ($_REQUEST["R"]) { - $q.= "AND RealName LIKE '%".mysql_escape_string($_REQUEST["R"])."%' "; - } - if ($_REQUEST["I"]) { - $q.= "AND IRCNick LIKE '%".mysql_escape_string($_REQUEST["I"])."%' "; - } - $q.= "LIMIT ". $OFFSET . ", " . $HITS_PER_PAGE; - $result = db_query($q, $dbh); - if (!$result) { - print __("No results matched your search criteria."); } else { - print "<center>\n"; - print "<table border='0' cellpadding='0' cellspacing='0' width='90%'>\n"; - print "<tr>"; - print "<td colspan='2'>"; - print "<table border='0' cellpadding='0' cellspacing='0' width='100%'>\n"; - print "<th>".__("Username")."</th>"; - print "<th>".__("Type")."</th>"; - print "<th>".__("Status")."</th>"; - print "<th>".__("Real Name")."</th>"; - print "<th>".__("IRC Nick")."</th>"; - print "<th>".__("Last Voted")."</th>"; - print "</tr>\n"; - $i = 0; - while ($row = mysql_fetch_assoc($result)) { - if ($i % 2) { - print "<tr class='data1'>"; - } else { - print "<tr class='data2'>"; - } - print "<td align='center'>".$row["Username"]."</td>"; - print "<td align='center'>".user_type($row["AccountType"])."</td>"; - print "<td align='center'>"; - if ($row["Suspended"]) { - print __("Suspended"); - } else { - print __("Active"); - } - print "</td>"; - print "<td align='left'>"; - $row["RealName"] ? print $row["RealName"] : print " "; - print "</td>"; - print "<td align='left'>"; - $row["IRCNick"] ? print $row["IRCNick"] : print " "; - print "</td>"; - print "<td align='center'>"; - $row["LastVoted"] - ? print date("Ymd", $row["LastVoted"]) - : print __("Never"); - print "</td>"; - print "</tr>\n"; - $i++; - } - print "</table>\n"; - print "</td></tr>\n"; - - print "<tr>"; - print "<td align='left'>"; - print "<form action='/account.php' method='post'>\n"; - print "<input type='hidden' name='Action' value='SearchPackages'>\n"; - print "<input type='hidden' name='offset' value='more'>\n"; - print "<input type='submit' value='<-- ".__("Less")."'>"; - print "</form>\n"; - print "</td>"; - print "<td align='right'>"; - print "<form action='/account.php' method='post'>\n"; - print "<input type='hidden' name='Action' value='SearchPackages'>\n"; - print "<input type='hidden' name='offset' value='more'>\n"; - print "<input type='submit' value='".__("More")." -->'>"; - print "</form>\n"; - print "</td>"; - print "</tr>\n"; - print "</table>\n"; - print "</center>\n"; + # a non-privileged user is trying to access the search page + # + print __("You are not allowed to access this area.")."<br/>\n"; } - } elseif ($_REQUEST["Action"] == "DisplayAccount") { # the user has clicked 'edit', display the account details in a form # @@ -258,151 +41,30 @@ if (isset($_COOKIE["AURSID"])) { # } else { - # display the search page - # - print "<form action='/account.php' method='post'>\n"; - print "<input type='hidden' name='Action' value='SearchAccounts'>\n"; - print "<center>\n"; - print "<table border='0' cellpadding='0' cellspacing='0' width='80%'>\n"; - print "<tr><td colspan='2'> </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'></td>"; - print "</tr>\n"; - - print "<tr>"; - print "<td align='left'>".__("Account Type:")."</td>"; - print "<td align='left'><select name=T>\n"; - print "<option value=''> ".__("Any type")."\n"; - print "<option value='u'> ".__("Normal user")."\n"; - print "<option value='t'> ".__("Trusted user")."\n"; - print "<option value='d'> ".__("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'>"; - 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'></td>"; - print "</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'></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'></td>"; - print "</tr>\n"; - - print "<tr>"; - print "<td> </td>"; - print "<td align='left'>"; - print "<input type='submit' value='Search'> "; - print "<input type='reset' value='Reset'></td>"; - print "</tr>\n"; + if ($atype == "Trusted user" || $atype == "Developer") { + # display the search page if they're a TU/dev + # + print __("Use this form to search existing accounts.")."<br/>\n"; + search_accounts_form(); - print "</table>\n"; - print "</center>\n"; - print "</form>\n"; + } else { + # TODO A normal user, give them the ability to edit + # their own account + # + print __("Regular users can edit their own account."); + } } } else { # visitor is not logged in # if ($_REQUEST["Action"] == "NewAccount") { - # error check and process request for a new account + # process the form input for creating a new account # - $dbh = db_connect(); - $error = ""; - if (!isset($_REQUEST["E"]) || !isset($_REQUEST["P"]) || - !isset($_REQUEST["C"])) { - $error = __("Missing a required field."); - } - if (!$error && ($_REQUEST["P"] != $_REQUEST["C"])) { - $error = __("Password fields do not match."); - } - if (!$error && !valid_email($_REQUEST["E"])) { - $error = __("The email address is invalid."); - } - if (!$error && !array_key_exists($_REQUEST["L"], $SUPPORTED_LANGS)) { - $error = __("Language is not currently supported."); - } - if (!$error) { - # check to see if this username is available - # NOTE: a race condition exists here if we care... - # - $q = "SELECT COUNT(*) AS CNT FROM Users "; - $q.= "WHERE Username = '".mysql_escape_string($_REQUEST["U"])."'"; - $result = db_query($q, $dbh); - if ($result) { - $row = mysql_fetch_array($result); - if ($row[0]) { - $error = __("The username, %h%s%h, is already in use.", - array("<b>", $_REQUEST["U"], "</b>")); - } - } - } - if (!$error) { - # check to see if this email address is available - # NOTE: a race condition exists here if we care... - # - $q = "SELECT COUNT(*) AS CNT FROM Users "; - $q.= "WHERE Email = '".mysql_escape_string($_REQUEST["E"])."'"; - $result = db_query($q, $dbh); - if ($result) { - $row = mysql_fetch_array($result); - if ($row[0]) { - $error = __("The address, %h%s%h, is already in use.", - array("<b>", $_REQUEST["E"], "</b>")); - } - } - } - if ($error) { - print "<span class='error'>".$error."</span><br/>\n"; - display_account_form("", "NewAccount", "", "", - $_REQUEST["U"], $_REQUEST["E"], $_REQUEST["R"], $_REQUEST["L"], - $_REQUEST["I"], $_REQUEST["N"]); - } else { - # no errors, go ahead and create the unprivileged user - # - $q = "INSERT INTO Users (AccountTypeID, Suspended, Username, Email, "; - $q.= "Passwd, RealName, LangPreference, IRCNick, NewPkgNotify) "; - $q.= "VALUES (1, 0, '".mysql_escape_string($_REQUEST["U"])."'"; - $q.= ", '".mysql_escape_string($_REQUEST["E"])."'"; - $q.= ", '".mysql_escape_string($_REQUEST["P"])."'"; - $q.= ", '".mysql_escape_string($_REQUEST["R"])."'"; - $q.= ", '".mysql_escape_string($_REQUEST["L"])."'"; - $q.= ", '".mysql_escape_string($_REQUEST["I"])."'"; - if ($_REQUEST["N"] == "on") { - $q.= ", 1)"; - } else { - $q.= ", 0)"; - } - $result = db_query($q, $dbh); - if (!$result) { - print __("Error trying to create account, %h%s%h: %s.", - array("<b>", $_REQUEST["U"], "</b>", mysql_error($dbh))); - } else { - # account created, tell them so. - # - print __("The account, %h%s%h, has been successfully created.", - array("<b>", $_REQUEST["U"], "</b>")); - print "<p>\n"; - print __("Click on the Home link above to login."); - print "</p>\n"; - } - } + process_account_form("","new", "NewAccount", + $_REQUEST["U"], 1, 0, $_REQUEST["E"], + $_REQUEST["P"], $_REQUEST["C"], $_REQUEST["R"], + $_REQUEST["L"], $_REQUEST["I"], $_REQUEST["N"]); } else { # display the account request form diff --git a/web/html/css/containers.css b/web/html/css/containers.css index 1f437e70..9710b039 100644 --- a/web/html/css/containers.css +++ b/web/html/css/containers.css @@ -185,6 +185,11 @@ {
text-align: left;
}
+ th.header
+ {
+ border-bottom: #666 1px solid;
+ vertical-align: bottom;
+ }
input,textarea,select
{
diff --git a/web/lang/account_po.inc b/web/lang/account_po.inc index ef883070..c69515e8 100644 --- a/web/lang/account_po.inc +++ b/web/lang/account_po.inc @@ -201,4 +201,49 @@ $_t["en"]["Username:"] = "Username:"; # $_t["fr"]["Username:"] = "--> Traduction française ici. <--"; # $_t["de"]["Username:"] = "--> Deutsche Übersetzung hier. <--"; +$_t["en"]["Sort by"] = "Sort by"; +# $_t["es"]["Sort by"] = "--> Traducción española aquí. <--"; +# $_t["fr"]["Sort by"] = "--> Traduction française ici. <--"; +# $_t["de"]["Sort by"] = "--> Deutsche Übersetzung hier. <--"; + +$_t["en"]["Account Type"] = "Account Type"; +# $_t["es"]["Account Type"] = "--> Traducción española aquí. <--"; +# $_t["fr"]["Account Type"] = "--> Traduction française ici. <--"; +# $_t["de"]["Account Type"] = "--> Deutsche Übersetzung hier. <--"; + +$_t["en"]["Account Suspended"] = "Account Suspended"; +# $_t["es"]["Account Suspended"] = "--> Traducción española aquí. <--"; +# $_t["fr"]["Account Suspended"] = "--> Traduction française ici. <--"; +# $_t["de"]["Account Suspended"] = "--> Deutsche Übersetzung hier. <--"; + +$_t["en"]["Email address"] = "Email address"; +# $_t["es"]["Email address"] = "--> Traducción española aquí. <--"; +# $_t["fr"]["Email address"] = "--> Traduction française ici. <--"; +# $_t["de"]["Email address"] = "--> Deutsche Übersetzung hier. <--"; + +$_t["en"]["Last vote"] = "Last vote"; +# $_t["es"]["Last vote"] = "--> Traducción española aquí. <--"; +# $_t["fr"]["Last vote"] = "--> Traduction française ici. <--"; +# $_t["de"]["Last vote"] = "--> Deutsche Übersetzung hier. <--"; + +$_t["en"]["Regular users can edit their own account."] = "Regular users can edit their own account."; +# $_t["es"]["Regular users can edit their own account."] = "--> Traducción española aquí. <--"; +# $_t["fr"]["Regular users can edit their own account."] = "--> Traduction française ici. <--"; +# $_t["de"]["Regular users can edit their own account."] = "--> Deutsche Übersetzung hier. <--"; + +$_t["en"]["Edit Account"] = "Edit Account"; +# $_t["es"]["Edit Account"] = "--> Traducción española aquí. <--"; +# $_t["fr"]["Edit Account"] = "--> Traduction française ici. <--"; +# $_t["de"]["Edit Account"] = "--> Deutsche Übersetzung hier. <--"; + +$_t["en"]["Use this form to search existing accounts."] = "Use this form to search existing accounts."; +# $_t["es"]["Use this form to search existing accounts."] = "--> Traducción española aquí. <--"; +# $_t["fr"]["Use this form to search existing accounts."] = "--> Traduction française ici. <--"; +# $_t["de"]["Use this form to search existing accounts."] = "--> Deutsche Übersetzung hier. <--"; + +$_t["en"]["You are not allowed to access this area."] = "You are not allowed to access this area."; +# $_t["es"]["You are not allowed to access this area."] = "--> Traducción española aquí. <--"; +# $_t["fr"]["You are not allowed to access this area."] = "--> Traduction française ici. <--"; +# $_t["de"]["You are not allowed to access this area."] = "--> Deutsche Übersetzung hier. <--"; + ?>
\ No newline at end of file diff --git a/web/lang/acctfuncs_po.inc b/web/lang/acctfuncs_po.inc new file mode 100644 index 00000000..fb59c42c --- /dev/null +++ b/web/lang/acctfuncs_po.inc @@ -0,0 +1,194 @@ +<? +# INSTRUCTIONS TO TRANSLATORS +# +# This file contains the i18n translations for a subset of the +# Arch Linux User-community Repository (AUR). This is a PHP +# script, and as such, you MUST pay great attention to the syntax. +# If your text contains any double-quotes ("), you MUST escape +# them with the backslash character (\). +# + +include_once("translator.inc"); +global $_t; + +$_t["en"]["Missing a required field."] = "Missing a required field."; +# $_t["es"]["Missing a required field."] = "--> Traducción española aquí. <--"; +# $_t["fr"]["Missing a required field."] = "--> Traduction française ici. <--"; +# $_t["de"]["Missing a required field."] = "--> Deutsche Übersetzung hier. <--"; + +$_t["en"]["The account, %h%s%h, has been successfully created."] = "The account, %h%s%h, has been successfully created."; +# $_t["es"]["The account, %h%s%h, has been successfully created."] = "--> Traducción española aquí. <--"; +# $_t["fr"]["The account, %h%s%h, has been successfully created."] = "--> Traduction française ici. <--"; +# $_t["de"]["The account, %h%s%h, has been successfully created."] = "--> Deutsche Übersetzung hier. <--"; + +$_t["en"]["Error trying to modify account, %h%s%h: %s."] = "Error trying to modify account, %h%s%h: %s."; +# $_t["es"]["Error trying to modify account, %h%s%h: %s."] = "--> Traducción española aquí. <--"; +# $_t["fr"]["Error trying to modify account, %h%s%h: %s."] = "--> Traduction française ici. <--"; +# $_t["de"]["Error trying to modify account, %h%s%h: %s."] = "--> Deutsche Übersetzung hier. <--"; + +$_t["en"]["The email address is invalid."] = "The email address is invalid."; +# $_t["es"]["The email address is invalid."] = "--> Traducción española aquí. <--"; +# $_t["fr"]["The email address is invalid."] = "--> Traduction française ici. <--"; +# $_t["de"]["The email address is invalid."] = "--> Deutsche Übersetzung hier. <--"; + +$_t["en"]["Error trying to create account, %h%s%h: %s."] = "Error trying to create account, %h%s%h: %s."; +# $_t["es"]["Error trying to create account, %h%s%h: %s."] = "--> Traducción española aquí. <--"; +# $_t["fr"]["Error trying to create account, %h%s%h: %s."] = "--> Traduction française ici. <--"; +# $_t["de"]["Error trying to create account, %h%s%h: %s."] = "--> Deutsche Übersetzung hier. <--"; + +$_t["en"]["The username, %h%s%h, is already in use."] = "The username, %h%s%h, is already in use."; +# $_t["es"]["The username, %h%s%h, is already in use."] = "--> Traducción española aquí. <--"; +# $_t["fr"]["The username, %h%s%h, is already in use."] = "--> Traduction française ici. <--"; +# $_t["de"]["The username, %h%s%h, is already in use."] = "--> Deutsche Übersetzung hier. <--"; + +$_t["en"]["Account Type"] = "Account Type"; +# $_t["es"]["Account Type"] = "--> Traducción española aquí. <--"; +# $_t["fr"]["Account Type"] = "--> Traduction française ici. <--"; +# $_t["de"]["Account Type"] = "--> Deutsche Übersetzung hier. <--"; + +$_t["en"]["The account, %h%s%h, has been successfully modified."] = "The account, %h%s%h, has been successfully modified."; +# $_t["es"]["The account, %h%s%h, has been successfully modified."] = "--> Traducción española aquí. <--"; +# $_t["fr"]["The account, %h%s%h, has been successfully modified."] = "--> Traduction française ici. <--"; +# $_t["de"]["The account, %h%s%h, has been successfully modified."] = "--> Deutsche Übersetzung hier. <--"; + +$_t["en"]["Account Suspended"] = "Account Suspended"; +# $_t["es"]["Account Suspended"] = "--> Traducción española aquí. <--"; +# $_t["fr"]["Account Suspended"] = "--> Traduction française ici. <--"; +# $_t["de"]["Account Suspended"] = "--> Deutsche Übersetzung hier. <--"; + +$_t["en"]["New Package Notify"] = "New Package Notify"; +# $_t["es"]["New Package Notify"] = "--> Traducción española aquí. <--"; +# $_t["fr"]["New Package Notify"] = "--> Traduction française ici. <--"; +# $_t["de"]["New Package Notify"] = "--> Deutsche Übersetzung hier. <--"; + +$_t["en"]["IRC Nick"] = "IRC Nick"; +# $_t["es"]["IRC Nick"] = "--> Traducción española aquí. <--"; +# $_t["fr"]["IRC Nick"] = "--> Traduction française ici. <--"; +# $_t["de"]["IRC Nick"] = "--> Deutsche Übersetzung hier. <--"; + +$_t["en"]["Trusted user"] = "Trusted user"; +# $_t["es"]["Trusted user"] = "--> Traducción española aquí. <--"; +# $_t["fr"]["Trusted user"] = "--> Traduction française ici. <--"; +# $_t["de"]["Trusted user"] = "--> Deutsche Übersetzung hier. <--"; + +$_t["en"]["Normal user"] = "Normal user"; +# $_t["es"]["Normal user"] = "--> Traducción española aquí. <--"; +# $_t["fr"]["Normal user"] = "--> Traduction française ici. <--"; +# $_t["de"]["Normal user"] = "--> Deutsche Übersetzung hier. <--"; + +$_t["en"]["Real Name"] = "Real Name"; +# $_t["es"]["Real Name"] = "--> Traducción española aquí. <--"; +# $_t["fr"]["Real Name"] = "--> Traduction française ici. <--"; +# $_t["de"]["Real Name"] = "--> Deutsche Übersetzung hier. <--"; + +$_t["en"]["Password fields do not match."] = "Password fields do not match."; +# $_t["es"]["Password fields do not match."] = "--> Traducción española aquí. <--"; +# $_t["fr"]["Password fields do not match."] = "--> Traduction française ici. <--"; +# $_t["de"]["Password fields do not match."] = "--> Deutsche Übersetzung hier. <--"; + +$_t["en"]["Language"] = "Language"; +# $_t["es"]["Language"] = "--> Traducción española aquí. <--"; +# $_t["fr"]["Language"] = "--> Traduction française ici. <--"; +# $_t["de"]["Language"] = "--> Deutsche Übersetzung hier. <--"; + +$_t["en"]["The address, %h%s%h, is already in use."] = "The address, %h%s%h, is already in use."; +# $_t["es"]["The address, %h%s%h, is already in use."] = "--> Traducción española aquí. <--"; +# $_t["fr"]["The address, %h%s%h, is already in use."] = "--> Traduction française ici. <--"; +# $_t["de"]["The address, %h%s%h, is already in use."] = "--> Deutsche Übersetzung hier. <--"; + +$_t["en"]["Click on the Home link above to login."] = "Click on the Home link above to login."; +# $_t["es"]["Click on the Home link above to login."] = "--> Traducción española aquí. <--"; +# $_t["fr"]["Click on the Home link above to login."] = "--> Traduction française ici. <--"; +# $_t["de"]["Click on the Home link above to login."] = "--> Deutsche Übersetzung hier. <--"; + +$_t["en"]["Re-type password"] = "Re-type password"; +# $_t["es"]["Re-type password"] = "--> Traducción española aquí. <--"; +# $_t["fr"]["Re-type password"] = "--> Traduction française ici. <--"; +# $_t["de"]["Re-type password"] = "--> Deutsche Übersetzung hier. <--"; + +$_t["en"]["Language is not currently supported."] = "Language is not currently supported."; +# $_t["es"]["Language is not currently supported."] = "--> Traducción española aquí. <--"; +# $_t["fr"]["Language is not currently supported."] = "--> Traduction française ici. <--"; +# $_t["de"]["Language is not currently supported."] = "--> Deutsche Übersetzung hier. <--"; + +$_t["en"]["Missing User ID"] = "Missing User ID"; +# $_t["es"]["Missing User ID"] = "--> Traducción española aquí. <--"; +# $_t["fr"]["Missing User ID"] = "--> Traduction française ici. <--"; +# $_t["de"]["Missing User ID"] = "--> Deutsche Übersetzung hier. <--"; + +$_t["en"]["Developer"] = "Developer"; +# $_t["es"]["Developer"] = "--> Traducción española aquí. <--"; +# $_t["fr"]["Developer"] = "--> Traduction française ici. <--"; +# $_t["de"]["Developer"] = "--> Deutsche Übersetzung hier. <--"; + +$_t["en"]["Search'"] = "Search'"; +# $_t["es"]["Search'"] = "--> Traducción española aquí. <--"; +# $_t["fr"]["Search'"] = "--> Traduction française ici. <--"; +# $_t["de"]["Search'"] = "--> Deutsche Übersetzung hier. <--"; + +$_t["en"]["Status"] = "Status"; +# $_t["es"]["Status"] = "--> Traducción española aquí. <--"; +# $_t["fr"]["Status"] = "--> Traduction française ici. <--"; +# $_t["de"]["Status"] = "--> Deutsche Übersetzung hier. <--"; + +$_t["en"]["No results matched your search criteria."] = "No results matched your search criteria."; +# $_t["es"]["No results matched your search criteria."] = "--> Traducción española aquí. <--"; +# $_t["fr"]["No results matched your search criteria."] = "--> Traduction française ici. <--"; +# $_t["de"]["No results matched your search criteria."] = "--> Deutsche Übersetzung hier. <--"; + +$_t["en"]["Never"] = "Never"; +# $_t["es"]["Never"] = "--> Traducción española aquí. <--"; +# $_t["fr"]["Never"] = "--> Traduction française ici. <--"; +# $_t["de"]["Never"] = "--> Deutsche Übersetzung hier. <--"; + +$_t["en"]["Active"] = "Active"; +# $_t["es"]["Active"] = "--> Traducción española aquí. <--"; +# $_t["fr"]["Active"] = "--> Traduction française ici. <--"; +# $_t["de"]["Active"] = "--> Deutsche Übersetzung hier. <--"; + +$_t["en"]["Last Voted"] = "Last Voted"; +# $_t["es"]["Last Voted"] = "--> Traducción española aquí. <--"; +# $_t["fr"]["Last Voted"] = "--> Traduction française ici. <--"; +# $_t["de"]["Last Voted"] = "--> Deutsche Übersetzung hier. <--"; + +$_t["en"]["Edit Account"] = "Edit Account"; +# $_t["es"]["Edit Account"] = "--> Traducción española aquí. <--"; +# $_t["fr"]["Edit Account"] = "--> Traduction française ici. <--"; +# $_t["de"]["Edit Account"] = "--> Deutsche Übersetzung hier. <--"; + +$_t["en"]["Email address"] = "Email address"; +# $_t["es"]["Email address"] = "--> Traducción española aquí. <--"; +# $_t["fr"]["Email address"] = "--> Traduction française ici. <--"; +# $_t["de"]["Email address"] = "--> Deutsche Übersetzung hier. <--"; + +$_t["en"]["Type"] = "Type"; +# $_t["es"]["Type"] = "--> Traducción española aquí. <--"; +# $_t["fr"]["Type"] = "--> Traduction française ici. <--"; +# $_t["de"]["Type"] = "--> Deutsche Übersetzung hier. <--"; + +$_t["en"]["Sort by"] = "Sort by"; +# $_t["es"]["Sort by"] = "--> Traducción española aquí. <--"; +# $_t["fr"]["Sort by"] = "--> Traduction française ici. <--"; +# $_t["de"]["Sort by"] = "--> Deutsche Übersetzung hier. <--"; + +$_t["en"]["Any type"] = "Any type"; +# $_t["es"]["Any type"] = "--> Traducción española aquí. <--"; +# $_t["fr"]["Any type"] = "--> Traduction française ici. <--"; +# $_t["de"]["Any type"] = "--> Deutsche Übersetzung hier. <--"; + +$_t["en"]["Last vote"] = "Last vote"; +# $_t["es"]["Last vote"] = "--> Traducción española aquí. <--"; +# $_t["fr"]["Last vote"] = "--> Traduction française ici. <--"; +# $_t["de"]["Last vote"] = "--> Deutsche Übersetzung hier. <--"; + +$_t["en"]["Suspended"] = "Suspended"; +# $_t["es"]["Suspended"] = "--> Traducción española aquí. <--"; +# $_t["fr"]["Suspended"] = "--> Traduction française ici. <--"; +# $_t["de"]["Suspended"] = "--> Deutsche Übersetzung hier. <--"; + +$_t["en"]["No more results to display."] = "No more results to display."; +# $_t["es"]["No more results to display."] = "--> Traducción española aquí. <--"; +# $_t["fr"]["No more results to display."] = "--> Traduction française ici. <--"; +# $_t["de"]["No more results to display."] = "--> Deutsche Übersetzung hier. <--"; + +?>
\ No newline at end of file diff --git a/web/lib/acctfuncs.inc b/web/lib/acctfuncs.inc new file mode 100644 index 00000000..9579381e --- /dev/null +++ b/web/lib/acctfuncs.inc @@ -0,0 +1,552 @@ +<? +include_once("acctfuncs_po.inc"); + +# Display the standard Account form, pass in default values if any +# +function display_account_form($SID,$A,$U="",$T="",$S="", + $E="",$P="",$C="",$R="",$L="",$I="",$N="") { + # SID: the session id cookie value (if any) + # A: what "form" name to use + # U: value to display for username + # T: value to display for account type + # S: value to display for account suspended + # E: value to display for email address + # P: password value + # C: confirm password value + # R: value to display for RealName + # L: value to display for Language preference + # I: value to display for IRC nick + # N: new package notify value + + global $SUPPORTED_LANGS; + + print "<form action='/account.php' method='post'>\n"; + print "<input type='hidden' name='Action' value='".$A."'>\n"; + print "<center>\n"; + print "<table border='0' cellpadding='0' cellspacing='0' width='80%'>\n"; + print "<tr><td colspan='2'> </td></tr>\n"; + + # figure out what account type the visitor is + # + if ($SID) { + $atype = account_from_sid($SID); + } else { + $atype = ""; + } + + print "<tr>"; + print "<td align='left'>".__("Username").":</td>"; + print "<td align='left'><input type='text' size='30' maxlength='64'"; + print " name='U' value='".$U."'> (".__("required").")</td>"; + print "</tr>\n"; + + if ($atype == "Trusted User" || $atype == "Developer") { + # only TUs or Devs can promote/demote/suspend a user + # + print "<tr>"; + print "<td align='left'>".__("Account Type").":</td>"; + print "<td align='left'><select name=T>\n"; + print "<option value='u'> ".__("Normal user")."\n"; + print "<option value='t'> ".__("Trusted user")."\n"; + if ($atype == "Developer") { + # only developers can make another account a developer + # + print "<option value='d'> ".__("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>"; + } 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='".$E."'> (".__("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."'> (".__("required").")</td>"; + print "</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."'> (".__("required").")</td>"; + print "</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='".$R."'></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='".$I."'></td>"; + print "</tr>\n"; + + print "<tr>"; + print "<td align='left'>".__("Language").":</td>"; + print "<td align='left'><select name=L>\n"; + 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>"; + print "<td align='left'>".__("New Package Notify").":</td>"; + print "<td align='left'><input type='checkbox' name='N'"; + if ($N) { + print " checked>"; + } else { + print ">"; + } + print "</tr>\n"; + + print "<tr><td colspan='2'> </td></tr>\n"; + print "<tr>"; + print "<td> </td>"; + print "<td align='left'>"; + if ($A == "ModifyAccount") { + print "<input type='submit' value='".__("Update")."'> "; + } else { + print "<input type='submit' value='".__("Create")."'> "; + } + print "<input type='reset' value='".__("Reset")."'>"; + print "</td>"; + print "</tr>\n"; + + print "</table>\n"; + print "</center>\n"; + print "</form>\n"; + return; +} # function display_account_form() + + +# process form input from a new/edit account form +# +function process_account_form($SID,$TYPE,$A,$U="",$T="",$S="",$E="", + $P="",$C="",$R="",$L="",$I="",$N="",$UID=0) { + # SID: the session id from the cookie + # TYPE: either "edit" or "new" + # A: what parent "form" name to use + # U: value to display for username + # T: value to display for account type + # S: value to display for account suspended + # E: value to display for email address + # P: password value + # C: confirm password value + # R: value to display for RealName + # L: value to display for Language preference + # I: value to display for IRC nick + # N: new package notify value + # UID: database Users.ID value + + # error check and process request for a new/modified account + # + global $SUPPORTED_LANGS; + dbug("=> process_account_form"); + dbug(" A=$A,U=$U,T=$T,S=$S,E=$E,P=$P,C=$C,R=$R,L=$L,I=$I,N=$N"); + + $dbh = db_connect(); + $error = ""; + if (!isset($E) || !isset($U)) { + $error = __("Missing a required field."); + } + if ($TYPE == "new") { + # they need password fields for this type of action + # + if (!isset($P) || !isset($C)) { + $error = __("Missing a required field."); + } + } else { + if (!$UID) { + $error = __("Missing User ID"); + } + } + if (!$error && $P && $C && ($P != $C)) { + $error = __("Password fields do not match."); + } + if (!$error && !valid_email($E)) { + $error = __("The email address is invalid."); + } + if (!$error && !array_key_exists($L, $SUPPORTED_LANGS)) { + $error = __("Language is not currently supported."); + } + if (!$error) { + # check to see if this username is available + # NOTE: a race condition exists here if we care... + # + $q = "SELECT COUNT(*) AS CNT FROM Users "; + $q.= "WHERE Username = '".mysql_escape_string($U)."'"; + $result = db_query($q, $dbh); + if ($result) { + $row = mysql_fetch_array($result); + if ($row[0]) { + $error = __("The username, %h%s%h, is already in use.", + array("<b>", $U, "</b>")); + } + } + } + if (!$error) { + # check to see if this email address is available + # NOTE: a race condition exists here if we care... + # + $q = "SELECT COUNT(*) AS CNT FROM Users "; + $q.= "WHERE Email = '".mysql_escape_string($E)."'"; + $result = db_query($q, $dbh); + if ($result) { + $row = mysql_fetch_array($result); + if ($row[0]) { + $error = __("The address, %h%s%h, is already in use.", + array("<b>", $E, "</b>")); + } + } + } + if ($error) { + print "<span class='error'>".$error."</span><br/>\n"; + display_account_form($SID, $A, $U, $T, $S, $E, "", "", + $R, $L, $I, $N, $UID); + } else { + if ($TYPE == "new") { + # no errors, go ahead and create the unprivileged user + # + $q = "INSERT INTO Users (AccountTypeID, Suspended, Username, Email, "; + $q.= "Passwd, RealName, LangPreference, IRCNick, NewPkgNotify) "; + $q.= "VALUES (1, 0, '".mysql_escape_string($U)."'"; + $q.= ", '".mysql_escape_string($E)."'"; + $q.= ", '".mysql_escape_string($P)."'"; + $q.= ", '".mysql_escape_string($R)."'"; + $q.= ", '".mysql_escape_string($L)."'"; + $q.= ", '".mysql_escape_string($I)."'"; + if ($N) { + $q.= ", 1)"; + } else { + $q.= ", 0)"; + } + $result = db_query($q, $dbh); + if (!$result) { + print __("Error trying to create account, %h%s%h: %s.", + array("<b>", $U, "</b>", mysql_error($dbh))); + } else { + # account created/modified, tell them so. + # + print __("The account, %h%s%h, has been successfully created.", + array("<b>", $U, "</b>")); + print "<p>\n"; + print __("Click on the Home link above to login."); + print "</p>\n"; + } + + } else { + # no errors, go ahead and modify the user account + # + $q = "UPDATE Users SET "; + $q.= "AccountTypeID = ".intval($T); + $q.= ", Suspended = ".intval($S); + $q.= ", Username = '".mysql_escape_string($U)."'"; + $q.= ", Email = '".mysql_escape_string($E)."'"; + $q.= ", Passwd = '".mysql_escape_string($P)."'"; + $q.= ", RealName = '".mysql_escape_string($R)."'"; + $q.= ", LangPreference = '".mysql_escape_string($L)."'"; + $q.= ", IRCNick = '".mysql_escape_string($I)."'"; + $q.= ", NewPkgNotify = "; + if ($N) { + $q.= "1 "; + } else { + $q.= "0 "; + } + $q.= "WHERE ID = ".intval($UID); + $result = db_query($q, $dbh); + if (!$result) { + print __("Error trying to modify account, %h%s%h: %s.", + array("<b>", $U, "</b>", mysql_error($dbh))); + } else { + print __("The account, %h%s%h, has been successfully modified.", + array("<b>", $U, "</b>")); + } + } + } + return; +} + +# search existing accounts +# +function search_accounts_form() { + print "<form action='/account.php' method='post'>\n"; + print "<input type='hidden' name='Action' value='SearchAccounts'>\n"; + print "<center>\n"; + print "<table border='0' cellpadding='0' cellspacing='0' width='80%'>\n"; + print "<tr><td colspan='2'> </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'></td>"; + print "</tr>\n"; + + print "<tr>"; + print "<td align='left'>".__("Account Type").":</td>"; + print "<td align='left'><select name=T>\n"; + print "<option value=''> ".__("Any type")."\n"; + print "<option value='u'> ".__("Normal user")."\n"; + print "<option value='t'> ".__("Trusted user")."\n"; + print "<option value='d'> ".__("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'>"; + 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'></td>"; + print "</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'></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'></td>"; + print "</tr>\n"; + + print "<tr>"; + print "<td align='left'>".__("Sort by").":</td>"; + print "<td align='left'><select name=SB>\n"; + print "<option value='u'> ".__("Username")."\n"; + print "<option value='t'> ".__("Account Type")."\n"; + print "<option value='e'> ".__("Email address")."\n"; + print "<option value='r'> ".__("Real Name")."\n"; + print "<option value='i'> ".__("IRC Nick")."\n"; + print "<option value='v'> ".__("Last vote")."\n"; + print "</select></td>"; + print "</tr>\n"; + + print "<tr>"; + print "<td> </td>"; + print "<td align='left'>"; + print "<input type='submit' value='".__("Search'")."> "; + print "<input type='reset' value='".__("Reset")."'></td>"; + print "</tr>\n"; + + print "</table>\n"; + print "</center>\n"; + print "</form>\n"; + return; +} + + +# search results page +# +function search_results_page($O=0,$SB="",$U="",$T="", + $S="",$E="",$R="",$I="") { + # O: what row offset we're at + # SB: how to sort the results + # U: value to display for username + # T: value to display for account type + # S: value to display for account suspended + # E: value to display for email address + # R: value to display for RealName + # I: value to display for IRC nick + + $HITS_PER_PAGE = 50; + if ($O) { + $OFFSET = intval($O); + } else { + $OFFSET = 0; + } + if ($OFFSET < 0) { + $OFFSET = 0; + } + $search_vars = array(); + + $q = "SELECT Users.*, AccountTypes.AccountType "; + $q.= "FROM Users, AccountTypes "; + $q.= "WHERE AccountTypes.ID = Users.AccountTypeID "; + if ($T == "u") { + $q.= "AND AccountTypes.ID = 1 "; + $search_vars[] = "T"; + } elseif ($T == "t") { + $q.= "AND AccountTypes.ID = 2 "; + $search_vars[] = "T"; + } elseif ($T == "d") { + $q.= "AND AccountTypes.ID = 3 "; + $search_vars[] = "T"; + } + if ($S) { + $q.= "AND Users.Suspended = 1 "; + $search_vars[] = "S"; + } + if ($U) { + $q.= "AND Username LIKE '%".mysql_escape_string($U)."%' "; + $search_vars[] = "U"; + } + if ($E) { + $q.= "AND Email LIKE '%".mysql_escape_string($E)."%' "; + $search_vars[] = "E"; + } + if ($R) { + $q.= "AND RealName LIKE '%".mysql_escape_string($R)."%' "; + $search_vars[] = "R"; + } + if ($I) { + $q.= "AND IRCNick LIKE '%".mysql_escape_string($I)."%' "; + $search_vars[] = "I"; + } + switch ($SB) { + case 't': + $q.= "ORDER BY AccountTypeID, Username "; + break; + case 'e': + $q.= "ORDER BY Email, AccountTypeID "; + break; + case 'r': + $q.= "ORDER BY RealName, AccountTypeID "; + break; + case 'i': + $q.= "ORDER BY IRCNick, AccountTypeID "; + break; + case 'v': + $q.= "ORDER BY LastVoted, Username "; + break; + default: + $q.= "ORDER BY Username, AccountTypeID "; + break; + } + $search_vars[] = "SB"; + $q.= "LIMIT ". $OFFSET . ", " . $HITS_PER_PAGE; + $result = db_query($q, $dbh); + if (!$result) { + print __("No results matched your search criteria."); + } else { + $num_rows = mysql_num_rows($result); + if ($num_rows) { + print "<center>\n"; + print "<table border='0' cellpadding='0'"; + print " cellspacing='0' width='90%'>\n"; + print "<tr>"; + print "<td colspan='2'>"; + print "<table border='0' cellpadding='0'"; + print " cellspacing='0' width='100%'>\n"; + print "<th class='header'>"; + print "<span class='f2'>".__("Username")."</span></th>"; + print "<th class='header'>"; + print "<span class='f2'>".__("Type")."</span></th>"; + print "<th class='header'>"; + print "<span class='f2'>".__("Status")."</span></th>"; + print "<th class='header'>"; + print "<span class='f2'>".__("Real Name")."</span></th>"; + print "<th class='header'>"; + print "<span class='f2'>".__("IRC Nick")."</span></th>"; + print "<th class='header'>"; + print "<span class='f2'>".__("Last Voted")."</span></th>"; + print "<th class='header'>"; + print "<span class='f2'>".__("Edit Account")."</span></th>"; + print "</tr>\n"; + $i = 0; + while ($row = mysql_fetch_assoc($result)) { + if ($i % 2) { + $c = "data1"; + } else { + $c = "data2"; + } + print "<tr>"; + print "<td class='".$c."'>"; + print "<span class='f5'>".$row["Username"]."</span></td>"; + print "<td class='".$c."'>"; + print "<span class='f5'>".$row["AccountType"]; + print "</span></td>"; + print "<td class='".$c."'><span class='f5'>"; + if ($row["Suspended"]) { + print __("Suspended"); + } else { + print __("Active"); + } + print "</span></td>"; + print "<td class='".$c."'><span class='f5'>"; + $row["RealName"] ? print $row["RealName"] : print " "; + print "</span></td>"; + print "<td class='".$c."'><span class='f5'>"; + $row["IRCNick"] ? print $row["IRCNick"] : print " "; + print "</span></td>"; + print "<td class='".$c."'><span class='f5'>"; + $row["LastVoted"] + ? print date("Ymd", $row["LastVoted"]) + : print __("Never"); + print "</span></td>"; + print "<td class='".$c."'><span class='f5'>"; + $edit_url = "/account.php?Action=DisplayAccount&ID=".$row["ID"]; + print "<a href='".$edit_url . "'>"; + print "Edit</a></span></td>"; + print "</tr>\n"; + $i++; + } + print "</table>\n"; + print "</td></tr>\n"; + + print "<tr>"; + print "<td align='left'>"; + print "<form action='/account.php' method='post'>\n"; + print "<input type='hidden' name='Action' value='SearchAccounts'>\n"; + print "<input type='hidden' name='O'"; + print " value='".($OFFSET-$HITS_PER_PAGE)."'>\n"; + reset($search_vars); + while (list($k, $ind) = each($search_vars)) { + print "<input type='hidden' name='".$ind."'"; + print " value='".${$ind}."'>\n"; + } + print "<input type='submit' value='<-- ".__("Less")."'>"; + print "</form>\n"; + print "</td>"; + print "<td align='right'>"; + print "<form action='/account.php' method='post'>\n"; + print "<input type='hidden' name='Action' value='SearchAccounts'>\n"; + print "<input type='hidden' name='O'"; + print " value='".($OFFSET+$HITS_PER_PAGE)."'>\n"; + reset($search_vars); + while (list($k, $ind) = each($search_vars)) { + print "<input type='hidden' name='".$ind."'"; + print " value='".${$ind}."'>\n"; + } + print "<input type='submit' value='".__("More")." -->'>"; + print "</form>\n"; + print "</td>"; + print "</tr>\n"; + print "</table>\n"; + print "</center>\n"; + } else { + print "<center>\n"; + print __("No more results to display."); + print "</center>\n"; + } + } + return; +} + +# vim: ts=2 sw=2 noet ft=php +?> diff --git a/web/lib/aur.inc b/web/lib/aur.inc index 9695229a..ecedb51f 100644 --- a/web/lib/aur.inc +++ b/web/lib/aur.inc @@ -99,17 +99,6 @@ function new_sid() { return strtoupper(md5($id)); } -# obtain the user type from its database ID -# -function user_type($id=0) { - if ($id == 3) { - return __("Developer"); - } elseif ($id == 2) { - return __("Trusted user"); - } else { - return __("User"); - } -} # obtain the username if given their current SID # @@ -162,7 +151,7 @@ function account_from_sid($sid="") { $q = "SELECT AccountType "; $q.= "FROM Users, AccountTypes, Sessions "; $q.= "WHERE Users.ID = Sessions.UsersID "; - $q.= "AND AccountTypes.ID = Users.AccountTypesID "; + $q.= "AND AccountTypes.ID = Users.AccountTypeID "; $q.= "AND Sessions.SessionID = '" . mysql_escape_string($sid) . "'"; $result = db_query($q, $dbh); if (!$result) { |