[aur-dev] [PATCH 0/8] Assorted working branch changes
Most of these patches are minor changes and fix some lingering bug reports. The final patch is a really big change that I've been testing for a while now, it brings PDO to the AUR code. It is a large change so I'd love to have more eyes look over it and maybe some people test out corner cases and parts of the web interface that I may have failed at testing. This patch series is based against Lukas' "wip" branch [1]. Those changes and my changes in entirety can be had from my "working" branch [2]. [1] http://git.cryptocrack.de/aur.git/log/?h=wip [2] https://github.com/canyonknight/aur/tree/working canyonknight (8): pkgsubmit.php: Make page friendlier for logged out users pkg_details.php: Fix broken HTML for package page with no dependencies Update docs to require Archive_Tar version greater than 1.3.7 Print error message when maximum DB character length is exceeded Allow only Trusted Users, Developers, and Maintainers to unflag packages Fix broken RSS feed link on front page Fix broken package search on front page Migrate all DB code to use PDO INSTALL | 4 +- UPGRADING | 4 + web/html/home.php | 2 +- web/html/pkgsubmit.php | 43 +++-- web/lib/acctfuncs.inc.php | 229 ++++++++++++------------ web/lib/aur.inc.php | 154 ++++++---------- web/lib/aurjson.class.php | 26 ++- web/lib/cachefuncs.inc.php | 4 +- web/lib/config.inc.php.proto | 3 +- web/lib/pkgfuncs.inc.php | 306 +++++++++++++++++--------------- web/lib/stats.inc.php | 4 +- web/lib/translator.inc.php | 6 +- web/template/account_search_results.php | 2 +- web/template/actions_form.php | 3 +- web/template/pkg_details.php | 5 +- web/template/stats/updates_table.php | 2 +- 16 files changed, 400 insertions(+), 397 deletions(-) -- 1.7.11.4
Logged out users who navigate to /submit currently reach a page with only an
error message. This adds the full navigation bar for users who errantly reach
/submit before logging in.
Signed-off-by: canyonknight
The "Required by" column already handles an empty list appropriately. Move a
</div> tag to match that behavior in the "Dependencies" column
Signed-off-by: canyonknight
Prior to version 1.3.8 of Archive_Tar, long filenames within a tar file
would result in the filename being a shortened string of the fullname. This
shortening would prevent the upload of any tar file having a filepath longer
than 99 characters. Require AUR installations to use an update Archive_Tar
version to avoid related issues
Fixes FS#30472
Signed-off-by: canyonknight
Packages can currently be submitted with variables longer than the maximum
allowed by the DB for that specific field. The string will be shortened
without informing the user. This can result in unexpected oddities on
submitted packages. Print error messages informing the user when the package
name, URL, description, license, or version is too long.
Also move the resolution of full package version (including epoch) to an
earlier point in pkgsubmit.php
Signed-off-by: canyonknight
On Thu, Aug 09, 2012 at 09:15:49PM -0400, canyonknight wrote:
Packages can currently be submitted with variables longer than the maximum allowed by the DB for that specific field. The string will be shortened without informing the user. This can result in unexpected oddities on submitted packages. Print error messages informing the user when the package name, URL, description, license, or version is too long.
Also move the resolution of full package version (including epoch) to an earlier point in pkgsubmit.php
Signed-off-by: canyonknight
--- web/html/pkgsubmit.php | 35 +++++++++++++++++++++++++++++------ 1 file changed, 29 insertions(+), 6 deletions(-) diff --git a/web/html/pkgsubmit.php b/web/html/pkgsubmit.php index e87279e..5783da4 100644 --- a/web/html/pkgsubmit.php +++ b/web/html/pkgsubmit.php @@ -277,6 +277,35 @@ if ($uid): } }
+ # Determine the full package version with epoch + if (!$error) { + if (isset($new_pkgbuild['epoch']) && (int)$new_pkgbuild['epoch'] > 0) { + $pkg_version = sprintf('%d:%s-%s', $new_pkgbuild['epoch'], $new_pkgbuild['pkgver'], $new_pkgbuild['pkgrel']); + } else { + $pkg_version = sprintf('%s-%s', $new_pkgbuild['pkgver'], $new_pkgbuild['pkgrel']); + } + } + + # The DB schema imposes limitations on number of allowed characters + # Print error message when these limitations are exceeded + if (!$error) { + if (strlen($pkg_name) > 64) { + $error = __("Error - Package name cannot be greater than %s characters", 64); + } + if (strlen($new_pkgbuild['url']) > 255) { + $error = __("Error - Package URL cannot be greater than %s characters", 255); + } + if (strlen($new_pkgbuild['pkgdesc']) > 255) { + $error = __("Error - Package description cannot be greater than %s characters", 255); + } + if (strlen($new_pkgbuild['license']) > 40) { + $error = __("Error - Package license cannot be greater than %s characters", 40); + } + if (strlen($pkg_version) > 32) { + $error = __("Error - Package version cannot be greater than %s characters", 32); + }
Only one minor complaint: We should probably use "%d" here. The other patches look fine to me -- thanks!
+ } + if (isset($pkg_name)) { $incoming_pkgdir = INCOMING_DIR . substr($pkg_name, 0, 2) . "/" . $pkg_name; } @@ -324,12 +353,6 @@ if ($uid):
$pdata = pkgdetails_by_pkgname($new_pkgbuild['pkgname'], $dbh);
- if (isset($new_pkgbuild['epoch']) && (int)$new_pkgbuild['epoch'] > 0) { - $pkg_version = sprintf('%d:%s-%s', $new_pkgbuild['epoch'], $new_pkgbuild['pkgver'], $new_pkgbuild['pkgrel']); - } else { - $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'])) { -- 1.7.11.4
Packages can currently be submitted with variables longer than the maximum
allowed by the DB for that specific field. The string will be shortened
without informing the user. This can result in unexpected oddities on
submitted packages. Print error messages informing the user when the package
name, URL, description, license, or version is too long.
Also move the resolution of full package version (including epoch) to an
earlier point in pkgsubmit.php
Signed-off-by: canyonknight
Currently everyone is allowed to unflag a package as out of date. This should
be limited to only the appropriate people for a specific package.
Fixes FS#27263
Signed-off-by: canyonknight
Signed-off-by: canyonknight
Signed-off-by: canyonknight
participants (2)
-
canyonknight
-
Lukas Fleischer