- Aur-dev - lists.archlinux.org

[aur-dev] aurweb 4.5.1 released
by Lukas Fleischer 09 Mar '17

09 Mar '17

Hello, We are pleased to announce aurweb 4.5.1, the first maintenance release for 4.5. The official aurweb setup [1] has already been updated. 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.1 [3] https://bugs.archlinux.org/index.php?project=2

1 0

[aur-dev] [PATCH] index.php: Remove routes for dropped images
by Lukas Fleischer 04 Mar '17

04 Mar '17

Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/html/index.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/web/html/index.php b/web/html/index.php index 78ab6ad..364d399 100644 --- a/web/html/index.php +++ b/web/html/index.php @@ -170,8 +170,6 @@ if (!empty($tokens[1]) && '/' . $tokens[1] == get_pkg_route()) { case "/css/archnavbar/archlogo.png": case "/css/archnavbar/aurlogo.png": case "/images/favicon.ico": - case "/images/titlelogo.png": - case "/images/x.png": header("Content-Type: image/png"); readfile("./$path"); break; @@ -181,7 +179,6 @@ if (!empty($tokens[1]) && '/' . $tokens[1] == get_pkg_route()) { case "/images/pin.min.svg": case "/images/unpin.min.svg": case "/images/rss.svg": - case "/images/new.svg": header("Content-Type: image/svg+xml"); readfile("./$path"); break; -- 2.12.0

1 0

[aur-dev] [PATCH] test/setup.sh: Error out on missing SQLite schema
by Lukas Fleischer 03 Mar '17

03 Mar '17

Instead of making all tests fail, error out during initialization if the SQLite schema has not been generated. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- test/setup.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/setup.sh b/test/setup.sh index 64ba88f..b71e73e 100644 --- a/test/setup.sh +++ b/test/setup.sh @@ -105,8 +105,10 @@ SSH_TTY=/dev/pts/0 export SSH_CLIENT SSH_CONNECTION SSH_TTY # Initialize the test database. +DBSCHEMA="$TOPLEVEL/schema/aur-schema-sqlite.sql" +[ -f "$DBSCHEMA" ] || error 'SQLite database schema not found' rm -f aur.db -sqlite3 aur.db <"$TOPLEVEL/schema/aur-schema-sqlite.sql" +sqlite3 aur.db <"$DBSCHEMA" echo "INSERT INTO Users (ID, UserName, Passwd, Email, AccountTypeID) VALUES (1, 'user', '!', 'user@localhost', 1);" | sqlite3 aur.db echo "INSERT INTO Users (ID, UserName, Passwd, Email, AccountTypeID) VALUES (2, 'tu', '!', 'tu@localhost', 2);" | sqlite3 aur.db -- 2.12.0

1 0

[aur-dev] Post-4.5.0 string freeze
by Lukas Fleischer 02 Mar '17

02 Mar '17

Dear translators, Since the last release was rushed a bit and there was no proper string freeze, we will have a freeze for 4.5.1 to catch up with the missing strings. I plan to tag the release on Thursday, 2017-03-09, so there are seven days left for translation. Regards, Lukas

1 0

[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