summaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
authorCallan Barrett <wizzomafizzo@gmail.com>2008-01-15 07:54:23 +0100
committerDan McGee <dan@archlinux.org>2008-01-20 07:21:21 +0100
commit8ab823728c729e9780820bf15aad3585078c8342 (patch)
tree4873eec0eb010b46836c07f73d78b842ce679705 /web
parent2f56688b56757a3365ee4cc48f1bd139216c74f9 (diff)
downloadaur-8ab823728c729e9780820bf15aad3585078c8342.tar.gz
aur-8ab823728c729e9780820bf15aad3585078c8342.tar.xz
More cleanup, add TU link to header
Cleans up links on front page, adds a TU link to the header to the voting application, fixes some titles and styling for logged in text Signed-off-by: Callan Barrett <wizzomafizzo@gmail.com>
Diffstat (limited to 'web')
-rw-r--r--web/html/index.php2
-rw-r--r--web/html/packages.php2
-rw-r--r--web/lang/en/aur_po.inc4
-rw-r--r--web/lib/aur.inc23
-rw-r--r--web/lib/pkgfuncs.inc8
-rw-r--r--web/template/header.php19
6 files changed, 22 insertions, 36 deletions
diff --git a/web/html/index.php b/web/html/index.php
index 617b16a3..7e04d59e 100644
--- a/web/html/index.php
+++ b/web/html/index.php
@@ -52,7 +52,7 @@ while ($row = mysql_fetch_assoc($result)) {
print '<tr>';
print '<td class="boxSoft">';
- print '<span class="f4"><span class="blue"><a href="/packages.php?do_Details=1&ID='.intval($row["ID"]).'">';
+ print '<span class="f4"><span class="blue"><a href="/packages.php?ID='.intval($row["ID"]).'">';
print $row["Name"]." ".$row["Version"]."</a></span></span>";
print '</td>';
diff --git a/web/html/packages.php b/web/html/packages.php
index 1600e41c..143fbdf6 100644
--- a/web/html/packages.php
+++ b/web/html/packages.php
@@ -16,7 +16,7 @@ if (isset($_GET['ID'])) {
if (!empty($id)) {
$title = $id;
}
-} else if (isset($_GET['K'])) {
+} else if (!empty($_GET['K'])) {
$title = "Search: " . $_GET['K'];
} else if (isset($_GET['do_MyPackages'])) {
$title = __("My Packages");
diff --git a/web/lang/en/aur_po.inc b/web/lang/en/aur_po.inc
index 1542817b..feab23a1 100644
--- a/web/lang/en/aur_po.inc
+++ b/web/lang/en/aur_po.inc
@@ -27,4 +27,6 @@ $_t["en"]["Discussion"] = "Discussion";
$_t["en"]["Bugs"] = "Bugs";
-?> \ No newline at end of file
+$_t["en"]["Trusted User"] = "TU";
+
+?>
diff --git a/web/lib/aur.inc b/web/lib/aur.inc
index a9095cd9..cfe4a96f 100644
--- a/web/lib/aur.inc
+++ b/web/lib/aur.inc
@@ -447,29 +447,6 @@ function can_submit_pkg($name="", $sid="") {
return 0;
}
-# convert an ini_get number to a real integer - stupid PHP!
-#
-function initeger($inival="0", $isbytes=1) {
- $last_char = strtolower(substr($inival, -1));
- if ($isbytes) {
- switch ($last_char) {
- case 't': $multiplier = 1024 * 1024 * 1024; break;
- case 'm': $multiplier = 1024 * 1024; break;
- case 'k': $multiplier = 1024; break;
- default: $multiplier = 1; break;
- }
- } else {
- switch ($last_char) {
- case 't': $multiplier = 1000 * 1000 * 1000; break;
- case 'm': $multiplier = 1000 * 1000; break;
- case 'k': $multiplier = 1000; break;
- default: $multiplier = 1; break;
- }
- }
-
- return intval($inival) * $multiplier;
-}
-
# recursive delete directory
#
function rm_rf($dirname="") {
diff --git a/web/lib/pkgfuncs.inc b/web/lib/pkgfuncs.inc
index d4f3ae7c..a6086f80 100644
--- a/web/lib/pkgfuncs.inc
+++ b/web/lib/pkgfuncs.inc
@@ -290,10 +290,10 @@ function package_details($id=0, $SID="") {
} else {
# print out package details
- #
- echo "<div class=\"pgbox\">\n";
- echo " <div class=\"pgboxtitle\"><span class=\"f3\">".__("Package Details")."</span></div>\n";
- echo " <div class=\"pgboxbody\">\n";
+ #
+ echo "<div class=\"pgbox\">\n";
+ echo " <div class=\"pgboxtitle\"><span class=\"f3\">".__("Package Details")."</span></div>\n";
+ echo " <div class=\"pgboxbody\">\n";
echo " <table>\n";
echo " <tr><td class='boxSoft' colspan='2'><span class='f2'>";
echo $row["Name"] . " " . $row["Version"]."</span></td></tr>\n";
diff --git a/web/template/header.php b/web/template/header.php
index 3c35523e..52f7242c 100644
--- a/web/template/header.php
+++ b/web/template/header.php
@@ -31,10 +31,17 @@
<ul>
<?php
if (isset($_COOKIE["AURSID"])) {
- echo ' <li><a href="/logout.php">'.__("Logout")."</a></li>\n";
- echo ' <li><a href="/pkgsubmit.php">'.__("Submit")."</a></li>\n";
- echo ' <li><a href="/packages.php?do_MyPackages=1">'
- .__("My Packages")."</a></li>\n";
+?>
+ <li><a href="/logout.php"><?php print __("Logout"); ?></a></li>
+ <li><a href="/pkgsubmit.php"><?php print __("Submit"); ?></a></li>
+ <li><a href="/packages.php?do_MyPackages=1"><?php print __("My Packages"); ?></a></li>
+<?php
+ if (account_from_sid($_COOKIE["AURSID"]) == "Trusted User"
+ || account_from_sid($_COOKIE["AURSID"]) == "Developer") {
+?>
+ <li><a href="/tu.php"><?php print __("Trusted User"); ?></a></li>
+<?php
+ }
}
?>
<li><a href="http://archlinux.org/mailman/listinfo/aur-general">
@@ -59,8 +66,8 @@ foreach ($SUPPORTED_LANGS as $lang => $lang_name) {
<li>Lang: </li>
</ul>
</div>
- <br />
- <div style="text-align: right; padding-right: 10px">
+ <br />
+ <div style="text-align: right; padding-right: 10px; clear: right">
<?php
if (isset($_COOKIE["AURSID"])) {
print __("Logged-in as: %h%s%h",