Merge branch 'maint'

This commit is contained in:
Lukas Fleischer 2013-01-19 12:21:26 +01:00
commit 49e6184508
5 changed files with 9 additions and 7 deletions

View file

@ -86,4 +86,11 @@ Setup on Arch Linux:
$ cd ~/aur/web/lib/ $ cd ~/aur/web/lib/
$ cp config.inc.php.proto config.inc.php $ 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 8) Point your browser to http://aur

View file

@ -303,8 +303,6 @@ function html_header($title="", $details=array()) {
global $LANG; global $LANG;
global $SUPPORTED_LANGS; global $SUPPORTED_LANGS;
$title = htmlspecialchars($title, ENT_QUOTES);
include('header.php'); include('header.php');
return; return;
} }

View file

@ -43,9 +43,6 @@ function user_table($userid, $dbh) {
$flagged_outdated = db_cache_value($q, $dbh, $flagged_outdated = db_cache_value($q, $dbh,
'user_flagged_outdated:' . $userid); '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'); include('stats/user_table.php');
} }

View file

@ -5,7 +5,7 @@
<?php if ($ver): ?> <?php if ($ver): ?>
<p>AUR <?= htmlspecialchars($ver) ?></p> <p>AUR <?= htmlspecialchars($ver) ?></p>
<?php endif; ?> <?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> <p><?= __('Unsupported packages are user produced content. Any use of the provided files is at your own risk.') ?></p>
</div> </div>
</div> </div>

View file

@ -7,7 +7,7 @@ $username = username_from_sid($_COOKIE["AURSID"]);
<table> <table>
<tr> <tr>
<td> <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> <?= __("Packages in unsupported"); ?></a>
</td> </td>
<td><?= $maintainer_unsupported_count; ?></td> <td><?= $maintainer_unsupported_count; ?></td>