Merge branch 'feature-cookie-settings' into devel

Author: olgabrani

CHANGELOG.md

@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   - OpenAIRE
   - OpenMinTeD
 - Add info about compatiblity in README.
+- Enable/disable cookie banner functionality via setting in config file.
 
 
 ## [v2.1.0](https://github.com/rciam/simplesamlphp-module-themevanilla/compare/v2.0.0...v2.1.0) - 2018-10-18

README.md

@@ -98,6 +98,15 @@ directories (`js.zip` and `css.zip`) from the [release page](https://github.com/
 extract them under `modules/themevanilla/www/resources`.  If you want to produce
 them, you may read the customisation instructions below.
 
+### Cookie Policy
+
+In order to use Cookie Policy page you must copy the configuration file
+from the `config-example` folder to core config directory.
+```
+cp <path-to-module>/config-example/module_themevanilla.php <path-to-simplesamlphp>/config
+```
+To disable the feature, set `enable_cookies_banner` to `false` in the above
+file.
 
 ## Configuration
 
@@ -237,8 +246,7 @@ compiling options.
 To modify the cookie banner and cookie policy page, you must edit the following files:
 `<path-to-module>/dictionaries/policy.definition.json`
 and to modify the table in cookie policy page:
-`<path-to-simplesamlphp>/config/module_themevanilla.php`
-
+`<path-to-simplesamlphp>/config/module_themevanilla.php`.
 
 ## Compatibility Note
 

config-example/module_themevanilla.php

@@ -16,7 +16,8 @@
         array('type' => 'Preferences', 'provider' => 'aai.rciam.eu', 'name' => 'rciam_co_registry_tz', 'thirdParty' => false, 'category' => 'Persistent', 'purpose' => 'Preserve preferred timezone selection for COmanage RCIAM Account Registry'),
         array('type' => 'Preferences', 'provider' => 'aai.rciam.eu', 'name' => 'i18next', 'thirdParty' => false, 'category' => 'Session', 'purpose' => 'Preserve preferred language for RCIAM AAI OpenID Connect Provider'),
         array('type' => 'Session State', 'provider' => 'aai.rciam.eu', 'name' => 'JSESSIONID', 'thirdParty' => false, 'category' => 'Session', 'purpose' => 'Preserve user session ID to retrieve session information')
-    )
+      ),
+      'enable_cookies_banner' => false
 );
 
 ?>

themes/ssp/default/includes/footer.php

@@ -1,5 +1,8 @@
 
 <?php
+$themeConfig = SimpleSAML_Configuration::getConfig('module_themevanilla.php');
+$enable_cookies_banner = $themeConfig->getValue('enable_cookies_banner');
+
 if(!empty($this->data['htmlinject']['htmlContentPost'])) {
   foreach($this->data['htmlinject']['htmlContentPost'] AS $c) {
     echo $c;
@@ -9,7 +12,7 @@
   </div><!-- /container -->
   </div><!-- /ssp-container -->
 
-<?php if(strpos($this->t('{themevanilla:discopower:cookies_text}'), 'not translated') === FALSE || strpos($this->t('{themevanilla:discopower:cookies_accept_btn_text}'), 'not translated') === FALSE) { ?>
+<?php if ($enable_cookies_banner) { ?>
   <!-- cookies popup -->
   <div id="cookies">
     <div id="cookies-wrapper">