Update t() calls

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

diff --git a/xmpp/xmpp.php b/xmpp/xmpp.php
index e523c65c5fe3fcccb954f01c6d94d1d2bfca3f34..bd5adb574e2714513e779c867569a98e2a9f272c 100644 (file)
--- a/xmpp/xmpp.php
+++ b/xmpp/xmpp.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Name: XMPP (Jabber)
  * Description: Embedded XMPP (Jabber) client
@@ -7,26 +6,28 @@
  * Author: Michael Vogel <https://pirati.ca/profile/heluecht>
  */
 use Friendica\App;
+use Friendica\Core\Addon;
 use Friendica\Core\Config;
+use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 
 function xmpp_install()
 {
-       register_hook('plugin_settings', 'addon/xmpp/xmpp.php', 'xmpp_plugin_settings');
-       register_hook('plugin_settings_post', 'addon/xmpp/xmpp.php', 'xmpp_plugin_settings_post');
-       register_hook('page_end', 'addon/xmpp/xmpp.php', 'xmpp_script');
-       register_hook('logged_in', 'addon/xmpp/xmpp.php', 'xmpp_login');
+       Addon::registerHook('addon_settings', 'addon/xmpp/xmpp.php', 'xmpp_addon_settings');
+       Addon::registerHook('addon_settings_post', 'addon/xmpp/xmpp.php', 'xmpp_addon_settings_post');
+       Addon::registerHook('page_end', 'addon/xmpp/xmpp.php', 'xmpp_script');
+       Addon::registerHook('logged_in', 'addon/xmpp/xmpp.php', 'xmpp_login');
 }
 
 function xmpp_uninstall()
 {
-       unregister_hook('plugin_settings', 'addon/xmpp/xmpp.php', 'xmpp_plugin_settings');
-       unregister_hook('plugin_settings_post', 'addon/xmpp/xmpp.php', 'xmpp_plugin_settings_post');
-       unregister_hook('page_end', 'addon/xmpp/xmpp.php', 'xmpp_script');
-       unregister_hook('logged_in', 'addon/xmpp/xmpp.php', 'xmpp_login');
+       Addon::unregisterHook('addon_settings', 'addon/xmpp/xmpp.php', 'xmpp_addon_settings');
+       Addon::unregisterHook('addon_settings_post', 'addon/xmpp/xmpp.php', 'xmpp_addon_settings_post');
+       Addon::unregisterHook('page_end', 'addon/xmpp/xmpp.php', 'xmpp_script');
+       Addon::unregisterHook('logged_in', 'addon/xmpp/xmpp.php', 'xmpp_login');
 }
 
-function xmpp_plugin_settings_post()
+function xmpp_addon_settings_post()
 {
        if (!local_user() || (!x($_POST, 'xmpp-settings-submit'))) {
                return;
@@ -35,10 +36,10 @@ function xmpp_plugin_settings_post()
        PConfig::set(local_user(), 'xmpp', 'individual', intval($_POST['xmpp_individual']));
        PConfig::set(local_user(), 'xmpp', 'bosh_proxy', $_POST['xmpp_bosh_proxy']);
 
-       info(t('XMPP settings updated.') . EOL);
+       info(L10n::t('XMPP settings updated.') . EOL);
 }
 
-function xmpp_plugin_settings(App $a, &$s)
+function xmpp_addon_settings(App $a, &$s)
 {
        if (!local_user()) {
                return;
@@ -60,26 +61,26 @@ function xmpp_plugin_settings(App $a, &$s)
 
        /* Add some HTML to the existing form */
        $s .= '<span id="settings_xmpp_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_xmpp_expanded\'); openClose(\'settings_xmpp_inflated\');">';
-       $s .= '<h3>' . t('XMPP-Chat (Jabber)') . '</h3>';
+       $s .= '<h3>' . L10n::t('XMPP-Chat (Jabber)') . '</h3>';
        $s .= '</span>';
        $s .= '<div id="settings_xmpp_expanded" class="settings-block" style="display: none;">';
        $s .= '<span class="fakelink" onclick="openClose(\'settings_xmpp_expanded\'); openClose(\'settings_xmpp_inflated\');">';
-       $s .= '<h3>' . t('XMPP-Chat (Jabber)') . '</h3>';
+       $s .= '<h3>' . L10n::t('XMPP-Chat (Jabber)') . '</h3>';
        $s .= '</span>';
 
        $s .= '<div id="xmpp-settings-wrapper">';
-       $s .= '<label id="xmpp-enabled-label" for="xmpp-enabled">' . t('Enable Webchat') . '</label>';
+       $s .= '<label id="xmpp-enabled-label" for="xmpp-enabled">' . L10n::t('Enable Webchat') . '</label>';
        $s .= '<input id="xmpp-enabled" type="checkbox" name="xmpp_enabled" value="1" ' . $enabled_checked . '/>';
        $s .= '<div class="clear"></div>';
 
        if (Config::get("xmpp", "central_userbase")) {
-               $s .= '<label id="xmpp-individual-label" for="xmpp-individual">' . t('Individual Credentials') . '</label>';
+               $s .= '<label id="xmpp-individual-label" for="xmpp-individual">' . L10n::t('Individual Credentials') . '</label>';
                $s .= '<input id="xmpp-individual" type="checkbox" name="xmpp_individual" value="1" ' . $individual_checked . '/>';
                $s .= '<div class="clear"></div>';
        }
 
        if (!Config::get("xmpp", "central_userbase") || PConfig::get(local_user(), "xmpp", "individual")) {
-               $s .= '<label id="xmpp-bosh-proxy-label" for="xmpp-bosh-proxy">' . t('Jabber BOSH host') . '</label>';
+               $s .= '<label id="xmpp-bosh-proxy-label" for="xmpp-bosh-proxy">' . L10n::t('Jabber BOSH host') . '</label>';
                $s .= ' <input id="xmpp-bosh-proxy" type="text" name="xmpp_bosh_proxy" value="' . $bosh_proxy . '" />';
                $s .= '<div class="clear"></div>';
        }
@@ -88,7 +89,7 @@ function xmpp_plugin_settings(App $a, &$s)
 
        /* provide a submit button */
 
-       $s .= '<div class="settings-submit-wrapper" ><input type="submit" name="xmpp-settings-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div></div>';
+       $s .= '<div class="settings-submit-wrapper" ><input type="submit" name="xmpp-settings-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div></div>';
 }
 
 function xmpp_login()
@@ -99,24 +100,24 @@ function xmpp_login()
        }
 }
 
-function xmpp_plugin_admin(App $a, &$o)
+function xmpp_addon_admin(App $a, &$o)
 {
        $t = get_markup_template("admin.tpl", "addon/xmpp/");
 
-       $o = replace_macros($t, array(
-               '$submit' => t('Save Settings'),
-               '$bosh_proxy' => array('bosh_proxy', t('Jabber BOSH host'), Config::get('xmpp', 'bosh_proxy'), ''),
-               '$central_userbase' => array('central_userbase', t('Use central userbase'), Config::get('xmpp', 'central_userbase'), t('If enabled, users will automatically login to an ejabberd server that has to be installed on this machine with synchronized credentials via the "auth_ejabberd.php" script.')),
-       ));
+       $o = replace_macros($t, [
+               '$submit' => L10n::t('Save Settings'),
+               '$bosh_proxy' => ['bosh_proxy', L10n::t('Jabber BOSH host'), Config::get('xmpp', 'bosh_proxy'), ''],
+               '$central_userbase' => ['central_userbase', L10n::t('Use central userbase'), Config::get('xmpp', 'central_userbase'), L10n::t('If enabled, users will automatically login to an ejabberd server that has to be installed on this machine with synchronized credentials via the "auth_ejabberd.php" script.')],
+       ]);
 }
 
-function xmpp_plugin_admin_post()
+function xmpp_addon_admin_post()
 {
        $bosh_proxy = ((x($_POST, 'bosh_proxy')) ? trim($_POST['bosh_proxy']) : '');
        $central_userbase = ((x($_POST, 'central_userbase')) ? intval($_POST['central_userbase']) : false);
        Config::set('xmpp', 'bosh_proxy', $bosh_proxy);
        Config::set('xmpp', 'central_userbase', $central_userbase);
-       info(t('Settings updated.') . EOL);
+       info(L10n::t('Settings updated.') . EOL);
 }
 
 function xmpp_script(App $a)
@@ -142,7 +143,7 @@ function xmpp_converse(App $a)
                return;
        }
 
-       if (in_array($a->query_string, array("admin/federation/"))) {
+       if (in_array($a->query_string, ["admin/federation/"])) {
                return;
        }
 
@@ -152,7 +153,7 @@ function xmpp_converse(App $a)
        if (Config::get("xmpp", "central_userbase") && !PConfig::get(local_user(), "xmpp", "individual")) {
                $bosh_proxy = Config::get("xmpp", "bosh_proxy");
 
-               $password = PConfig::get(local_user(), "xmpp", "password");
+               $password = PConfig::get(local_user(), "xmpp", "password", '', true);
 
                if ($password == "") {
                        $password = random_string(16);
@@ -176,7 +177,7 @@ function xmpp_converse(App $a)
                return;
        }
 
-       if (in_array($a->argv[0], array("manage", "logout"))) {
+       if (in_array($a->argv[0], ["manage", "logout"])) {
                $additional_commands = "converse.user.logout();\n";
        } else {
                $additional_commands = "";