Merge pull request #950 from nupplaphil/bug/8182_another_notification_bug

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

diff --git a/randplace/randplace.php b/randplace/randplace.php
index 019d6f7666318803f8959709f13ab008ec481d83..886d79d125a58f240d63404ddcee5521367a3daf 100644 (file)
--- a/randplace/randplace.php
+++ b/randplace/randplace.php
@@ -18,9 +18,9 @@
  * system will call the name_uninstall() function.
  *
  */
-use Friendica\Core\Addon;
-use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
+use Friendica\Core\Hook;
+use Friendica\Core\Logger;
+use Friendica\DI;
 
 function randplace_install() {
 
@@ -31,7 +31,7 @@ function randplace_install() {
         *
         */
 
-       Addon::registerHook('post_local', 'addon/randplace/randplace.php', 'randplace_post_hook');
+       Hook::register('post_local', 'addon/randplace/randplace.php', 'randplace_post_hook');
 
        /**
         *
@@ -41,10 +41,10 @@ function randplace_install() {
         *
         */
 
-       Addon::registerHook('addon_settings', 'addon/randplace/randplace.php', 'randplace_settings');
-       Addon::registerHook('addon_settings_post', 'addon/randplace/randplace.php', 'randplace_settings_post');
+       Hook::register('addon_settings', 'addon/randplace/randplace.php', 'randplace_settings');
+       Hook::register('addon_settings_post', 'addon/randplace/randplace.php', 'randplace_settings_post');
 
-       logger("installed randplace");
+       Logger::log("installed randplace");
 }
 
 
@@ -58,12 +58,12 @@ function randplace_uninstall() {
         *
         */
 
-       Addon::unregisterHook('post_local',    'addon/randplace/randplace.php', 'randplace_post_hook');
-       Addon::unregisterHook('addon_settings', 'addon/randplace/randplace.php', 'randplace_settings');
-       Addon::unregisterHook('addon_settings_post', 'addon/randplace/randplace.php', 'randplace_settings_post');
+       Hook::unregister('post_local',    'addon/randplace/randplace.php', 'randplace_post_hook');
+       Hook::unregister('addon_settings', 'addon/randplace/randplace.php', 'randplace_settings');
+       Hook::unregister('addon_settings_post', 'addon/randplace/randplace.php', 'randplace_settings_post');
 
 
-       logger("removed randplace");
+       Logger::log("removed randplace");
 }
 
 
@@ -79,7 +79,7 @@ function randplace_post_hook($a, &$item) {
         *
         */
 
-       logger('randplace invoked');
+       Logger::log('randplace invoked');
 
        if(! local_user())   /* non-zero if this is a logged in user of this system */
                return;
@@ -92,7 +92,7 @@ function randplace_post_hook($a, &$item) {
 
        /* Retrieve our personal config setting */
 
-       $active = PConfig::get(local_user(), 'randplace', 'enable');
+       $active = DI::pConfig()->get(local_user(), 'randplace', 'enable');
 
        if(! $active)
                return;
@@ -137,7 +137,7 @@ function randplace_settings_post($a,$post) {
        if(! local_user())
                return;
        if($_POST['randplace-submit'])
-               PConfig::set(local_user(),'randplace','enable',intval($_POST['randplace']));
+               DI::pConfig()->set(local_user(),'randplace','enable',intval($_POST['randplace']));
 }
 
 
@@ -157,25 +157,25 @@ function randplace_settings(&$a,&$s) {
 
        /* Add our stylesheet to the page so we can make our settings look nice */
 
-       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/randplace/randplace.css' . '" media="all" />' . "\r\n";
+       DI::page()['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/addon/randplace/randplace.css' . '" media="all" />' . "\r\n";
 
        /* Get the current state of our config variable */
 
-       $enabled = PConfig::get(local_user(),'randplace','enable');
+       $enabled = DI::pConfig()->get(local_user(),'randplace','enable');
 
        $checked = (($enabled) ? ' checked="checked" ' : '');
 
        /* Add some HTML to the existing form */
 
        $s .= '<div class="settings-block">';
-       $s .= '<h3>' . L10n::t('Randplace Settings') . '</h3>';
+       $s .= '<h3>' . DI::l10n()->t('Randplace Settings') . '</h3>';
        $s .= '<div id="randplace-enable-wrapper">';
-       $s .= '<label id="randplace-enable-label" for="randplace-checkbox">' . L10n::t('Enable Randplace Addon') . '</label>';
+       $s .= '<label id="randplace-enable-label" for="randplace-checkbox">' . DI::l10n()->t('Enable Randplace Addon') . '</label>';
        $s .= '<input id="randplace-checkbox" type="checkbox" name="randplace" value="1" ' . $checked . '/>';
        $s .= '</div><div class="clear"></div>';
 
        /* provide a submit button */
 
-       $s .= '<div class="settings-submit-wrapper" ><input type="submit" name="randplace-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div></div>';
+       $s .= '<div class="settings-submit-wrapper" ><input type="submit" name="randplace-submit" class="settings-submit" value="' . DI::l10n()->t('Save Settings') . '" /></div></div>';
 
 }