April 2014 - Aur-dev - lists.archlinux.org

[aur-dev] [PATCH 1/2] Fix searching by category
by Lukas Fleischer 05 Apr '14

05 Apr '14

Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/lib/pkgfuncs.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php index f5eb11d..76fed89 100644 --- a/web/lib/pkgfuncs.inc.php +++ b/web/lib/pkgfuncs.inc.php @@ -422,7 +422,7 @@ function pkg_search_page($SID="") { * variable values more sensible. */ if (isset($_GET["C"]) && intval($_GET["C"])) { - $q_where .= "AND Packages.CategoryID = ".intval($_GET["C"])." "; + $q_where .= "AND PackageBases.CategoryID = ".intval($_GET["C"])." "; } if (isset($_GET['K'])) { -- 1.9.1

1 1

[aur-dev] [PATCH] pkg_search_results.php: Link to account when logged in
by Lukas Fleischer 05 Apr '14

05 Apr '14

Replace the maintainer package search links with links to the maintainer's account when browsing the search results as a logged-in user. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- web/template/pkg_search_results.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/web/template/pkg_search_results.php b/web/template/pkg_search_results.php index c9da5f9..e47fcb2 100644 --- a/web/template/pkg_search_results.php +++ b/web/template/pkg_search_results.php @@ -73,7 +73,11 @@ if (!$result): ?> <td class="wrap"><?= htmlspecialchars($row['Description'], ENT_QUOTES); ?></td> <td> <?php if (isset($row["Maintainer"])): ?> + <?php if ($SID): ?> + <a href="<?= get_uri('/account/') . htmlspecialchars($row['Maintainer'], ENT_QUOTES) ?>" title="<?= __('View account information for %s', htmlspecialchars($row['Maintainer'])) ?>"><?= htmlspecialchars($row['Maintainer']) ?></a> + <?php else: ?> <a href="<?= get_uri('/packages/'); ?>?K=<?= htmlspecialchars($row['Maintainer'], ENT_QUOTES) ?>&SeB=m"><?= htmlspecialchars($row['Maintainer']) ?></a> + <?php endif; ?> <?php else: ?> <span><?= __("orphan") ?></span> <?php endif; ?> -- 1.9.1

1 0

[aur-dev] [PATCH 0/7] Split package support: Cleanups, fixes, improvements
by Lukas Fleischer 05 Apr '14

05 Apr '14

To be applied on top of the split package patch set. Lukas Fleischer (7): Use snake case for all package functions Prefix package functions with pkg_/pkgbase_ Split out package base functions pkgfuncs.inc.php: Remove several unused functions pkgbasefuncs.inc.php: Fix leftover bits Add full package list to the removal form Do not show package base page of non-split packages scripts/cleanup | 2 +- web/html/index.php | 2 +- web/html/packages.php | 10 +- web/html/pkgbase.php | 38 +- web/html/pkgdel.php | 9 +- web/html/pkgmerge.php | 10 +- web/html/pkgsubmit.php | 20 +- web/html/voters.php | 2 +- web/lib/pkgbasefuncs.inc.php | 968 ++++++++++++++++++++++++++++++++++ web/lib/pkgfuncs.inc.php | 1058 +------------------------------------- web/template/actions_form.php | 4 +- web/template/pkg_comments.php | 4 +- web/template/pkg_details.php | 12 +- web/template/pkg_search_form.php | 2 +- web/template/pkgbase_details.php | 6 +- 15 files changed, 1058 insertions(+), 1089 deletions(-) create mode 100644 web/lib/pkgbasefuncs.inc.php -- 1.9.1

1 6

[aur-dev] [PATCH 00/13] Split package support
by Lukas Fleischer 05 Apr '14

05 Apr '14

This patch series adds full .AURINFO support and split package support. Implementing this requires massive database layout changes and thus, a lot of patches in this series are quite invasive. Things that need to be done: * Testing, the patches are still experimental. * Fix and extend the RPC interface. Suggestions? * Do a lot of refactoring and code cleanup. Lukas Fleischer (13): Add provisional support for package bases Store comments on a per-package base basis routing.inc.php: Add get_pkgbase_uri() Make the delete function remove package bases Add full support for the new .AURINFO format Add package base detail pages pkg_details.php: Add link to package base details Do not allow for overwriting arbitrary packages Factor out PKGBUILD parsing Only parse PKGBUILD when required UPGRADING: Add migration instructions for 3.0.0 Allow for searching by package base name Move package actions to package bases UPGRADING | 124 +++++++++ schema/aur-schema.sql | 44 +-- schema/gendummydata.py | 18 +- web/html/index.php | 18 +- web/html/packages.php | 75 ----- web/html/pkgbase.php | 135 +++++++++ web/html/pkgdel.php | 10 +- web/html/pkgmerge.php | 10 +- web/html/pkgsubmit.php | 432 +++++++++++------------------ web/lib/aur.inc.php | 34 ++- web/lib/pkgbuild-parser.inc.php | 139 ++++++++++ web/lib/pkgfuncs.inc.php | 540 +++++++++++++++++++++++++----------- web/lib/routing.inc.php | 18 ++ web/lib/stats.inc.php | 21 +- web/template/pkg_comment_form.php | 4 +- web/template/pkg_comments.php | 10 +- web/template/pkg_details.php | 34 ++- web/template/pkg_search_form.php | 4 +- web/template/pkg_search_results.php | 4 +- web/template/pkgbase_details.php | 210 ++++++++++++++ 20 files changed, 1304 insertions(+), 580 deletions(-) create mode 100644 web/html/pkgbase.php create mode 100644 web/lib/pkgbuild-parser.inc.php create mode 100644 web/template/pkgbase_details.php -- 1.9.1

1 13

[aur-dev] [PATCH] Fix database schema
by Lukas Fleischer 03 Apr '14

03 Apr '14

Replace "ON SET NULL" with "ON DELETE SET NULL". Fixes a regression introduced in commit fb7bde3 (Add support for anonymous comments, 2014-02-04). Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- schema/aur-schema.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schema/aur-schema.sql b/schema/aur-schema.sql index 86f7563..932c1d3 100644 --- a/schema/aur-schema.sql +++ b/schema/aur-schema.sql @@ -167,7 +167,7 @@ CREATE TABLE PackageComments ( PRIMARY KEY (ID), INDEX (UsersID), INDEX (PackageID), - FOREIGN KEY (UsersID) REFERENCES Users(ID) ON SET NULL, + FOREIGN KEY (UsersID) REFERENCES Users(ID) ON DELETE SET NULL, FOREIGN KEY (DelUsersID) REFERENCES Users(ID) ON DELETE CASCADE, FOREIGN KEY (PackageID) REFERENCES Packages(ID) ON DELETE CASCADE ) ENGINE = InnoDB; -- 1.9.1

1 0