- Aur-dev - lists.archlinux.org

[aur-dev] [PATCH 1/2] pkg_details: Convert most action links to forms
by Lukas Fleischer 27 Aug '13

27 Aug '13

Use forms and POST instead of GET for following actions: * Flagging/Unflagging a package out-of-date * Voting for a package and removing votes * Enabling/Disabling notifications Use CSS to make the submit buttons of these forms look like links. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/html/css/aur.css | 19 +++++++++++++++++++ web/template/pkg_details.php | 36 ++++++++++++++++++++++++++++++------ 2 files changed, 49 insertions(+), 6 deletions(-) diff --git a/web/html/css/aur.css b/web/html/css/aur.css index bae8e21..a8fb009 100644 --- a/web/html/css/aur.css +++ b/web/html/css/aur.css @@ -14,3 +14,22 @@ #pkg-stats td.stat-desc { white-space: normal; } + +#actionlist form { + margin: 0; + padding: 0; +} + +#actionlist .text-button { + color: #07b; + background: none; + border: none; + padding: 0; + cursor: pointer; + font-size: 100%; +} + +#actionlist .text-button:hover { + text-decoration: underline; + color: #666; +} diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php index 0973448..bd54923 100644 --- a/web/template/pkg_details.php +++ b/web/template/pkg_details.php @@ -39,20 +39,44 @@ $sources = package_sources($row["ID"]); <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 ($row["OutOfDateTS"] === NULL): ?> - <li><a href="<?= get_pkg_uri($row['Name']) . 'flag/'; ?>"><?= __('Flag package out-of-date'); ?></a></li> + <li> + <form action="<?= get_pkg_uri($row['Name']) . 'flag/'; ?>" method="post"> + <input type="submit" class="button text-button" name="do_Flag" value="<?= __('Flag package out-of-date') ?>" /> + </form> + </li> <?php elseif (($row["OutOfDateTS"] !== NULL) && ($uid == $row["MaintainerUID"] || $atype == "Trusted User" || $atype == "Developer")): ?> - <li><a href="<?= get_pkg_uri($row['Name']) . 'unflag/'; ?>"><?= __('Unflag package'); ?></a></li> + <li> + <form action="<?= get_pkg_uri($row['Name']) . 'unflag/'; ?>" method="post"> + <input type="submit" class="button text-button" name="do_UnFlag" value="<?= __('Unflag package') ?>" /> + </form> + </li> <?php endif; ?> <?php if (user_voted($uid, $row['ID'])): ?> - <li><a href="<?= get_pkg_uri($row['Name']) . 'unvote/'; ?>"><?= __('Remove vote'); ?></a></li> + <li> + <form action="<?= get_pkg_uri($row['Name']) . 'unvote/'; ?>" method="post"> + <input type="submit" class="button text-button" name="do_UnVote" value="<?= __('Remove vote') ?>" /> + </form> + </li> <?php else: ?> - <li><a href="<?= get_pkg_uri($row['Name']) . 'vote/'; ?>"><?= __('Vote for this package'); ?></a></li> + <li> + <form action="<?= get_pkg_uri($row['Name']) . 'vote/'; ?>" method="post"> + <input type="submit" class="button text-button" name="do_Vote" value="<?= __('Vote for this package') ?>" /> + </form> + </li> <?php endif; ?> <?php if (user_notify($uid, $row['ID'])): ?> - <li><a href="<?= get_pkg_uri($row['Name']) . 'unnotify/'; ?>"><?= __('Disable notifications'); ?></a></li> + <li> + <form action="<?= get_pkg_uri($row['Name']) . 'unnotify/'; ?>" method="post"> + <input type="submit" class="button text-button" name="do_UnNotify" value="<?= __('Disable notifications') ?>" /> + </form> + </li> <?php else: ?> - <li><a href="<?= get_pkg_uri($row['Name']) . 'notify/'; ?>"><?= __('Notify of new comments'); ?></a></li> + <li> + <form action="<?= get_pkg_uri($row['Name']) . 'notify/'; ?>" method="post"> + <input type="submit" class="button text-button" name="do_Notify" value="<?= __('Notify of new comments') ?>" /> + </form> + </li> <?php endif; ?> <?php if ($atype == "Trusted User" || $atype == "Developer"): ?> <li><a href="<?= get_pkg_uri($row['Name']) . 'delete/'; ?>"><?= __('Delete Package'); ?></a></li> -- 1.8.4.rc3.500.gc3113b0

1 1

[aur-dev] [PATCH] tu_details.php: Avoid division by zero
by Lukas Fleischer 26 Aug '13

26 Aug '13

Do not divide by zero if the number of active TUs is unknown. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/template/tu_details.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/web/template/tu_details.php b/web/template/tu_details.php index c09e30c..667956b 100644 --- a/web/template/tu_details.php +++ b/web/template/tu_details.php @@ -6,7 +6,9 @@ $active_tus = $row["ActiveTUs"]; $quorum = $row["Quorum"]; $total = $yes + $no + $abstain; -$participation = $total / $active_tus; +if ($active_tus > 0) { + $participation = $total / $active_tus; +} if ($yes > $active_tus / 2) { $vote_accepted = true; -- 1.8.4.rc3.500.gc3113b0

2 2

[aur-dev] [PATCH 1/2] Add "Last Votes by TU" list
by Lukas Fleischer 26 Aug '13

26 Aug '13

This shows a list of all Trusted Users and the vote ID of the last proposal each of the TUs voted on. This list is sorted by vote ID. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/html/tu.php | 2 ++ web/lib/acctfuncs.inc.php | 19 ++++++++++++++++++ web/template/tu_last_votes_list.php | 40 +++++++++++++++++++++++++++++++++++++ 3 files changed, 61 insertions(+) create mode 100644 web/template/tu_last_votes_list.php diff --git a/web/html/tu.php b/web/html/tu.php index e2f7712..d221619 100644 --- a/web/html/tu.php +++ b/web/html/tu.php @@ -134,6 +134,8 @@ if ($atype == "Trusted User" || $atype == "Developer") { <?php endif; ?> </div> <?php + $result = last_votes_list(); + include("tu_last_votes_list.php"); } } else { diff --git a/web/lib/acctfuncs.inc.php b/web/lib/acctfuncs.inc.php index 31cdd79..f52dfc3 100644 --- a/web/lib/acctfuncs.inc.php +++ b/web/lib/acctfuncs.inc.php @@ -996,6 +996,25 @@ function past_proposal_list($order, $lim) { } /** + * Get the vote ID of the last vote of all Trusted Users + * + * @return array The vote ID of the last vote of each Trusted User + */ +function last_votes_list() { + $dbh = DB::connect(); + + $q = "SELECT UserID, MAX(VoteID) AS LastVote FROM TU_Votes GROUP BY UserID ORDER BY VoteID DESC"; + $result = $dbh->query($q); + + $details = array(); + while ($row = $result->fetch(PDO::FETCH_ASSOC)) { + $details[] = $row; + } + + return $details; +} + +/** * Determine the total number of Trusted User proposals * * @return string The total number of Trusted User proposals diff --git a/web/template/tu_last_votes_list.php b/web/template/tu_last_votes_list.php new file mode 100644 index 0000000..090ce8d --- /dev/null +++ b/web/template/tu_last_votes_list.php @@ -0,0 +1,40 @@ +<div class="box"> + <h2><?= __("Last Votes by TU") ?></h2> + <table class="results"> + <thead> + <tr> + <th><?= __("User") ?></th> + <th><?= __("Last vote") ?></th> + </tr> + </thead> + + <tbody> + <?php if (empty($result)): ?> + <tr><td align="center" colspan="0"><?= __("No results found.") ?></td></tr> + <?php else: while (list($indx, $row) = each($result)): + if ($indx % 2): + $c = "even"; + else: + $c = "odd"; + endif; + $username = username_from_id($row["UserID"]); + ?> + <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')?> <?= htmlspecialchars($username) ?>"><?= htmlspecialchars($username) ?></a></td> + <?php else: ?> + <a href="<?= get_uri('/account/') . htmlspecialchars($username, ENT_QUOTES) ?>" title="<?= __('View account information for %s', htmlspecialchars($username)) ?>"><?= htmlspecialchars($username) ?></a> + <?php endif; ?> + </td> + <td> + <a href="<?= get_uri('/tu/'); ?>?id=<?= $row['LastVote'] ?>"><?= intval($row["LastVote"]) ?></a> + </td> + </tr> + <?php + endwhile; + endif; + ?> + </tbody> + </table> +</div> -- 1.8.4.rc3.500.gc3113b0

1 1

[aur-dev] [PATCH v2 0/7] Display vote results on the Proposal Details page
by Lukas Fleischer 22 Aug '13

22 Aug '13

Reroll with some minor changes. Counting the total number of TUs instead of the number of active TUs now (adapted to recent bylaws changes). Dropped the patches to update participation if a TU becomes active during the voting period since they are no longer needed. I kept [1/7]: "Allow for setting an account's inactivity status" since it is a useful feature anyway. Lukas Fleischer (7): Allow for setting an account's inactivity status Store the number of TUs when starting a vote Show participation in vote details Add a quorum column to TU_VoteInfo Add a vote type to the TU proposal form tu_details.php: Avoid inline computations tu_details.php: Display vote result UPGRADING | 18 +++++++++++++++ support/schema/aur-schema.sql | 3 +++ web/html/account.php | 5 +++-- web/html/addvote.php | 46 ++++++++++++++++++++++++++++---------- web/lib/acctfuncs.inc.php | 41 +++++++++++++++++++++++++-------- web/template/account_details.php | 6 +++++ web/template/account_edit_form.php | 5 +++++ web/template/tu_details.php | 43 +++++++++++++++++++++++++++++++---- 8 files changed, 140 insertions(+), 27 deletions(-) -- 1.8.4.rc3.500.gc3113b0

1 7

[aur-dev] AUR 2.2.1 released
by Lukas Fleischer 17 Aug '13

17 Aug '13

Important changes: * Retrieve package details after package actions are processed. * Update aurblup for pacman 4.1 API changes. * Fix PHP 5.5 compatibility. Check the Git log [1] for a complete list. [1] http://projects.archlinux.org/aur.git/log/?id=v2.2.1

1 0

[aur-dev] [acpi_call-git] makepkg fails when applying x86_64 patch
by Vadim Kochan 17 Aug '13

17 Aug '13

Hi AUR devs, I just tried to makepkg for acpi_call-git package and it fails because of rejected acpi_call-x86_64.patch. I compared the patch and original file and they are with the same changes. As a local fix I used: --- PKGBUILD 2013-08-17 03:36:47.690127666 +0300 +++ PKGBUILD 2013-08-17 03:37:31.380127165 +0300 @@ -46,12 +46,6 @@ sed -i 's|/lib/modules/|/usr/lib/modules/|g' ./Makefile || return 1 fi - ## x86_64 Patch - if [ "$CARCH" = "x86_64" ]; then - msg "Patching for x86_64 systems" - patch -p1 -i ${srcdir}/acpi_call-x86_64.patch - fi - ## Build make } I think that patch should be removed too. Thanks, Vadim

3 2

[aur-dev] [PATCH 0/7] Display vote results on the Proposal Details page
by Lukas Fleischer 08 Aug '13

08 Aug '13

This is a resubmission of the two patch series I submitted yesterday with Florian's suggestions incorporated. Further comments welcome. Lukas Fleischer (7): Allow for setting an account's inactivity status Store the number of active TUs when starting a vote Show participation in vote details Add a quorum column to TU_VoteInfo Add a vote type to the TU proposal form tu_details.php: Avoid inline computations tu_details.php: Display vote result UPGRADING | 18 +++++++++++++++ support/schema/aur-schema.sql | 3 +++ web/html/account.php | 5 +++-- web/html/addvote.php | 46 ++++++++++++++++++++++++++++---------- web/lib/acctfuncs.inc.php | 42 ++++++++++++++++++++++++++-------- web/template/account_details.php | 6 +++++ web/template/account_edit_form.php | 5 +++++ web/template/tu_details.php | 43 +++++++++++++++++++++++++++++++---- 8 files changed, 141 insertions(+), 27 deletions(-) -- 1.8.4.rc1.383.g13e9f3f

3 11

[aur-dev] [PATCH 1/2] Store active TUs for each vote
by Lukas Fleischer 06 Aug '13

06 Aug '13

This allows for easily keeping track of TUs that become active during a voting period later. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- UPGRADING | 18 +++++++++++++----- support/schema/aur-schema.sql | 10 +++++++++- web/lib/acctfuncs.inc.php | 23 ++++++++++++++--------- 3 files changed, 36 insertions(+), 15 deletions(-) diff --git a/UPGRADING b/UPGRADING index a300a91..740078c 100644 --- a/UPGRADING +++ b/UPGRADING @@ -10,13 +10,21 @@ From 2.2.0 to 2.3.0 ALTER TABLE Users ADD COLUMN InactivityTS BIGINT NOT NULL DEFAULT 0; ---- -2. Add fields to store the number of active TUs and the quorum to the - "TU_VoteInfo" table: +2. Add a field to store the quorum to the "TU_VoteInfo" table: ---- -ALTER TABLE TU_VoteInfo - ADD COLUMN ActiveTUs tinyint(3) unsigned NOT NULL default '0', - ADD COLUMN Quorum decimal(2, 2) unsigned NOT NULL; +ALTER TABLE TU_VoteInfo ADD COLUMN Quorum decimal(2, 2) unsigned NOT NULL; +---- + +3. Create the "TU_VoteActive" table: + +---- +CREATE TABLE IF NOT EXISTS TU_VoteActive ( + VoteID int(10) unsigned NOT NULL, + UserID int(10) unsigned NOT NULL, + FOREIGN KEY (VoteID) REFERENCES TU_VoteInfo(ID) ON DELETE CASCADE, + FOREIGN KEY (UserID) REFERENCES Users(ID) ON DELETE CASCADE +) ENGINE = InnoDB; ---- From 2.1.0 to 2.2.0 diff --git a/support/schema/aur-schema.sql b/support/schema/aur-schema.sql index 59da3aa..6efe91c 100644 --- a/support/schema/aur-schema.sql +++ b/support/schema/aur-schema.sql @@ -203,11 +203,19 @@ CREATE TABLE IF NOT EXISTS TU_VoteInfo ( Yes tinyint(3) unsigned NOT NULL default '0', No tinyint(3) unsigned NOT NULL default '0', Abstain tinyint(3) unsigned NOT NULL default '0', - ActiveTUs tinyint(3) unsigned NOT NULL default '0', PRIMARY KEY (ID), FOREIGN KEY (SubmitterID) REFERENCES Users(ID) ON DELETE CASCADE ) ENGINE = InnoDB; +-- TUs being active during a specific voting period +-- +CREATE TABLE IF NOT EXISTS TU_VoteActive ( + VoteID int(10) unsigned NOT NULL, + UserID int(10) unsigned NOT NULL, + FOREIGN KEY (VoteID) REFERENCES TU_VoteInfo(ID) ON DELETE CASCADE, + FOREIGN KEY (UserID) REFERENCES Users(ID) ON DELETE CASCADE +) ENGINE = InnoDB; + -- Individual vote records -- CREATE TABLE IF NOT EXISTS TU_Votes ( diff --git a/web/lib/acctfuncs.inc.php b/web/lib/acctfuncs.inc.php index 9df1856..3f7b595 100644 --- a/web/lib/acctfuncs.inc.php +++ b/web/lib/acctfuncs.inc.php @@ -618,19 +618,18 @@ function open_user_proposals($user) { function add_tu_proposal($agenda, $user, $votelength, $quorum, $submitteruid) { $dbh = DB::connect(); - $q = "SELECT COUNT(*) FROM Users WHERE AccountTypeID = 2 AND "; - $q.= "InactivityTS = 0"; - $result = $dbh->query($q); - $row = $result->fetch(PDO::FETCH_NUM); - $active_tus = $row[0]; - $q = "INSERT INTO TU_VoteInfo (Agenda, User, Submitted, End, Quorum, "; - $q.= "SubmitterID, ActiveTUs) VALUES "; + $q.= "SubmitterID) VALUES "; $q.= "(" . $dbh->quote($agenda) . ", " . $dbh->quote($user) . ", "; $q.= "UNIX_TIMESTAMP(), UNIX_TIMESTAMP() + " . $dbh->quote($votelength); - $q.= ", " . $dbh->quote($quorum) . ", " . $submitteruid . ", "; - $q.= $active_tus . ")"; + $q.= ", " . $dbh->quote($quorum) . ", " . $submitteruid . ")"; $result = $dbh->exec($q); + $vote_id = last_insert_id(); + + $q = "INSERT INTO TU_VoteActive (VoteID, UserID) SELECT "; + $q.= $vote_id . " AS VoteID, ID AS UserID FROM Users WHERE "; + $q.= "AccountTypeID = 2 AND InactivityTS = 0"; + $dbh->exec($q); } /** @@ -1026,6 +1025,12 @@ function vote_details($voteid) { $result = $dbh->query($q); $row = $result->fetch(PDO::FETCH_ASSOC); + $q = "SELECT COUNT(*) FROM TU_VoteActive WHERE VoteID = "; + $q.= intval($voteid); + $result = $dbh->query($q); + $row_ = $result->fetch(PDO::FETCH_NUM); + $row['ActiveTUs'] = $row_[0]; + return $row; } -- 1.8.4.rc1.383.g13e9f3f

2 3

[aur-dev] [PATCH 1/3] Add a quorum column to TU_VoteInfo
by Lukas Fleischer 04 Aug '13

04 Aug '13

This allows for specifying a quorum per vote and sets a basis for implementing automated acceptance/rejection of TU votes later. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- UPGRADING | 6 ++++-- support/schema/aur-schema.sql | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/UPGRADING b/UPGRADING index 307ed8d..a300a91 100644 --- a/UPGRADING +++ b/UPGRADING @@ -10,11 +10,13 @@ From 2.2.0 to 2.3.0 ALTER TABLE Users ADD COLUMN InactivityTS BIGINT NOT NULL DEFAULT 0; ---- -2. Add a field to store the number of active TUs to the "TU_VoteInfo" table: +2. Add fields to store the number of active TUs and the quorum to the + "TU_VoteInfo" table: ---- ALTER TABLE TU_VoteInfo - ADD COLUMN ActiveTUs tinyint(3) unsigned NOT NULL default '0'; + ADD COLUMN ActiveTUs tinyint(3) unsigned NOT NULL default '0', + ADD COLUMN Quorum decimal(2, 2) unsigned NOT NULL; ---- From 2.1.0 to 2.2.0 diff --git a/support/schema/aur-schema.sql b/support/schema/aur-schema.sql index 51f9601..59da3aa 100644 --- a/support/schema/aur-schema.sql +++ b/support/schema/aur-schema.sql @@ -198,6 +198,7 @@ CREATE TABLE IF NOT EXISTS TU_VoteInfo ( User VARCHAR(32) NOT NULL, Submitted bigint(20) unsigned NOT NULL, End bigint(20) unsigned NOT NULL, + Quorum decimal(2, 2) unsigned NOT NULL, SubmitterID int(10) unsigned NOT NULL, Yes tinyint(3) unsigned NOT NULL default '0', No tinyint(3) unsigned NOT NULL default '0', -- 1.8.4.rc1.383.g13e9f3f

2 6

[aur-dev] [PATCH 0/3] Automated TU vote participation calculation
by Lukas Fleischer 04 Aug '13

04 Aug '13

The first idea is to allow for setting one's inactivity status using the AUR instead of having to consult several different sources (mailing lists, the Wiki, archweb, ...) This allows for doing an automated calculation of vote participation. Note that this currently doesn't really match the TU bylaws since the bylaws define active TUs as the number of active TUs at the *end* of the vote, whereas this patch counts TUs when the vote is started. We should come up with a proper solution before this is merged (some additional patches; amend the bylaws?) Comments welcome. Lukas Fleischer (3): Allow for setting an account's inactivity status Store the number of active TUs when starting a vote Show participation in vote details UPGRADING | 16 ++++++++++++++++ support/schema/aur-schema.sql | 2 ++ web/html/account.php | 5 +++-- web/lib/acctfuncs.inc.php | 39 ++++++++++++++++++++++++++++++-------- web/template/account_details.php | 6 ++++++ web/template/account_edit_form.php | 9 +++++++++ web/template/tu_details.php | 6 ++++++ 7 files changed, 73 insertions(+), 10 deletions(-) -- 1.8.4.rc1.383.g13e9f3f

2 4