- Aur-dev - lists.archlinux.org

[aur-dev] [PATCH] fixup! aurjson: Pass http_data array to all functions
by Marcel Korpel 22 Jul '15

22 Jul '15

Signed-off-by: Marcel Korpel <marcel.korpel(a)gmail.com> --- web/lib/aurjson.class.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/web/lib/aurjson.class.php b/web/lib/aurjson.class.php index 944362b..d255d45 100644 --- a/web/lib/aurjson.class.php +++ b/web/lib/aurjson.class.php @@ -299,7 +299,7 @@ class AurJSON { * IDs and package names are valid; sort them into the relevant arrays and * escape/quote the names. * - * @param $args the arg string or array to parse. + * @param array $http_data Query parameters. * * @return mixed An array containing 'ids' and 'names'. */ @@ -328,7 +328,7 @@ class AurJSON { /* * Performs a fulltext mysql search of the package database. * - * @param $keyword_string A string of keywords to search with. + * @param array $http_data Query parameters. * * @return mixed Returns an array of package matches. */ @@ -359,7 +359,7 @@ class AurJSON { /* * Returns the info on a specific package. * - * @param $pqdata The ID or name of the package. Package Query Data. + * @param array $http_data Query parameters. * * @return mixed Returns an array of value data containing the package data */ @@ -377,7 +377,7 @@ class AurJSON { /* * Returns the info on multiple packages. * - * @param $pqdata A comma-separated list of IDs or names of the packages. + * @param array $http_data Query parameters. * * @return mixed Returns an array of results containing the package data */ @@ -414,7 +414,7 @@ class AurJSON { /* * Returns all the packages for a specific maintainer. * - * @param $maintainer The name of the maintainer. + * @param array $http_data Query parameters. * * @return mixed Returns an array of value data containing the package data */ @@ -430,7 +430,7 @@ class AurJSON { /* * Get all package names that start with $search. * - * @param string $search Search string. + * @param array $http_data Query parameters. * * @return string The JSON formatted response data. */ @@ -457,7 +457,7 @@ class AurJSON { /* * Get all package base names that start with $search. * - * @param string $search Search string. + * @param array $http_data Query parameters. * * @return string The JSON formatted response data. */ -- 2.4.6

2 1

[aur-dev] [PATCH v4 0/4] Add JavaScript method to edit comments
by Marcel Korpel 21 Jul '15

21 Jul '15

For a better user experience, enhance the comment edit form with a JavaScript method to edit comments on the same page, using a customized RPC interface. If JavaScript is not available, the page falls back to a standard web page, where a user can edit a comment. Marcel Korpel (4): pkg_comments.php: Merge two DIVs with same ID Split pkg_comment_form.php so the outer box is not always included aurjson.class.php: Add method get_comment_form() pkg_comments.php: Add JavaScript function to edit comments web/html/commentedit.php | 2 +- web/html/css/aurweb.css | 6 +++++ web/html/images/ajax-loader.gif | Bin 0 -> 723 bytes web/html/index.php | 4 +++ web/lib/aurjson.class.php | 51 +++++++++++++++++++++++++++++++++++++- web/lib/pkgbasefuncs.inc.php | 2 +- web/lib/pkgfuncs.inc.php | 2 +- web/template/pkg_comment_box.php | 4 +++ web/template/pkg_comment_form.php | 4 --- web/template/pkg_comments.php | 39 ++++++++++++++++++++++++++--- 10 files changed, 103 insertions(+), 11 deletions(-) create mode 100644 web/html/images/ajax-loader.gif create mode 100644 web/template/pkg_comment_box.php -- 2.4.6

2 5

[aur-dev] [PATCH v3 0/4] Add JavaScript method to edit comments
by Marcel Korpel 21 Jul '15

21 Jul '15

For a better user experience, enhance the comment edit form with a JavaScript method to edit comments on the same page, using a customized RPC interface. If JavaScript is not available, the page falls back to a standard web page, where a user can edit a comment. Marcel Korpel (4): pkg_comments.php: Merge two DIVs with same ID Split pkg_comment_form.php so the outer box is not always included aurjson.class.php: Add method load_comment pkg_comments.php: Add JavaScript function to edit comments web/html/commentedit.php | 2 +- web/html/css/aurweb.css | 6 ++++++ web/html/images/ajax-loader.gif | Bin 0 -> 723 bytes web/html/index.php | 4 ++++ web/lib/aurjson.class.php | 43 +++++++++++++++++++++++++++++++++++++- web/lib/pkgbasefuncs.inc.php | 2 +- web/lib/pkgfuncs.inc.php | 2 +- web/template/pkg_comment_box.php | 4 ++++ web/template/pkg_comment_form.php | 4 ---- web/template/pkg_comments.php | 43 +++++++++++++++++++++++++++++++++----- 10 files changed, 97 insertions(+), 13 deletions(-) create mode 100644 web/html/images/ajax-loader.gif create mode 100644 web/template/pkg_comment_box.php -- 2.4.6

2 6

[aur-dev] [PATCH v2 0/3] Add JavaScript method to edit comments
by Marcel Korpel 21 Jul '15

21 Jul '15

For a better user experience, enhance the comment edit form with a JavaScript method to edit comments on the same page, using a customized RPC interface. If JavaScript is not available, the page falls back to a standard web page, where a user can edit a comment. Marcel Korpel (3): pkg_comment_form.php: Make printing of header conditional aurjson.class.php: Add method load_comment pkg_comments.php: Add JavaScript function to edit comments web/html/css/aurweb.css | 6 ++++++ web/html/images/ajax-loader.gif | Bin 0 -> 723 bytes web/html/index.php | 4 ++++ web/lib/aurjson.class.php | 26 +++++++++++++++++++++++++- web/template/pkg_comment_form.php | 5 +++++ web/template/pkg_comments.php | 30 ++++++++++++++++++++++++++++++ 6 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 web/html/images/ajax-loader.gif -- 2.4.6

2 10

[aur-dev] [PATCH] Do not use the term "unsupported" for AUR packages
by Lukas Fleischer 21 Jul '15

21 Jul '15

We no longer use the term [unsupported] to refer to the "repository" of AUR packages. Fixes FS#45381. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/html/home.php | 2 +- web/template/cgit/footer.html | 2 +- web/template/footer.php | 2 +- web/template/stats/user_table.php | 2 +- 4 files changed, 4 insertions(+), 4 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> diff --git a/web/template/stats/user_table.php b/web/template/stats/user_table.php index 284d5b9..62361a7 100644 --- a/web/template/stats/user_table.php +++ b/web/template/stats/user_table.php @@ -8,7 +8,7 @@ $username = username_from_sid($_COOKIE["AURSID"]); <tr> <td> <a href="<?= get_uri('/packages/'); ?>?SeB=m&K=<?= $username; ?>"> -<?= __("Packages in unsupported"); ?></a> +<?= __("Packages"); ?></a> </td> <td><?= $maintainer_unsupported_count; ?></td> </tr> -- 2.4.6

3 4

[aur-dev] [PATCH] pkg_comments.php: Merge two DIVs with same ID
by Marcel Korpel 21 Jul '15

21 Jul '15

Signed-off-by: Marcel Korpel <marcel.korpel(a)gmail.com> --- web/template/pkg_comments.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/web/template/pkg_comments.php b/web/template/pkg_comments.php index 6f74349..d38c976 100644 --- a/web/template/pkg_comments.php +++ b/web/template/pkg_comments.php @@ -63,10 +63,8 @@ $count = pkgbase_comments_count($base_id, $include_deleted); </p> </div> <?php endwhile; ?> -</div> <?php if ($count > 10 && !isset($_GET['comments'])): ?> -<div id="news"> <h3> <a href="<?= htmlentities(get_pkgbase_uri($pkgbase_name), ENT_QUOTES) . '?' . mkurl('comments=all') ?>" title="<?= __('View all comments') ?> (<?= $count ?>)"><?= __('All comments', $count) ?></a> </h3> -- 2.4.6

2 1

[aur-dev] [PATCH] Show popularity in package base details
by Lukas Fleischer 21 Jul '15

21 Jul '15

Fixes FS#45600. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- web/lib/pkgbasefuncs.inc.php | 2 +- web/lib/pkgfuncs.inc.php | 4 ++-- web/template/pkg_details.php | 5 +++++ web/template/pkgbase_details.php | 5 +++++ 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/web/lib/pkgbasefuncs.inc.php b/web/lib/pkgbasefuncs.inc.php index 6057d10..2d1969b 100644 --- a/web/lib/pkgbasefuncs.inc.php +++ b/web/lib/pkgbasefuncs.inc.php @@ -140,7 +140,7 @@ function pkgbase_get_details($base_id) { $dbh = DB::connect(); $q = "SELECT PackageBases.ID, PackageBases.Name, "; - $q.= "PackageBases.NumVotes, "; + $q.= "PackageBases.NumVotes, PackageBases.Popularity, "; $q.= "PackageBases.OutOfDateTS, PackageBases.SubmittedTS, "; $q.= "PackageBases.ModifiedTS, PackageBases.SubmitterUID, "; $q.= "PackageBases.MaintainerUID, PackageBases.PackagerUID, "; diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php index de57c3e..bcadf54 100644 --- a/web/lib/pkgfuncs.inc.php +++ b/web/lib/pkgfuncs.inc.php @@ -431,8 +431,8 @@ function pkg_get_details($id=0) { $dbh = DB::connect(); $q = "SELECT Packages.*, PackageBases.ID AS BaseID, "; - $q.= "PackageBases.Name AS BaseName, "; - $q.= "PackageBases.NumVotes, PackageBases.OutOfDateTS, "; + $q.= "PackageBases.Name AS BaseName, PackageBases.NumVotes, "; + $q.= "PackageBases.Popularity, PackageBases.OutOfDateTS, "; $q.= "PackageBases.SubmittedTS, PackageBases.ModifiedTS, "; $q.= "PackageBases.SubmitterUID, PackageBases.MaintainerUID, "; $q.= "PackageBases.PackagerUID, "; diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php index ae8d084..9730d7e 100644 --- a/web/template/pkg_details.php +++ b/web/template/pkg_details.php @@ -25,6 +25,7 @@ if ($row["MaintainerUID"] !== NULL) { } $votes = $row['NumVotes']; +$popularity = $row['Popularity']; # In case of wanting to put a custom message $msg = __('unknown'); @@ -254,6 +255,10 @@ endif; <?php endif; ?> </tr> <tr> + <th><?= __('Popularity') . ': ' ?></th> + <td><?= number_format($popularity, 6) ?></td> + </tr> + <tr> <th><?= __('First Submitted') . ': ' ?></th> <td><?= $submitted_time ?></td> </tr> diff --git a/web/template/pkgbase_details.php b/web/template/pkgbase_details.php index 667b3f7..d4304e3 100644 --- a/web/template/pkgbase_details.php +++ b/web/template/pkgbase_details.php @@ -24,6 +24,7 @@ if ($row["MaintainerUID"] !== NULL) { } $votes = $row['NumVotes']; +$popularity = $row['Popularity']; # In case of wanting to put a custom message $msg = __('unknown'); @@ -105,6 +106,10 @@ endif; <?php endif; ?> </tr> <tr> + <th><?= __('Popularity') . ': ' ?></th> + <td><?= number_format($popularity, 6) ?></td> + </tr> + <tr> <th><?= __('First Submitted') . ': ' ?></th> <td><?= $submitted_time ?></td> </tr> -- 2.4.6

2 1

[aur-dev] [PATCH 0/5] Add JavaScript method to edit comments
by Marcel Korpel 21 Jul '15

21 Jul '15

For a better user experience, enhance the comment edit form with a JavaScript method to edit comments on the same page, using a customized RPC interface. If JavaScript is not available, the page falls back to a standard web page, where a user can edit a comment. Marcel Korpel (5): rpc.php: Allow POST method in RPC interface Refactor pkgbase_edit_comment() to use parameter comment ID pkg_comment_form.php: Make printing of header conditional aurjson.class.php: Add methods load_comment and save_comment pkg_comments.php: Add JavaScript function to edit comments web/html/pkgbase.php | 8 +++++--- web/html/rpc.php | 5 ++++- web/lib/aurjson.class.php | 35 ++++++++++++++++++++++++++++++++++- web/lib/pkgbasefuncs.inc.php | 8 +------- web/template/pkg_comment_form.php | 7 ++++++- web/template/pkg_comments.php | 25 +++++++++++++++++++++++++ 6 files changed, 75 insertions(+), 13 deletions(-) -- 2.4.6

1 5

[aur-dev] [PATCH v4 1/3] Use username from the database if one is provided by the user
by Marcel Korpel 19 Jul '15

19 Jul '15

This fixes a bug where the new user name input by the user was invalid, causing the account deletion link and the form action to be wrong. Signed-off-by: Marcel Korpel <marcel.korpel(a)gmail.com> --- web/html/account.php | 4 ++-- web/lib/acctfuncs.inc.php | 8 +++++--- web/template/account_edit_form.php | 4 ++-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/web/html/account.php b/web/html/account.php index c447de3..f5e6c19 100644 --- a/web/html/account.php +++ b/web/html/account.php @@ -61,7 +61,7 @@ if (isset($_COOKIE["AURSID"])) { $row["AccountTypeID"], $row["Suspended"], $row["Email"], "", "", $row["RealName"], $row["LangPreference"], $row["IRCNick"], $row["PGPKey"], $PK, - $row["InactivityTS"] ? 1 : 0, $row["ID"]); + $row["InactivityTS"] ? 1 : 0, $row["ID"], $row["Username"]); } else { print __("You do not have permission to edit this account."); } @@ -100,7 +100,7 @@ if (isset($_COOKIE["AURSID"])) { 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")); + in_request("ID"), $row["Username"]); } } else { if (has_credential(CRED_ACCOUNT_SEARCH)) { diff --git a/web/lib/acctfuncs.inc.php b/web/lib/acctfuncs.inc.php index 2b57b2d..9d6f5ee 100644 --- a/web/lib/acctfuncs.inc.php +++ b/web/lib/acctfuncs.inc.php @@ -56,11 +56,12 @@ function html_format_pgp_fingerprint($fingerprint) { * @param string $PK The list of SSH public keys * @param string $J The inactivity status of the displayed user * @param string $UID The user ID of the displayed user + * @param string $N The username as present in the database * * @return void */ function display_account_form($A,$U="",$T="",$S="",$E="",$P="",$C="",$R="", - $L="",$I="",$K="",$PK="",$J="", $UID=0) { + $L="",$I="",$K="",$PK="",$J="",$UID=0,$N="") { global $SUPPORTED_LANGS; include("account_edit_form.php"); @@ -86,11 +87,12 @@ function display_account_form($A,$U="",$T="",$S="",$E="",$P="",$C="",$R="", * @param string $PK The list of public SSH keys * @param string $J The inactivity status of the user * @param string $UID The user ID of the modified account + * @param string $N The username as present in the database * * @return string|void Return void if successful, otherwise return error */ function process_account_form($TYPE,$A,$U="",$T="",$S="",$E="",$P="",$C="", - $R="",$L="",$I="",$K="",$PK="",$J="",$UID=0) { + $R="",$L="",$I="",$K="",$PK="",$J="",$UID=0,$N="") { global $SUPPORTED_LANGS; $error = ''; @@ -247,7 +249,7 @@ function process_account_form($TYPE,$A,$U="",$T="",$S="",$E="",$P="",$C="", if ($error) { print "<ul class='errorlist'><li>".$error."</li></ul>\n"; display_account_form($A, $U, $T, $S, $E, "", "", - $R, $L, $I, $K, $PK, $J, $UID); + $R, $L, $I, $K, $PK, $J, $UID, $N); return; } diff --git a/web/template/account_edit_form.php b/web/template/account_edit_form.php index 56bdd45..0aadb9d 100644 --- a/web/template/account_edit_form.php +++ b/web/template/account_edit_form.php @@ -1,9 +1,9 @@ <?php if ($A == "UpdateAccount"): ?> <p> - <?= __('Click %shere%s if you want to permanently delete this account.', '<a href="' . get_user_uri($U) . 'delete/' . '">', '</a>') ?> + <?= __('Click %shere%s if you want to permanently delete this account.', '<a href="' . get_user_uri($N) . 'delete/' . '">', '</a>') ?> </p> -<form id="edit-profile-form" action="<?= get_user_uri($U) . 'update/'; ?>" method="post"> +<form id="edit-profile-form" action="<?= get_user_uri($N) . 'update/'; ?>" method="post"> <?php else: ?> <form id="edit-profile-form" action="<?= get_uri('/register/'); ?>" method="post"> <?php endif; ?> -- 2.4.6

1 2

[aur-dev] [PATCH] git-update: Error out if PKGBUILD is missing
by Lukas Fleischer 16 Jul '15

16 Jul '15

Fixes FS#45646. Signed-off-by: Lukas Fleischer <lfleischer(a)archlinux.org> --- git-interface/git-update.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/git-interface/git-update.py b/git-interface/git-update.py index ba65cab..935fa5b 100755 --- a/git-interface/git-update.py +++ b/git-interface/git-update.py @@ -216,8 +216,9 @@ cur.execute("SELECT Name FROM PackageBlacklist") blacklist = [row[0] for row in cur.fetchall()] for commit in walker: - if not '.SRCINFO' in commit.tree: - die_commit("missing .SRCINFO", str(commit.id)) + for fname in ('.SRCINFO', 'PKGBUILD'): + if not fname in commit.tree: + die_commit("missing {:s}".format(fname), str(commit.id)) for treeobj in commit.tree: blob = repo[treeobj.id] -- 2.4.6

1 0