[aur-dev] [PATCH 13/13] header.php: Update account editing link

2012-09-15 Thread canyonknight 
* 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 
---
 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 @@

">

-   
+   
+   
+   
+   



-- 
1.7.12

[aur-dev] [PATCH 12/13] Overhaul ability to edit own account

2012-09-15 Thread canyonknight 
* 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 
---
 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 "";
-   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 (!$

[aur-dev] [PATCH 11/13] Use URL rewriting for user account update page

2012-09-15 Thread canyonknight 
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 
---
 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 @@
-
+



-- 
1.7.12

[aur-dev] [PATCH 10/13] Use URL rewriting for user editing page

2012-09-15 Thread canyonknight 
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 
---
 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:
?>
-   ">
+   ">



-- 
1.7.12

[aur-dev] [PATCH 09/13] Use URL rewriting for user info page

2012-09-15 Thread canyonknight 
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 
---
 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'):



-   
+   



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.= ''.$row['Username'].' ';
+   $whovoted.= ''.$row['Username'].' ';
}
}
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: 
nob...@archlinux.org\nFrom:aur-not...@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'];
 

{$row['UserName']}";
+   $row['UserName'] = "{$row['UserName']}";
endif; ?>


-- 
1.7.12

[aur-dev] [PATCH 08/13] Fix account search page results routing to /account/

2012-09-15 Thread canyonknight 
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 
---
 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:



-   
+   



@@ -78,7 +78,7 @@ else:



-   
+   



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 @@
 
-
+

 

-- 
1.7.12

[aur-dev] [PATCH 07/13] pkg_comment_form.php: Fix PHP undefined variable notice for package "ID"

2012-09-15 Thread canyonknight 
Signed-off-by: canyonknight 
---
 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()) {
 }
 ?>

-   
+   



-- 
1.7.12

[aur-dev] [PATCH 06/13] Remove unused image "titlelogo.png"

2012-09-15 Thread canyonknight 
Signed-off-by: canyonknight 
---
 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..
GIT binary patch
literal 0
HcmV?d1

literal 4502
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

[aur-dev] [PATCH 05/13] Use the "new" icon from archweb for the recent updates table

2012-09-15 Thread canyonknight 
Signed-off-by: canyonknight 
---
 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..
GIT binary patch
literal 0
HcmV?d1

literal 116
zcmZ?wbhEHblxN^!SjYeZ|3Lu6Q2fcl$iTqJpabH7Q51$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$}vYpDI9TZYLgxm?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?d1

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 @@

">

-   
+   



-- 
1.7.12

[aur-dev] [PATCH 04/13] Add the new package icon back to the front page

2012-09-15 Thread canyonknight 
This regression was introduced with d2480e8b9d3d0f946d57fa9422811cb37296b8b4.
Re-implement the functionality in a cleaner way.

Signed-off-by: canyonknight 
---
 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 @@


">
+   
+   
+   



-- 
1.7.12

[aur-dev] [PATCH 03/13] logout.php: Fix PHP undefined variable notice

2012-09-15 Thread canyonknight 
Signed-off-by: canyonknight 
---
 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

[aur-dev] [PATCH 02/13] Adjust user directions after registering to reflect new login page

2012-09-15 Thread canyonknight 
Signed-off-by: canyonknight 
---
 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.",
"", 
htmlspecialchars($U,ENT_QUOTES), "");
print "\n";
-   print __("Click on the Home link above to 
login.");
+   print __("Click on the Login link above to use 
your account.");
print "\n";
}
 
-- 
1.7.12

[aur-dev] [PATCH 00/13] Status Update

2012-09-15 Thread canyonknight 
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