diff options
| -rw-r--r-- | web/html/index.php | 2 | ||||
| -rw-r--r-- | web/html/pkgsubmit.php | 12 | ||||
| -rw-r--r-- | web/html/rpc.php | 2 | ||||
| -rw-r--r-- | web/html/rss2.php | 1 | ||||
| -rw-r--r-- | web/lib/acctfuncs.inc | 6 | ||||
| -rw-r--r-- | web/lib/aurjson.class.php | 2 | ||||
| -rw-r--r-- | web/lib/config.inc.proto | 2 | ||||
| -rw-r--r-- | web/lib/translator.inc | 2 |
8 files changed, 14 insertions, 15 deletions
diff --git a/web/html/index.php b/web/html/index.php index 87158b9..3918d95 100644 --- a/web/html/index.php +++ b/web/html/index.php @@ -23,7 +23,7 @@ $dbh = db_connect(); <div class="frontpgboxbody"> <p> -<?php +<?php echo __( 'Welcome to the AUR! Please read the %hAUR User Guidelines%h and %hAUR TU Guidelines%h for more information.', '<a href="http://wiki.archlinux.org/index.php/AUR_User_Guidelines">', diff --git a/web/html/pkgsubmit.php b/web/html/pkgsubmit.php index 1db6abc..a3394af 100644 --- a/web/html/pkgsubmit.php +++ b/web/html/pkgsubmit.php @@ -133,15 +133,15 @@ if ($_COOKIE["AURSID"]): # array parens and any quoting, except in pkgdesc # for pkgdesc, only remove start/end pairs of " or ' if ($lparts[0]=="pkgdesc") { - if ($lparts[1]{0} == '"' && + if ($lparts[1]{0} == '"' && $lparts[1]{strlen($lparts[1])-1} == '"') { $pkgbuild[$lparts[0]] = substr($lparts[1], 1, -1); } - elseif - ($lparts[1]{0} == "'" && + elseif + ($lparts[1]{0} == "'" && $lparts[1]{strlen($lparts[1])-1} == "'") { $pkgbuild[$lparts[0]] = substr($lparts[1], 1, -1); - } else { + } else { $pkgbuild[$lparts[0]] = $lparts[1]; } } else { @@ -158,7 +158,7 @@ if ($_COOKIE["AURSID"]): } # some error checking on PKGBUILD contents - just make sure each - # variable has a value. This does not do any validity checking + # variable has a value. This does not do any validity checking # on the values, or attempts to fix line continuation/wrapping. # if (!$seen_build_function) { @@ -180,7 +180,7 @@ if ($_COOKIE["AURSID"]): # # Check for http:// or other protocol in url - # + # if (!$error) { $parsed_url = parse_url($pkgbuild['url']); if (!$parsed_url['scheme']) { diff --git a/web/html/rpc.php b/web/html/rpc.php index 033cba5..f94d5bc 100644 --- a/web/html/rpc.php +++ b/web/html/rpc.php @@ -10,7 +10,7 @@ if ( $_SERVER['REQUEST_METHOD'] == 'GET' ) { if ( isset($_GET['type']) ) { echo $rpc_o->handle($_GET); } - else { + else { // dump a simple usage output for people to use. // this could be moved to an api doc in the future, or generated from // the AurJSON class directly with phpdoc. For now though, just putting it here. diff --git a/web/html/rss2.php b/web/html/rss2.php index 1f5c50c..499450b 100644 --- a/web/html/rss2.php +++ b/web/html/rss2.php @@ -53,4 +53,3 @@ while ($row = mysql_fetch_assoc($result)) { #save it so that useCached() can find it $rss->saveFeed("RSS2.0","xml/newestpkg.xml",true); -?> diff --git a/web/lib/acctfuncs.inc b/web/lib/acctfuncs.inc index 1c15af0..9ed4f22 100644 --- a/web/lib/acctfuncs.inc +++ b/web/lib/acctfuncs.inc @@ -176,7 +176,7 @@ function process_account_form($UTYPE,$TYPE,$A,$U="",$T="",$S="",$E="", global $SUPPORTED_LANGS; if(isset($_COOKIE['AURSID'])) - $editor_user = uid_from_sid($_COOKIE['AURSID']); + $editor_user = uid_from_sid($_COOKIE['AURSID']); else $editor_user = null; @@ -237,7 +237,7 @@ function process_account_form($UTYPE,$TYPE,$A,$U="",$T="",$S="",$E="", $row = mysql_fetch_array($result); if ($row[0]) { $error = __("The username, %h%s%h, is already in use.", - "<b>", $U, "</b>"); + "<b>", $U, "</b>"); } } } @@ -607,7 +607,7 @@ function display_account_info($U="",$T="", * SID of 0 means login failed. */ function try_login() { - $login_error = ""; + $login_error = ""; $new_sid = ""; $userID = null; diff --git a/web/lib/aurjson.class.php b/web/lib/aurjson.class.php index 897423a..daa785f 100644 --- a/web/lib/aurjson.class.php +++ b/web/lib/aurjson.class.php @@ -1,7 +1,7 @@ <?php /** * AurJSON - * + * * This file contains the AurRPC remote handling class **/ if (!extension_loaded('json')) diff --git a/web/lib/config.inc.proto b/web/lib/config.inc.proto index 068305a..89b4fe5 100644 --- a/web/lib/config.inc.proto +++ b/web/lib/config.inc.proto @@ -3,7 +3,7 @@ # define( "AUR_db_host", "localhost:/tmp/mysql.sock" ); define( "AUR_db_name", "AUR" ); -define( "AUR_db_user", "aur" ); +define( "AUR_db_user", "aur" ); define( "AUR_db_pass", "aur" ); # Configuration of directories where things live diff --git a/web/lib/translator.inc b/web/lib/translator.inc index da89e9e..8c90551 100644 --- a/web/lib/translator.inc +++ b/web/lib/translator.inc @@ -61,7 +61,7 @@ function __() { } } - $translated = htmlspecialchars($translated, ENT_QUOTES); + $translated = htmlspecialchars($translated, ENT_QUOTES); # This condition is to reorganise the arguments in case of # deprecated usage. __("string", array("string","string")) |