- Aur-dev - lists.archlinux.org

[PATCH] Handle empty resultset getting recent 10 packages
by nodivbyzero 21 Mar '18

21 Mar '18

--- web/lib/stats.inc.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/web/lib/stats.inc.php b/web/lib/stats.inc.php index 80619fe..0fa3ec6 100644 --- a/web/lib/stats.inc.php +++ b/web/lib/stats.inc.php @@ -19,10 +19,13 @@ function updates_table() { $result = $dbh->query($q); $newest_packages = new ArrayObject(); - while ($row = $result->fetch(PDO::FETCH_ASSOC)) { - $newest_packages->append($row); - } - set_cache_value($key, $newest_packages); + if ($result) { + + while ($row = $result->fetch(PDO::FETCH_ASSOC)) { + $newest_packages->append($row); + } + set_cache_value($key, $newest_packages); + } } include('stats/updates_table.php'); } -- 2.16.1

2 1

[PATCH] Terminates execution of the script if aurweb config file not found
by nodivbyzero 20 Mar '18

20 Mar '18

--- web/lib/confparser.inc.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/web/lib/confparser.inc.php b/web/lib/confparser.inc.php index e7128be..499481d 100644 --- a/web/lib/confparser.inc.php +++ b/web/lib/confparser.inc.php @@ -8,7 +8,11 @@ function config_load() { if (!$path) { $path = "/etc/aurweb/config"; } - $AUR_CONFIG = parse_ini_file($path, true, INI_SCANNER_RAW); + if (file_exists($path)) { + $AUR_CONFIG = parse_ini_file($path, true, INI_SCANNER_RAW); + } else { + die("aurweb config file not found"); + } } } -- 2.16.1

4 3

[PATCH 1/1] schema/makefile - Replacing MySQL with SQLite in the comment
by nodivbyzero 13 Mar '18

13 Mar '18

--- schema/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/schema/Makefile b/schema/Makefile index e0448ad..62d0856 100644 --- a/schema/Makefile +++ b/schema/Makefile @@ -3,6 +3,7 @@ aur-schema-sqlite.sql: aur-schema.sql -e 's/ ENGINE = InnoDB//' \ -e 's/ [A-Z]* UNSIGNED NOT NULL AUTO_INCREMENT/ INTEGER NOT NULL/' \ -e 's/([0-9, ]*) UNSIGNED / UNSIGNED /' \ + -e 's/ MySQL / SQLite /' \ $< >$@ clean: -- 2.16.1

1 0

[PATCH] TESTING: Adding 2 required packages in the documentation file
by nodivbyzero 13 Mar '18

13 Mar '18

--- TESTING | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TESTING b/TESTING index d2c97d9..9613314 100644 --- a/TESTING +++ b/TESTING @@ -11,7 +11,7 @@ INSTALL. 2) Install php and necessary modules: - # pacman -S php php-sqlite sqlite + # pacman -S php php-sqlite sqlite words fortune-mod 3) Prepare the testing database: -- 2.16.1

1 0

[PATCH] notify: Send vote reminders to TUs that are also devs as well
by Johannes Löthberg 13 Mar '18

13 Mar '18

Signed-off-by: Johannes Löthberg <johannes(a)kyriasis.com> --- aurweb/scripts/notify.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aurweb/scripts/notify.py b/aurweb/scripts/notify.py index 2d0f757..693abff 100755 --- a/aurweb/scripts/notify.py +++ b/aurweb/scripts/notify.py @@ -140,7 +140,7 @@ def get_request_recipients(conn, reqid): def get_tu_vote_reminder_recipients(conn, vote_id): cur = conn.execute('SELECT Email FROM Users ' + - 'WHERE AccountTypeID = 2 AND ID NOT IN ' + + 'WHERE AccountTypeID IN (2, 4) AND ID NOT IN ' + '(SELECT UserID FROM TU_Votes ' + 'WHERE TU_Votes.VoteID = ?)', [vote_id]) return [row[0] for row in cur.fetchall()] -- 2.16.2

2 1

[PATCH 1/1] TESTING: Adding 2 required packages in the documentation file. Replacing MySQL with SQLite in the comment
by Nodiv Byzero 11 Mar '18

11 Mar '18

--- TESTING | 2 +- schema/Makefile | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/TESTING b/TESTING index d2c97d9..9613314 100644 --- a/TESTING +++ b/TESTING @@ -11,7 +11,7 @@ INSTALL. 2) Install php and necessary modules: - # pacman -S php php-sqlite sqlite + # pacman -S php php-sqlite sqlite words fortune-mod 3) Prepare the testing database: diff --git a/schema/Makefile b/schema/Makefile index e0448ad..62d0856 100644 --- a/schema/Makefile +++ b/schema/Makefile @@ -3,6 +3,7 @@ aur-schema-sqlite.sql: aur-schema.sql -e 's/ ENGINE = InnoDB//' \ -e 's/ [A-Z]* UNSIGNED NOT NULL AUTO_INCREMENT/ INTEGER NOT NULL/' \ -e 's/([0-9, ]*) UNSIGNED / UNSIGNED /' \ + -e 's/ MySQL / SQLite /' \ $< >$@ clean: -- 2.16.1

2 2

Change aur-schema.sql to check if table exists
by Jelle van der Waa 10 Mar '18

10 Mar '18

Would it be possible to change the aur-schema.sql to check if tables exists before creating them? This would be easier for the Ansible role for deploying the AUR, since I can skip the check if the User table exists. I believe it would be as easy as changing it to: CREATE TABLE IF NOT EXISTS tbl_name -- Jelle van der Waa

1 0

[PATCH] Add capability for co-maintainers to disown packages
by Mark Weiman 10 Mar '18

10 Mar '18

Implements FS#53832 Signed-off-by: Mark Weiman <mark.weiman(a)markzz.com> --- web/html/pkgbase.php | 3 +++ web/html/pkgdisown.php | 13 ++++++++++--- web/lib/pkgbasefuncs.inc.php | 12 ++++++++++-- web/template/pkgbase_actions.php | 2 +- 4 files changed, 24 insertions(+), 6 deletions(-) diff --git a/web/html/pkgbase.php b/web/html/pkgbase.php index 03b0eee..cf9a6c6 100644 --- a/web/html/pkgbase.php +++ b/web/html/pkgbase.php @@ -60,6 +60,9 @@ if (check_token()) { $output = __("The selected packages have not been disowned, check the confirmation checkbox."); $ret = false; } + } elseif (current_action("do_DisownComaintainer")) { + $uid = uid_from_sid($_COOKIE["AURSID"]); + list($ret, $output) = pkgbase_remove_comaintainer($base_id, $uid); } elseif (current_action("do_Vote")) { list($ret, $output) = pkgbase_vote($ids, true); } elseif (current_action("do_UnVote")) { diff --git a/web/html/pkgdisown.php b/web/html/pkgdisown.php index 4b04e85..8da08cf 100644 --- a/web/html/pkgdisown.php +++ b/web/html/pkgdisown.php @@ -7,10 +7,13 @@ include_once("pkgfuncs.inc.php"); html_header(__("Disown Package")); +$action = "do_Disown"; + $maintainer_uids = array(pkgbase_maintainer_uid($base_id)); $comaintainers = pkgbase_get_comaintainers($base_id); +$comaintainer_uids = pkgbase_get_comaintainer_uids(array($base_id)); -if (has_credential(CRED_PKGBASE_DISOWN, $maintainer_uids)): ?> +if (has_credential(CRED_PKGBASE_DISOWN, array_merge($maintainer_uids, $comaintainer_uids))): ?> <div class="box"> <h2><?= __('Disown Package') ?>: <?= htmlspecialchars($pkgbase_name) ?></h2> <p> @@ -23,7 +26,11 @@ if (has_credential(CRED_PKGBASE_DISOWN, $maintainer_uids)): ?> <?php endforeach; ?> </ul> <p> - <?php if (count($comaintainers) > 0 && !has_credential(CRED_PKGBASE_DISOWN)): ?> + + <?php if (in_array(uid_from_sid($_COOKIE["AURSID"]), $comaintainer_uids) && !has_credential(CRED_PKGBASE_DISOWN)): + $action = "do_DisownComaintainer"; ?> + <?= __("By selecting the checkbox, you confirm that you want to no longer be a package co-maintainer.") ?> + <?php elseif (count($comaintainers) > 0 && !has_credential(CRED_PKGBASE_DISOWN)): ?> <?= __('By selecting the checkbox, you confirm that you want to disown the package and transfer ownership to %s%s%s.', '<strong>', $comaintainers[0], '</strong>'); ?> <?php else: ?> @@ -40,7 +47,7 @@ if (has_credential(CRED_PKGBASE_DISOWN, $maintainer_uids)): ?> <?php endif; ?> <p><label class="confirmation"><input type="checkbox" name="confirm" value="1" /> <?= __("Confirm to disown the package") ?></label</p> - <p><input type="submit" class="button" name="do_Disown" value="<?= __("Disown") ?>" /></p> + <p><input type="submit" class="button" name="<?= $action ?>" value="<?= __("Disown") ?>" /></p> </fieldset> </form> </div> diff --git a/web/lib/pkgbasefuncs.inc.php b/web/lib/pkgbasefuncs.inc.php index ff1bc90..16f95da 100644 --- a/web/lib/pkgbasefuncs.inc.php +++ b/web/lib/pkgbasefuncs.inc.php @@ -1158,11 +1158,12 @@ function pkgbase_get_comaintainer_uids($base_ids) { * * @param int $base_id The package base ID to update the co-maintainers of * @param array $users Array of co-maintainer user names + * @param boolean $override Override credential check if true * * @return array Tuple of success/failure indicator and error message */ -function pkgbase_set_comaintainers($base_id, $users) { - if (!has_credential(CRED_PKGBASE_EDIT_COMAINTAINERS, array(pkgbase_maintainer_uid($base_id)))) { +function pkgbase_set_comaintainers($base_id, $users, $override=false) { + if (!$override && !has_credential(CRED_PKGBASE_EDIT_COMAINTAINERS, array(pkgbase_maintainer_uid($base_id)))) { return array(false, __("You are not allowed to manage co-maintainers of this package base.")); } @@ -1213,3 +1214,10 @@ function pkgbase_set_comaintainers($base_id, $users) { return array(true, __("The package base co-maintainers have been updated.")); } + +function pkgbase_remove_comaintainer($base_id, $uid) { + $uname = username_from_id($uid); + $names = pkgbase_get_comaintainers($base_id); + $names = array_diff($names, array($uname)); + return pkgbase_set_comaintainers($base_id, $names, true); +} diff --git a/web/template/pkgbase_actions.php b/web/template/pkgbase_actions.php index d3f0592..5eee547 100644 --- a/web/template/pkgbase_actions.php +++ b/web/template/pkgbase_actions.php @@ -41,7 +41,7 @@ <?php if ($uid && $row["MaintainerUID"] === NULL): ?> <li><?= html_action_form($base_uri . 'adopt/', "do_Adopt", __('Adopt Package')) ?></li> - <?php elseif (has_credential(CRED_PKGBASE_DISOWN, array($row["MaintainerUID"]))): ?> + <?php elseif (has_credential(CRED_PKGBASE_DISOWN, array_merge(array($row["MaintainerUID"]), pkgbase_get_comaintainer_uids(array($base_id))))): ?> <li><?= html_action_form($base_uri . 'disown/', "do_Disown", __('Disown Package')) ?></li> <?php endif; ?> </ul> -- 2.16.1

4 6

[PATCH 0/1] Update cache code to INI style configuration
by Jelle van der Waa 10 Mar '18

10 Mar '18

This updates the cache code to make it possible to enable memcache for the cache of MySQL data. I couldn't get APC working and can't figure out if Arch still supports it, I'd suggest getting rid of it. Would you accept more patches to use memcache caching? Jelle van der Waa (1): Update cache code to INI style configuration INSTALL | 6 ++++++ conf/config.proto | 3 +++ web/lib/cachefuncs.inc.php | 10 +++------- 3 files changed, 12 insertions(+), 7 deletions(-) -- 2.16.2

2 2

[PATCH] Remove unused variable $dbh in pkgbase_display_details
by Jelle van der Waa 10 Mar '18

10 Mar '18

Signed-off-by: Jelle van der Waa <jelle(a)vdwaa.nl> --- web/lib/pkgbasefuncs.inc.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/web/lib/pkgbasefuncs.inc.php b/web/lib/pkgbasefuncs.inc.php index ff1bc90..ed4f3d0 100644 --- a/web/lib/pkgbasefuncs.inc.php +++ b/web/lib/pkgbasefuncs.inc.php @@ -264,8 +264,6 @@ function pkgbase_get_details($base_id) { * @return void */ function pkgbase_display_details($base_id, $row, $SID="") { - $dbh = DB::connect(); - if (isset($row['error'])) { print "<p>" . $row['error'] . "</p>\n"; } -- 2.16.2

2 1