summaryrefslogtreecommitdiffstats
path: root/web/lib
diff options
context:
space:
mode:
Diffstat (limited to 'web/lib')
-rw-r--r--web/lib/aur.inc16
-rw-r--r--web/lib/pkgfuncs.inc8
2 files changed, 10 insertions, 14 deletions
diff --git a/web/lib/aur.inc b/web/lib/aur.inc
index 005c5642..7ea1e965 100644
--- a/web/lib/aur.inc
+++ b/web/lib/aur.inc
@@ -62,7 +62,7 @@ function check_sid() {
global $_COOKIE;
global $LOGIN_TIMEOUT;
- if (isset($_COOKIE["AURSID"])) {
+ if ($_COOKIE["AURSID"]) {
$failed = 0;
# the visitor is logged in, try and update the session
#
@@ -290,18 +290,18 @@ function set_lang() {
global $SUPPORTED_LANGS;
$update_cookie = 0;
- if (isset($_REQUEST['setlang'])) {
+ if ($_REQUEST['setlang']) {
# visitor is requesting a language change
#
$LANG = $_REQUEST['setlang'];
$update_cookie = 1;
- } elseif (isset($_COOKIE['AURLANG'])) {
+ } elseif ($_COOKIE['AURLANG']) {
# If a cookie is set, use that
#
$LANG = $_COOKIE['AURLANG'];
- } elseif (isset($_COOKIE["AURSID"])) {
+ } elseif ($_COOKIE["AURSID"]) {
$dbh = db_connect();
$q = "SELECT LangPreference FROM Users, Sessions ";
$q.= "WHERE Users.ID = Sessions.UsersID ";
@@ -392,17 +392,13 @@ function html_header() {
print " <span class='black'> - </span> ";
print " <a href='/account.php'>".__("Accounts")."</a> ";
print " <span class='black'> - </span> ";
- print " <a href='/pkgsearch.php'>".__("Packages")."</a> ";
- if (isset($_COOKIE["AURSID"])) {
+ print " <a href='/packages.php'>".__("Packages")."</a> ";
+ if ($_COOKIE["AURSID"]) {
# Only display these items if the visitor is logged in. This should
# be a safe check because check_sid() has been called prior to
# html_header().
#
print " <span class='black'> - </span> ";
- print " <a href='/pkgvote.php'>".__("Vote")."</a> ";
- print " <span class='black'> - </span> ";
- print " <a href='/pkgmgmnt.php'>".__("Manage")."</a> ";
- print " <span class='black'> - </span> ";
print " <a href='/pkgsubmit.php'>".__("Submit")."</a> ";
print " <span class='black'> - </span> ";
print " <a href='/logout.php'>".__("Logout")."</a> ";
diff --git a/web/lib/pkgfuncs.inc b/web/lib/pkgfuncs.inc
index 0b7a0003..658dfbaa 100644
--- a/web/lib/pkgfuncs.inc
+++ b/web/lib/pkgfuncs.inc
@@ -12,7 +12,7 @@ function pkgsearch_results_link() {
global $_REQUEST;
global $pkgsearch_vars;
- $url_data = "<a href='/pkgsearch.php?do_Search=1";
+ $url_data = "<a href='/packages.php?do_Search=1";
while (list($k, $var) = each($pkgsearch_vars)) {
if ($var == "do_MyPackages" && $_REQUEST[$var]) {
$url_data.="&".$var."=1";
@@ -218,7 +218,7 @@ function package_details($id=0) {
print "<tr><td class='boxSoft'>";
$deps = package_dependencies($row["ID"]); # $deps[0] = array('id','name');
while (list($k, $darr) = each($deps)) {
- $url = "<a href='/pkgsearch.php?do_Details=1&ID=".$darr[0];
+ $url = "<a href='/packages.php?do_Details=1&ID=".$darr[0];
while(list($k, $var) = each($pkgsearch_vars)) {
if ($var == "do_MyPackages" && $_REQUEST[$var]) {
$url .= "&".$var."=1";
@@ -305,7 +305,7 @@ function pkg_search_page($SID="") {
# The search form
#
- print "<form action='/pkgsearch.php' method='post'>\n";
+ print "<form action='/packages.php' method='post'>\n";
print "<input type='hidden' name='O' value='".$O."'>\n";
print "<center>\n";
@@ -588,7 +588,7 @@ function pkg_search_page($SID="") {
print " <td class='".$c."'><span class='f5'><span class='blue'>";
print $cats[$row["CategoryID"]]."</span></span></td>\n";
print " <td class='".$c."'><span class='f4'>";
- $url = "<a href='/pkgsearch.php?";
+ $url = "<a href='/packages.php?";
$url .= "do_Details=1&ID=";
$url .= $row["ID"];
while (list($k, $var) = each($pkgsearch_vars)) {