Merge branch 'maint'

5 files changed, 9 insertions, 7 deletions

diff --git a/INSTALL b/INSTALL
index 76df42b9..e8bf797d 100644
--- a/INSTALL
+++ b/INSTALL
@@ -86,4 +86,11 @@ Setup on Arch Linux:
    $ cd ~/aur/web/lib/
    $ cp config.inc.php.proto config.inc.php
 
+   In case you set $USE_VIRTUAL_URLS to true (default nowadays) you should add
+   a rewrite rule. For Apache, add this ~/aur/web/html/.htaccess:
+
+   RewriteEngine on
+   RewriteCond %{REQUEST_URI} !^/index.php
+   RewriteRule ^(.*)$ /index.php/$1
+
 8) Point your browser to http://aur
diff --git a/web/lib/aur.inc.php b/web/lib/aur.inc.php
index e3921025..9317ec94 100644
--- a/web/lib/aur.inc.php
+++ b/web/lib/aur.inc.php
@@ -303,8 +303,6 @@ function html_header($title="", $details=array()) {
 	global $LANG;
 	global $SUPPORTED_LANGS;
 
-	$title = htmlspecialchars($title, ENT_QUOTES);
-
 	include('header.php');
 	return;
 }
diff --git a/web/lib/stats.inc.php b/web/lib/stats.inc.php
index 60973e90..cfae7947 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');
 }
 
diff --git a/web/template/footer.php b/web/template/footer.php
index 857211ee..806d3be5 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 &copy; 2004-2012 AUR Development Team.</p>
+				<p>Copyright &copy; 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>
diff --git a/web/template/stats/user_table.php b/web/template/stats/user_table.php
index ba6751f4..284d5b9e 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&amp;L=2&amp;K=<?= $username; ?>">
+			<a href="<?= get_uri('/packages/'); ?>?SeB=m&amp;K=<?= $username; ?>">
 <?= __("Packages in unsupported"); ?></a>
 		</td>
 		<td><?= $maintainer_unsupported_count; ?></td>