June 2008 - Aur-dev - lists.archlinux.org

[aur-dev] [PATCH] Updated Italian translation
by Giovanni Scafora 12 Jun '08

12 Jun '08

Hello guys, here is the updated Italian translation. Please, push it to testing. Thanks a lot. -- Giovanni Scafora Arch Linux Trusted User (voidnull) AUR & Pacman Italian Translations http://www.archlinux.it

2 1

[aur-dev] [PATCH] Use PEAR modules when submitting PKGBUILDs
by Callan Barrett 11 Jun '08

11 Jun '08

pkgsubmit.php now uses the PEAR modules Archive_Tar and File_Find for finding the PKGBUILD and messing with tarballs, Archive_Tar should be installed by default but you'll need to install File_Find yourself to make this work. I've also done some other cleanup such as (aside from rm_rf) no more exec use and changing some variables around. As far as I can tell this setup is actually faster than what we have now and I know it's much cleaner (compared to before, that file is still a mess) and it's also much more reliable for finding files. Fixes FS#2900. -- Callan Barrett

2 4

[aur-dev] [PATCH] Split HTML in index.php
by Callan Barrett 11 Jun '08

11 Jun '08

Ok here's another version of that patch to clean up index.php. I think in its current form it's good enough to apply but I'd like to hear anyone else's opinion on it. HTML still needs a cleanup. -- Callan Barrett

1 1

[aur-dev] [PATCH] Fix FS#10016
by Callan Barrett 10 Jun '08

10 Jun '08

Fix entry of URLPath and FSPath to be actual locations, fixes RPC results Gonna have to resubmit packages before results are correct. -- Callan Barrett

2 3

[aur-dev] [PATCH] Add version, username and description to daily new package email.
by Loui 09 Jun '08

09 Jun '08

Someone with the nick 'dmartins' popped in IRC and had a little patch on pastebin for the version and description. I thought the script itself needed some clean up so here it is. I'm using MaintainerUID here instead of SubmitterUID for the username.

2 3

[aur-dev] [PATCH] Add description and submitter to nightly emails
by Callan Barrett 09 Jun '08

09 Jun '08

Based on mario.stg's patch -- Callan Barrett

2 3

[aur-dev] [PATCH] fixed indention + xhtml in search_accounts_form.php
by Michael Klier 09 Jun '08

09 Jun '08

--- web/template/search_accounts_form.php | 122 ++++++++++++++++++--------------- 1 files changed, 66 insertions(+), 56 deletions(-) diff --git a/web/template/search_accounts_form.php b/web/template/search_accounts_form.php index d5665e9..17be75e 100644 --- a/web/template/search_accounts_form.php +++ b/web/template/search_accounts_form.php @@ -1,68 +1,78 @@ <br /> <form action='account.php' method='post'> -<input type='hidden' name='Action' value='SearchAccounts'> -<center> -<table border='0' cellpadding='0' cellspacing='0' width='80%'> + <input type='hidden' name='Action' value='SearchAccounts' /> + <center> + <table border='0' cellpadding='0' cellspacing='0' width='80%'> -<tr> - <td align='left'><?php print __("Username"); ?>:</td> -<td align='left'><input type='text' size='30' maxlength='64' - name='U'></td> -</tr> + <tr> + <td align='left'><?php print __("Username"); ?>:</td> + <td align='left'> + <input type='text' size='30' maxlength='64' name='U' /> + </td> + </tr> -<tr> -<td align='left'><?php print __("Account Type"); ?>:</td> -<td align='left'><select name=T> -<option value=''><?php print __("Any type"); ?> -<option value='u'><?php print __("Normal user"); ?> -<option value='t'><?php print __("Trusted user"); ?> -<option value='d'><?php print __("Developer"); ?> -</select></td> -</tr> + <tr> + <td align='left'><?php print __("Account Type"); ?>:</td> + <td align='left'> + <select name=T> + <option value=''><?php print __("Any type"); ?></option> + <option value='u'><?php print __("Normal user"); ?></option> + <option value='t'><?php print __("Trusted user"); ?></option> + <option value='d'><?php print __("Developer"); ?></option> + </select> + </td> + </tr> -<tr> -<td align='left'><?php print __("Account Suspended"); ?>:</td> -<td align='left'><input type='checkbox' name='S'> -</tr> + <tr> + <td align='left'><?php print __("Account Suspended"); ?>:</td> + <td align='left'> + <input type='checkbox' name='S' /> + </td> + </tr> -<tr> -<td align='left'><?php print __("Email Address"); ?>:</td> -<td align='left'><input type='text' size='30' maxlength='64' - name='E'></td> -</tr> + <tr> + <td align='left'><?php print __("Email Address"); ?>:</td> + <td align='left'> + <input type='text' size='30' maxlength='64'name='E' /> + </td> + </tr> -<tr> -<td align='left'><?php print __("Real Name"); ?>:</td> -<td align='left'><input type='text' size='30' maxlength='32' - name='R'></td> -</tr> + <tr> + <td align='left'><?php print __("Real Name"); ?>:</td> + <td align='left'> + <input type='text' size='30' maxlength='32' name='R' /> + </td> + </tr> -<tr> -<td align='left'><?php print __("IRC Nick"); ?>:</td> -<td align='left'><input type='text' size='30' maxlength='32' - name='I'></td> -</tr> + <tr> + <td align='left'><?php print __("IRC Nick"); ?>:</td> + <td align='left'> + <input type='text' size='30' maxlength='32' name='I' /> + </td> + </tr> -<tr> -<td align='left'><?php print __("Sort by"); ?>:</td> -<td align='left'><select name=SB> -<option value='u'><?php print __("Username"); ?> -<option value='t'><?php print __("Account Type"); ?> -<option value='r'><?php print __("Real Name"); ?> -<option value='i'><?php print __("IRC Nick"); ?> -<option value='v'><?php print __("Last vote"); ?> -</select></td> -</tr> + <tr> + <td align='left'><?php print __("Sort by"); ?>:</td> + <td align='left'> + <select name=SB> + <option value='u'><?php print __("Username"); ?></option> + <option value='t'><?php print __("Account Type"); ?></option> + <option value='r'><?php print __("Real Name"); ?></option> + <option value='i'><?php print __("IRC Nick"); ?></option> + <option value='v'><?php print __("Last vote"); ?></option> + </select> + </td> + </tr> -<tr> -<td> </td> -<td align='left'> <br/> -<input type='submit' class='button' - value="<?php print __("Search"); ?>"> -<input type='reset' class='button' - value="<?php print __("Reset"); ?>"></td> -</tr> + <tr> + <td> </td> + <td align='left'> + <br /> + <input type='submit' class='button' value="<?php print __("Search"); ?>" /> + <input type='reset' class='button' value="<?php print __("Reset"); ?>" /> + </td> + </tr> -</table> -</center> + </table> + </center> </form> -- 1.4.4.4 -- Michael Klier www: http://www.chimeric.de jabber: chi(a)jabber.shipdown.de key: http://downloads.chimeric.de/chi.asc key-id: 0x8308F551

2 1

[aur-dev] [PATCH] Fix FS#8622
by Callan Barrett 09 Jun '08

09 Jun '08

Previous fix for this was only half implemented, links now work with both a new package and an updated one -- Callan Barrett

1 1

[aur-dev] [PATCH] Extended JSON query method
by Sylvester Johansson 08 Jun '08

08 Jun '08

From: Sylvester Johansson <scj(a)konservburken.localdomain> --- web/html/rpc.php | 8 +++++- web/lib/aurjson.class.php | 59 +++++++++++++++++++++++++++++++++++++++----- 2 files changed, 59 insertions(+), 8 deletions(-) diff --git a/web/html/rpc.php b/web/html/rpc.php index 033cba5..8ca0f4b 100644 --- a/web/html/rpc.php +++ b/web/html/rpc.php @@ -19,11 +19,17 @@ if ( $_SERVER['REQUEST_METHOD'] == 'GET' ) { echo '<ul>'; echo '<li>search</li>'; echo '<li>info</li>'; + echo '<li>query</li>'; echo '</ul><br />'; - echo 'Each method requires the following HTTP GET syntax:<br />'; + echo '<i>search</i> and <i>info</i> requires the following HTTP GET syntax:<br />'; echo '   type=<i>methodname</i>&arg=<i>data</i> <br /><br />'; echo 'Where <i>methodname</i> is the name of an allowed method, and <i>data</i> is the argument to the call.<br />'; echo '<br />'; + echo '<br />'; + echo '<i>query<i> has the following syntax: <br />'; + echo 'type=query&arg=<<i>term</i>>&include=<<i>field1</i>>:<<i>field2</i>>:...:<<i>fieldN</i>> <br />'; + echo 'where <i>fieldN</i> is a field to be included in the result. Allowed fields are: <br />'; + echo 'ID, Name, Version, Description, URL, URLPath, License, NumVotes and OutOfDate <br />'; echo 'If you need jsonp type callback specification, you can provide an additional variable <i>callback</i>.<br />'; echo 'Example URL: <br />   http://aur-url/rpc.php?type=search&arg=foobar&callback=jsonp1192244621103'; echo '</body></html>'; diff --git a/web/lib/aurjson.class.php b/web/lib/aurjson.class.php index be92c25..770a80a 100644 --- a/web/lib/aurjson.class.php +++ b/web/lib/aurjson.class.php @@ -21,7 +21,9 @@ if (!extension_loaded('json')) **/ class AurJSON { private $dbh = false; - private $exposed_methods = array('search','info'); + private $exposed_methods = array('search','info','query'); + private $valid_parameters = array('ID','Name','Version','Description','URL','URLPath','License','NumVotes','OutOfDate'); + /** * Handles post data, and routes the request. @@ -42,13 +44,18 @@ class AurJSON { // do the routing if ( in_array($http_data['type'], $this->exposed_methods) ) { // ugh. this works. I hate you php. - $json = call_user_func_array(array(&$this,$http_data['type']),$http_data['arg']); - // allow rpc callback for XDomainAjax - if ( isset($http_data['callback']) ) { - return $http_data['callback'] . "({$json})"; + if ($http_data['type'] === 'query') { + return $this->query($http_data['arg'],$http_data['include']); } - else { - return $json; + else { + $json = call_user_func_array(array(&$this,$http_data['type']),$http_data['arg']); + // allow rpc callback for XDomainAjax + if ( isset($http_data['callback']) ) { + return $http_data['callback'] . "({$json})"; + } + else { + return $json; + } } } else { @@ -137,5 +144,43 @@ class AurJSON { return $this->json_error('No result found'); } } + + private function query($value,$pqdata) { + $pqdata = explode(":",$pqdata); + $value = mysql_real_escape_string($value); + + if (! $this->parameter_sanity($pqdata)) { + return $this->json_error('Parameter error'); + } + + $base_query = "SELECT " . implode(',',$pqdata) . " FROM Packages WHERE DummyPkg=0 AND " . sprintf("( Name LIKE '%%%s%%' OR Description LIKE '%%%s%%' )",$value,$value); + $result = db_query($base_query,$this->dbh); + if($result && (mysql_num_rows($result)>0)){ + $search_data = array(); + while($row = mysql_fetch_assoc($result)) { + array_push($search_data,$row); + } + mysql_free_result($result); + return $this->json_results('query',$search_data); + } + else { + return $this->json_error('No result found'); + } + + } + + /** + * @param $parameters is a semicolon separated string of column names + * @return True if the parameters are acceptable, otherwise false + **/ + private function parameter_sanity($parameters) { + foreach($parameters as $param) { + if (!in_array($param, $this->valid_parameters)) { + return false; + } + } + return true; + } } ?> + -- 1.5.5.3

5 9

[aur-dev] [PATCH] French translation
by Cilyan Olowen 07 Jun '08

07 Jun '08

Hello ! Here is the new translation for french language. Please update because it seems to me I already translated some strings in my last patch. Regards, Cilyan PS: If some thing is wrong in my patches, please let me know, so I'll be able to fix that next time.

2 1