X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=xmpp%2Fxmpp.php;h=bd5adb574e2714513e779c867569a98e2a9f272c;hb=87a392a3c793b1b9b781939b46cf4189f15fb881;hp=fc2d6bb5c0d347e469ebfed2456dab7b1c85d368;hpb=0afd633346b517894ff8e92c705bd5d052dd06a2;p=friendica-addons.git

diff --git a/xmpp/xmpp.php b/xmpp/xmpp.php
index fc2d6bb5..bd5adb57 100644
--- a/xmpp/xmpp.php
+++ b/xmpp/xmpp.php
@@ -1,5 +1,4 @@
 <?php
-
 /**
  * Name: XMPP (Jabber)
  * Description: Embedded XMPP (Jabber) client
@@ -9,25 +8,26 @@
 use Friendica\App;
 use Friendica\Core\Addon;
 use Friendica\Core\Config;
+use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 
 function xmpp_install()
 {
-	Addon::registerHook('plugin_settings', 'addon/xmpp/xmpp.php', 'xmpp_plugin_settings');
-	Addon::registerHook('plugin_settings_post', 'addon/xmpp/xmpp.php', 'xmpp_plugin_settings_post');
+	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()
 {
-	Addon::unregisterHook('plugin_settings', 'addon/xmpp/xmpp.php', 'xmpp_plugin_settings');
-	Addon::unregisterHook('plugin_settings_post', 'addon/xmpp/xmpp.php', 'xmpp_plugin_settings_post');
+	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;
@@ -36,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;
@@ -61,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>';
 	}
@@ -89,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()
@@ -100,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, [
-		'$submit' => t('Save Settings'),
-		'$bosh_proxy' => ['bosh_proxy', t('Jabber BOSH host'), Config::get('xmpp', 'bosh_proxy'), ''],
-		'$central_userbase' => ['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.')],
+		'$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)