external/aurweb
0
0
Fork 0
mirror of https://gitlab.archlinux.org/archlinux/aurweb.git synced 2025-02-03 10:43:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

account.php: Pull out DB code

Browse source 
* Move DB code in account.php to new functions in  acctfuncs.inc.php
* Centralization of DB code important in a future transition to PDO interface
* Consolidate redudant SQL statements from DisplayAccount and AccountInfo
* Consolidation also adds ability to edit accounts based on username

Signed-off-by: canyonknight <canyonknight@gmail.com>
Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
This commit is contained in:
canyonknight 2012-05-23 15:32:52 -04:00 • committed by Lukas Fleischer
parent 763cbf8373
commit 8a59cd6208
2 changed files with 49 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
web/html/account.php
View file

@ -44,17 +44,10 @@ if (isset($_COOKIE["AURSID"])) {
} elseif ($action == "DisplayAccount") { } elseif ($action == "DisplayAccount") {
# the user has clicked 'edit', display the account details in a form # the user has clicked 'edit', display the account details in a form
# #
$q = "SELECT Users.*, AccountTypes.AccountType "; $row = account_details(in_request("ID"), in_request("U"));
$q.= "FROM Users, AccountTypes "; if (empty($row)) {
$q.= "WHERE AccountTypes.ID = Users.AccountTypeID ";
$q.= "AND Users.ID = ".intval(in_request("ID"));
$result = db_query($q, $dbh);
if (!mysql_num_rows($result)) {
print __("Could not retrieve information for the specified user."); print __("Could not retrieve information for the specified user.");
} else { } else {
$row = mysql_fetch_assoc($result);
# double check to make sure logged in user can edit this account # double check to make sure logged in user can edit this account
# #
if ($atype == "User" || ($atype == "Trusted User" && $row["AccountType"] == "Developer")) { if ($atype == "User" || ($atype == "Trusted User" && $row["AccountType"] == "Developer")) {
@ -71,19 +64,10 @@ if (isset($_COOKIE["AURSID"])) {
} elseif ($action == "AccountInfo") { } elseif ($action == "AccountInfo") {
# no editing, just looking up user info # no editing, just looking up user info
# #
$q = "SELECT Users.*, AccountTypes.AccountType "; $row = account_details(in_request("ID"), in_request("U"));
$q.= "FROM Users, AccountTypes "; if (empty($row)) {
$q.= "WHERE AccountTypes.ID = Users.AccountTypeID ";
if (isset($_REQUEST["ID"])) {
$q.= "AND Users.ID = ".intval(in_request("ID"));
} else {
$q.= "AND Users.Username = '".db_escape_string(in_request("U")) . "'";
}
$result = db_query($q, $dbh);
if (!mysql_num_rows($result)) {
print __("Could not retrieve information for the specified user."); print __("Could not retrieve information for the specified user.");
} else { } else {
$row = mysql_fetch_assoc($result);
display_account_info($row["Username"], display_account_info($row["Username"],
$row["AccountType"], $row["Email"], $row["RealName"], $row["AccountType"], $row["Email"], $row["RealName"],
$row["IRCNick"], $row["PGPKey"], $row["LastVoted"]); $row["IRCNick"], $row["PGPKey"], $row["LastVoted"]);
@ -110,18 +94,10 @@ if (isset($_COOKIE["AURSID"])) {
# A normal user, give them the ability to edit # A normal user, give them the ability to edit
# their own account # their own account
# #
$q = "SELECT Users.*, AccountTypes.AccountType "; $row = own_account_details($_COOKIE["AURSID"]);
$q.= "FROM Users, AccountTypes, Sessions "; if (empty($row)) {
$q.= "WHERE AccountTypes.ID = Users.AccountTypeID ";
$q.= "AND Users.ID = Sessions.UsersID ";
$q.= "AND Sessions.SessionID = '";
$q.= db_escape_string($_COOKIE["AURSID"])."'";
$result = db_query($q, $dbh);
if (!mysql_num_rows($result)) {
print __("Could not retrieve information for the specified user."); print __("Could not retrieve information for the specified user.");
} else { } else {
$row = mysql_fetch_assoc($result);
# don't need to check if they have permissions, this is a # don't need to check if they have permissions, this is a
# normal user editing themselves. # normal user editing themselves.
# #

39
web/lib/acctfuncs.inc.php
View file

@ -740,3 +740,42 @@ function clear_expired_sessions($dbh=NULL) {
return; return;
} }
function account_details($uid, $username, $dbh=NULL) {
if(!$dbh) {
$dbh = db_connect();
}
$q = "SELECT Users.*, AccountTypes.AccountType ";
$q.= "FROM Users, AccountTypes ";
$q.= "WHERE AccountTypes.ID = Users.AccountTypeID ";
if (!empty($uid)) {
$q.= "AND Users.ID = ".intval($uid);
} else {
$q.= "AND Users.Username = '".db_escape_string($username) . "'";
}
$result = db_query($q, $dbh);
if ($result) {
$row = mysql_fetch_assoc($result);
}
return $row;
}
function own_account_details($sid, $dbh=NULL) {
if(!$dbh) {
$dbh = db_connect();
}
$q = "SELECT Users.*, AccountTypes.AccountType ";
$q.= "FROM Users, AccountTypes, Sessions ";
$q.= "WHERE AccountTypes.ID = Users.AccountTypeID ";
$q.= "AND Users.ID = Sessions.UsersID ";
$q.= "AND Sessions.SessionID = '";
$q.= db_escape_string($sid)."'";
$result = db_query($q, $dbh);
if ($result) {
$row = mysql_fetch_assoc($result);
}
return $row;
}