diff options
Diffstat (limited to 'web/html')
| -rw-r--r-- | web/html/account.php | 2 | ||||
| -rw-r--r-- | web/html/css/arch.css | 9 | ||||
| -rw-r--r-- | web/html/index.php | 6 | ||||
| -rw-r--r-- | web/html/logout.php | 3 | ||||
| -rw-r--r-- | web/html/passreset.php | 8 | ||||
| -rw-r--r-- | web/html/pkgsubmit.php | 4 | ||||
| -rw-r--r-- | web/html/rpc.php | 11 | ||||
| -rw-r--r-- | web/html/tu.php | 5 |
8 files changed, 29 insertions, 19 deletions
diff --git a/web/html/account.php b/web/html/account.php index 387fd93..d94d711 100644 --- a/web/html/account.php +++ b/web/html/account.php @@ -82,7 +82,7 @@ if (isset($_COOKIE["AURSID"])) { $row = mysql_fetch_assoc($result); display_account_info($row["Username"], $row["AccountType"], $row["Email"], $row["RealName"], - $row["IRCNick"]); + $row["IRCNick"], $row["LastVoted"]); } } elseif ($action == "UpdateAccount") { diff --git a/web/html/css/arch.css b/web/html/css/arch.css index eec02ee..1e588f1 100644 --- a/web/html/css/arch.css +++ b/web/html/css/arch.css @@ -244,13 +244,14 @@ table.center { } table.results { padding: 0px; + width: 100%; border-collapse: collapse; } .results th { - background-color: #e1e3e6; - border-bottom: 1px solid #46494d; - border-top: 1px solid #46494d; - padding: 0px 5px 0px 0px; + text-align: center; +} +.results th, .results td { + padding: 1px; } .results th>a { text-decoration: none; diff --git a/web/html/index.php b/web/html/index.php index ffc5f00..0d513d3 100644 --- a/web/html/index.php +++ b/web/html/index.php @@ -25,7 +25,7 @@ $dbh = db_connect(); <?php echo __( - 'Welcome to the AUR! Please read the %hAUR User Guidelines%h and %hAUR TU Guidelines%h for more information.', + 'Welcome to the AUR! Please read the %sAUR User Guidelines%s and %sAUR TU Guidelines%s for more information.', '<a href="http://wiki.archlinux.org/index.php/AUR_User_Guidelines">', '</a>', '<a href="http://wiki.archlinux.org/index.php/AUR_Trusted_User_Guidelines">', @@ -37,7 +37,7 @@ echo __( <?php echo __( - 'Contributed PKGBUILDs %hmust%h conform to the %hArch Packaging Standards%h otherwise they will be deleted!', + 'Contributed PKGBUILDs %smust%s conform to the %sArch Packaging Standards%s otherwise they will be deleted!', '<b>', '</b>', '<a href="http://wiki.archlinux.org/index.php/Arch_Packaging_Standards">', '</a>' @@ -50,7 +50,7 @@ echo __( <br /> <?php echo __('Some packages may be provided as binaries in [community].'); ?> </p> -<table border='0' cellpadding='0' cellspacing='3' width='90%'> +<table> <tr> <td class='boxSoft' valign='top'> <?php updates_table($dbh); ?> diff --git a/web/html/logout.php b/web/html/logout.php index 45ab564..e51eeb9 100644 --- a/web/html/logout.php +++ b/web/html/logout.php @@ -17,9 +17,8 @@ if (isset($_COOKIE["AURSID"])) { # setting expiration to 1 means '1 second after midnight January 1, 1970' setcookie("AURSID", "", 1, "/", null, !empty($_SERVER['HTTPS']), true); unset($_COOKIE['AURSID']); + clear_expired_sessions($dbh); } -clear_expired_sessions(); - header('Location: index.php'); diff --git a/web/html/passreset.php b/web/html/passreset.php index 97fbebb..98aa685 100644 --- a/web/html/passreset.php +++ b/web/html/passreset.php @@ -67,11 +67,11 @@ if (isset($_GET['resetkey'], $_POST['email'], $_POST['password'], $_POST['confir 'your password follow the link below, otherwise ignore '. 'this message and nothing will happen.'). "\n\n". - 'https://aur.archlinux.org/passreset.php?'. + "{$AUR_LOCATION}/passreset.php?". "resetkey={$resetkey}"; $body = wordwrap($body, 70); - $headers = "To: {$email}\nReply-to: nobody@archlinux.org\nFrom:aur-notify@archlinux.org\nX-Mailer: PHP\nX-MimeOLE: Produced By AUR"; - @mail(' ', 'AUR Password Reset', $body, $headers); + $headers = "Reply-to: nobody@archlinux.org\nFrom:aur-notify@archlinux.org\nX-Mailer: PHP\nX-MimeOLE: Produced By AUR"; + @mail($email, 'AUR Password Reset', $body, $headers); } header('Location: passreset.php?step=confirm'); @@ -122,7 +122,7 @@ html_header(__("Password Reset")); <?php } else { ?> - <p><?php echo __('If you have forgotten the e-mail address you used to register, please send a message to the %haur-general%h mailing list.', + <p><?php echo __('If you have forgotten the e-mail address you used to register, please send a message to the %saur-general%s mailing list.', '<a href="http://mailman.archlinux.org/mailman/listinfo/aur-general">', '</a>'); ?></p> <form action="" method="post"> diff --git a/web/html/pkgsubmit.php b/web/html/pkgsubmit.php index 539f056..75a4b69 100644 --- a/web/html/pkgsubmit.php +++ b/web/html/pkgsubmit.php @@ -273,7 +273,7 @@ if ($uid): $error = __( "Could not create directory %s.", $incoming_pkgdir); } } else { - $error = __( "You are not allowed to overwrite the %h%s%h package.", "<b>", $pkg_name, "</b>"); + $error = __( "You are not allowed to overwrite the %s%s%s package.", "<b>", $pkg_name, "</b>"); } if (!$error) { @@ -449,7 +449,7 @@ html_header("Submit"); <form action='pkgsubmit.php' method='post' enctype='multipart/form-data'> <div> <input type='hidden' name='pkgsubmit' value='1' /> </div> - <table border='0' cellspacing='5'> + <table> <tr> <td class='f4' align='right'><?php print __("Package Category"); ?>:</td> <td class='f4' align='left'> diff --git a/web/html/rpc.php b/web/html/rpc.php index ee7cda3..415dcb8 100644 --- a/web/html/rpc.php +++ b/web/html/rpc.php @@ -18,7 +18,7 @@ else { // here. ?> <html><body> -<p>The methods currently allowed are:</p> +<h2>Allowed methods</h2> <ul> <li><tt>search</tt></li> <li><tt>info</tt></li> @@ -29,7 +29,14 @@ else { <pre>type=<em>methodname</em>&arg=<em>data</em></pre> <p>Where <em>methodname</em> is the name of an allowed method, and <em>data</em> is the argument to the call.</p> <p>If you need jsonp type callback specification, you can provide an additional variable <em>callback</em>.</p> -<p>Example URL: <tt>http://aur-url/rpc.php?type=search&arg=foobar&callback=jsonp1192244621103</tt></p> +<h2>Examples</h2> +<dl> + <dt><tt>search</tt></dt><dd><tt>http://aur-url/rpc.php?type=search&arg=foobar</tt></li></dd> + <dt><tt>info</tt></dt><dd><tt>http://aur-url/rpc.php?type=info&arg=foobar</tt></dd> + <dt><tt>multiinfo</tt></dt><dd><tt>http://aur-url/rpc.php?type=multiinfo&arg[]=foo&arg[]=bar</tt></dd> + <dt><tt>msearch</tt></dt><dd><tt>http://aur-url/rpc.php?type=msearch&arg=john</tt></li></dd> + <dt>Callback</dt><dd><tt>http://aur-url/rpc.php?type=search&arg=foobar&callback=jsonp1192244621103</tt></dd> +</dl> </body></html> <?php // close if statement diff --git a/web/html/tu.php b/web/html/tu.php index 6e202c8..6e04353 100644 --- a/web/html/tu.php +++ b/web/html/tu.php @@ -5,7 +5,10 @@ set_include_path(get_include_path() . PATH_SEPARATOR . '../lib'); include_once("aur.inc.php"); set_lang(); check_sid(); -html_header(); + +$title = __("Trusted User"); + +html_header($title); # Default votes per page $pp = 10; |