- Aur-dev - lists.archlinux.org

[aur-dev] [PATCH] Fixes incorrect SQLs on generating dummy data.
by Shinya Yamaoka 16 Dec '14

16 Dec '14

The number of columns in the SQLs doesn't match the number of rows, so an error like below occurs: ERROR 1136 (21S01) at line 50929: Column count doesn't match value count at row 1 Signed-off-by: Shinya Yamaoka <contact(a)mail.libmacro.com> --- schema/gendummydata.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/schema/gendummydata.py b/schema/gendummydata.py index bb622d1..9ad5373 100755 --- a/schema/gendummydata.py +++ b/schema/gendummydata.py @@ -259,7 +259,7 @@ for p in list(seen_pkgs.keys()): deptype = random.randrange(1, 5) if deptype == 4: dep += ": for " + random.choice([k for k in seen_pkgs]) - s = "INSERT INTO PackageDepends VALUES (%d, %d, '%s', NULL);\n" + s = "INSERT INTO PackageDepends(PackageID, DepTypeID, DepName) VALUES (%d, %d, '%s');\n" s = s % (seen_pkgs[p], deptype, dep) out.write(s) @@ -267,7 +267,7 @@ for p in list(seen_pkgs.keys()): for i in range(0, num_deps): rel = random.choice([k for k in seen_pkgs]) reltype = random.randrange(1, 4) - s = "INSERT INTO PackageRelations VALUES (%d, %d, '%s', NULL);\n" + s = "INSERT INTO PackageRelations(PackageID, RelTypeID, RelName) VALUES (%d, %d, '%s');\n" s = s % (seen_pkgs[p], reltype, rel) out.write(s) @@ -279,7 +279,7 @@ for p in list(seen_pkgs.keys()): p, RANDOM_TLDS[random.randrange(0,len(RANDOM_TLDS))], RANDOM_LOCS[random.randrange(0,len(RANDOM_LOCS))], src_file, genVersion()) - s = "INSERT INTO PackageSources VALUES (%d, '%s');\n" + s = "INSERT INTO PackageSources(PackageID, Source) VALUES (%d, '%s');\n" s = s % (seen_pkgs[p], src) out.write(s) -- 2.1.3

2 4

[aur-dev] [PATCH] Redirect to requests page after accepting deletions
by archlinux＠cryptocrack.de 13 Dec '14

13 Dec '14

From: Lukas Fleischer <archlinux(a)cryptocrack.de> Fixes FS#43100. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/html/pkgbase.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/web/html/pkgbase.php b/web/html/pkgbase.php index 691639c..bdce516 100644 --- a/web/html/pkgbase.php +++ b/web/html/pkgbase.php @@ -106,7 +106,8 @@ if (check_token()) { } if ($ret) { - if (current_action("do_CloseRequest")) { + if (current_action("do_CloseRequest") || + (current_action("do_Delete") && $_POST['via'])) { /* Redirect back to package request page on success. */ header('Location: ' . get_pkgreq_route()); exit(); -- 2.1.3

1 0

[aur-dev] [PATCH] Show user name in title on the account details page
by archlinux＠cryptocrack.de 13 Dec '14

13 Dec '14

From: Lukas Fleischer <archlinux(a)cryptocrack.de> Suggested-by: Florian Pritz <bluewind(a)xinu.at> Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/html/account.php | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/web/html/account.php b/web/html/account.php index f5ca304..c1a1cd7 100644 --- a/web/html/account.php +++ b/web/html/account.php @@ -8,15 +8,27 @@ include_once('acctfuncs.inc.php'); # access Account specific functions set_lang(); # this sets up the visitor's language check_sid(); # see if they're still logged in -html_header(__('Accounts')); +$action = in_request("Action"); + +$need_userinfo = array( + "DisplayAccount", "DeleteAccount", "AccountInfo", "UpdateAccount" +); + +if (in_array($action, $need_userinfo)) { + $row = account_details(in_request("ID"), in_request("U")); +} + +if ($action == "AccountInfo") { + html_header(__('Account') . ' ' . $row['Username']); +} else { + html_header(__('Accounts')); +} # Main page processing here # echo "<div class=\"box\">\n"; echo " <h2>".__("Accounts")."</h2>\n"; -$action = in_request("Action"); - if (isset($_COOKIE["AURSID"])) { if ($action == "SearchAccounts") { @@ -39,7 +51,6 @@ if (isset($_COOKIE["AURSID"])) { } elseif ($action == "DisplayAccount") { # the user has clicked 'edit', display the account details in a form # - $row = account_details(in_request("ID"), in_request("U")); if (empty($row)) { print __("Could not retrieve information for the specified user."); } else { @@ -57,15 +68,13 @@ if (isset($_COOKIE["AURSID"])) { } elseif ($action == "DeleteAccount") { /* Details for account being deleted. */ - $acctinfo = account_details(in_request('ID'), in_request('U')); - - if (can_edit_account($acctinfo)) { - $UID = $acctinfo['ID']; + if (can_edit_account($row)) { + $UID = $row['ID']; if (in_request('confirm_Delete') && check_token()) { user_delete($UID); header('Location: /'); } else { - $username = $acctinfo['Username']; + $username = $row['Username']; include("account_delete.php"); } } else { @@ -74,7 +83,6 @@ if (isset($_COOKIE["AURSID"])) { } elseif ($action == "AccountInfo") { # no editing, just looking up user info # - $row = account_details(in_request("ID"), in_request("U")); if (empty($row)) { print __("Could not retrieve information for the specified user."); } else { @@ -83,10 +91,8 @@ if (isset($_COOKIE["AURSID"])) { } elseif ($action == "UpdateAccount") { /* Details for account being updated */ - $acctinfo = account_details(in_request('ID'), in_request('U')); - /* Verify user permissions and that the request is a valid POST */ - if (can_edit_account($acctinfo) && check_token()) { + if (can_edit_account($row) && check_token()) { /* Update the details for the existing account */ process_account_form("edit", "UpdateAccount", in_request("U"), in_request("T"), in_request("S"), -- 2.1.3

1 0

[aur-dev] [PATCH] Avoid double slashes in notification email body
by archlinux＠cryptocrack.de 13 Dec '14

13 Dec '14

From: Lukas Fleischer <archlinux(a)cryptocrack.de> Refactor some of the URI generation code to avoid double slashes in absolute URIs. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/html/login.php | 2 +- web/lib/acctfuncs.inc.php | 2 +- web/lib/pkgbasefuncs.inc.php | 5 ++--- web/lib/pkgreqfuncs.inc.php | 12 ++++++------ web/lib/routing.inc.php | 23 +++++++++++++++-------- web/template/header.php | 2 +- 6 files changed, 26 insertions(+), 20 deletions(-) diff --git a/web/html/login.php b/web/html/login.php index dba3af5..9818d04 100644 --- a/web/html/login.php +++ b/web/html/login.php @@ -48,7 +48,7 @@ html_header('AUR ' . __("Login")); <?php else: ?> <p> <?php printf(__("HTTP login is disabled. Please %sswitch to HTTPs%s if you want to login."), - '<a href="' . aur_location() . get_uri('/login') . '">', '</a>'); ?> + '<a href="' . get_uri('/login', true) . '">', '</a>'); ?> </p> <?php endif; ?> </div> diff --git a/web/lib/acctfuncs.inc.php b/web/lib/acctfuncs.inc.php index 5e83f42..2d8dbaf 100644 --- a/web/lib/acctfuncs.inc.php +++ b/web/lib/acctfuncs.inc.php @@ -660,7 +660,7 @@ function send_resetkey($email, $subject, $body) { /* Send e-mail with confirmation link. */ $body = wordwrap($body, 70); - $body .= "\n\n". aur_location() . get_uri('/passreset/') . + $body .= "\n\n". get_uri('/passreset/', true) . "?resetkey={$resetkey}"; $headers = "MIME-Version: 1.0\r\n" . "Content-type: text/plain; charset=UTF-8\r\n" . diff --git a/web/lib/pkgbasefuncs.inc.php b/web/lib/pkgbasefuncs.inc.php index 9cdd8a3..708f861 100644 --- a/web/lib/pkgbasefuncs.inc.php +++ b/web/lib/pkgbasefuncs.inc.php @@ -131,8 +131,7 @@ function pkgbase_add_comment($base_id, $uid, $comment) { * work, users would be getting emails in the language that the * user who posted the comment was in. */ - $body = - 'from ' . aur_location() . get_pkgbase_uri($row['Name']) . "\n" + $body = 'from ' . get_pkgbase_uri($row['Name'], true) . "\n" . username_from_sid($_COOKIE['AURSID']) . " wrote:\n\n" . $comment . "\n\n---\nIf you no longer wish to receive notifications about this package, please go the the above package page and click the UnNotify button."; @@ -380,7 +379,7 @@ function pkgbase_flag($base_ids) { $result = $dbh->query($q); if ($result) { while ($row = $result->fetch(PDO::FETCH_ASSOC)) { - $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_pkgbase_uri($row['Name']) . "\n\n[1] - " . aur_location() . get_user_uri($f_name); + $body = "Your package " . $row['Name'] . " has been flagged out of date by " . $f_name . " [1]. You may view your package at:\n" . get_pkgbase_uri($row['Name'], true) . "\n\n[1] - " . get_user_uri($f_name, true); $body = wordwrap($body, 70); $headers = "MIME-Version: 1.0\r\n" . "Content-type: text/plain; charset=UTF-8\r\n" . diff --git a/web/lib/pkgreqfuncs.inc.php b/web/lib/pkgreqfuncs.inc.php index e285477..a5d6be8 100644 --- a/web/lib/pkgreqfuncs.inc.php +++ b/web/lib/pkgreqfuncs.inc.php @@ -160,15 +160,15 @@ function pkgreq_file($ids, $type, $merge_into, $comments) { $username . " [1] filed a request to merge " . $row['Name'] . " [2] into " . $merge_into . " [3]:\n\n" . $comments . "\n\n" . - "[1] " . aur_location() . get_user_uri($username) . "\n" . - "[2] " . aur_location() . get_pkgbase_uri($row['Name']) . "\n" . - "[3] " . aur_location() . get_pkgbase_uri($merge_into) . "\n"; + "[1] " . get_user_uri($username, true) . "\n" . + "[2] " . get_pkgbase_uri($row['Name'], true) . "\n" . + "[3] " . get_pkgbase_uri($merge_into, true) . "\n"; } else { $body = $username . " [1] filed a " . $type . " request for " . $row['Name'] . " [2]:\n\n" . $comments . "\n\n" . - "[1] " . aur_location() . get_user_uri($username) . "\n" . - "[2] " . aur_location() . get_pkgbase_uri($row['Name']) . "\n"; + "[1] " . get_user_uri($username, true) . "\n" . + "[2] " . get_pkgbase_uri($row['Name'], true) . "\n"; } $body = wordwrap($body, 70); $cc = array_unique($cc); @@ -278,7 +278,7 @@ function pkgreq_close($id, $reason, $comments, $auto_close=false) { } if (!$auto_close) { $body .= "\n"; - $body .= "[1] " . aur_location() . get_user_uri($username); + $body .= "[1] " . get_user_uri($username, true); $body .= "\n"; } $body = wordwrap($body, 70); diff --git a/web/lib/routing.inc.php b/web/lib/routing.inc.php index 833ea0f..1ee2e35 100644 --- a/web/lib/routing.inc.php +++ b/web/lib/routing.inc.php @@ -37,8 +37,12 @@ function get_route($path) { } } -function get_uri($path) { - return $path; +function get_uri($path, $absolute=false) { + if ($absolute) { + return rtrim(aur_location(), '/') . $path; + } else { + return $path; + } } function get_pkg_route() { @@ -56,14 +60,16 @@ function get_pkgreq_route() { return $PKGREQ_PATH; } -function get_pkg_uri($pkgname) { +function get_pkg_uri($pkgname, $absolute=false) { global $PKG_PATH; - return $PKG_PATH . '/' . urlencode($pkgname) . '/'; + $path = $PKG_PATH . '/' . urlencode($pkgname) . '/'; + return get_uri($path, $absolute); } -function get_pkgbase_uri($pkgbase_name) { +function get_pkgbase_uri($pkgbase_name, $absolute=false) { global $PKGBASE_PATH; - return $PKGBASE_PATH . '/' . urlencode($pkgbase_name) . '/'; + $path = $PKGBASE_PATH . '/' . urlencode($pkgbase_name) . '/'; + return get_uri($path, $absolute); } function get_user_route() { @@ -71,7 +77,8 @@ function get_user_route() { return $USER_PATH; } -function get_user_uri($username) { +function get_user_uri($username, $absolute=false) { global $USER_PATH; - return $USER_PATH . '/' . urlencode($username) . '/'; + $path = $USER_PATH . '/' . urlencode($username) . '/'; + return get_uri($path, $absolute); } diff --git a/web/template/header.php b/web/template/header.php index 8bc3fd1..6167fb7 100644 --- a/web/template/header.php +++ b/web/template/header.php @@ -70,7 +70,7 @@ <?php else: ?> <li><a href="<?= get_uri('/register/'); ?>"><?= __("Register"); ?></a></li> <?php if (config_get_bool('options', 'disable_http_login') && empty($_SERVER['HTTPS'])): ?> - <li><a href="<?= aur_location() . get_uri('/login/'); ?>"><?= __("Login"); ?></a></li> + <li><a href="<?= get_uri('/login/', true); ?>"><?= __("Login"); ?></a></li> <?php else: ?> <li><a href="<?= get_uri('/login/'); ?>"><?= __("Login"); ?></a></li> <?php endif; ?> -- 2.1.3

1 0

[aur-dev] AUR 3.5.0 released
by Lukas Fleischer 25 Nov '14

25 Nov '14

Hello, I am pleased to announce that AUR 3.5.0 has been released. The official AUR setup [1] has already been updated. This release adds support for architecture-specific sources (resp. provides, conflicts, replaces) and for .SRCINFO, both of which will be included in the next pacman release. Apart from that, the package list and package base list are now official and available at [2, 3]. There have also been a couple of internal changes and bug fixes. For a comprehensive list of changes, please consult the Git log [4]. As usual, bugs should be reported to the AUR bug tracker [5]. [1] https://aur.archlinux.org/ [2] https://aur.archlinux.org/packages.gz [3] https://aur.archlinux.org/pkgbase.gz [4] https://projects.archlinux.org/aur.git/log/?id=v3.5.0 [5] https://bugs.archlinux.org/index.php?project=2

4 5

[aur-dev] [PATCH 1/3] Check password length on the password reset form
by archlinux＠cryptocrack.de 21 Nov '14

21 Nov '14

From: Lukas Fleischer <archlinux(a)cryptocrack.de> We already check for a minimum password length on the account edit page. Add the same check to the password reset form (which is also used to set an initial password). Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/html/passreset.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/web/html/passreset.php b/web/html/passreset.php index 9d8e1ae..fecefe4 100644 --- a/web/html/passreset.php +++ b/web/html/passreset.php @@ -25,6 +25,10 @@ if (isset($_GET['resetkey'], $_POST['email'], $_POST['password'], $_POST['confir $error = __('Missing a required field.'); } elseif ($password != $confirm) { $error = __('Password fields do not match.'); + } elseif (!good_passwd($password)) { + $length_min = config_get_int('options', 'passwd_min_len'); + $error = __("Your password must be at least %s characters.", + $length_min); } elseif ($uid == null) { $error = __('Invalid e-mail.'); } -- 2.1.3

1 2

[aur-dev] [PATCH] Always use virtual URLs
by archlinux＠cryptocrack.de 21 Nov '14

21 Nov '14

From: Lukas Fleischer <archlinux(a)cryptocrack.de> Support for non-virtual URLs has been broken for a long time and is no longer used on the official AUR setup. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- conf/config.proto | 1 - upgrading/3.5.0.txt | 2 ++ web/lib/pkgbasefuncs.inc.php | 1 - web/lib/pkgfuncs.inc.php | 1 - web/lib/routing.inc.php | 33 +++-------------- web/template/actions_form.php | 38 -------------------- web/template/pkg_details.php | 72 ++++++++++++------------------------- web/template/pkgbase_details.php | 66 ++++++++++------------------------ web/template/tu_last_votes_list.php | 4 --- 9 files changed, 47 insertions(+), 171 deletions(-) delete mode 100644 web/template/actions_form.php diff --git a/conf/config.proto b/conf/config.proto index 280c1e8..f00b352 100644 --- a/conf/config.proto +++ b/conf/config.proto @@ -22,7 +22,6 @@ max_filesize_uncompressed = 8388608 disable_http_login = 1 aur_location = http://localhost package_url = /packages/ -use_virtual_urls = 1 max_rpc_results = 5000 aur_request_ml = aur-requests(a)archlinux.org request_idle_time = 1209600 diff --git a/upgrading/3.5.0.txt b/upgrading/3.5.0.txt index e8af4af..006f9b3 100644 --- a/upgrading/3.5.0.txt +++ b/upgrading/3.5.0.txt @@ -21,3 +21,5 @@ INSERT INTO PackageCategories (Category) VALUES ('wayland'); 4. The configuration file format has been changed. Make sure you convert web/lib/config.inc.php to the new format (see conf/config.proto for an example configuration) and put the resulting file in conf/config. + +5. Support for non-virtual URLs has been removed. diff --git a/web/lib/pkgbasefuncs.inc.php b/web/lib/pkgbasefuncs.inc.php index 322ea60..9cdd8a3 100644 --- a/web/lib/pkgbasefuncs.inc.php +++ b/web/lib/pkgbasefuncs.inc.php @@ -236,7 +236,6 @@ function pkgbase_display_details($base_id, $row, $SID="") { include('pkgbase_details.php'); if ($SID) { - include('actions_form.php'); include('pkg_comment_form.php'); } diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php index 948e2ae..7e7a98f 100644 --- a/web/lib/pkgfuncs.inc.php +++ b/web/lib/pkgfuncs.inc.php @@ -481,7 +481,6 @@ function pkg_display_details($id=0, $row, $SID="") { include('pkg_details.php'); if ($SID) { - include('actions_form.php'); include('pkg_comment_form.php'); } diff --git a/web/lib/routing.inc.php b/web/lib/routing.inc.php index 9585304..833ea0f 100644 --- a/web/lib/routing.inc.php +++ b/web/lib/routing.inc.php @@ -26,10 +26,6 @@ $PKGBASE_PATH = '/pkgbase'; $PKGREQ_PATH = '/requests'; $USER_PATH = '/account'; -function use_virtual_urls() { - return config_get_bool('options', 'use_virtual_urls'); -} - function get_route($path) { global $ROUTES; @@ -42,13 +38,7 @@ function get_route($path) { } function get_uri($path) { - global $ROUTES; - - if (use_virtual_urls()) { - return $path; - } else { - return get_route($path); - } + return $path; } function get_pkg_route() { @@ -68,22 +58,12 @@ function get_pkgreq_route() { function get_pkg_uri($pkgname) { global $PKG_PATH; - - if (use_virtual_urls()) { - return $PKG_PATH . '/' . urlencode($pkgname) . '/'; - } else { - return '/' . get_route($PKG_PATH) . '?N=' . urlencode($pkgname); - } + return $PKG_PATH . '/' . urlencode($pkgname) . '/'; } function get_pkgbase_uri($pkgbase_name) { global $PKGBASE_PATH; - - if (use_virtual_urls()) { - return $PKGBASE_PATH . '/' . urlencode($pkgbase_name) . '/'; - } else { - return '/' . get_route($PKGBASE_PATH) . '?N=' . urlencode($pkgbase_name); - } + return $PKGBASE_PATH . '/' . urlencode($pkgbase_name) . '/'; } function get_user_route() { @@ -93,10 +73,5 @@ function get_user_route() { function get_user_uri($username) { global $USER_PATH; - - if (use_virtual_urls()) { - return $USER_PATH . '/' . urlencode($username) . '/'; - } else { - return '/' . get_route($USER_PATH) . '?U=' . urlencode($username); - } + return $USER_PATH . '/' . urlencode($username) . '/'; } diff --git a/web/template/actions_form.php b/web/template/actions_form.php deleted file mode 100644 index f18c01c..0000000 --- a/web/template/actions_form.php +++ /dev/null @@ -1,38 +0,0 @@ -<?php if (!use_virtual_urls()): ?> -<div class="box"> - <form action="<?= htmlspecialchars(get_pkg_uri($row['Name']), ENT_QUOTES); ?>" method="post"> - <fieldset> - <input type="hidden" name="IDs[<?= $row['ID'] ?>]" value="1" /> - <input type="hidden" name="ID" value="<?= $row['ID'] ?>" /> - <input type="hidden" name="token" value="<?= htmlspecialchars($_COOKIE['AURSID']) ?>" /> - - <?php if (pkgbase_user_voted($uid, $row['ID'])): ?> - <input type="submit" class="button" name="do_UnVote" value="<?= __("UnVote") ?>" /> - <?php else: ?> - <input type="submit" class="button" name="do_Vote" value="<?= __("Vote") ?>" /> - <?php endif; ?> - - <?php if (pkgbase_user_notify($uid, $row['ID'])): ?> - <input type="submit" class="button" name="do_UnNotify" value="<?= __("UnNotify") ?>" title="<?= __("No New Comment Notification") ?>" /> - <?php else: ?> - <input type="submit" class="button" name="do_Notify" value="<?= __("Notify") ?>" title="<?= __("New Comment Notification") ?>" /> - <?php endif; ?> - - <?php if ($row["OutOfDateTS"] === NULL): ?> - <input type="submit" class="button" name="do_Flag" value="<?= __("Flag Out-of-date") ?>" /> - <?php elseif (($row["OutOfDateTS"] !== NULL) && has_credential(CRED_PKGBASE_UNFLAG, array($row["MaintainerUID"]))): ?> - <input type="submit" class="button" name="do_UnFlag" value="<?= __("UnFlag Out-of-date") ?>" /> - <?php endif; ?> - - <?php if (has_credential(CRED_PKGBASE_DELETE)): ?> - <input type="submit" class="button" name="do_Delete" value="<?= __("Delete Packages") ?>" /> - <label for="merge_Into" ><?= __("Merge into") ?></label> - <input type="text" id="merge_Into" name="merge_Into" /> - <input type="checkbox" name="confirm_Delete" value="1" /> - <?= __("Confirm") ?> - <?php endif; ?> - - </fieldset> - </form> -</div> -<?php endif; ?> diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php index faec0dc..a8a0b3e 100644 --- a/web/template/pkg_details.php +++ b/web/template/pkg_details.php @@ -83,7 +83,7 @@ $sources = pkg_sources($row["ID"]); <li><a href="<?= $urlpath . '/' . $row['BaseName'] ?>.tar.gz"><?= __('Download tarball') ?></a></li> <li><a href="https://wiki.archlinux.org/index.php/Special:Search?search=<?= urlencode($row['Name']) ?>"><?= __('Search wiki') ?></a></li> <li><span class="flagged"><?php if ($row["OutOfDateTS"] !== NULL) { echo __('Flagged out-of-date')." (${out_of_date_time})"; } ?></span></li> - <?php if (use_virtual_urls() && $uid): ?> + <?php if ($uid): ?> <?php if ($row["OutOfDateTS"] === NULL): ?> <li> <form action="<?= get_pkgbase_uri($row['BaseName']) . 'flag/'; ?>" method="post"> @@ -279,69 +279,41 @@ if (has_credential(CRED_PKGBASE_CHANGE_CATEGORY, array($row["MaintainerUID"]))): <?php endif; ?> <tr> <th><?= __('Submitter') .': ' ?></th> -<?php -if ($row["SubmitterUID"]): - if ($SID): - if (!use_virtual_urls()): -?> - <td><a href="<?= get_uri('/account/'); ?>?Action=AccountInfo&ID=<?= htmlspecialchars($row['SubmitterUID'], ENT_QUOTES) ?>" title="<?= __('View account information for')?> <?= html_format_username($submitter) ?>"><?= html_format_username($submitter) ?></a></td> - <?php else: ?> - <td><a href="<?= get_uri('/account/') . html_format_username($submitter) ?>" title="<?= __('View account information for %s', html_format_username($submitter)) ?>"><?= html_format_username($submitter) ?></a></td> - <?php endif; ?> -<?php else: ?> - <td><?= html_format_username($submitter) ?></td> - <?php endif; ?> -<?php else: ?> + <?php if ($row["SubmitterUID"] && $SID): ?> + <td><a href="<?= get_uri('/account/') . html_format_username($submitter, ENT_QUOTES) ?>" title="<?= __('View account information for %s', html_format_username($submitter)) ?>"><?= html_format_username($submitter) ?></a></td> + <?php elseif ($row["SubmitterUID"] && !$SID): ?> + <td><?= html_format_username($submitter) ?></td> + <?php else: ?> <td><?= __('None') ?></td> -<?php endif; ?> + <?php endif; ?> </tr> <tr> <th><?= __('Maintainer') .': ' ?></th> -<?php -if ($row["MaintainerUID"]): - if ($SID): - if (!use_virtual_urls()): -?> - <td><a href="<?= get_uri('/account/'); ?>?Action=AccountInfo&ID=<?= htmlspecialchars($row['MaintainerUID'], ENT_QUOTES) ?>" title="<?= __('View account information for')?> <?= html_format_username($maintainer) ?>"><?= html_format_username($maintainer) ?></a></td> - <?php else: ?> + <?php if ($row["MaintainerUID"] && $SID): ?> <td><a href="<?= get_uri('/account/') . html_format_username($maintainer) ?>" title="<?= __('View account information for %s', html_format_username($maintainer)) ?>"><?= html_format_username($maintainer) ?></a></td> - <?php endif; ?> - <?php else: ?> - <td><?= html_format_username($maintainer) ?></td> - <?php endif; ?> -<?php else: ?> + <?php elseif ($row["MaintainerUID"] && !$SID): ?> + <td><?= html_format_username($maintainer) ?></td> + <?php else: ?> <td><?= __('None') ?></td> -<?php endif; ?> + <?php endif; ?> </tr> <tr> - <th><?= __('Last Packager') .': ' ?></th> -<?php -if ($row["PackagerUID"]): - if ($SID): - if (!use_virtual_urls()): -?> - <td><a href="<?= get_uri('/account/'); ?>?Action=AccountInfo&ID=<?= htmlspecialchars($row['PackagerUID'], ENT_QUOTES) ?>" title="<?= __('View account information for')?> <?= html_format_username($packager) ?>"><?= html_format_username($packager) ?></a></td> - <?php else: ?> + <th><?= __('Last Packager') .': ' ?></th> + <?php if ($row["PackagerUID"] && $SID): ?> <td><a href="<?= get_uri('/account/') . html_format_username($packager) ?>" title="<?= __('View account information for %s', html_format_username($packager)) ?>"><?= html_format_username($packager) ?></a></td> - <?php endif; ?> - <?php else: ?> - <td><?= html_format_username($packager) ?></td> - <?php endif; ?> -<?php else: ?> + <?php elseif ($row["PackagerUID"] && !$SID): ?> + <td><?= html_format_username($packager) ?></td> + <?php else: ?> <td><?= __('None') ?></td> -<?php endif; ?> + <?php endif; ?> </tr> <tr> <th><?= __('Votes') . ': ' ?></th> -<?php if (has_credential(CRED_PKGBASE_LIST_VOTERS)): ?> -<?php if (use_virtual_urls()): ?> - <td><a href="<?= get_pkgbase_uri($row['BaseName']); ?>voters/"><?= $votes ?></a></td> -<?php else: ?> - <td><a href="<?= get_uri('/voters/'); ?>?N=<?= htmlspecialchars($row['BaseName'], ENT_QUOTES) ?>"><?= $votes ?></a></td> -<?php endif; ?> -<?php else: ?> + <?php if (has_credential(CRED_PKGBASE_LIST_VOTERS)): ?> + <td><a href="<?= get_pkgbase_uri($row['Name']); ?>voters/"><?= $votes ?></a></td> + <?php else: ?> <td><?= $votes ?></td> -<?php endif; ?> + <?php endif; ?> </tr> <tr> <th><?= __('First Submitted') . ': ' ?></th> diff --git a/web/template/pkgbase_details.php b/web/template/pkgbase_details.php index 406408b..b8d36ed 100644 --- a/web/template/pkgbase_details.php +++ b/web/template/pkgbase_details.php @@ -34,7 +34,7 @@ $pkgs = pkgbase_get_pkgnames($base_id); <li><a href="<?= $urlpath . '/' . $row['Name'] ?>.tar.gz"><?= __('Download tarball') ?></a></li> <li><a href="https://wiki.archlinux.org/index.php/Special:Search?search=<?= urlencode($row['Name']) ?>"><?= __('Search wiki') ?></a></li> <li><span class="flagged"><?php if ($row["OutOfDateTS"] !== NULL) { echo __('Flagged out-of-date')." (${out_of_date_time})"; } ?></span></li> - <?php if (use_virtual_urls() && $uid): ?> + <?php if ($uid): ?> <?php if ($row["OutOfDateTS"] === NULL): ?> <li> <form action="<?= get_pkgbase_uri($row['Name']) . 'flag/'; ?>" method="post"> @@ -138,69 +138,41 @@ if (has_credential(CRED_PKGBASE_CHANGE_CATEGORY, array($row["MaintainerUID"]))): </tr> <tr> <th><?= __('Submitter') .': ' ?></th> -<?php -if ($row["SubmitterUID"]): - if ($SID): - if (!use_virtual_urls()): -?> - <td><a href="<?= get_uri('/account/'); ?>?Action=AccountInfo&ID=<?= htmlspecialchars($row['SubmitterUID'], ENT_QUOTES) ?>" title="<?= __('View account information for')?> <?= html_format_username($submitter) ?>"><?= html_format_username($submitter) ?></a></td> - <?php else: ?> + <?php if ($row["SubmitterUID"] && $SID): ?> <td><a href="<?= get_uri('/account/') . html_format_username($submitter, ENT_QUOTES) ?>" title="<?= __('View account information for %s', html_format_username($submitter)) ?>"><?= html_format_username($submitter) ?></a></td> - <?php endif; ?> -<?php else: ?> - <td><?= html_format_username($submitter) ?></td> - <?php endif; ?> -<?php else: ?> + <?php elseif ($row["SubmitterUID"] && !$SID): ?> + <td><?= html_format_username($submitter) ?></td> + <?php else: ?> <td><?= __('None') ?></td> -<?php endif; ?> + <?php endif; ?> </tr> <tr> <th><?= __('Maintainer') .': ' ?></th> -<?php -if ($row["MaintainerUID"]): - if ($SID): - if (!use_virtual_urls()): -?> - <td><a href="<?= get_uri('/account/'); ?>?Action=AccountInfo&ID=<?= htmlspecialchars($row['MaintainerUID'], ENT_QUOTES) ?>" title="<?= __('View account information for')?> <?= html_format_username($maintainer) ?>"><?= html_format_username($maintainer) ?></a></td> - <?php else: ?> + <?php if ($row["MaintainerUID"] && $SID): ?> <td><a href="<?= get_uri('/account/') . html_format_username($maintainer) ?>" title="<?= __('View account information for %s', html_format_username($maintainer)) ?>"><?= html_format_username($maintainer) ?></a></td> - <?php endif; ?> - <?php else: ?> - <td><?= html_format_username($maintainer) ?></td> - <?php endif; ?> -<?php else: ?> + <?php elseif ($row["MaintainerUID"] && !$SID): ?> + <td><?= html_format_username($maintainer) ?></td> + <?php else: ?> <td><?= __('None') ?></td> -<?php endif; ?> + <?php endif; ?> </tr> <tr> <th><?= __('Last Packager') .': ' ?></th> -<?php -if ($row["PackagerUID"]): - if ($SID): - if (!use_virtual_urls()): -?> - <td><a href="<?= get_uri('/account/'); ?>?Action=AccountInfo&ID=<?= htmlspecialchars($row['PackagerUID'], ENT_QUOTES) ?>" title="<?= __('View account information for')?> <?= html_format_username($packager) ?>"><?= html_format_username($packager) ?></a></td> - <?php else: ?> + <?php if ($row["PackagerUID"] && $SID): ?> <td><a href="<?= get_uri('/account/') . html_format_username($packager) ?>" title="<?= __('View account information for %s', html_format_username($packager)) ?>"><?= html_format_username($packager) ?></a></td> - <?php endif; ?> - <?php else: ?> - <td><?= html_format_username($packager) ?></td> - <?php endif; ?> -<?php else: ?> + <?php elseif ($row["PackagerUID"] && !$SID): ?> + <td><?= html_format_username($packager) ?></td> + <?php else: ?> <td><?= __('None') ?></td> -<?php endif; ?> + <?php endif; ?> </tr> <tr> <th><?= __('Votes') . ': ' ?></th> -<?php if (has_credential(CRED_PKGBASE_LIST_VOTERS)): ?> -<?php if (use_virtual_urls()): ?> + <?php if (has_credential(CRED_PKGBASE_LIST_VOTERS)): ?> <td><a href="<?= get_pkgbase_uri($row['Name']); ?>voters/"><?= $votes ?></a></td> -<?php else: ?> - <td><a href="<?= get_uri('/voters/'); ?>?N=<?= htmlspecialchars($row['Name'], ENT_QUOTES) ?>"><?= $votes ?></a></td> -<?php endif; ?> -<?php else: ?> + <?php else: ?> <td><?= $votes ?></td> -<?php endif; ?> + <?php endif; ?> </tr> <tr> <th><?= __('First Submitted') . ': ' ?></th> diff --git a/web/template/tu_last_votes_list.php b/web/template/tu_last_votes_list.php index 0b0ee48..f7b07bc 100644 --- a/web/template/tu_last_votes_list.php +++ b/web/template/tu_last_votes_list.php @@ -21,11 +21,7 @@ ?> <tr class="<?= $c ?>"> <td> - <?php if (!use_virtual_urls()): ?> - <a href="<?= get_uri('/account/'); ?>?Action=AccountInfo&ID=<?= htmlspecialchars($row['UserID'], ENT_QUOTES) ?>" title="<?= __('View account information for')?> <?= html_format_username($username) ?>"><?= html_format_username($username) ?></a></td> - <?php else: ?> <a href="<?= get_uri('/account/') . html_format_username($username) ?>" title="<?= __('View account information for %s', html_format_username($username)) ?>"><?= html_format_username($username) ?></a> - <?php endif; ?> </td> <td> <a href="<?= get_uri('/tu/'); ?>?id=<?= $row['LastVote'] ?>"><?= intval($row["LastVote"]) ?></a> -- 2.1.3

1 0

[aur-dev] [PATCH] Fix login link
by archlinux＠cryptocrack.de 19 Nov '14

19 Nov '14

From: Lukas Fleischer <archlinux(a)cryptocrack.de> Regression introduced in 76343fb (Use an INI-style configuration file, 2014-10-24). Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/template/header.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/template/header.php b/web/template/header.php index dd1d480..8bc3fd1 100644 --- a/web/template/header.php +++ b/web/template/header.php @@ -70,7 +70,7 @@ <?php else: ?> <li><a href="<?= get_uri('/register/'); ?>"><?= __("Register"); ?></a></li> <?php if (config_get_bool('options', 'disable_http_login') && empty($_SERVER['HTTPS'])): ?> - <li><a href="<?= $AUR_LOCATION . get_uri('/login/'); ?>"><?= __("Login"); ?></a></li> + <li><a href="<?= aur_location() . get_uri('/login/'); ?>"><?= __("Login"); ?></a></li> <?php else: ?> <li><a href="<?= get_uri('/login/'); ?>"><?= __("Login"); ?></a></li> <?php endif; ?> -- 2.1.3

1 0

[aur-dev] [PATCH/RFC] Add support for .SRCINFO
by archlinux＠cryptocrack.de 18 Nov '14

18 Nov '14

From: Lukas Fleischer <archlinux(a)cryptocrack.de> pacman officially supports .SRCINFO since commit 6029a77 (makepkg: introduce .SRCINFO files for source packages, 2014-11-08). Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/html/pkgsubmit.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/web/html/pkgsubmit.php b/web/html/pkgsubmit.php index be9220e..d8df290 100644 --- a/web/html/pkgsubmit.php +++ b/web/html/pkgsubmit.php @@ -81,7 +81,7 @@ if ($uid): if (!$error) { $tar = new Archive_Tar($_FILES['pfile']['tmp_name']); - /* Extract PKGBUILD and .AURINFO into a string. */ + /* Extract PKGBUILD and .SRCINFO into a string. */ $pkgbuild_raw = $srcinfo_raw = ''; $dircount = 0; foreach ($tar->listContent() as $tar_file) { @@ -94,7 +94,8 @@ if ($uid): break; } elseif (substr($tar_file['filename'], -9) == '/PKGBUILD') { $pkgbuild_raw = $tar->extractInString($tar_file['filename']); - } elseif (substr($tar_file['filename'], -9) == '/.AURINFO') { + } elseif (substr($tar_file['filename'], -9) == '/.AURINFO' || + substr($tar_file['filename'], -9) == '/.SRCINFO') { $srcinfo_raw = $tar->extractInString($tar_file['filename']); } } elseif ($tar_file['typeflag'] == 5) { @@ -127,7 +128,7 @@ if ($uid): } } - /* Parse .AURINFO and extract meta data. */ + /* Parse .SRCINFO and extract meta data. */ $pkgbase_info = array(); $pkginfo = array(); $section_info = array(); -- 2.1.3

1 0

[aur-dev] [PATCH] mkpkglists: Use the main configuration file
by archlinux＠cryptocrack.de 24 Oct '14

24 Oct '14

From: Lukas Fleischer <archlinux(a)cryptocrack.de> Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- scripts/config.proto | 5 ----- scripts/mkpkglists.py | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) delete mode 100644 scripts/config.proto diff --git a/scripts/config.proto b/scripts/config.proto deleted file mode 100644 index 4cac94f..0000000 --- a/scripts/config.proto +++ /dev/null @@ -1,5 +0,0 @@ -[database] -host = localhost -name = AUR -user = aur -password = aur diff --git a/scripts/mkpkglists.py b/scripts/mkpkglists.py index c208fd1..173f5f7 100755 --- a/scripts/mkpkglists.py +++ b/scripts/mkpkglists.py @@ -9,7 +9,7 @@ import os docroot = os.path.dirname(os.path.realpath(__file__)) + "/../web/html/" config = configparser.RawConfigParser() -config.read(os.path.dirname(os.path.realpath(__file__)) + "/config") +config.read(os.path.dirname(os.path.realpath(__file__)) + "/../conf/config") aur_db_host = config.get('database', 'host') aur_db_name = config.get('database', 'name') -- 2.1.2

1 0