September 2011 - Aur-dev - lists.archlinux.org

[aur-dev] [PATCH 1/6] Remove a boatload of inline table styles
by Dan McGee 24 Oct '11

24 Oct '11

Replacing with CSS styles where appropriate. A previously unused CSS style is tweaked in the stylesheet to match most of what was done via non-CSS styling. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- Things look mostly the same on all these pages. However, there are a few exceptions- for example, the removal of the needless centering of the account search form. web/html/css/arch.css | 9 +++++---- web/html/index.php | 2 +- web/html/pkgsubmit.php | 2 +- web/lib/acctfuncs.inc.php | 14 ++++---------- web/template/pkg_search_results.php | 18 +++++++++--------- web/template/search_accounts_form.php | 2 +- web/template/tu_details.php | 12 ++++++------ web/template/tu_list.php | 16 ++++++++-------- 8 files changed, 35 insertions(+), 40 deletions(-) diff --git a/web/html/css/arch.css b/web/html/css/arch.css index eec02ee..1e588f1 100644 --- a/web/html/css/arch.css +++ b/web/html/css/arch.css @@ -244,13 +244,14 @@ table.center { } table.results { padding: 0px; + width: 100%; border-collapse: collapse; } .results th { - background-color: #e1e3e6; - border-bottom: 1px solid #46494d; - border-top: 1px solid #46494d; - padding: 0px 5px 0px 0px; + text-align: center; +} +.results th, .results td { + padding: 1px; } .results th>a { text-decoration: none; diff --git a/web/html/index.php b/web/html/index.php index 138541f..0d513d3 100644 --- a/web/html/index.php +++ b/web/html/index.php @@ -50,7 +50,7 @@ echo __( <br /> <?php echo __('Some packages may be provided as binaries in [community].'); ?> </p> -<table border='0' cellpadding='0' cellspacing='3' width='90%'> +<table> <tr> <td class='boxSoft' valign='top'> <?php updates_table($dbh); ?> diff --git a/web/html/pkgsubmit.php b/web/html/pkgsubmit.php index a5cc0c0..54c4b3e 100644 --- a/web/html/pkgsubmit.php +++ b/web/html/pkgsubmit.php @@ -437,7 +437,7 @@ html_header("Submit"); <form action='pkgsubmit.php' method='post' enctype='multipart/form-data'> <div> <input type='hidden' name='pkgsubmit' value='1' /> </div> - <table border='0' cellspacing='5'> + <table> <tr> <td class='f4' align='right'><?php print __("Package Category"); ?>:</td> <td class='f4' align='left'> diff --git a/web/lib/acctfuncs.inc.php b/web/lib/acctfuncs.inc.php index 59fa730..4c6da9f 100644 --- a/web/lib/acctfuncs.inc.php +++ b/web/lib/acctfuncs.inc.php @@ -35,7 +35,7 @@ function display_account_form($UTYPE,$A,$U="",$T="",$S="", print "<input type='hidden' name='ID' value='".$UID."' />\n"; } print "</fieldset>"; - print "<table border='0' cellpadding='0' cellspacing='0' width='80%' style=\"margin:0 auto;\">\n"; + print "<table>\n"; print "<tr><td colspan='2'> </td></tr>\n"; print "<tr>"; @@ -415,13 +415,7 @@ function search_results_page($UTYPE,$O=0,$SB="",$U="",$T="", } else { $num_rows = mysql_num_rows($result); if ($num_rows) { - print "<table border='0' cellpadding='0'"; - print " cellspacing='0' width='90%'"; - print " style=\"margin:0 auto\">\n"; - print "<tr>"; - print "<td colspan='2'>"; - print "<table border='0' cellpadding='0'"; - print " cellspacing='0' width='100%'>\n"; + print "<table class='results'>\n"; print "<tr>"; print "<th class='header'>"; print "<span class='f2'>".__("Username")."</span></th>"; @@ -483,8 +477,8 @@ function search_results_page($UTYPE,$O=0,$SB="",$U="",$T="", $i++; } print "</table>\n"; - print "</td></tr>\n"; + print "<table class='results'>\n"; print "<tr>"; print "<td align='left'>"; print "<form action='account.php' method='post'>\n"; @@ -540,7 +534,7 @@ function display_account_info($U="", $T="", $E="", $R="", $I="") { global $SUPPORTED_LANGS; - print "<table border='0' cellpadding='0' cellspacing='0' width='33%' style=\"margin:0 auto;\">\n"; + print "<table>\n"; print " <tr>\n"; print " <td colspan='2'> </td>\n"; print " </tr>\n"; diff --git a/web/template/pkg_search_results.php b/web/template/pkg_search_results.php index e576e6e..8ef352b 100644 --- a/web/template/pkg_search_results.php +++ b/web/template/pkg_search_results.php @@ -12,32 +12,32 @@ -<table width='100%' cellspacing='0' cellpadding='2'> +<table class='results'> <tr> <?php if ($SID): ?> - <th style='border-bottom: #666 1px solid; vertical-align: bottom'> </th> + <th class='header'> </th> <?php endif; ?> - <th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'> + <th class='header'><span class='f2'> <a href='?<?php print mkurl('SB=c&SO=' . $SO_next) ?>'><?php print __("Category") ?></a> </span></th> - <th style='border-bottom: #666 1px solid; vertical-align: bottom; text-align: center;'><span class='f2'> + <th class='header'><span class='f2'> <a href='?<?php print mkurl('SB=n&SO=' . $SO_next) ?>'><?php print __("Name") ?></a> </span></th> - <th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'> + <th class='header'><span class='f2'> <a href='?<?php print mkurl('SB=v&SO=' . $SO_next) ?>'><?php print __("Votes") ?></a> </span></th> <?php if ($SID): ?> - <th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'> + <th class='header'><span class='f2'> <a href='?<?php print mkurl('SB=w&SO=' . $SO_next) ?>'><?php print __("Voted") ?></a> </span></th> - <th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'> + <th class='header'><span class='f2'> <a href='?<?php print mkurl('SB=o&SO=' . $SO_next) ?>'><?php print __("Notify") ?></a> </span></th> <?php endif; ?> - <th style='border-bottom: #666 1px solid; vertical-align: bottom; text-align: center;'><span class='f2'><?php print __("Description") ?></span></th> - <th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'> + <th class='header'><span class='f2'><?php print __("Description") ?></span></th> + <th class='header'><span class='f2'> <a href='?<?php print mkurl('SB=m&SO=' . $SO_next) ?>'><?php print __("Maintainer") ?></a> </span></th> </tr> diff --git a/web/template/search_accounts_form.php b/web/template/search_accounts_form.php index 9d6c40d..9b0d8e2 100644 --- a/web/template/search_accounts_form.php +++ b/web/template/search_accounts_form.php @@ -1,6 +1,6 @@ <br /> <form action='account.php' method='post'> - <table border='0' cellpadding='0' cellspacing='0' width='80%' style="margin:0 auto;"> + <table> <tr> <td align='left'><?php print __("Username"); ?>:</td> diff --git a/web/template/tu_details.php b/web/template/tu_details.php index 7d6c305..c48f603 100644 --- a/web/template/tu_details.php +++ b/web/template/tu_details.php @@ -24,13 +24,13 @@ N/A <?php print str_replace("\n", "<br />\n", htmlspecialchars($row['Agenda'])) ?> </p> -<table class="boxSoft" width='100%' cellspacing='0' cellpadding='2'> +<table class="boxSoft"> <tr> -<th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'><?php print __("Yes") ?></span></th> -<th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'><?php print __("No") ?></span></th> -<th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'><?php print __("Abstain") ?></span></th> -<th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'><?php print __("Total") ?></span></th> -<th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'><?php print __('Voted') ?></span></th> +<th class='boxSoftTitle'><span class='f2'><?php print __("Yes") ?></span></th> +<th class='boxSoftTitle'><span class='f2'><?php print __("No") ?></span></th> +<th class='boxSoftTitle'><span class='f2'><?php print __("Abstain") ?></span></th> +<th class='boxSoftTitle'><span class='f2'><?php print __("Total") ?></span></th> +<th class='boxSoftTitle'><span class='f2'><?php print __('Voted') ?></span></th> </tr> <tr> <td class='data1'><span class='f5'><span class='blue'><?php print $row['Yes'] ?></span></span></td> diff --git a/web/template/tu_list.php b/web/template/tu_list.php index 75d9414..0966a4c 100644 --- a/web/template/tu_list.php +++ b/web/template/tu_list.php @@ -2,17 +2,17 @@ <div class="pgboxtitle" style="text-align:right;"> <span class='f3'><?php print $type ?></span> </div> - <table width='100%' cellspacing='0' cellpadding='2'> + <table class='results'> <tr> - <th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'><?php print __("Proposal") ?></span></th> - <th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'> + <th class='header'><span class='f2'><?php print __("Proposal") ?></span></th> + <th class='header'><span class='f2'> <a href='?off=<?php print $off ?>&by=<?php print $by_next ?>'><?php print __("Start") ?></a> </span></th> - <th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'><?php print __("End") ?></span></th> - <th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'><?php print __("User") ?></span></th> - <th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'><?php print __("Yes") ?></span></th> - <th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'><?php print __("No") ?></span></th> - <th style='border-bottom: #666 1px solid; vertical-align: bottom'><span class='f2'><?php print __('Voted') ?></span></th> + <th class='header'><span class='f2'><?php print __("End") ?></span></th> + <th class='header'><span class='f2'><?php print __("User") ?></span></th> + <th class='header'><span class='f2'><?php print __("Yes") ?></span></th> + <th class='header'><span class='f2'><?php print __("No") ?></span></th> + <th class='header'><span class='f2'><?php print __('Voted') ?></span></th> </tr> <?php if (mysql_num_rows($result) == 0) { ?> <tr><td align='center' colspan='0'><?php print __("No results found.") ?></td></tr> -- 1.7.6

3 10

[aur-dev] [PATCH] Remove explicit utf8 declarations in table creation
by Dan McGee 20 Oct '11

20 Oct '11

The create database statement sets the default character set of the database to UTF-8, so no need to do it down below. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- support/schema/aur-schema.sql | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/support/schema/aur-schema.sql b/support/schema/aur-schema.sql index 88d074e..544ed94 100644 --- a/support/schema/aur-schema.sql +++ b/support/schema/aur-schema.sql @@ -190,8 +190,8 @@ CREATE TABLE PackageBlacklist ( -- CREATE TABLE IF NOT EXISTS TU_VoteInfo ( ID int(10) unsigned NOT NULL auto_increment, - Agenda text COLLATE utf8_general_ci NOT NULL, - User VARCHAR(32) COLLATE utf8_general_ci NOT NULL, + Agenda text NOT NULL, + User VARCHAR(32) NOT NULL, Submitted bigint(20) unsigned NOT NULL, End bigint(20) unsigned NOT NULL, SubmitterID int(10) unsigned NOT NULL, -- 1.7.6

1 1

[aur-dev] [PATCH] send emails when delteing packages
by Florian Pritz 23 Sep '11

23 Sep '11

Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- web/lib/pkgfuncs.inc.php | 43 +++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 43 insertions(+), 0 deletions(-) diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php index 3e89fa3..b6d4d08 100644 --- a/web/lib/pkgfuncs.inc.php +++ b/web/lib/pkgfuncs.inc.php @@ -710,6 +710,49 @@ function pkg_delete ($atype, $ids, $mergepkgid, $dbh=NULL) { } if ($mergepkgid) { + $mergepkgname = pkgname_from_id($mergepkgid, $dbh); + } + + # Send email notifications + foreach ($ids as $pkgid) { + $q = 'SELECT CommentNotify.*, Users.Email '; + $q.= 'FROM CommentNotify, Users '; + $q.= 'WHERE Users.ID = CommentNotify.UserID '; + $q.= 'AND CommentNotify.UserID != ' . uid_from_sid($_COOKIE['AURSID']) . ' '; + $q.= 'AND CommentNotify.PkgID = ' . intval($pkgid); + $result = db_query($q, $dbh); + $bcc = array(); + + if (mysql_num_rows($result)) { + while ($row = mysql_fetch_assoc($result)) { + array_push($bcc, $row['Email']); + } + + $q = 'SELECT Packages.* '; + $q.= 'FROM Packages '; + $q.= 'WHERE Packages.ID = ' . intval($pkgid); + $result = db_query($q, $dbh); + $row = mysql_fetch_assoc($result); + + # TODO: native language emails for users, based on their prefs + # Simply making these strings translatable won't work, users would be + # getting emails in the language that the user who posted the comment was in + $body = ""; + if ($mergepkgid) { + $body .= username_from_sid($_COOKIE['AURSID']) . " merged \"".$row["Name"]."\" into \"$mergepkgname\".\n\n"; + $body .= "\n\n---\nYou will no longer receive notifications about this package, please go to https://aur.archlinux.org/packages.php?ID=".$mergepkgid." and click the Notify button if you wish to recieve them again."; + } else { + $body .= username_from_sid($_COOKIE['AURSID']) . " deleted \"".$row["Name"]."\".\n\n"; + $body .= "\n\n---\nYou will no longer receive notifications about this package."; + } + $body = wordwrap($body, 70); + $bcc = implode(', ', $bcc); + $headers = "Bcc: $bcc\nReply-to: nobody(a)archlinux.org\nFrom: aur-notify(a)archlinux.org\nX-Mailer: AUR\n"; + @mail(' ', "AUR Package deleted: " . $row['Name'], $body, $headers); + } + } + + if ($mergepkgid) { /* Merge comments */ $q = "UPDATE PackageComments "; $q.= "SET PackageID = " . intval($mergepkgid) . " "; -- 1.7.6.1

3 4

[aur-dev] [PATCH 1/2] RPC: Provide out-of-date timestamp
by Lukas Fleischer 23 Sep '11

23 Sep '11

Convert the "OutOfDate" field to provide a timestamp instead of a boolean flag in JSON results. We don't really care about backward compatibility here, as most AUR helpers would break anyway when trying to parse RPC responses after the data type overhaul that should come with one of the following patches. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/lib/aurjson.class.php | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/web/lib/aurjson.class.php b/web/lib/aurjson.class.php index b596359..b4648c9 100644 --- a/web/lib/aurjson.class.php +++ b/web/lib/aurjson.class.php @@ -18,9 +18,8 @@ class AurJSON { 'search', 'info', 'multiinfo', 'msearch' ); private static $fields = array( - 'Packages.ID', 'Name', 'Version', 'CategoryID', - 'Description', 'URL', 'License', - 'NumVotes', '(OutOfDateTS IS NOT NULL) AS OutOfDate', + 'Packages.ID', 'Name', 'Version', 'CategoryID', 'Description', 'URL', + 'License', 'NumVotes', 'OutOfDateTS AS OutOfDate', 'SubmittedTS AS FirstSubmitted', 'ModifiedTS AS LastModified' ); -- 1.7.6.3

1 1

[aur-dev] [PATCH] web/html/pkgsubmit.php: Deal with unset category ID
by Lukas Fleischer 02 Sep '11

02 Sep '11

Do not move the package to the incoming package directory and fail to create proper database entries if some AUR upload helper doesn't provide a category. We got several failing constraints here, such as: Cannot add or update a child row: a foreign key constraint fails (`AUR`.`Packages`, CONSTRAINT `Packages_ibfk_1` FOREIGN KEY (`CategoryID`) REFERENCES `PackageCategories` (`ID`) ON DELETE NO ACTION) Instead, default to "1" (which is "none", or "keep category" for existing packages) if no category is supplied. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/html/pkgsubmit.php | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/web/html/pkgsubmit.php b/web/html/pkgsubmit.php index 54c4b3e..f715e15 100644 --- a/web/html/pkgsubmit.php +++ b/web/html/pkgsubmit.php @@ -311,6 +311,18 @@ if ($uid): $pkg_version = sprintf('%s-%s', $new_pkgbuild['pkgver'], $new_pkgbuild['pkgrel']); } + # Check the category to use, "1" meaning "none" (or "keep category" for + # existing packages). + if (isset($_POST['category'])) { + $category_id = intval($_POST['category']); + if ($category_id <= 0) { + $category_id = 1; + } + } + else { + $category_id = 1; + } + if ($pdata) { # This is an overwrite of an existing package, the database ID # needs to be preserved so that any votes are retained. However, @@ -324,9 +336,9 @@ if ($uid): db_query($q, $dbh); # If a new category was chosen, change it to that - if ($_POST['category'] > 1) { + if ($category_id > 1) { $q = sprintf( "UPDATE Packages SET CategoryID = %d WHERE ID = %d", - mysql_real_escape_string($_REQUEST['category']), + $category_id, $packageID); db_query($q, $dbh); @@ -350,7 +362,7 @@ if ($uid): mysql_real_escape_string($new_pkgbuild['pkgname']), mysql_real_escape_string($new_pkgbuild['license']), mysql_real_escape_string($pkg_version), - mysql_real_escape_string($_REQUEST['category']), + $category_id, mysql_real_escape_string($new_pkgbuild['pkgdesc']), mysql_real_escape_string($new_pkgbuild['url']), $uid, -- 1.7.6.1

1 0