Merge branch '3.6-rc'

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

diff --git a/blackout/blackout.php b/blackout/blackout.php
index 2693db5a5fe5bb7a2b3508b82bc73ad1edbc5394..ec7215ab22dce5ed5810923c17a2eac8a6ac5818 100644 (file)
--- a/blackout/blackout.php
+++ b/blackout/blackout.php
@@ -9,12 +9,12 @@
  * About
  * =====
  *
- * This plugin will allow you to enter a date/time period during which
+ * This addon will allow you to enter a date/time period during which
  * all your ~friendica visitors from the web will be redirected to a page
  * you can configure in the admin panel as well.
  *
  * Calls to the API and the communication with other ~friendica nodes is
- * not effected from this plugin.
+ * not effected from this addon.
  *
  * If you enter a period the current date would be affected none of the
  * currently logged in users will be effected as well. But if they log
@@ -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
@@ -50,13 +50,15 @@
  */
 
 use Friendica\Core\Config;
+use Friendica\Core\Addon;
+use Friendica\Core\L10n;
 
 function blackout_install() {
-    register_hook('page_header', 'addon/blackout/blackout.php', 'blackout_redirect');
+    Addon::registerHook('page_header', 'addon/blackout/blackout.php', 'blackout_redirect');
 }
 
 function blackout_uninstall() {
-    unregister_hook('page_header', 'addon/blackout/blackout.php', 'blackout_redirect');
+    Addon::unregisterHook('page_header', 'addon/blackout/blackout.php', 'blackout_redirect');
 }
 function blackout_redirect ($a, $b) {
     // if we have a logged in user, don't throw her out
@@ -68,9 +70,9 @@ function blackout_redirect ($a, $b) {
                return true;
 
     // else...
-    $mystart = Config::get('blackout','begindate');
-    $myend   = Config::get('blackout','enddate');
-    $myurl   = Config::get('blackout','url');
+    $mystart = get_config('blackout','begindate');
+    $myend   = get_config('blackout','enddate');
+    $myurl   = get_config('blackout','url');
     $now = time();
     $date1 = DateTime::createFromFormat('Y-m-d G:i', $mystart);
     $date2 = DateTime::createFromFormat('Y-m-d G:i', $myend);
@@ -87,22 +89,22 @@ function blackout_redirect ($a, $b) {
     }
 }
 
-function blackout_plugin_admin(&$a, &$o) {
+function blackout_addon_admin(&$a, &$o) {
     $mystart = Config::get('blackout','begindate');
     if (! is_string($mystart)) { $mystart = "YYYY-MM-DD:hhmm"; }
-    $myend   = Config::get('blackout','enddate');
+    $myend   = get_config('blackout','enddate');
     if (! is_string($myend)) { $myend = "YYYY-MM-DD:hhmm"; }
-    $myurl   = Config::get('blackout','url');
+    $myurl   = get_config('blackout','url');
     if (! is_string($myurl)) { $myurl = "http://www.example.com"; }
     $t = get_markup_template( "admin.tpl", "addon/blackout/" );
 
    $o = replace_macros($t, [
-        '$submit' => t('Save Settings'),
+        '$submit' => L10n::t('Save Settings'),
         '$rurl' => ["rurl", "Redirect URL", $myurl, "all your visitors from the web will be redirected to this URL"],
         '$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) {
@@ -111,11 +113,11 @@ function blackout_plugin_admin(&$a, &$o) {
         $o = '<p>Please double check that the current settings for the blackout. Begin will be <strong>'.$mystart.'</strong> and it will end <strong>'.$myend.'</strong>.</p>' . $o;
     }
 }
-function blackout_plugin_admin_post (&$a) {
+function blackout_addon_admin_post (&$a) {
     $begindate = trim($_POST['startdate']);
     $enddate = trim($_POST['enddate']);
     $url = trim($_POST['rurl']);
-    Config::set('blackout','begindate',$begindate);
-    Config::set('blackout','enddate',$enddate);
-    Config::set('blackout','url',$url);
+    set_config('blackout','begindate',$begindate);
+    set_config('blackout','enddate',$enddate);
+    set_config('blackout','url',$url);
 }