Merge branch '3.6-rc'

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

diff --git a/irc/irc.php b/irc/irc.php
index 0ac7be37e8ed3c27fa7ec56d887381a82aa8c73d..e8dd92f46f586dfb704e4755ce58479365403967 100644 (file)
--- a/irc/irc.php
+++ b/irc/irc.php
@@ -1,21 +1,25 @@
 <?php
 /**
-* Name: IRC Chat Plugin
+* Name: IRC Chat Addon
 * Description: add an Internet Relay Chat chatroom on freenode
 * Version: 1.1
 * Author: tony baldwin <https://free-haven.org/profile/tony>
 * Author: Tobias Diekershoff <https://f.diekershoff.de/u/tobias>
 */
+use Friendica\Core\Addon;
+use Friendica\Core\Config;
+use Friendica\Core\L10n;
+use Friendica\Core\PConfig;
 
 function irc_install() {
-       register_hook('app_menu', 'addon/irc/irc.php', 'irc_app_menu');
-       register_hook('plugin_settings', 'addon/irc/irc.php', 'irc_addon_settings');
-       register_hook('plugin_settings_post', 'addon/irc/irc.php', 'irc_addon_settings_post');
+       Addon::registerHook('app_menu', 'addon/irc/irc.php', 'irc_app_menu');
+       Addon::registerHook('addon_settings', 'addon/irc/irc.php', 'irc_addon_settings');
+       Addon::registerHook('addon_settings_post', 'addon/irc/irc.php', 'irc_addon_settings_post');
 }
 
 function irc_uninstall() {
-       unregister_hook('app_menu', 'addon/irc/irc.php', 'irc_app_menu');
-       unregister_hook('plugin_settings', 'addon/irc/irc.php', 'irc_addon_settings');
+       Addon::unregisterHook('app_menu', 'addon/irc/irc.php', 'irc_app_menu');
+       Addon::unregisterHook('addon_settings', 'addon/irc/irc.php', 'irc_addon_settings');
 
 }
 
@@ -33,13 +37,13 @@ function irc_addon_settings(&$a,&$s) {
        $autochans = get_pconfig( local_user(), 'irc','autochans');  /* auto connect chans */
 
        $t = get_markup_template( "settings.tpl", "addon/irc/" );
-       $s .= replace_macros($t, array(
-               '$header' => t('IRC Settings'),
-               '$info' => t('Here you can change the system wide settings for the channels to automatically join and access via the side bar. Note the changes you do here, only effect the channel selection if you are logged in.'),
-               '$submit' => t('Save Settings'),
-               '$autochans' => array( 'autochans', t('Channel(s) to auto connect (comma separated)'), $autochans, t('List of channels that shall automatically connected to when the app is launched.')),
-               '$sitechats' => array( 'sitechats', t('Popular Channels (comma separated)'), $sitechats, t('List of popular channels, will be displayed at the side and hotlinked for easy joining.') )
-       ));
+       $s .= replace_macros($t, [
+               '$header' => L10n::t('IRC Settings'),
+               '$info' => L10n::t('Here you can change the system wide settings for the channels to automatically join and access via the side bar. Note the changes you do here, only effect the channel selection if you are logged in.'),
+               '$submit' => L10n::t('Save Settings'),
+               '$autochans' => [ 'autochans', L10n::t('Channel(s) to auto connect (comma separated)'), $autochans, L10n::t('List of channels that shall automatically connected to when the app is launched.')],
+               '$sitechats' => [ 'sitechats', L10n::t('Popular Channels (comma separated)'), $sitechats, L10n::t('List of popular channels, will be displayed at the side and hotlinked for easy joining.') ]
+       ]);
 
 
        return;
@@ -54,12 +58,12 @@ function irc_addon_settings_post(&$a,&$b) {
                set_pconfig( local_user(), 'irc','autochans',trim($_POST['autochans']));
                set_pconfig( local_user(), 'irc','sitechats',trim($_POST['sitechats']));
                /* upid pop-up thing */
-               info( t('IRC settings saved.') . EOL);
+               info(L10n::t('IRC settings saved.') . EOL);
        }
 }
 
 function irc_app_menu($a,&$b) {
-       $b['app_menu'][] = '<div class="app-title"><a href="irc">' . t('IRC Chatroom') . '</a></div>';
+       $b['app_menu'][] = '<div class="app-title"><a href="irc">' . L10n::t('IRC Chatroom') . '</a></div>';
 }
 
 
@@ -87,7 +91,7 @@ function irc_content(&$a) {
                $chats = array('friendica','chat','chatback','hottub','ircbar','dateroom','debian');
 
 
-       $a->page['aside'] .= '<div class="widget"><h3>' . t('Popular Channels') . '</h3><ul>';
+       $a->page['aside'] .= '<div class="widget"><h3>' . L10n::t('Popular Channels') . '</h3><ul>';
        foreach($chats as $chat) {
                $a->page['aside'] .= '<li><a href="' . $a->get_baseurl() . '/irc?channels=' . $chat . '" >' . '#' . $chat . '</a></li>';
        }
@@ -117,7 +121,7 @@ return $o;
     
 }
 
-function irc_plugin_admin_post (&$a) {
+function irc_addon_admin_post (&$a) {
        if(! is_site_admin())
                return;
 
@@ -125,16 +129,16 @@ function irc_plugin_admin_post (&$a) {
                set_config('irc','autochans',trim($_POST['autochans']));
                set_config('irc','sitechats',trim($_POST['sitechats']));
                /* stupid pop-up thing */
-               info( t('IRC settings saved.') . EOL);
+               info(L10n::t('IRC settings saved.') . EOL);
        }
 }
-function irc_plugin_admin (&$a, &$o) {
-       $sitechats = get_config('irc','sitechats'); /* popular channels */
-       $autochans = get_config('irc','autochans');  /* auto connect chans */
+function irc_addon_admin (&$a, &$o) {
+       $sitechats = Config::get('irc','sitechats'); /* popular channels */
+       $autochans = Config::get('irc','autochans');  /* auto connect chans */
        $t = get_markup_template( "admin.tpl", "addon/irc/" );
-       $o = replace_macros($t, array(
-               '$submit' => t('Save Settings'),
-               '$autochans' => array( 'autochans', t('Channel(s) to auto connect (comma separated)'), $autochans, t('List of channels that shall automatically connected to when the app is launched.')),
-               '$sitechats' => array( 'sitechats', t('Popular Channels (comma separated)'), $sitechats, t('List of popular channels, will be displayed at the side and hotlinked for easy joining.') )
-       ));
+       $o = replace_macros($t, [
+               '$submit' => L10n::t('Save Settings'),
+               '$autochans' => [ 'autochans', L10n::t('Channel(s) to auto connect (comma separated)'), $autochans, L10n::t('List of channels that shall automatically connected to when the app is launched.')],
+               '$sitechats' => [ 'sitechats', L10n::t('Popular Channels (comma separated)'), $sitechats, L10n::t('List of popular channels, will be displayed at the side and hotlinked for easy joining.') ]
+       ]);
 }