Add support for filtering tabs in discopower module...

git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@1291 44740490-163a-0410-bde0-09ae8108e29a

modules/discopower/config-templates/module_discopower.php

@@ -15,6 +15,11 @@ $config = array (
 	 * All other available tabs will be listed after the ones specified below.
 	 */
 	'taborder' => array('norway'),
+	/*
+	 * the 'tab' parameter allows you to limit the tabs to a specific list. (excluding unlisted tags)
+	 *
+	 * 'tabs' => array('norway', 'finland'),
+	 */
 
 );
 

modules/discopower/dictionaries/tabs.php

@@ -8,16 +8,25 @@ $lang = array(
 	),
 
 	'kalmar' => array (
-		'no' => 'Kalmar',
 		'en' => 'Kalmar',
+		'no' => 'Kalmar',
 	),
 
-	'haka' => array (
+	'finland' => array (
 		'no' => 'Finnland',
 		'en' => 'Finland',
 	),
+
+	'sweden' => array (
+		'no' => 'Sverige',
+		'en' => 'Sweden',
+	),
 	
-	'switch' => array (
+	'denmark' => array (
+		'no' => 'Danmark',
+		'en' => 'Denmark',
+	),
+	'switzerland' => array (
 		'no' => 'Sveits',
 		'en' => 'Switzerland',
 	),

modules/discopower/lib/PowerIdPDisco.php

@@ -58,12 +58,15 @@ class sspmod_discopower_PowerIdPDisco extends SimpleSAML_XHTML_IdPDisco {
 			}
 		}
 		
+		$enableTabs = $this->discoconfig->getValue('tabs', NULL);
+		
 		foreach($list AS $key => $val) {
 			$tags = array('misc');
 			if (array_key_exists('tags', $val)) {
 				$tags = $val['tags'];
 			}
 			foreach ($tags AS $tag) {
+				if (!empty($enableTabs) && !in_array($tag, $enableTabs)) continue;
 				$slist[$tag][$key] = $val;
 			}
 		}