Revert indentation

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

diff --git a/jappixmini/jappixmini.php b/jappixmini/jappixmini.php
index 8d93f9409ad4187eff90ff5695dbca1f8aeac9cb..0333d8ecf79dee33e0f0a7960cb51e35c13d8820 100644 (file)
--- a/jappixmini/jappixmini.php
+++ b/jappixmini/jappixmini.php
@@ -63,14 +63,12 @@
  */
 
 use Friendica\App;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\User;
-use Friendica\Util\Network;
 
 function jappixmini_install()
 {
@@ -106,19 +104,6 @@ function jappixmini_install()
        }
 }
 
-function jappixmini_uninstall()
-{
-       Hook::unregister('addon_settings', 'addon/jappixmini/jappixmini.php', 'jappixmini_settings');
-       Hook::unregister('addon_settings_post', 'addon/jappixmini/jappixmini.php', 'jappixmini_settings_post');
-
-       Hook::unregister('page_end', 'addon/jappixmini/jappixmini.php', 'jappixmini_script');
-       Hook::unregister('authenticate', 'addon/jappixmini/jappixmini.php', 'jappixmini_login');
-
-       Hook::unregister('cron', 'addon/jappixmini/jappixmini.php', 'jappixmini_cron');
-
-       Hook::unregister('about_hook', 'addon/jappixmini/jappixmini.php', 'jappixmini_download_source');
-}
-
 function jappixmini_addon_admin(App $a, &$o)
 {
        // display instructions and warnings on addon settings page for admin
@@ -435,7 +420,7 @@ function jappixmini_settings_post(App $a, &$b)
                        // check that Jabber password was encrypted with correct Friendica password
                        $friendica_password = trim($b['jappixmini-friendica-password']);
                        if (!User::authenticate((int) $uid, $friendica_password)) {
-                               info("Wrong friendica password!");
+                               notice("Wrong friendica password!");
                                return;
                        }
                }
@@ -463,11 +448,9 @@ function jappixmini_settings_post(App $a, &$b)
                DI::pConfig()->set($uid, 'jappixmini', 'activate'      , intval($b['jappixmini-activate']));
                DI::pConfig()->set($uid, 'jappixmini', 'dontinsertchat', intval($b['jappixmini-dont-insertchat']));
                DI::pConfig()->set($uid, 'jappixmini', 'encrypt'       , $encrypt);
-               info('Jappix Mini settings saved.');
 
                if ($purge) {
                        q("DELETE FROM `pconfig` WHERE `uid`=$uid AND `cat`='jappixmini' AND `k` LIKE 'id:%%'");
-                       info('List of addresses purged.');
                }
        }
 }
@@ -661,7 +644,7 @@ function jappixmini_cron(App $a, $d)
 
                        try {
                                // send request
-                               $answer_json = Network::fetchUrl($url);
+                               $answer_json = DI::httpRequest()->fetch($url);
 
                                // parse answer
                                $answer = json_decode($answer_json);