renamed config key switches to prefilter and renamed subkeys to the n…

…ame of the prefilter
Clansuite · Sep 24, 2012 · 7ee79e3 · 7ee79e3
1 parent 721bc18
commit 7ee79e3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/Clansuite/Configuration/Staging/development.php b/Clansuite/Configuration/Staging/development.php
@@ -81,11 +81,11 @@
 tag = ""
 
 ;----------------------------------------
-; switches
+; prefilter
 ;----------------------------------------
-[switches]
-themeswitch_via_url = 0
-languageswitch_via_url = 0
+[prefilter]
+theme_via_get = 0
+language_via_get = 0
 
 ;----------------------------------------
 ; maintenance

diff --git a/framework/Koch/Filter/Filters/LanguageViaGet.php b/framework/Koch/Filter/Filters/LanguageViaGet.php
@@ -59,7 +59,7 @@ class LanguageViaGet implements FilterInterface
     public function __construct(Config $config)
     {
         // only subarray is relevant
-        $this->config = $config['switches'];
+        $this->config = $config['prefilter'];
     }
 
     public function executeFilter(HttpRequestInterface $request, HttpResponseInterface $response)
@@ -68,7 +68,7 @@ public function executeFilter(HttpRequestInterface $request, HttpResponseInterfa
          * take the initiative of filtering, if language switching is enabled in CONFIG
          * or pass through (do nothing) if disabled
          */
-        if (true === (bool) $this->config['languageswitch_via_url']) {
+        if (true === (bool) $this->config['language_via_get']) {
             return;
         }
 
@@ -82,7 +82,7 @@ public function executeFilter(HttpRequestInterface $request, HttpResponseInterfa
              * b) that the language was set via $_GET parameter
              */
             $_SESSION['user']['language'] = mb_strtolower($language);
-            $_SESSION['user']['language_via_url'] = 1;
+            $_SESSION['user']['language_via_get'] = 1;
         }
     }
 }
diff --git a/framework/Koch/Filter/Filters/ThemeViaGet.php b/framework/Koch/Filter/Filters/ThemeViaGet.php
@@ -50,14 +50,14 @@ class ThemeViaGet implements FilterInterface
     public function __construct(Config $config, Inputfilter $input)
     {
         // reduce array size by selection of the section
-        $this->config = $config['switches'];
+        $this->config = $config['prefilter'];
         $this->input  = $input;
     }
 
     public function executeFilter(HttpRequestInterface $request, HttpResponseInterface $response)
     {
         // themeswitching must is enabled in configuration
-        if ($this->config['themeswitch_via_url'] == 1) {
+        if ($this->config['theme_via_get'] == 1) {
             return;
         }