diff www/loc.php @ 801:723ddd5537d9

Sync.
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 13 Jul 2009 02:49:27 +0000
parents b066148013cd
children 28825de98943
line wrap: on
line diff
--- a/www/loc.php	Mon Jul 13 02:46:23 2009 +0000
+++ b/www/loc.php	Mon Jul 13 02:49:27 2009 +0000
@@ -2,25 +2,25 @@
 require "config.inc.php";
 require "common.inc.php";
 
-function makeURL($afilter, $filter, $coders, $desc, $name, $class)
+function makeURL($afilter, $filter, $coders, $desc, $qname, $qclass)
 {
   $s = "";
   if ($afilter) $s = "f=".$filter;
 
   if (!$coders) {
-    if ($s != "") $s .= "&amp;";
+    if ($s !== "") $s .= "&amp;";
     $s .= "s";
   }
 
-  if (isset($name)) {
-    if ($s != "") $s .= "&amp;";
-    $s .= "n=".$name;
+  if ($qname !== "") {
+    if ($s !== "") $s .= "&amp;";
+    $s .= "n=".$qname;
   }
   
   echo "   <td><a ";
-  if (isset($class))
-    echo "class=\"".$class."\" ";
-  echo "href=\"".$GLOBALS["SCRIPT_NAME"];
+  if ($qclass !== "")
+    echo "class=\"".$qclass."\" ";
+  echo "href=\"".$_SERVER["PHP_SELF"];
   if (strlen($s) > 0) echo "?".$s;
   echo "\">".$desc."</a></td>\n";
 }
@@ -41,7 +41,7 @@
     $filter = $_GET["f"];
     $applyFilter = TRUE;
   } else {
-    $filter = "C";
+    $filter = "CF";
     $applyFilter = FALSE;
   }
 }
@@ -94,7 +94,7 @@
 
 ?>
 <div class="selbar">
- <form action="<? echo $GLOBALS["SCRIPT_NAME"]; ?>" method="get">
+ <form action="<? echo $_SERVER["PHP_SELF"]; ?>" method="get">
 <?
 if (isset($setName))
   echo "<input type=\"hidden\" name=\"n\" value=\"".htmlentities($setName)."\" />\n";
@@ -121,7 +121,7 @@
 
 echo "   <td></td>\n";
 
-makeURL($applyFilter, $filter, $showCoders, "All continents");
+makeURL($applyFilter, $filter, $showCoders, "All continents", "", "");
 
 reset($continentList);
 while (list($iKey, $iValue) = each($continentList)) {
@@ -254,7 +254,7 @@
           while (list($fKey, $fVal) = each($iv["coders"])) {
             if ($fs != "") $fs .= ", ";
             if ($filter != "C" || !$applyFilter)
-              $fs .= "<a href=\"".$GLOBALS["SCRIPT_NAME"]."?a=".$fVal."\">".$fVal."</a>";
+              $fs .= "<a href=\"".$_SERVER["PHP_SELF"]."?a=".$fVal."\">".$fVal."</a>";
             else
               $fs .= $fVal;
           }