SimpleSAML_XHTML_Template: add language parameter options (issue #530).

Andjelko Horvat · Andjelko Horvat · commit c74c356ff4df · 2013-01-08T11:56:19.000Z
git-svn-id: https://simplesamlphp.googlecode.com/svn/trunk@3217 44740490-163a-0410-bde0-09ae8108e29a
diff --git a/config-templates/config.php b/config-templates/config.php
@@ -277,6 +277,12 @@
 	'language.rtl'		=> array('ar','dv','fa','ur','he'),
 	'language.default'		=> 'en',
 
+	/*
+	 * Options to override the default settings for the language parameter
+	 */
+	'language.parameter.name'   => 'language',
+	'language.parameter.setcookie'  => TRUE,
+
 	/*
 	 * Options to override the default settings for the language cookie
 	 */
diff --git a/lib/SimpleSAML/XHTML/Template.php b/lib/SimpleSAML/XHTML/Template.php
@@ -38,6 +38,12 @@ class SimpleSAML_XHTML_Template {
 	private $defaultDictionary = NULL;
 
 
+	/**
+	 * HTTP GET language parameter name.
+	 */
+	private $languageParameterName = 'language';
+
+
 	/**
 	 * Constructor
 	 *
@@ -52,9 +58,10 @@ function __construct(SimpleSAML_Configuration $configuration, $template, $defaul
 		$this->data['baseurlpath'] = $this->configuration->getBaseURL();
 
 		$this->availableLanguages = $this->configuration->getArray('language.available', array('en'));
-		
-		if (isset($_GET['language'])) {
-			$this->setLanguage($_GET['language']);
+
+		$this->languageParameterName = $this->configuration->getString('language.parameter.name', 'language');
+		if (isset($_GET[$this->languageParameterName])) {
+			$this->setLanguage($_GET[$this->languageParameterName], $this->configuration->getBoolean('language.parameter.setcookie', TRUE));
 		}
 
 		if($defaultDictionary !== NULL && substr($defaultDictionary, -4) === '.php') {
diff --git a/templates/includes/header.php b/templates/includes/header.php
@@ -193,7 +193,7 @@
 			if ($current) {
 				$textarray[] = $langnames[$lang];
 			} else {
-				$textarray[] = '<a href="' . htmlspecialchars(SimpleSAML_Utilities::addURLparameter(SimpleSAML_Utilities::selfURL(), array('language' => $lang))) . '">' .
+				$textarray[] = '<a href="' . htmlspecialchars(SimpleSAML_Utilities::addURLparameter(SimpleSAML_Utilities::selfURL(), array($this->languageParameterName => $lang))) . '">' .
 					$langnames[$lang] . '</a>';
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,7 @@`
`193`	`193`	`if ($current) {`
`194`	`194`	`$textarray[] = $langnames[$lang];`
`195`	`195`	`} else {`
`196`		`- $textarray[] = '<a href="' . htmlspecialchars(SimpleSAML_Utilities::addURLparameter(SimpleSAML_Utilities::selfURL(), array('language' => $lang))) . '">' .`
	`196`	`+ $textarray[] = '<a href="' . htmlspecialchars(SimpleSAML_Utilities::addURLparameter(SimpleSAML_Utilities::selfURL(), array($this->languageParameterName => $lang))) . '">' .`
`197`	`197`	`$langnames[$lang] . '</a>';`
`198`	`198`	`}`
`199`	`199`	`}`