- Aur-dev - lists.archlinux.org

[aur-dev] [PATCH] pkg_details.php: Add missing translatable string
by canyonknight 21 Jan '13

21 Jan '13

Signed-off-by: canyonknight <canyonknight(a)gmail.com> --- web/template/pkg_details.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/web/template/pkg_details.php b/web/template/pkg_details.php index b5d8a9f..0973448 100644 --- a/web/template/pkg_details.php +++ b/web/template/pkg_details.php @@ -137,7 +137,7 @@ if ($row["SubmitterUID"]): <td><?= htmlspecialchars($submitter) ?></td> <?php endif; ?> <?php else: ?> - <td>None</td> + <td><?= __('None') ?></td> <?php endif; ?> </tr> <tr> @@ -155,7 +155,7 @@ if ($row["MaintainerUID"]): <td><?= htmlspecialchars($maintainer) ?></td> <?php endif; ?> <?php else: ?> - <td>None</td> + <td><?= __('None') ?></td> <?php endif; ?> </tr> <tr> -- 1.8.1.1

1 0

[aur-dev] How can I Upload a new vesion of the vidyo package to AUR?
by Fernando Monticelli 17 Jan '13

17 Jan '13

Hi all, Current vidyo (a CERN video conferencing tool) package in AUR doesn' t work for me. But I found a hack here (https://bugzilla.mozilla.org/show_bug.cgi?id=701083#c7) which makes vidyo believes is running under ubuntu. That actually works. It s just the package in that hack is an old version of Vidyo. So I made up a new PKGBUILD for the latest version of vidyo. This PKGBUILD is a modification of the one currently in AUR (https://aur.archlinux.org/packages/vidyo/) plus the hack I found. In any case, I can' t upload it to AUR because vidyo belongs to another maintanier. How can I proceed? Should I ask the other maintainer to modify his PKGBUILD? Thanks a lot! Cheers, Fernando

3 3

[aur-dev] [PATCH] stats.inc.php: Remove unnecessary account type lookup
by canyonknight 14 Jan '13

14 Jan '13

Signed-off-by: canyonknight <canyonknight(a)gmail.com> --- web/lib/stats.inc.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/web/lib/stats.inc.php b/web/lib/stats.inc.php index 60973e9..cfae794 100644 --- a/web/lib/stats.inc.php +++ b/web/lib/stats.inc.php @@ -43,9 +43,6 @@ function user_table($userid, $dbh) { $flagged_outdated = db_cache_value($q, $dbh, 'user_flagged_outdated:' . $userid); - # If the user is a TU calculate the number of the packages - $atype = account_from_sid($_COOKIE["AURSID"]); - include('stats/user_table.php'); } -- 1.8.1

1 0

[aur-dev] [PATCH] user_table.php: Remove unused link parameter
by canyonknight 14 Jan '13

14 Jan '13

Signed-off-by: canyonknight <canyonknight(a)gmail.com> --- web/template/stats/user_table.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/template/stats/user_table.php b/web/template/stats/user_table.php index ba6751f..284d5b9 100644 --- a/web/template/stats/user_table.php +++ b/web/template/stats/user_table.php @@ -7,7 +7,7 @@ $username = username_from_sid($_COOKIE["AURSID"]); <table> <tr> <td> - <a href="<?= get_uri('/packages/'); ?>?SeB=m&L=2&K=<?= $username; ?>"> + <a href="<?= get_uri('/packages/'); ?>?SeB=m&K=<?= $username; ?>"> <?= __("Packages in unsupported"); ?></a> </td> <td><?= $maintainer_unsupported_count; ?></td> -- 1.8.1

1 0

[aur-dev] [PATCH] Remove double htmlspecialchars
by Marcel Korpel 09 Jan '13

09 Jan '13

This is already done in header.php; doing this double will result in & in title element --- web/lib/aur.inc.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/web/lib/aur.inc.php b/web/lib/aur.inc.php index 018d5c8..387d81d 100644 --- a/web/lib/aur.inc.php +++ b/web/lib/aur.inc.php @@ -303,8 +303,6 @@ function html_header($title="") { global $LANG; global $SUPPORTED_LANGS; - $title = htmlspecialchars($title, ENT_QUOTES); - include('header.php'); return; } -- 1.8.1

1 0

[aur-dev] [PATCH] Add description meta-element to package pages
by Marcel Korpel 09 Jan '13

09 Jan '13

Implements FS#33294 --- web/html/packages.php | 11 ++++--- web/lib/aur.inc.php | 2 +- web/lib/pkgfuncs.inc.php | 81 ++++++++++++++++++++++++++++++------------------ web/template/header.php | 3 ++ 4 files changed, 62 insertions(+), 35 deletions(-) diff --git a/web/html/packages.php b/web/html/packages.php index 6182550..c1e54e1 100644 --- a/web/html/packages.php +++ b/web/html/packages.php @@ -20,9 +20,12 @@ if (!isset($pkgid) || !isset($pkgname)) { } } -# Set the title to the current query if required +# Set the title to the current query and get package details if required +$details = array(); + if (isset($pkgname)) { $title = $pkgname; + $details = get_package_details($pkgid); } else if (!empty($_GET['K'])) { $title = __("Search Criteria") . ": " . $_GET['K']; } else { @@ -93,7 +96,7 @@ if (check_token()) { } } -html_header($title); +html_header($title, $details); ?> <?php if ($output): ?> @@ -105,10 +108,10 @@ if (isset($pkgid)) { include('pkg_search_form.php'); if ($pkgid) { if (isset($_COOKIE["AURSID"])) { - package_details($pkgid, $_COOKIE["AURSID"]); + display_package_details($pkgid, $details, $_COOKIE["AURSID"]); } else { - package_details($pkgid, null); + display_package_details($pkgid, $details, null); } } else { print __("Error trying to retrieve package details.")."<br />\n"; diff --git a/web/lib/aur.inc.php b/web/lib/aur.inc.php index 018d5c8..e392102 100644 --- a/web/lib/aur.inc.php +++ b/web/lib/aur.inc.php @@ -297,7 +297,7 @@ function db_connect() { * * @return void */ -function html_header($title="") { +function html_header($title="", $details=array()) { global $AUR_LOCATION; global $DISABLE_HTTP_LOGIN; global $LANG; diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php index c00c33d..568ca3d 100644 --- a/web/lib/pkgfuncs.inc.php +++ b/web/lib/pkgfuncs.inc.php @@ -432,17 +432,52 @@ function pkgname_is_blacklisted($name, $dbh=NULL) { } /** + * Get the package details + * + * @param string $id The package ID to get description for + * @param \PDO $dbh An already established database connection + * + * @return array The package's details OR error message + **/ +function get_package_details($id=0, $dbh=NULL) { + if(!$dbh) { + $dbh = db_connect(); + } + + $q = "SELECT Packages.*,Category "; + $q.= "FROM Packages,PackageCategories "; + $q.= "WHERE Packages.CategoryID = PackageCategories.ID "; + $q.= "AND Packages.ID = " . intval($id); + $result = $dbh->query($q); + + $row = array(); + + if (!$result) { + $row['error'] = __("Error retrieving package details."); + } + else { + $row = $result->fetch(PDO::FETCH_ASSOC); + if (empty($row)) { + $row['error'] = __("Package details could not be found."); + } + } + + return $row; +} + +/** * Display the package details page * * @global string $AUR_LOCATION The AUR's URL used for notification e-mails * @global bool $USE_VIRTUAL_URLS True if using URL rewriting, otherwise false * @param string $id The package ID to get details page for + * @param array $row Package details retrieved by get_package_details * @param string $SID The session ID of the visitor * @param \PDO $dbh An already established database connection * * @return void */ -function package_details($id=0, $SID="", $dbh=NULL) { +function display_package_details($id=0, $row, $SID="", $dbh=NULL) { global $AUR_LOCATION; global $USE_VIRTUAL_URLS; @@ -450,42 +485,28 @@ function package_details($id=0, $SID="", $dbh=NULL) { $dbh = db_connect(); } - $q = "SELECT Packages.*,Category "; - $q.= "FROM Packages,PackageCategories "; - $q.= "WHERE Packages.CategoryID = PackageCategories.ID "; - $q.= "AND Packages.ID = " . intval($id); - $result = $dbh->query($q); - - if (!$result) { - print "<p>" . __("Error retrieving package details.") . "</p>\n"; + if (isset($row['error'])) { + print "<p>" . $row['error'] . "</p>\n"; } else { - $row = $result->fetch(PDO::FETCH_ASSOC); - if (empty($row)) { - print "<p>" . __("Package details could not be found.") . "</p>\n"; + include('pkg_details.php'); - } - else { - include('pkg_details.php'); - - # Actions Bar - if ($SID) { - include('actions_form.php'); - if (isset($_REQUEST['comment']) && check_token()) { - $uid = uid_from_sid($SID, $dbh); - add_package_comment($id, $uid, $_REQUEST['comment'], $dbh); - } - include('pkg_comment_form.php'); + # Actions Bar + if ($SID) { + include('actions_form.php'); + if (isset($_REQUEST['comment']) && check_token()) { + $uid = uid_from_sid($SID, $dbh); + add_package_comment($id, $uid, $_REQUEST['comment'], $dbh); } + include('pkg_comment_form.php'); + } - # Print Comments - $comments = package_comments($id, $dbh); - if (!empty($comments)) { - include('pkg_comments.php'); - } + # Print Comments + $comments = package_comments($id, $dbh); + if (!empty($comments)) { + include('pkg_comments.php'); } } - return; } diff --git a/web/template/header.php b/web/template/header.php index 92cb2ff..9cefedc 100644 --- a/web/template/header.php +++ b/web/template/header.php @@ -10,6 +10,9 @@ <link rel='shortcut icon' href='/images/favicon.ico' /> <link rel='alternate' type='application/rss+xml' title='Newest Packages RSS' href='<?= get_uri('/rss/'); ?>' /> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> +<?php if (isset($details['Description']) && !empty($details['Description'])): ?> + <meta name="description" content="<?= htmlspecialchars($details['Description']) ?>" /> +<?php endif; ?> </head> <body> <div id="archnavbar" class="anb-aur"> -- 1.8.1

1 0

[aur-dev] [PATCH] Add description meta-element to package pages
by Marcel Korpel 08 Jan '13

08 Jan '13

Implements FS#33294 --- web/html/packages.php | 7 +++++-- web/lib/aur.inc.php | 3 ++- web/lib/pkgfuncs.inc.php | 24 ++++++++++++++++++++++++ web/template/header.php | 5 +++++ 4 files changed, 36 insertions(+), 3 deletions(-) diff --git a/web/html/packages.php b/web/html/packages.php index 6182550..54386fc 100644 --- a/web/html/packages.php +++ b/web/html/packages.php @@ -20,9 +20,12 @@ if (!isset($pkgid) || !isset($pkgname)) { } } -# Set the title to the current query if required +# Set the title and description to the current query if required +$description = ""; + if (isset($pkgname)) { $title = $pkgname; + $description = package_description($pkgid); } else if (!empty($_GET['K'])) { $title = __("Search Criteria") . ": " . $_GET['K']; } else { @@ -93,7 +96,7 @@ if (check_token()) { } } -html_header($title); +html_header($title, $description); ?> <?php if ($output): ?> diff --git a/web/lib/aur.inc.php b/web/lib/aur.inc.php index 018d5c8..46ef340 100644 --- a/web/lib/aur.inc.php +++ b/web/lib/aur.inc.php @@ -297,13 +297,14 @@ function db_connect() { * * @return void */ -function html_header($title="") { +function html_header($title="", $description="") { global $AUR_LOCATION; global $DISABLE_HTTP_LOGIN; global $LANG; global $SUPPORTED_LANGS; $title = htmlspecialchars($title, ENT_QUOTES); + $description = htmlspecialchars($description, ENT_QUOTES); include('header.php'); return; diff --git a/web/lib/pkgfuncs.inc.php b/web/lib/pkgfuncs.inc.php index c00c33d..5230947 100644 --- a/web/lib/pkgfuncs.inc.php +++ b/web/lib/pkgfuncs.inc.php @@ -432,6 +432,30 @@ function pkgname_is_blacklisted($name, $dbh=NULL) { } /** + * Get the package description + * + * @param string $id The package ID to get description for + * + * @return string The package's description + **/ +function package_description($id=0, $dbh=NULL) { + if(!$dbh) { + $dbh = db_connect(); + } + + $q = "SELECT Description FROM Packages "; + $q.= "WHERE ID = " . intval($id); + $result = $dbh->query($q); + + if ($result) { + $row = $result->fetch(PDO::FETCH_ASSOC); + if (!empty($row)) { + return $row['Description']; + } + } +} + +/** * Display the package details page * * @global string $AUR_LOCATION The AUR's URL used for notification e-mails diff --git a/web/template/header.php b/web/template/header.php index 92cb2ff..d6362a5 100644 --- a/web/template/header.php +++ b/web/template/header.php @@ -10,6 +10,11 @@ <link rel='shortcut icon' href='/images/favicon.ico' /> <link rel='alternate' type='application/rss+xml' title='Newest Packages RSS' href='<?= get_uri('/rss/'); ?>' /> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> + <?php + if (isset($description) && $description != "") { + print "<meta name='description' content='" . $description . "' />\n"; + } + ?> </head> <body> <div id="archnavbar" class="anb-aur"> -- 1.8.1

2 1

[aur-dev] [PATCH] We live in 2013 now
by Marcel Korpel 06 Jan '13

06 Jan '13

--- web/template/footer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/template/footer.php b/web/template/footer.php index 857211e..806d3be 100644 --- a/web/template/footer.php +++ b/web/template/footer.php @@ -5,7 +5,7 @@ <?php if ($ver): ?> <p>AUR <?= htmlspecialchars($ver) ?></p> <?php endif; ?> - <p>Copyright © 2004-2012 AUR Development Team.</p> + <p>Copyright © 2004-<?= date("Y") ?> AUR Development Team.</p> <p><?= __('Unsupported packages are user produced content. Any use of the provided files is at your own risk.') ?></p> </div> </div> -- 1.8.1

2 3

[aur-dev] Format of translation files
by Marcel Korpel 06 Jan '13

06 Jan '13

Hi, I want to improve the Dutch translation file, but have a question about the format of msgstr variables. Can they be spread over multiple lines, like the msgid strings, or should they be one long string, probably breaking the 79-chars-per-line rule? A quick view revealed that currently all msgstr variables conform the latter practice. Or should I change strings on https://www.transifex.com/projects/p/aur/language/nl/, rather than changing po/nl.po directly? Thanks, Marcel

2 2

[aur-dev] [PATCH] Implemented typeahead suggest
by Marcel Korpel 06 Jan '13

06 Jan '13

--- web/html/home.php | 19 ++- web/html/index.php | 4 + web/html/js/bootstrap-typeahead.js | 311 +++++++++++++++++++++++++++++++++++++ web/lib/aurjson.class.php | 22 ++- 4 files changed, 354 insertions(+), 2 deletions(-) create mode 100644 web/html/js/bootstrap-typeahead.js diff --git a/web/html/home.php b/web/html/home.php index 4e489ba..0b51d55 100644 --- a/web/html/home.php +++ b/web/html/home.php @@ -95,7 +95,7 @@ $dbh = db_connect(); <fieldset> <label for="pkgsearch-field"><?= __('Package Search') ?>:</label> <input type="hidden" name="O" value="0" /> - <input type="text" name="K" size="30" value="<?php if (isset($_REQUEST["K"])) { print stripslashes(trim(htmlspecialchars($_REQUEST["K"], ENT_QUOTES))); } ?>" maxlength="35" /> + <input id="pkgsearch-field" type="text" name="K" size="30" value="<?php if (isset($_REQUEST["K"])) { print stripslashes(trim(htmlspecialchars($_REQUEST["K"], ENT_QUOTES))); } ?>" maxlength="35" /> </fieldset> </form> </div> @@ -107,5 +107,22 @@ $dbh = db_connect(); </div> </div> +<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min.js"></script> +<script type="text/javascript" src="/js/bootstrap-typeahead.js"></script> +<script type="text/javascript"> +$(document).ready(function() { + $('#pkgsearch-field').typeahead({ + source: function(query, callback) { + $.getJSON('<?= get_uri('/rpc'); ?>', {type: "suggest", arg: query}, function(data) { + callback(data); + }); + }, + matcher: function(item) { return true; }, + sorter: function(items) { return items; }, + menu: '<ul class="pkgsearch-typeahead"></ul>', + items: 20 + }).attr('autocomplete', 'off'); +}); +</script> <?php html_footer(AUR_VERSION); diff --git a/web/html/index.php b/web/html/index.php index a197d0b..c51f409 100644 --- a/web/html/index.php +++ b/web/html/index.php @@ -118,6 +118,10 @@ if (!empty($tokens[1]) && '/' . $tokens[1] == get_pkg_route()) { header("Content-Type: image/png"); include "./$path"; break; + case "/js/bootstrap-typeahead.js": + header("Content-Type: application/javascript"); + include "./$path"; + break; default: header("HTTP/1.0 404 Not Found"); include "./404.php"; diff --git a/web/html/js/bootstrap-typeahead.js b/web/html/js/bootstrap-typeahead.js new file mode 100644 index 0000000..2bb0355 --- /dev/null +++ b/web/html/js/bootstrap-typeahead.js @@ -0,0 +1,311 @@ +/* ============================================================= + * bootstrap-typeahead.js v2.2.1 + * http://twitter.github.com/bootstrap/javascript.html#typeahead + * ============================================================= + * Copyright 2012 Twitter, Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============================================================ */ + + +!function($){ + + "use strict"; // jshint ;_; + + + /* TYPEAHEAD PUBLIC CLASS DEFINITION + * ================================= */ + + var Typeahead = function (element, options) { + this.$element = $(element) + this.options = $.extend({}, $.fn.typeahead.defaults, options) + this.matcher = this.options.matcher || this.matcher + this.sorter = this.options.sorter || this.sorter + this.highlighter = this.options.highlighter || this.highlighter + this.updater = this.options.updater || this.updater + this.$menu = $(this.options.menu).appendTo('body') + this.source = this.options.source + this.shown = false + this.listen() + } + + Typeahead.prototype = { + + constructor: Typeahead + + , select: function () { + var val = this.$menu.find('.active').attr('data-value') + this.$element + .val(this.updater(val)) + .change() + return this.hide() + } + + , updater: function (item) { + return item + } + + , show: function () { + var pos = $.extend({}, this.$element.offset(), { + height: this.$element[0].offsetHeight + }) + + this.$menu.css({ + top: pos.top + pos.height + , left: pos.left + }) + + this.$menu.show() + this.shown = true + return this + } + + , hide: function () { + this.$menu.hide() + this.shown = false + return this + } + + , lookup: function (event) { + var items + + this.query = this.$element.val() + + if (!this.query || this.query.length < this.options.minLength) { + return this.shown ? this.hide() : this + } + + items = $.isFunction(this.source) ? this.source(this.query, $.proxy(this.process, this)) : this.source + + return items ? this.process(items) : this + } + + , process: function (items) { + var that = this + + items = $.grep(items, function (item) { + return that.matcher(item) + }) + + items = this.sorter(items) + + if (!items.length) { + return this.shown ? this.hide() : this + } + + return this.render(items.slice(0, this.options.items)).show() + } + + , matcher: function (item) { + return ~item.toLowerCase().indexOf(this.query.toLowerCase()) + } + + , sorter: function (items) { + var beginswith = [] + , caseSensitive = [] + , caseInsensitive = [] + , item + + while (item = items.shift()) { + if (!item.toLowerCase().indexOf(this.query.toLowerCase())) beginswith.push(item) + else if (~item.indexOf(this.query)) caseSensitive.push(item) + else caseInsensitive.push(item) + } + + return beginswith.concat(caseSensitive, caseInsensitive) + } + + , highlighter: function (item) { + var query = this.query.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g, '\\$&') + return item.replace(new RegExp('(' + query + ')', 'ig'), function ($1, match) { + return '<strong>' + match + '</strong>' + }) + } + + , render: function (items) { + var that = this + + items = $(items).map(function (i, item) { + i = $(that.options.item).attr('data-value', item) + i.find('a').html(that.highlighter(item)) + return i[0] + }) + + items.first().addClass('active') + this.$menu.html(items) + return this + } + + , next: function (event) { + var active = this.$menu.find('.active').removeClass('active') + , next = active.next() + + if (!next.length) { + next = $(this.$menu.find('li')[0]) + } + + next.addClass('active') + } + + , prev: function (event) { + var active = this.$menu.find('.active').removeClass('active') + , prev = active.prev() + + if (!prev.length) { + prev = this.$menu.find('li').last() + } + + prev.addClass('active') + } + + , listen: function () { + this.$element + .on('blur', $.proxy(this.blur, this)) + .on('keypress', $.proxy(this.keypress, this)) + .on('keyup', $.proxy(this.keyup, this)) + + if (this.eventSupported('keydown')) { + this.$element.on('keydown', $.proxy(this.keydown, this)) + } + + this.$menu + .on('click', $.proxy(this.click, this)) + .on('mouseenter', 'li', $.proxy(this.mouseenter, this)) + } + + , eventSupported: function(eventName) { + var isSupported = eventName in this.$element + if (!isSupported) { + this.$element.setAttribute(eventName, 'return;') + isSupported = typeof this.$element[eventName] === 'function' + } + return isSupported + } + + , move: function (e) { + if (!this.shown) return + + switch(e.keyCode) { + case 9: // tab + case 13: // enter + case 27: // escape + e.preventDefault() + break + + case 38: // up arrow + e.preventDefault() + this.prev() + break + + case 40: // down arrow + e.preventDefault() + this.next() + break + } + + e.stopPropagation() + } + + , keydown: function (e) { + this.suppressKeyPressRepeat = !~$.inArray(e.keyCode, [40,38,9,13,27]) + this.move(e) + } + + , keypress: function (e) { + if (this.suppressKeyPressRepeat) return + this.move(e) + } + + , keyup: function (e) { + switch(e.keyCode) { + case 40: // down arrow + case 38: // up arrow + case 16: // shift + case 17: // ctrl + case 18: // alt + break + + case 9: // tab + case 13: // enter + if (!this.shown) return + this.select() + break + + case 27: // escape + if (!this.shown) return + this.hide() + break + + default: + this.lookup() + } + + e.stopPropagation() + e.preventDefault() + } + + , blur: function (e) { + var that = this + setTimeout(function () { that.hide() }, 150) + } + + , click: function (e) { + e.stopPropagation() + e.preventDefault() + this.select() + this.$element.focus() + } + + , mouseenter: function (e) { + this.$menu.find('.active').removeClass('active') + $(e.currentTarget).addClass('active') + } + + } + + + /* TYPEAHEAD PLUGIN DEFINITION + * =========================== */ + + $.fn.typeahead = function (option) { + return this.each(function () { + var $this = $(this) + , data = $this.data('typeahead') + , options = typeof option == 'object' && option + if (!data) $this.data('typeahead', (data = new Typeahead(this, options))) + if (typeof option == 'string') data[option]() + }) + } + + $.fn.typeahead.defaults = { + source: [] + , items: 8 + , menu: '<ul class="typeahead dropdown-menu"></ul>' + , item: '<li><a></a></li>' + , minLength: 1 + } + + $.fn.typeahead.Constructor = Typeahead + + + /* TYPEAHEAD DATA-API + * ================== */ + + $(document).on('focus.typeahead.data-api', '[data-provide="typeahead"]', function (e) { + var $this = $(this) + if ($this.data('typeahead')) return + e.preventDefault() + $this.typeahead($this.data()) + }) + +}(window.jQuery); diff --git a/web/lib/aurjson.class.php b/web/lib/aurjson.class.php index 949c34f..d58cec1 100644 --- a/web/lib/aurjson.class.php +++ b/web/lib/aurjson.class.php @@ -15,7 +15,7 @@ include_once("aur.inc.php"); class AurJSON { private $dbh = false; private static $exposed_methods = array( - 'search', 'info', 'multiinfo', 'msearch' + 'search', 'info', 'multiinfo', 'msearch', 'suggest' ); private static $fields = array( 'Packages.ID', 'Name', 'Version', 'CategoryID', 'Description', 'URL', @@ -276,5 +276,25 @@ class AurJSON { return $this->process_query('msearch', $where_condition); } + + /** + * Get all package names that start with $search. + * @param $search Search string. + * @return string The JSON formatted response data. + **/ + private function suggest($search) { + $query = 'SELECT Name FROM Packages WHERE Name LIKE ' . + $this->dbh->quote(addcslashes($search, '%_') . '%') . + ' ORDER BY Name ASC LIMIT 20'; + + $result = $this->dbh->query($query); + $result_array = array(); + + if ($result) { + $result_array = $result->fetchAll(PDO::FETCH_COLUMN, 0); + } + + return json_encode($result_array); + } } -- 1.8.0.2

2 2