[aur-dev] [PATCH 00/13] Status Update
Hello all, I've been doing quite a bit of testing lately and have collected a few patches. Note that the PDO patch isn't present because it is too large for the mailing list. The following things still need to be fixed: - Account registration needs to be modified to work with URL rewriting - When a user is logged out they get the "adopt package" button on orphan package pages - "View PKGBUILD" and "Download tarball" appear to be broken by rewriting - Move delete and merge to "Package Actions" so that the actions bar is deprecated (maybe?) - Fix undefined notice when a logged out user navigates to a package page - The "Latest Comments" link appends "?comments=all" to URL on every click Anything else? canyonknight (13): Migrate all DB code to use PDO Adjust user directions after registering to reflect new login page logout.php: Fix PHP undefined variable notice Add the new package icon back to the front page Use the "new" icon from archweb for the recent updates table Remove unused image "titlelogo.png" pkg_comment_form.php: Fix PHP undefined variable notice for package "ID" Fix account search page results routing to /account/ Use URL rewriting for user info page Use URL rewriting for user editing page Use URL rewriting for user account update page Overhaul ability to edit own account header.php: Update account editing link INSTALL | 2 +- UPGRADING | 2 + web/html/account.php | 34 +--- web/html/images/new.gif | Bin 116 -> 0 bytes web/html/images/new.png | Bin 0 -> 378 bytes web/html/images/titlelogo.png | Bin 4502 -> 0 bytes web/html/index.php | 21 ++- web/html/logout.php | 2 +- web/html/voters.php | 2 +- web/lib/acctfuncs.inc.php | 245 +++++++++++++------------ web/lib/aur.inc.php | 154 ++++++---------- web/lib/aurjson.class.php | 26 ++- web/lib/cachefuncs.inc.php | 4 +- web/lib/config.inc.php.proto | 3 +- web/lib/pkgfuncs.inc.php | 304 +++++++++++++++++--------------- web/lib/routing.inc.php | 17 ++ web/lib/stats.inc.php | 4 +- web/lib/translator.inc.php | 6 +- web/template/account_edit_form.php | 2 +- web/template/account_search_results.php | 8 +- web/template/header.php | 5 +- web/template/pkg_comment_form.php | 2 +- web/template/pkg_comments.php | 2 +- web/template/search_accounts_form.php | 2 +- web/template/stats/updates_table.php | 3 + 25 files changed, 414 insertions(+), 436 deletions(-) delete mode 100644 web/html/images/new.gif create mode 100644 web/html/images/new.png delete mode 100644 web/html/images/titlelogo.png -- 1.7.12
Signed-off-by: canyonknight <canyonknight@gmail.com> --- web/lib/acctfuncs.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/lib/acctfuncs.inc.php b/web/lib/acctfuncs.inc.php index 54e8381..e7dcb10 100644 --- a/web/lib/acctfuncs.inc.php +++ b/web/lib/acctfuncs.inc.php @@ -195,7 +195,7 @@ function process_account_form($UTYPE,$TYPE,$A,$U="",$T="",$S="",$E="", print __("The account, %s%s%s, has been successfully created.", "<b>", htmlspecialchars($U,ENT_QUOTES), "</b>"); print "<p>\n"; - print __("Click on the Home link above to login."); + print __("Click on the Login link above to use your account."); print "</p>\n"; } -- 1.7.12
Signed-off-by: canyonknight <canyonknight@gmail.com> --- web/html/logout.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/html/logout.php b/web/html/logout.php index 835f1c9..3d059e7 100644 --- a/web/html/logout.php +++ b/web/html/logout.php @@ -10,7 +10,7 @@ include_once("acctfuncs.inc.php"); # access AUR common functions # sending any HTML output. # if (isset($_COOKIE["AURSID"])) { - if (!$dbh) { + if (!isset($dbh)) { $dbh = db_connect(); } delete_session_id($_COOKIE["AURSID"], $dbh); -- 1.7.12
This regression was introduced with d2480e8b9d3d0f946d57fa9422811cb37296b8b4. Re-implement the functionality in a cleaner way. Signed-off-by: canyonknight <canyonknight@gmail.com> --- web/template/stats/updates_table.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/web/template/stats/updates_table.php b/web/template/stats/updates_table.php index 4955ddc..93eb44f 100644 --- a/web/template/stats/updates_table.php +++ b/web/template/stats/updates_table.php @@ -7,6 +7,9 @@ <tr> <td> <a href="<?php echo get_pkg_uri($row["Name"]); ?>"><?php print htmlspecialchars($row["Name"]) . ' ' . htmlspecialchars($row["Version"]); ?></a> + <?php if ($row["ModifiedTS"] === $row["SubmittedTS"]): ?> + <img src="images/new.gif" alt="New!" /> + <?php endif; ?> </td> <td> <span><?php print gmdate("Y-m-d H:i", intval($row["ModifiedTS"])); ?></span> -- 1.7.12
Signed-off-by: canyonknight <canyonknight@gmail.com> --- web/html/images/new.gif | Bin 116 -> 0 bytes web/html/images/new.png | Bin 0 -> 378 bytes web/html/index.php | 4 ++-- web/template/stats/updates_table.php | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) delete mode 100644 web/html/images/new.gif create mode 100644 web/html/images/new.png diff --git a/web/html/images/new.gif b/web/html/images/new.gif deleted file mode 100644 index 7df4823516538c5c60c6ce442ffeaea6644156dc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 116 zcmZ?wbhEHblxN^!SjYeZ|3Lu6Q2fcl$iTqJpabH7<QbS;d-9vQ6z@E$Jb%$;^<=Z( z{|m(&CLYL4TXKx^`Q&L@x0gM8y=$Yzp^g1YAFDRpIm6L;qU)fN(M|?WN8K|=SDoOI M-r^e)#K2$;03sqS!vFvP diff --git a/web/html/images/new.png b/web/html/images/new.png new file mode 100644 index 0000000000000000000000000000000000000000..6a9bf0370708a165d3e49047c09e110e02074a53 GIT binary patch literal 378 zcmV-=0fqjFP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006JZ zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz3`s;mR5;7s zlEF#>Q51$RwCw?WgWe;0fi^vY%UagXRhyB(O=1wVPFJlYqlK$kNFcaSBrLFKHcpU( zVj5rP+%se7wuRup#~J3_|C@8?jsx6(aN8gV+_?~^wID=7QAmWo&=P9GzK~Bj7P?xU z4^LybJ-~;P$nL)ri2Lx-f?f?uyKtX3G(76UWeycgm{0H$eX9nWr+ASHH8>r~vom;o zFz$}vYpDI9TZY<K7R&^TnN9E>Lgxm?Z}9nS!RQHI8Y*b~3AE}I>k|Ynq_|_kL0z^} zg`YWG?`i*VRiHt=)+fle*{;CjiLD9r5bPAPFRr!h8&+rODTKm>mjte|vSwTU#7zr+ Y0SIdSJYsEaB>(^b07*qoM6N<$g6XKB5dZ)H literal 0 HcmV?d00001 diff --git a/web/html/index.php b/web/html/index.php index df0d133..7c4eb47 100644 --- a/web/html/index.php +++ b/web/html/index.php @@ -59,8 +59,8 @@ if (isset($tokens[1]) && '/' . $tokens[1] == get_pkg_route()) { include "./$path"; break; case "/css/archnavbar/archlogo.gif": - case "/images/new.gif": - header("Content-Type: image/gif"); + case "/images/new.png": + header("Content-Type: image/png"); include "./$path"; break; case "/css/archnavbar/archlogo.png": diff --git a/web/template/stats/updates_table.php b/web/template/stats/updates_table.php index 93eb44f..e7ceec7 100644 --- a/web/template/stats/updates_table.php +++ b/web/template/stats/updates_table.php @@ -8,7 +8,7 @@ <td> <a href="<?php echo get_pkg_uri($row["Name"]); ?>"><?php print htmlspecialchars($row["Name"]) . ' ' . htmlspecialchars($row["Version"]); ?></a> <?php if ($row["ModifiedTS"] === $row["SubmittedTS"]): ?> - <img src="images/new.gif" alt="New!" /> + <img src="images/new.png" alt="New!" /> <?php endif; ?> </td> <td> -- 1.7.12
Signed-off-by: canyonknight <canyonknight@gmail.com> --- web/html/images/titlelogo.png | Bin 4502 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 web/html/images/titlelogo.png diff --git a/web/html/images/titlelogo.png b/web/html/images/titlelogo.png deleted file mode 100644 index be7f14c79330f60391cfce0bfa772c349a663251..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4502 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 -- 1.7.12
Signed-off-by: canyonknight <canyonknight@gmail.com> --- web/template/pkg_comment_form.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/template/pkg_comment_form.php b/web/template/pkg_comment_form.php index 95d2cb0..fb3ebff 100644 --- a/web/template/pkg_comment_form.php +++ b/web/template/pkg_comment_form.php @@ -8,7 +8,7 @@ if (isset($_REQUEST['comment']) && check_token()) { } ?> <div> - <input type="hidden" name="ID" value="<?php echo intval($_REQUEST['ID']) ?>" /> + <input type="hidden" name="ID" value="<?php echo intval($row['ID']) ?>" /> <input type="hidden" name="token" value="<?php echo htmlspecialchars($_COOKIE['AURSID']) ?>" /> </div> <p> -- 1.7.12
Account search page has /account/ in the address bar when it should still be /accounts/. The only time /account/ should be used is on a specific user's page. Signed-off-by: canyonknight <canyonknight@gmail.com> --- web/template/account_search_results.php | 4 ++-- web/template/search_accounts_form.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/template/account_search_results.php b/web/template/account_search_results.php index 61887a3..8719928 100644 --- a/web/template/account_search_results.php +++ b/web/template/account_search_results.php @@ -63,7 +63,7 @@ else: <table class="results"> <tr> <td align="left"> - <form action="<?php echo get_uri('/account/'); ?>" method="post"> + <form action="<?php echo get_uri('/accounts/'); ?>" method="post"> <fieldset> <input type="hidden" name="Action" value="SearchAccounts" /> <input type="hidden" name="O" value="<?php echo ($OFFSET-$HITS_PER_PAGE) ?>" /> @@ -78,7 +78,7 @@ else: </form> </td> <td align="right"> - <form action="<?php echo get_uri('/account/'); ?>" method="post"> + <form action="<?php echo get_uri('/accounts/'); ?>" method="post"> <fieldset> <input type="hidden" name="Action" value="SearchAccounts" /> <input type="hidden" name="O" value="<?php echo ($OFFSET+$HITS_PER_PAGE) ?>" /> diff --git a/web/template/search_accounts_form.php b/web/template/search_accounts_form.php index 3080ecd..2fd003a 100644 --- a/web/template/search_accounts_form.php +++ b/web/template/search_accounts_form.php @@ -1,5 +1,5 @@ <br /> -<form action="<?php echo get_uri('/account/'); ?>" method="post"> +<form action="<?php echo get_uri('/accounts/'); ?>" method="post"> <table> <tr> -- 1.7.12
Navigation to the "AccountInfo" page should only require a user to know the username of the account they are looking for. Update all AUR links that use the user info page to reflect the new URL. Before: AUR_URL/account/?Action=AccountInfo&U=userfoo After: AUR_URL/account/userfoo Signed-off-by: canyonknight <canyonknight@gmail.com> --- web/html/index.php | 6 ++++++ web/html/voters.php | 2 +- web/lib/acctfuncs.inc.php | 2 +- web/lib/pkgfuncs.inc.php | 2 +- web/lib/routing.inc.php | 17 +++++++++++++++++ web/template/pkg_comments.php | 2 +- 6 files changed, 27 insertions(+), 4 deletions(-) diff --git a/web/html/index.php b/web/html/index.php index 7c4eb47..e6f3771 100644 --- a/web/html/index.php +++ b/web/html/index.php @@ -48,6 +48,12 @@ if (isset($tokens[1]) && '/' . $tokens[1] == get_pkg_route()) { } include get_route('/' . $tokens[1]); +} elseif (isset($tokens[1]) && '/' . $tokens[1] == get_user_route()) { + if (isset($tokens[2])) { + $_REQUEST['U'] = $tokens[2]; + $_REQUEST['Action'] = "AccountInfo"; + } + include get_route('/' . $tokens[1]); } elseif (get_route($path) !== NULL) { include get_route($path); } else { diff --git a/web/html/voters.php b/web/html/voters.php index 0ec77ec..41c9d6f 100644 --- a/web/html/voters.php +++ b/web/html/voters.php @@ -19,7 +19,7 @@ if ($atype == 'Trusted User' || $atype== 'Developer'): <div class="boxbody"> <ul> <?php while (list($indx, $row) = each($votes)): ?> - <li><a href="<?php echo get_uri('/account/'); ?>?Action=AccountInfo&ID=<?php echo $row['UsersID'] ?>"><?php echo htmlspecialchars($row['Username']) ?></a></li> + <li><a href="<?php echo get_user_uri($row['Username']); ?>"><?php echo htmlspecialchars($row['Username']) ?></a></li> <?php endwhile; ?> </ul> </div> diff --git a/web/lib/acctfuncs.inc.php b/web/lib/acctfuncs.inc.php index e7dcb10..7471d06 100644 --- a/web/lib/acctfuncs.inc.php +++ b/web/lib/acctfuncs.inc.php @@ -827,7 +827,7 @@ function voter_list($voteid, $dbh=NULL) { $result = $dbh->query($q); if ($result) { while ($row = $result->fetch(PDO::FETCH_ASSOC)) { - $whovoted.= '<a href="' . get_uri('/accounts/') . '?Action=AccountInfo&ID='.$row['UserID'].'">'.$row['Username'].'</a> '; + $whovoted.= '<a href="' . get_user_uri($row['Username']) . '">'.$row['Username'].'</a> '; } } return $whovoted; diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php index 6cdab0f..b2daf0e 100644 --- a/web/lib/pkgfuncs.inc.php +++ b/web/lib/pkgfuncs.inc.php @@ -764,7 +764,7 @@ function pkg_flag ($atype, $ids, $action=true, $dbh=NULL) { if ($result) { while ($row = $result->fetch(PDO::FETCH_ASSOC)) { # construct email - $body = "Your package " . $row['Name'] . " has been flagged out of date by " . $f_name . " [1]. You may view your package at:\n" . $AUR_LOCATION . "/" . get_pkg_uri($row['Name']) . "\n\n[1] - " . $AUR_LOCATION . "/" . get_uri('/accounts/') . "?Action=AccountInfo&ID=" . $f_uid; + $body = "Your package " . $row['Name'] . " has been flagged out of date by " . $f_name . " [1]. You may view your package at:\n" . $AUR_LOCATION . "/" . get_pkg_uri($row['Name']) . "\n\n[1] - " . $AUR_LOCATION . "/" . get_user_uri($f_name); $body = wordwrap($body, 70); $headers = "Reply-to: nobody@archlinux.org\nFrom:aur-notify@archlinux.org\nX-Mailer: PHP\nX-MimeOLE: Produced By AUR\n"; @mail($row['Email'], "AUR Out-of-date Notification for ".$row['Name'], $body, $headers); diff --git a/web/lib/routing.inc.php b/web/lib/routing.inc.php index 4ca1150..dfd6942 100644 --- a/web/lib/routing.inc.php +++ b/web/lib/routing.inc.php @@ -18,6 +18,7 @@ $ROUTES = array( ); $PKG_PATH = '/packages'; +$USER_PATH = '/account'; function get_route($path) { global $ROUTES; @@ -56,3 +57,19 @@ function get_pkg_uri($pkgname) { return get_route($PKG_PATH) . '?N=' . urlencode($pkgname); } } + +function get_user_route() { + global $USER_PATH; + return $USER_PATH; +} + +function get_user_uri($username) { + global $USE_VIRTUAL_URLS; + global $USER_PATH; + + if ($USE_VIRTUAL_URLS) { + return $USER_PATH . '/' . urlencode($username) . '/'; + } else { + return get_route($USER_PATH) . '?U=' . urlencode($username); + } +} diff --git a/web/template/pkg_comments.php b/web/template/pkg_comments.php index 46c1ef3..d0bd4f8 100644 --- a/web/template/pkg_comments.php +++ b/web/template/pkg_comments.php @@ -11,7 +11,7 @@ $pkgname = $row['Name']; <?php while (list($indx, $row) = each($comments)): ?> <?php if ($SID): - $row['UserName'] = "<a href=\"" . get_uri('/account/') . "?Action=AccountInfo&ID={$row['UsersID']}\">{$row['UserName']}</a>"; + $row['UserName'] = "<a href=\"" . get_user_uri($row['UserName']) . "\">{$row['UserName']}</a>"; endif; ?> <h4> <?php if (canDeleteCommentArray($row, $atype, $uid)): ?> -- 1.7.12
Allows for easier account editing and saner URLs. Update account editing links to use new URL. Before: AUR_URL/account/?Action=DisplayAccount&U=userfoo After: AUR_URL/account/userfoo/edit Signed-off-by: canyonknight <canyonknight@gmail.com> --- web/html/index.php | 10 +++++++++- web/template/account_search_results.php | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/web/html/index.php b/web/html/index.php index e6f3771..8013362 100644 --- a/web/html/index.php +++ b/web/html/index.php @@ -51,7 +51,15 @@ if (isset($tokens[1]) && '/' . $tokens[1] == get_pkg_route()) { } elseif (isset($tokens[1]) && '/' . $tokens[1] == get_user_route()) { if (isset($tokens[2])) { $_REQUEST['U'] = $tokens[2]; - $_REQUEST['Action'] = "AccountInfo"; + + if (isset($tokens[3])) { + if ($tokens[3] == 'edit') { + $_REQUEST['Action'] = "DisplayAccount"; + } else { + $_REQUEST['Action'] = "AccountInfo"; + } + } + } include get_route('/' . $tokens[1]); } elseif (get_route($path) !== NULL) { diff --git a/web/template/account_search_results.php b/web/template/account_search_results.php index 8719928..f67cc6a 100644 --- a/web/template/account_search_results.php +++ b/web/template/account_search_results.php @@ -50,7 +50,7 @@ else: print " "; else: ?> - <a href="<?php echo get_uri('/account/'); ?>?Action=DisplayAccount&ID=<?php echo $row["ID"] ?>"><?php echo __("Edit") ?></a> + <a href="<?php echo get_user_uri($row["Username"]) . "edit/" ?>"><?php echo __("Edit") ?></a> <?php endif; ?> </td> </tr> -- 1.7.12
The "UpdateAccount" page displays information as to whether an account update was successful. All POST account info goes to this page, so use it with sane URLs. Before: AUR_URL/account/?Action=UpdateAccount&U=userfoo After: AUR_URL/account/userfoo/update Signed-off-by: canyonknight <canyonknight@gmail.com> --- web/html/index.php | 2 ++ web/template/account_edit_form.php | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/web/html/index.php b/web/html/index.php index 8013362..0e36883 100644 --- a/web/html/index.php +++ b/web/html/index.php @@ -55,6 +55,8 @@ if (isset($tokens[1]) && '/' . $tokens[1] == get_pkg_route()) { if (isset($tokens[3])) { if ($tokens[3] == 'edit') { $_REQUEST['Action'] = "DisplayAccount"; + } elseif ($tokens[3] == 'update') { + $_REQUEST['Action'] = "UpdateAccount"; } else { $_REQUEST['Action'] = "AccountInfo"; } diff --git a/web/template/account_edit_form.php b/web/template/account_edit_form.php index 7da8e33..9b5b1d8 100644 --- a/web/template/account_edit_form.php +++ b/web/template/account_edit_form.php @@ -1,4 +1,4 @@ -<form action="<?php echo get_uri('/account/'); ?>" method="post"> +<form action="<?php echo get_user_uri($U) . 'update/'; ?>" method="post"> <fieldset> <input type="hidden" name="Action" value="<?php echo $A ?>" /> <?php if ($UID): ?> -- 1.7.12
* Restructure account.php to remove redundant code. * Remove own_account_details(). * Rework logic check to default to no access to account edit form. * Make default account action viewing account info. Signed-off-by: canyonknight <canyonknight@gmail.com> --- web/html/account.php | 34 +++++++++------------------------- web/html/index.php | 3 ++- web/lib/acctfuncs.inc.php | 18 ------------------ 3 files changed, 11 insertions(+), 44 deletions(-) diff --git a/web/html/account.php b/web/html/account.php index b0906d9..786ae02 100644 --- a/web/html/account.php +++ b/web/html/account.php @@ -50,14 +50,15 @@ if (isset($_COOKIE["AURSID"])) { } else { # double check to make sure logged in user can edit this account # - if ($atype == "User" || ($atype == "Trusted User" && $row["AccountType"] == "Developer")) { - print __("You do not have permission to edit this account."); - } else { - + if ($atype == "Developer" || ($atype == "Trusted User" && + $row["AccountType"] != "Developer") || + ($row["ID"] == uid_from_sid($_COOKIE["AURSID"]))) { display_account_form($atype, "UpdateAccount", $row["Username"], - $row["AccountType"], $row["Suspended"], $row["Email"], - "", "", $row["RealName"], $row["LangPreference"], - $row["IRCNick"], $row["PGPKey"], $row["ID"]); + $row["AccountType"], $row["Suspended"], $row["Email"], + "", "", $row["RealName"], $row["LangPreference"], + $row["IRCNick"], $row["PGPKey"], $row["ID"]); + } else { + print __("You do not have permission to edit this account."); } } @@ -89,24 +90,7 @@ if (isset($_COOKIE["AURSID"])) { search_accounts_form(); } else { - # A normal user, give them the ability to edit - # their own account - # - $row = own_account_details($_COOKIE["AURSID"]); - if (empty($row)) { - print __("Could not retrieve information for the specified user."); - } else { - # don't need to check if they have permissions, this is a - # normal user editing themselves. - # - print __("Use this form to update your account."); - print "<br />"; - print __("Leave the password fields blank to keep your same password."); - display_account_form($atype, "UpdateAccount", $row["Username"], - $row["AccountType"], $row["Suspended"], $row["Email"], - "", "", $row["RealName"], $row["LangPreference"], - $row["IRCNick"], $row["PGPKey"], $row["ID"]); - } + print __("You are not allowed to access this area."); } } diff --git a/web/html/index.php b/web/html/index.php index 0e36883..70698a4 100644 --- a/web/html/index.php +++ b/web/html/index.php @@ -60,8 +60,9 @@ if (isset($tokens[1]) && '/' . $tokens[1] == get_pkg_route()) { } else { $_REQUEST['Action'] = "AccountInfo"; } + } else { + $_REQUEST['Action'] = "AccountInfo"; } - } include get_route('/' . $tokens[1]); } elseif (get_route($path) !== NULL) { diff --git a/web/lib/acctfuncs.inc.php b/web/lib/acctfuncs.inc.php index 7471d06..ed2c7c6 100644 --- a/web/lib/acctfuncs.inc.php +++ b/web/lib/acctfuncs.inc.php @@ -719,24 +719,6 @@ function account_details($uid, $username, $dbh=NULL) { 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 = " . $dbh->quote($sid); - $result = $dbh->query($q); - - if ($result) { - $row = $result->fetch(PDO::FETCH_ASSOC); - } - - return $row; -} - function tu_voted($voteid, $uid, $dbh=NULL) { if (!$dbh) { $dbh = db_connect(); -- 1.7.12
* Use AUR_URL/account/userfoo/edit format for own account editing. * Change "Accounts" label to "My Account" for regular users. * Add ability for Developers and Trusted Users to edit their account without having to use the search form first. Signed-off-by: canyonknight <canyonknight@gmail.com> --- web/template/header.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/web/template/header.php b/web/template/header.php index 52c0ab8..2c04b58 100644 --- a/web/template/header.php +++ b/web/template/header.php @@ -55,7 +55,10 @@ <?php if (isset($_COOKIE['AURSID'])): ?> <li><a href="<?php echo get_uri('/packages/'); ?>?SeB=m&K=<?php print username_from_sid($_COOKIE["AURSID"]); ?>"><?php print __("My Packages"); ?></a></li> <li><a href="<?php echo get_uri('/submit/'); ?>"><?php print __("Submit"); ?></a></li> - <li><a href="<?php echo get_uri('/accounts/'); ?>"><?php print __("Accounts"); ?></a></li> + <?php if (check_user_privileges()): ?> + <li><a href="<?php echo get_uri('/accounts/') ; ?>"><?php print __("Accounts"); ?></a></li> + <?php endif; ?> + <li><a href="<?php echo get_user_uri(username_from_sid($_COOKIE['AURSID'])) . 'edit/'; ?>"><?php print __(" My Account"); ?></a></li> <?php if (check_user_privileges()): ?><li><a href="<?php echo get_uri('/tu/'); ?>"><?php print __("Trusted User"); ?></a></li><?php endif; ?> <li><a href="<?php echo get_uri('/logout/'); ?>"><?php print __("Logout"); ?></a></li> <?php else: ?> -- 1.7.12
On Sat, Sep 15, 2012 at 12:38:06PM -0400, canyonknight wrote:
Hello all,
I've been doing quite a bit of testing lately and have collected a few patches. Note that the PDO patch isn't present because it is too large for the mailing list.
I merged all of your patches into my working branch, including the PDO patch. Good job!
The following things still need to be fixed: - Account registration needs to be modified to work with URL rewriting
The registration form works for me with virtual URLs enabled. Am I missing something?
- When a user is logged out they get the "adopt package" button on orphan package pages
Good catch -- we should probably wrap the whole form in an if-statement that checks the login status.
- "View PKGBUILD" and "Download tarball" appear to be broken by rewriting
I don't think we should deal with that in the code. The virtual URL feature requires specific rewrite rules anyway; exceptions, such as any files in the upload area, can be easily declared using rewrite conditions or "blacklist" rewrite rules.
- Move delete and merge to "Package Actions" so that the actions bar is deprecated (maybe?)
Yes, I intended to do that. Initially, I even planned to move the package deletion form (including removal options, such as the confirmation check box and the target name of a merge operation) to a separate page. I'm not sure whether this breaks the "mass-deletion" feature (using check boxes and the "Actions" drop-down list on the package search results page), though.
- Fix undefined notice when a logged out user navigates to a package page
+1. That's a one-liner.
- The "Latest Comments" link appends "?comments=all" to URL on every click
Yes, should be easy to fix as well.
Anything else?
canyonknight (13): Migrate all DB code to use PDO Adjust user directions after registering to reflect new login page logout.php: Fix PHP undefined variable notice Add the new package icon back to the front page Use the "new" icon from archweb for the recent updates table Remove unused image "titlelogo.png" pkg_comment_form.php: Fix PHP undefined variable notice for package "ID" Fix account search page results routing to /account/ Use URL rewriting for user info page Use URL rewriting for user editing page Use URL rewriting for user account update page Overhaul ability to edit own account header.php: Update account editing link
INSTALL | 2 +- UPGRADING | 2 + web/html/account.php | 34 +--- web/html/images/new.gif | Bin 116 -> 0 bytes web/html/images/new.png | Bin 0 -> 378 bytes web/html/images/titlelogo.png | Bin 4502 -> 0 bytes web/html/index.php | 21 ++- web/html/logout.php | 2 +- web/html/voters.php | 2 +- web/lib/acctfuncs.inc.php | 245 +++++++++++++------------ web/lib/aur.inc.php | 154 ++++++---------- web/lib/aurjson.class.php | 26 ++- web/lib/cachefuncs.inc.php | 4 +- web/lib/config.inc.php.proto | 3 +- web/lib/pkgfuncs.inc.php | 304 +++++++++++++++++--------------- web/lib/routing.inc.php | 17 ++ web/lib/stats.inc.php | 4 +- web/lib/translator.inc.php | 6 +- web/template/account_edit_form.php | 2 +- web/template/account_search_results.php | 8 +- web/template/header.php | 5 +- web/template/pkg_comment_form.php | 2 +- web/template/pkg_comments.php | 2 +- web/template/search_accounts_form.php | 2 +- web/template/stats/updates_table.php | 3 + 25 files changed, 414 insertions(+), 436 deletions(-) delete mode 100644 web/html/images/new.gif create mode 100644 web/html/images/new.png delete mode 100644 web/html/images/titlelogo.png
-- 1.7.12
On Mon, Sep 17, 2012 at 7:48 PM, Lukas Fleischer <archlinux@cryptocrack.de> wrote:
On Sat, Sep 15, 2012 at 12:38:06PM -0400, canyonknight wrote:
<snip>
The following things still need to be fixed: - Account registration needs to be modified to work with URL rewriting
The registration form works for me with virtual URLs enabled. Am I missing something?
Nope. It works now. Must have been broken at some point because I wrote it down, but all is well!
- When a user is logged out they get the "adopt package" button on orphan package pages
Good catch -- we should probably wrap the whole form in an if-statement that checks the login status.
Sounds like a safe and easy solution.
- "View PKGBUILD" and "Download tarball" appear to be broken by rewriting
I don't think we should deal with that in the code. The virtual URL feature requires specific rewrite rules anyway; exceptions, such as any files in the upload area, can be easily declared using rewrite conditions or "blacklist" rewrite rules.
Sounds good. A note somewhere in the documentation probably wouldn't be a bad thing.
- Move delete and merge to "Package Actions" so that the actions bar is deprecated (maybe?)
Yes, I intended to do that. Initially, I even planned to move the package deletion form (including removal options, such as the confirmation check box and the target name of a merge operation) to a separate page. I'm not sure whether this breaks the "mass-deletion" feature (using check boxes and the "Actions" drop-down list on the package search results page), though.
That's what I thought. I'll explore whether it breaks "mass-deletion".
- Fix undefined notice when a logged out user navigates to a package page
+1. That's a one-liner.
- The "Latest Comments" link appends "?comments=all" to URL on every click
Yes, should be easy to fix as well.
Thanks!
participants (3)
-
canyonknight
-
canyonknight＠gmail.com
-
Lukas Fleischer