--- a/filters.inc	Thu May 19 18:04:33 2011 +0200
+++ b/filters.inc	Fri May 20 13:25:53 2011 +0200
@@ -1,26 +1,38 @@
 <?php
-function activeNav($input, $name, $lang)
+function activeNav($input)
 {
+	$name=$GLOBALS['name'];
+	$lang=$GLOBALS['lang'];
 	$pattern = "/<li id=\"${name}\"\s?([^>]*)>/is";
 	$replacement = "<li id=\"${name}\" class=\"active\" $1>";
 	$output= preg_replace($pattern, $replacement, $input);
 	
 	$pattern = '/<li id="([^"]+)"\s?([^>]*)>(.*?)<\/li>/is';
-	$replacement = "<li id=\"\$1\" \$2><a href=\"?name=$1&amp;lang=${lang}\">\$3</a></li>";
+	$replacement = "<li id=\"\$1\" \$2><a href=\"".genUrl(array( "name" => "$1" ))."\">\$3</a></li>";
 	$output=preg_replace($pattern, $replacement, $output);
 
 	return $output;
 }
 
-function addLangBar($input, $lang) {
+function addLangBar($input) {
+	 $name=$GLOBALS['name'];
+	 $lang=$GLOBALS['lang'];
 	 $languages = array("no","en");
 	 $langbar='<ul id="language-select">';
 
 	 foreach($languages as $l) {
-	   $active=($l == $lang)?1:0;
+	   $active=($l == $lang)?0:1;
 	     $langbar.= "
-	    <li class=\"${l}\">
-	      <img src=\"http://dev.bfginvest.no/php/flag.php?lang=${l}&amp;active=${active}\" width=\"20\" height=\"16\" alt=\"Norsk versjon - inaktiv\" title=\"Norsk\"/>
+	    <li class=\"${l}\">";
+	    if ($active) 
+	    $langbar.='<a href="'.genUrl(array( lang => $l)).'">';
+
+	    $langbar.= "
+	      <img src=\"http://dev.bfginvest.no/php/flag.php?lang=${l}&amp;active=${active}\" width=\"20\" height=\"16\" alt=\"Norsk versjon - inaktiv\" title=\"Norsk\"/>";
+	    if ($active) 
+	    $langbar.="</a>";
+
+	      $langbar.= "
 	    </li>
 ";