Merge pull request #46 from silinternational/feature/announcement-change

Get announcements by calling the utils method directly rather than from the config.php

Author: Baggerone

README.md

@@ -39,15 +39,15 @@ Update `/simplesamlphp/config/config.php`:
 _[ssp-base](https://github.com/silinternational/ssp-base) provides a convenience by loading this config with whatever is in the environment variable `ANALYTICS_ID`._
 
 ### Announcements
-Update `/simplesamlphp/config/config.php`:
+Update `/simplesamlphp/announcement/announcement.php`:
 
 ```
-'announcement' => 'Some <strong>important</strong> announcement'
+ return 'Some <strong>important</strong> announcement';
 ```
 
-_[ssp-base](https://github.com/silinternational/ssp-base) provides a convenience by loading this config with whatever is returned by `/simplesamlphp/announcement/announcement.php`._
+_[ssp-utilities](https://github.com/silinternational/ssp-utilities) provides whatever is returned by `/simplesamlphp/announcement/announcement.php`._
 
-If configured, an alert will be shown to the user filled with the content of that announcement.  HTML is supported.
+If provided, an alert will be shown to the user filled with the content of that announcement.  HTML is supported.
 
 ## Testing theme
 

composer.json

@@ -14,6 +14,7 @@
     "php": ">=5.4",
     "roave/security-advisories": "dev-master",
     "simplesamlphp/composer-module-installer": "^1.1.5",
-    "simplesamlphp/simplesamlphp": "^1.14.10"
+    "simplesamlphp/simplesamlphp": "^1.14.10",
+    "silinternational/ssp-utilities": "^1.0"
   }
 }

themes/material/common-announcement.php

@@ -1,5 +1,8 @@
 <?php
-$announcementHtml = $this->configuration->getValue('announcement');
+
+use Sil\SspUtils\AnnouncementUtils;
+
+$announcementHtml = AnnouncementUtils::getAnnouncement();
 
 if (! empty($announcementHtml)) {
 ?>