Merge branch '3.6-release'

[friendica-addons.git] / blackout / blackout.php

diff --git a/blackout/blackout.php b/blackout/blackout.php
index ec7215ab22dce5ed5810923c17a2eac8a6ac5818..28e5567f75243f1fa509b283fd3be4b8d4809010 100644 (file)
--- a/blackout/blackout.php
+++ b/blackout/blackout.php
@@ -36,10 +36,10 @@
  * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
  * copies of the Software, and to permit persons to whom the Software is
  * furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included in
  * all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -70,9 +70,9 @@ function blackout_redirect ($a, $b) {
                return true;
 
     // else...
-    $mystart = get_config('blackout','begindate');
-    $myend   = get_config('blackout','enddate');
-    $myurl   = get_config('blackout','url');
+    $mystart = Config::get('blackout','begindate');
+    $myend   = Config::get('blackout','enddate');
+    $myurl   = Config::get('blackout','url');
     $now = time();
     $date1 = DateTime::createFromFormat('Y-m-d G:i', $mystart);
     $date2 = DateTime::createFromFormat('Y-m-d G:i', $myend);
@@ -92,9 +92,9 @@ function blackout_redirect ($a, $b) {
 function blackout_addon_admin(&$a, &$o) {
     $mystart = Config::get('blackout','begindate');
     if (! is_string($mystart)) { $mystart = "YYYY-MM-DD:hhmm"; }
-    $myend   = get_config('blackout','enddate');
+    $myend   = Config::get('blackout','enddate');
     if (! is_string($myend)) { $myend = "YYYY-MM-DD:hhmm"; }
-    $myurl   = get_config('blackout','url');
+    $myurl   = Config::get('blackout','url');
     if (! is_string($myurl)) { $myurl = "http://www.example.com"; }
     $t = get_markup_template( "admin.tpl", "addon/blackout/" );
 
@@ -104,7 +104,7 @@ function blackout_addon_admin(&$a, &$o) {
         '$startdate' => ["startdate", "Begin of the Blackout<br />(YYYY-MM-DD hh:mm)", $mystart, "format is <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute"],
         '$enddate' => ["enddate", "End of the Blackout<br />(YYYY-MM-DD hh:mm)", $myend, ""],
 
-    ));
+    ]);
     $date1 = DateTime::createFromFormat('Y-m-d G:i', $mystart);
     $date2 = DateTime::createFromFormat('Y-m-d G:i', $myend);
     if ($date2 < $date1) {
@@ -117,7 +117,7 @@ function blackout_addon_admin_post (&$a) {
     $begindate = trim($_POST['startdate']);
     $enddate = trim($_POST['enddate']);
     $url = trim($_POST['rurl']);
-    set_config('blackout','begindate',$begindate);
-    set_config('blackout','enddate',$enddate);
-    set_config('blackout','url',$url);
+    Config::set('blackout','begindate',$begindate);
+    Config::set('blackout','enddate',$enddate);
+    Config::set('blackout','url',$url);
 }