August 2015 - Aur-dev - lists.archlinux.org

[aur-dev] [PATCH 1/2] Remember user ID when flagging package bases
by Lukas Fleischer 30 Aug '15

30 Aug '15

Add a new FlaggerUID field to the database and use it to store the user ID of the account who recently flagged a package out-of-date. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- schema/aur-schema.sql | 2 ++ upgrading/4.1.0.txt | 8 ++++++++ web/lib/pkgbasefuncs.inc.php | 4 ++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/schema/aur-schema.sql b/schema/aur-schema.sql index 444cb5e..9556b20 100644 --- a/schema/aur-schema.sql +++ b/schema/aur-schema.sql @@ -84,6 +84,7 @@ CREATE TABLE PackageBases ( OutOfDateTS BIGINT UNSIGNED NULL DEFAULT NULL, SubmittedTS BIGINT UNSIGNED NOT NULL, ModifiedTS BIGINT UNSIGNED NOT NULL, + FlaggerUID BIGINT UNSIGNED NULL DEFAULT NULL, -- who flagged the package out-of-date? SubmitterUID INTEGER UNSIGNED NULL DEFAULT NULL, -- who submitted it? MaintainerUID INTEGER UNSIGNED NULL DEFAULT NULL, -- User PackagerUID INTEGER UNSIGNED NULL DEFAULT NULL, -- Last packager @@ -93,6 +94,7 @@ CREATE TABLE PackageBases ( INDEX (SubmitterUID), INDEX (MaintainerUID), INDEX (PackagerUID), + FOREIGN KEY (FlaggerUID) REFERENCES Users(ID) ON DELETE SET NULL, -- deleting a user will cause packages to be orphaned, not deleted FOREIGN KEY (SubmitterUID) REFERENCES Users(ID) ON DELETE SET NULL, FOREIGN KEY (MaintainerUID) REFERENCES Users(ID) ON DELETE SET NULL, diff --git a/upgrading/4.1.0.txt b/upgrading/4.1.0.txt index 7862030..c0bf573 100644 --- a/upgrading/4.1.0.txt +++ b/upgrading/4.1.0.txt @@ -7,3 +7,11 @@ ALTER TABLE PackageComments ADD COLUMN EditedUsersID INTEGER UNSIGNED NULL DEFAULT NULL, ADD FOREIGN KEY (EditedUsersID) REFERENCES Users(ID) ON DELETE SET NULL; ---- + +2. Add a field to store the ID of the last user who flagged a package +out-of-date: + +---- +ALTER TABLE PackageBases + ADD COLUMN FlaggerUID BIGINT UNSIGNED NULL DEFAULT NULL; +---- diff --git a/web/lib/pkgbasefuncs.inc.php b/web/lib/pkgbasefuncs.inc.php index 677ae6b..df1ae18 100644 --- a/web/lib/pkgbasefuncs.inc.php +++ b/web/lib/pkgbasefuncs.inc.php @@ -328,15 +328,15 @@ function pkgbase_flag($base_ids) { return array(false, __("You did not select any packages to flag.")); } + $uid = uid_from_sid($_COOKIE['AURSID']); $dbh = DB::connect(); $q = "UPDATE PackageBases SET"; - $q.= " OutOfDateTS = UNIX_TIMESTAMP()"; + $q.= " OutOfDateTS = UNIX_TIMESTAMP(), FlaggerUID = " . $uid; $q.= " WHERE ID IN (" . implode(",", $base_ids) . ")"; $q.= " AND OutOfDateTS IS NULL"; $dbh->exec($q); - $uid = uid_from_sid($_COOKIE['AURSID']); foreach ($base_ids as $base_id) { notify(array('flag', $uid, $base_id)); } -- 2.5.0

1 1

[aur-dev] [PATCH] updates_table.php: Fix identification of new packages
by Marcel Korpel 19 Aug '15

19 Aug '15

Currently, package creation has to be done separately from first submission, so ModifiedTS will never be the same as SubmittedTS. Consider all packages that are submitted within an hour from package creation as new. Signed-off-by: Marcel Korpel <marcel.korpel(a)gmail.com> --- web/template/stats/updates_table.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/template/stats/updates_table.php b/web/template/stats/updates_table.php index a4b31c5..775d707 100644 --- a/web/template/stats/updates_table.php +++ b/web/template/stats/updates_table.php @@ -10,7 +10,7 @@ <a href="<?= get_pkg_uri($row["Name"]); ?>" title="<?= htmlspecialchars($row["Name"]) . ' ' . htmlspecialchars($row["Version"]); ?>"><?= htmlspecialchars($row["Name"]) . ' ' . htmlspecialchars($row["Version"]); ?></a> </td> <td class="pkg-new"> - <?php if ($row["ModifiedTS"] === $row["SubmittedTS"]): ?> + <?php if ($row["ModifiedTS"] - $row["SubmittedTS"] < 3600): ?> <img src="images/new.png" alt="New!" /> <?php endif; ?> </td> -- 2.5.0

2 1

[aur-dev] [PATCH] updates_table.php: Consider packages first submitted in the last hour as new
by Marcel Korpel 19 Aug '15

19 Aug '15

Since there will always be a delay between package creation and its first submission, ModifiedTS will never be the same as SubmittedTS. Signed-off-by: Marcel Korpel <marcel.korpel(a)gmail.com> --- web/template/stats/updates_table.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/template/stats/updates_table.php b/web/template/stats/updates_table.php index a4b31c5..775d707 100644 --- a/web/template/stats/updates_table.php +++ b/web/template/stats/updates_table.php @@ -10,7 +10,7 @@ <a href="<?= get_pkg_uri($row["Name"]); ?>" title="<?= htmlspecialchars($row["Name"]) . ' ' . htmlspecialchars($row["Version"]); ?>"><?= htmlspecialchars($row["Name"]) . ' ' . htmlspecialchars($row["Version"]); ?></a> </td> <td class="pkg-new"> - <?php if ($row["ModifiedTS"] === $row["SubmittedTS"]): ?> + <?php if ($row["ModifiedTS"] - $row["SubmittedTS"] < 3600): ?> <img src="images/new.png" alt="New!" /> <?php endif; ?> </td> -- 2.5.0

2 2

[aur-dev] [PATCH] account_edit_form.php: Warn users to correctly enter their email address
by Marcel Korpel 19 Aug '15

19 Aug '15

Signed-off-by: Marcel Korpel <marcel.korpel(a)gmail.com> --- web/template/account_edit_form.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/web/template/account_edit_form.php b/web/template/account_edit_form.php index 0aadb9d..83aedb0 100644 --- a/web/template/account_edit_form.php +++ b/web/template/account_edit_form.php @@ -72,6 +72,10 @@ <input type="text" size="30" maxlength="64" name="E" id="id_email" value="<?= htmlspecialchars($E,ENT_QUOTES) ?>" /> (<?= __("required") ?>) </p> + <p> + <em><?= __("Please ensure you correctly entered your email address, otherwise you will be locked out.") ?></em> + </p> + <?php if ($A == "UpdateAccount"): ?> <p> <label for="id_passwd1"><?= __("Password") ?>:</label> -- 2.5.0

2 1

[aur-dev] [PATCH] Let the user verify their email address
by Marcel Korpel 17 Aug '15

17 Aug '15

On registering and updating an email address, the user has to type their email address twice. Do not allow autocomplete and pasting in the verification field. Fixes FS#45792. Signed-off-by: Marcel Korpel <marcel.korpel(a)gmail.com> --- web/html/account.php | 17 +++++++++-------- web/html/register.php | 6 +++--- web/lib/acctfuncs.inc.php | 12 +++++++++--- web/template/account_edit_form.php | 11 +++++++++++ 4 files changed, 32 insertions(+), 14 deletions(-) diff --git a/web/html/account.php b/web/html/account.php index adc2542..3452af3 100644 --- a/web/html/account.php +++ b/web/html/account.php @@ -32,10 +32,10 @@ if ($action == "UpdateAccount") { list($success, $update_account_message) = process_account_form( "edit", "UpdateAccount", in_request("U"), in_request("T"), in_request("S"), - in_request("E"), in_request("P"), in_request("C"), - in_request("R"), in_request("L"), in_request("I"), - in_request("K"), in_request("PK"), in_request("J"), - in_request("ID"), $row["Username"]); + in_request("E"), in_request("E2"), in_request("P"), + in_request("C"), in_request("R"), in_request("L"), + in_request("I"), in_request("K"), in_request("PK"), + in_request("J"), in_request("ID"), $row["Username"]); } } @@ -79,7 +79,7 @@ if (isset($_COOKIE["AURSID"])) { if (can_edit_account($row)) { display_account_form("UpdateAccount", $row["Username"], $row["AccountTypeID"], $row["Suspended"], $row["Email"], - "", "", $row["RealName"], $row["LangPreference"], + $row["Email"], "", "", $row["RealName"], $row["LangPreference"], $row["IRCNick"], $row["PGPKey"], $PK, $row["InactivityTS"] ? 1 : 0, $row["ID"], $row["Username"]); } else { @@ -115,9 +115,10 @@ if (isset($_COOKIE["AURSID"])) { if (!$success) { display_account_form("UpdateAccount", in_request("U"), in_request("T"), - in_request("S"), in_request("E"), in_request("P"), in_request("C"), - in_request("R"), in_request("L"), in_request("I"), in_request("K"), - in_request("PK"), in_request("J"), in_request("ID"), $row["Username"]); + in_request("S"), in_request("E"), in_request("E2"), in_request("P"), + in_request("C"), in_request("R"), in_request("L"), in_request("I"), + in_request("K"), in_request("PK"), in_request("J"), in_request("ID"), + $row["Username"]); } } else { diff --git a/web/html/register.php b/web/html/register.php index 9c5c1cc..483bc5e 100644 --- a/web/html/register.php +++ b/web/html/register.php @@ -21,7 +21,7 @@ echo '<h2>' . __('Register') . '</h2>'; if (in_request("Action") == "NewAccount") { list($success, $message) = process_account_form( "new", "NewAccount", in_request("U"), 1, 0, - in_request("E"), '', '', in_request("R"), + in_request("E"), in_request("E2"), '', '', in_request("R"), in_request("L"), in_request("I"), in_request("K"), in_request("PK")); @@ -29,13 +29,13 @@ if (in_request("Action") == "NewAccount") { if (!$success) { display_account_form("NewAccount", in_request("U"), 1, 0, - in_request("E"), '', '', in_request("R"), + in_request("E"), in_request("E2"), '', '', in_request("R"), in_request("L"), in_request("I"), in_request("K"), in_request("PK")); } } else { print '<p>' . __("Use this form to create an account.") . '</p>'; - display_account_form("NewAccount", "", "", "", "", "", "", "", $LANG); + display_account_form("NewAccount", "", "", "", "", "", "", "", "", $LANG); } echo '</div>'; diff --git a/web/lib/acctfuncs.inc.php b/web/lib/acctfuncs.inc.php index f718a77..942b7f8 100644 --- a/web/lib/acctfuncs.inc.php +++ b/web/lib/acctfuncs.inc.php @@ -47,6 +47,7 @@ function html_format_pgp_fingerprint($fingerprint) { * @param string $T The account type of the displayed user * @param string $S Whether the displayed user has a suspended account * @param string $E The e-mail address of the displayed user + * @param string $E2 The e-mail address of the user, verification field * @param string $P The password value of the displayed user * @param string $C The confirmed password value of the displayed user * @param string $R The real name of the displayed user @@ -60,7 +61,7 @@ function html_format_pgp_fingerprint($fingerprint) { * * @return void */ -function display_account_form($A,$U="",$T="",$S="",$E="",$P="",$C="",$R="", +function display_account_form($A,$U="",$T="",$S="",$E="",$E2="",$P="",$C="",$R="", $L="",$I="",$K="",$PK="",$J="",$UID=0,$N="") { global $SUPPORTED_LANGS; @@ -78,6 +79,7 @@ function display_account_form($A,$U="",$T="",$S="",$E="",$P="",$C="",$R="", * @param string $T The account type for the user * @param string $S Whether or not the account is suspended * @param string $E The e-mail address for the user + * @param string $E2 The e-mail address for the user, verification field * @param string $P The password for the user * @param string $C The confirmed password for the user * @param string $R The real name of the user @@ -91,7 +93,7 @@ function display_account_form($A,$U="",$T="",$S="",$E="",$P="",$C="",$R="", * * @return array Boolean indicating success and message to be printed */ -function process_account_form($TYPE,$A,$U="",$T="",$S="",$E="",$P="",$C="", +function process_account_form($TYPE,$A,$U="",$T="",$S="",$E="",$E2="",$P="",$C="", $R="",$L="",$I="",$K="",$PK="",$J="",$UID=0,$N="") { global $SUPPORTED_LANGS; @@ -114,10 +116,14 @@ function process_account_form($TYPE,$A,$U="",$T="",$S="",$E="",$P="",$C="", $editor_user = null; } - if (empty($E) || empty($U)) { + if (empty($E) || empty($E2) || empty($U)) { $error = __("Missing a required field."); } + if ($E != $E2) { + $error = __("Entered email addresses do not match."); + } + if ($TYPE != "new" && !$UID) { $error = __("Missing User ID"); } diff --git a/web/template/account_edit_form.php b/web/template/account_edit_form.php index 0aadb9d..1c1c1ab 100644 --- a/web/template/account_edit_form.php +++ b/web/template/account_edit_form.php @@ -72,6 +72,11 @@ <input type="text" size="30" maxlength="64" name="E" id="id_email" value="<?= htmlspecialchars($E,ENT_QUOTES) ?>" /> (<?= __("required") ?>) </p> + <p> + <label for="id_email_verify"><?= __("Verify Email Address") ?>:</label> + <input type="text" size="30" maxlength="64" name="E2" id="id_email_verify" autocomplete="off" value="<?= htmlspecialchars($E2,ENT_QUOTES) ?>" /> (<?= __("required") ?>) + </p> + <?php if ($A == "UpdateAccount"): ?> <p> <label for="id_passwd1"><?= __("Password") ?>:</label> @@ -136,3 +141,9 @@ </p> </fieldset> </form> +<script> +var verify_field = document.getElementById('id_email_verify'); +verify_field.addEventListener('paste', function (e) { + e.preventDefault(); +}, false); +</script> -- 2.5.0

5 8

[aur-dev] [PATCH] Rename unsupported packages into AUR packages
by Stefan Auditor 17 Aug '15

17 Aug '15

Fixes FS#45381. Signed-off-by: Stefan Auditor <stefan.auditor(a)erdfisch.de> --- web/html/home.php | 2 +- web/template/cgit/footer.html | 2 +- web/template/footer.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/web/html/home.php b/web/html/home.php index 3252876..23f37fe 100644 --- a/web/html/home.php +++ b/web/html/home.php @@ -39,7 +39,7 @@ html_header( __("Home") ); </p> <p class="important"> <?= __('DISCLAIMER') ?>: - <?= __('Unsupported packages are user produced content. Any use of the provided files is at your own risk.'); ?> + <?= __('AUR packages are user produced content. Any use of the provided files is at your own risk.'); ?> </p> <p class="readmore"><a href="https://wiki.archlinux.org/index.php/AUR"><?= __('Learn more...') ?></a></p> </div> diff --git a/web/template/cgit/footer.html b/web/template/cgit/footer.html index 80481d9..36e0f1b 100644 --- a/web/template/cgit/footer.html +++ b/web/template/cgit/footer.html @@ -1,6 +1,6 @@ <div id="footer"> <p> Copyright © 2004-2014 aurweb Development Team – - <strong>Unsupported packages are user produced content. Any use of the provided files is at your own risk.</strong> + <strong>AUR packages are user produced content. Any use of the provided files is at your own risk.</strong> </p> </div> diff --git a/web/template/footer.php b/web/template/footer.php index 068cc06..1b3c936 100644 --- a/web/template/footer.php +++ b/web/template/footer.php @@ -6,7 +6,7 @@ <p>aurweb <a href="https://projects.archlinux.org/aurweb.git/log/?h=<?= htmlspecialchars($ver, ENT_QUOTES) ?>"><?= htmlspecialchars($ver) ?></a></p> <?php endif; ?> <p>Copyright © 2004-<?= date("Y") ?> aurweb Development Team.</p> - <p><?= __('Unsupported packages are user produced content. Any use of the provided files is at your own risk.') ?></p> + <p><?= __('AUR packages are user produced content. Any use of the provided files is at your own risk.') ?></p> </div> </div> </body> -- 2.5.0

2 1

[aur-dev] [PATCH 1/2] Remove success message from comment form
by Marcel Korpel 16 Aug '15

16 Aug '15

To be more flexible with messages, we shouldn't always output this message when a comment has been sent. Moreover, currently it is not displayed due to the POST-Redirect-GET pattern, where the comment parameter is lost after redirection. Signed-off-by: Marcel Korpel <marcel.korpel(a)gmail.com> --- web/template/pkg_comment_form.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/web/template/pkg_comment_form.php b/web/template/pkg_comment_form.php index 7c16eb7..c450c4b 100644 --- a/web/template/pkg_comment_form.php +++ b/web/template/pkg_comment_form.php @@ -1,10 +1,5 @@ <form action="<?= get_pkgbase_uri($pkgbase_name) ?>" method="post"> <fieldset> -<?php -if (isset($_REQUEST['comment']) && check_token()) { - echo '<p>' . __('Comment has been added.') . '</p>'; -} -?> <div> <input type="hidden" name="action" value="<?= (isset($comment_id)) ? "do_EditComment" : "do_AddComment" ?>" /> <input type="hidden" name="ID" value="<?= intval($base_id) ?>" /> -- 2.5.0

1 1

[aur-dev] [PATCH] Display sources count on package details page
by Stefan Auditor 16 Aug '15

16 Aug '15

Show item count on sources section just like it is done for dependencies and required by. Fixes FS#45881. Signed-off-by: Stefan Auditor <stefan.auditor(a)erdfisch.de> --- web/template/pkg_details.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php index ae8d084..c79c00f 100644 --- a/web/template/pkg_details.php +++ b/web/template/pkg_details.php @@ -285,7 +285,7 @@ endif; <?php endif; ?> </div> <div id="pkgfiles" class="listing"> - <h3><?= __('Sources') ?></h3> + <h3><?= __('Sources') . " (" . count($sources) . ")"?></h3> </div> <?php if (count($sources) > 0): ?> <div> -- 2.5.0

1 0

[aur-dev] [PATCH] Update link to package submission documentation
by Stefan Auditor 16 Aug '15

16 Aug '15

Fixes FS#45942. Signed-off-by: Stefan Auditor <stefan.auditor(a)erdfisch.de> --- web/html/home.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/html/home.php b/web/html/home.php index 3252876..5b7081f 100644 --- a/web/html/home.php +++ b/web/html/home.php @@ -77,7 +77,7 @@ html_header( __("Home") ); <?php echo __( 'Git over SSH is now used to submit packages to the AUR. See the %sSubmitting packages%s section of the Arch User Repository ArchWiki page for more details.', - '<a href="https://wiki.archlinux.org/index.php/Arch_User_Repository#AUR_4">', + '<a href="https://wiki.archlinux.org/index.php/Arch_User_Repository#Submitting_packag…">', '</a>' ); ?> -- 2.5.0

1 0

[aur-dev] [PATCH] FS#45834 - Remove trailing slash from git https://link.git/
by Stefan Auditor 16 Aug '15

16 Aug '15

Signed-off-by: Stefan Auditor <stefan.auditor(a)erdfisch.de> --- conf/config.proto | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/config.proto b/conf/config.proto index 2fbc27a..b2198e5 100644 --- a/conf/config.proto +++ b/conf/config.proto @@ -18,8 +18,8 @@ persistent_cookie_timeout = 2592000 max_filesize_uncompressed = 8388608 disable_http_login = 1 aur_location = https://aur.archlinux.org -git_clone_uri_anon = https://aur.archlinux.org/%s.git/ -git_clone_uri_priv = ssh+git://aur@aur.archlinux.org/%s.git/ +git_clone_uri_anon = https://aur.archlinux.org/%s.git +git_clone_uri_priv = ssh+git://aur@aur.archlinux.org/%s.git max_rpc_results = 5000 aur_request_ml = aur-requests(a)archlinux.org request_idle_time = 1209600 -- 2.5.0

5 9