- Aur-dev - lists.archlinux.org

[aur-dev] [PATCH] account_delete.php: Fix variable name
by Lukas Fleischer 02 Mar '17

02 Mar '17

Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/template/account_delete.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/template/account_delete.php b/web/template/account_delete.php index 74f386d..718b172 100644 --- a/web/template/account_delete.php +++ b/web/template/account_delete.php @@ -7,7 +7,7 @@ <form id="edit-profile-form" action="<?= get_user_uri($username) . 'delete/'; ?>" method="post"> <fieldset> - <input type="hidden" name="Action" value="<?= $A ?>" /> + <input type="hidden" name="Action" value="<?= $action ?>" /> <input type="hidden" name="ID" value="<?= $UID ?>" /> <input type="hidden" name="token" value="<?= htmlspecialchars($_COOKIE['AURSID']) ?>" /> </fieldset> -- 2.12.0

1 0

[aur-dev] [PATCH 1/2] aur-schema.sql: Do not recreate the database
by Lukas Fleischer 01 Mar '17

01 Mar '17

Modify the schema such that it only creates the necessary tables, indices and predefined data. This makes it easier to import the schema into a database with a name other than "AUR". Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- schema/aur-schema.sql | 3 --- 1 file changed, 3 deletions(-) diff --git a/schema/aur-schema.sql b/schema/aur-schema.sql index b75a257..418e532 100644 --- a/schema/aur-schema.sql +++ b/schema/aur-schema.sql @@ -1,9 +1,6 @@ -- The MySQL database layout for the AUR. Certain data -- is also included such as AccountTypes, etc. -- -DROP DATABASE IF EXISTS AUR; -CREATE DATABASE AUR DEFAULT CHARACTER SET utf8 COLLATE utf8_general_ci; -USE AUR; -- Define the Account Types for the AUR. -- -- 2.12.0

1 1

[aur-dev] [PATCH] pkgbase.php: Fix PHP notice
by Lukas Fleischer 28 Feb '17

28 Feb '17

Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/html/pkgbase.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/web/html/pkgbase.php b/web/html/pkgbase.php index ab40984..a593af1 100644 --- a/web/html/pkgbase.php +++ b/web/html/pkgbase.php @@ -44,6 +44,7 @@ if (isset($_POST['IDs'])) { } /* Perform package base actions. */ +$via = isset($_POST['via']) ? $_POST['via'] : NULL; $ret = false; $output = ""; $fragment = ""; @@ -56,7 +57,6 @@ if (check_token()) { list($ret, $output) = pkgbase_adopt($ids, true, NULL); } elseif (current_action("do_Disown")) { if (isset($_POST['confirm'])) { - $via = isset($_POST['via']) ? $_POST['via'] : NULL; list($ret, $output) = pkgbase_adopt($ids, false, $via); } else { $output = __("The selected packages have not been disowned, check the confirmation checkbox."); @@ -68,7 +68,6 @@ if (check_token()) { list($ret, $output) = pkgbase_vote($ids, false); } elseif (current_action("do_Delete")) { if (isset($_POST['confirm'])) { - $via = isset($_POST['via']) ? $_POST['via'] : NULL; if (!isset($_POST['merge_Into']) || empty($_POST['merge_Into'])) { list($ret, $output) = pkgbase_delete($ids, NULL, $via); unset($_GET['ID']); @@ -129,7 +128,7 @@ if (check_token()) { if ($ret) { if (current_action("do_CloseRequest") || - (current_action("do_Delete") && $_POST['via'])) { + (current_action("do_Delete") && $via)) { /* Redirect back to package request page on success. */ header('Location: ' . get_pkgreq_route()); exit(); -- 2.12.0

1 0

[aur-dev] [PATCH] pkgbase.php: Squelch PHP warning
by Lukas Fleischer 28 Feb '17

28 Feb '17

Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/html/pkgbase.php | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/web/html/pkgbase.php b/web/html/pkgbase.php index 23aa6c8..ab40984 100644 --- a/web/html/pkgbase.php +++ b/web/html/pkgbase.php @@ -145,17 +145,21 @@ if (check_token()) { } } -$pkgs = pkgbase_get_pkgnames($base_id); -if (!$output && count($pkgs) == 1) { - /* Not a split package. Redirect to the package page. */ - if (empty($_SERVER['QUERY_STRING'])) { - header('Location: ' . get_pkg_uri($pkgs[0]) . $fragment); - } else { - header('Location: ' . get_pkg_uri($pkgs[0]) . '?' . $_SERVER['QUERY_STRING'] . $fragment); +if (isset($base_id)) { + $pkgs = pkgbase_get_pkgnames($base_id); + if (!$output && count($pkgs) == 1) { + /* Not a split package. Redirect to the package page. */ + if (empty($_SERVER['QUERY_STRING'])) { + header('Location: ' . get_pkg_uri($pkgs[0]) . $fragment); + } else { + header('Location: ' . get_pkg_uri($pkgs[0]) . '?' . $_SERVER['QUERY_STRING'] . $fragment); + } } -} -$details = pkgbase_get_details($base_id); + $details = pkgbase_get_details($base_id); +} else { + $details = array(); +} html_header($title, $details); ?> @@ -169,10 +173,12 @@ html_header($title, $details); <?php include('pkg_search_form.php'); -if (isset($_COOKIE["AURSID"])) { - pkgbase_display_details($base_id, $details, $_COOKIE["AURSID"]); -} else { - pkgbase_display_details($base_id, $details, null); +if (isset($base_id)) { + if (isset($_COOKIE["AURSID"])) { + pkgbase_display_details($base_id, $details, $_COOKIE["AURSID"]); + } else { + pkgbase_display_details($base_id, $details, null); + } } html_footer(AURWEB_VERSION); -- 2.12.0

1 0

[aur-dev] [PATCH] account.php: Always initialize $success
by Lukas Fleischer 28 Feb '17

28 Feb '17

Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/html/account.php | 1 + 1 file changed, 1 insertion(+) diff --git a/web/html/account.php b/web/html/account.php index 0b75761..549f852 100644 --- a/web/html/account.php +++ b/web/html/account.php @@ -24,6 +24,7 @@ if (in_array($action, $need_userinfo)) { * which could be changed by process_account_form() */ if ($action == "UpdateAccount") { + $success = false; $update_account_message = ''; /* Details for account being updated */ /* Verify user permissions and that the request is a valid POST */ -- 2.12.0

1 0

[aur-dev] [PATCH 1/3] Remove bogus if-statement from pkgbase_delete()
by Lukas Fleischer 27 Feb '17

27 Feb '17

The variable $action is always undefined in pkgbase_delete() which makes the if-statement always true and triggers a warning whenever a package base is removed. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/lib/pkgbasefuncs.inc.php | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/web/lib/pkgbasefuncs.inc.php b/web/lib/pkgbasefuncs.inc.php index 57b307d..b20c2ff 100644 --- a/web/lib/pkgbasefuncs.inc.php +++ b/web/lib/pkgbasefuncs.inc.php @@ -522,15 +522,13 @@ function pkgbase_delete ($base_ids, $merge_base_id, $via, $grant=false) { } /* Scan through pending deletion requests and close them. */ - if (!$action) { - $username = username_from_sid($_COOKIE['AURSID']); - foreach ($base_ids as $base_id) { - $pkgreq_ids = array_merge(pkgreq_by_pkgbase($base_id)); - foreach ($pkgreq_ids as $pkgreq_id) { - pkgreq_close(intval($pkgreq_id), 'accepted', - 'The user ' . $username . - ' deleted the package.', true); - } + $username = username_from_sid($_COOKIE['AURSID']); + foreach ($base_ids as $base_id) { + $pkgreq_ids = array_merge(pkgreq_by_pkgbase($base_id)); + foreach ($pkgreq_ids as $pkgreq_id) { + pkgreq_close(intval($pkgreq_id), 'accepted', + 'The user ' . $username . + ' deleted the package.', true); } } -- 2.12.0

1 2

[aur-dev] [PATCH 1/5] 404.php: Squelch warning on empty PATH_INFO
by Lukas Fleischer 27 Feb '17

27 Feb '17

Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/html/404.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/html/404.php b/web/html/404.php index 757c485..9f81d11 100644 --- a/web/html/404.php +++ b/web/html/404.php @@ -5,7 +5,7 @@ set_include_path(get_include_path() . PATH_SEPARATOR . '../lib'); $path = $_SERVER['PATH_INFO']; $tokens = explode('/', $path); -if (preg_match('/^([a-z0-9][a-z0-9.+_-]*?)(\.git)?$/', $tokens[1], $matches)) { +if (isset($tokens[1]) && preg_match('/^([a-z0-9][a-z0-9.+_-]*?)(\.git)?$/', $tokens[1], $matches)) { $gitpkg = $matches[1]; if (pkg_from_name($gitpkg)) { $gitcmd = 'git clone ' . sprintf(config_get('options', 'git_clone_uri_anon'), htmlspecialchars($gitpkg)); -- 2.12.0

1 4

[aur-dev] [PATCH 1/4] Fix SQL query used for creating new accounts
by Lukas Fleischer 26 Feb '17

26 Feb '17

Fixes a regression introduced in 608c483 (Add user set timezones, 2017-01-20). Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- 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 d0a7ff9..5f7f1f4 100644 --- a/web/lib/acctfuncs.inc.php +++ b/web/lib/acctfuncs.inc.php @@ -292,7 +292,7 @@ function process_account_form($TYPE,$A,$U="",$T="",$S="",$E="",$H="",$P="",$C="" $q = "INSERT INTO Users (AccountTypeID, Suspended, "; $q.= "InactivityTS, Username, Email, Passwd , "; $q.= "RealName, LangPreference, Timezone, Homepage, IRCNick, PGPKey) "; - $q.= "VALUES (1, 0, 0, $U, $E, $P, $R, $L, $TZ "; + $q.= "VALUES (1, 0, 0, $U, $E, $P, $R, $L, $TZ, "; $q.= "$HP, $I, $K)"; $result = $dbh->exec($q); if (!$result) { -- 2.12.0

1 3

[aur-dev] aurweb 4.5.0 released
by Lukas Fleischer 26 Feb '17

26 Feb '17

Dear aurweb contributors and users, aurweb 4.5.0 has just been released. You will notice that after logging in, the home page is now replaced by a dashboard which shows your flagged packages and your recent package requests, followed by a list of your packages. There also is a list of packages you co-maintain which hopefully makes co-maintainers' lives easier. Moreover, co-maintainers of packages now receive out-of-date notifications. In your account settings, you can now specify a timezone which will be used to format dates and times throughout the whole aurweb interface. The most notable internal improvements were made in password security. The minimum password length was bumped to 8 characters. Passwords are now hashed using bcrypt instead of MD5. The conversion from MD5 to bcrypt is done automatically when logging in. We thus recommend to log out of the aurweb interface and log in again. There were also improvements to the SSH interface, including new commands to vote for packages and flag packages out-of-date. For a comprehensive list of changes, please consult the Git log [2]. As usual, bugs should be reported to the aurweb bug tracker [3]. [1] https://aur.archlinux.org/ [2] https://projects.archlinux.org/aurweb.git/log/?id=v4.5.0 [3] https://bugs.archlinux.org/index.php?project=2

1 0

[aur-dev] [PATCH] pkgreq_results.php: Hide empty table
by Lukas Fleischer 25 Feb '17

25 Feb '17

Display a message that no requests matched the filter criteria instead of showing an empty package requests table. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/template/pkgreq_results.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/web/template/pkgreq_results.php b/web/template/pkgreq_results.php index 74fcb10..fb49dfa 100644 --- a/web/template/pkgreq_results.php +++ b/web/template/pkgreq_results.php @@ -1,3 +1,6 @@ +<?php if (count($results) == 0): ?> +<p><?= __("No requests matched your search criteria.") ?></p> +<?php else: ?> <?php if ($show_headers): ?> <div class="pkglist-stats"> <p> @@ -129,3 +132,4 @@ <?php endif; ?> </div> <?php endif; ?> +<?php endif; ?> -- 2.12.0

1 0