X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=jappixmini%2Fjappixmini.php;h=8b58ecb39ffd6884c860ba760e1d26b08201d2a8;hb=f8c162cbfb777793891f885e019eb8eae319dce1;hp=ba82a076270f4ee36b47cbeed35b286ed614dbf2;hpb=46e09b05440fac8984ffc777b1dff4a765fcabf6;p=friendica-addons.git

diff --git a/jappixmini/jappixmini.php b/jappixmini/jappixmini.php
index ba82a076..8b58ecb3 100644
--- a/jappixmini/jappixmini.php
+++ b/jappixmini/jappixmini.php
@@ -63,22 +63,24 @@
  */
 
 use Friendica\App;
+use Friendica\Core\Addon;
 use Friendica\Core\Config;
+use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Model\User;
 
 function jappixmini_install()
 {
-	register_hook('plugin_settings', 'addon/jappixmini/jappixmini.php', 'jappixmini_settings');
-	register_hook('plugin_settings_post', 'addon/jappixmini/jappixmini.php', 'jappixmini_settings_post');
+	Addon::registerHook('addon_settings', 'addon/jappixmini/jappixmini.php', 'jappixmini_settings');
+	Addon::registerHook('addon_settings_post', 'addon/jappixmini/jappixmini.php', 'jappixmini_settings_post');
 
-	register_hook('page_end', 'addon/jappixmini/jappixmini.php', 'jappixmini_script');
-	register_hook('authenticate', 'addon/jappixmini/jappixmini.php', 'jappixmini_login');
+	Addon::registerHook('page_end', 'addon/jappixmini/jappixmini.php', 'jappixmini_script');
+	Addon::registerHook('authenticate', 'addon/jappixmini/jappixmini.php', 'jappixmini_login');
 
-	register_hook('cron', 'addon/jappixmini/jappixmini.php', 'jappixmini_cron');
+	Addon::registerHook('cron', 'addon/jappixmini/jappixmini.php', 'jappixmini_cron');
 
 	// Jappix source download as required by AGPL
-	register_hook('about_hook', 'addon/jappixmini/jappixmini.php', 'jappixmini_download_source');
+	Addon::registerHook('about_hook', 'addon/jappixmini/jappixmini.php', 'jappixmini_download_source');
 
 	// set standard configuration
 	$info_text = Config::get("jappixmini", "infotext");
@@ -103,18 +105,18 @@ function jappixmini_install()
 
 function jappixmini_uninstall()
 {
-	unregister_hook('plugin_settings', 'addon/jappixmini/jappixmini.php', 'jappixmini_settings');
-	unregister_hook('plugin_settings_post', 'addon/jappixmini/jappixmini.php', 'jappixmini_settings_post');
+	Addon::unregisterHook('addon_settings', 'addon/jappixmini/jappixmini.php', 'jappixmini_settings');
+	Addon::unregisterHook('addon_settings_post', 'addon/jappixmini/jappixmini.php', 'jappixmini_settings_post');
 
-	unregister_hook('page_end', 'addon/jappixmini/jappixmini.php', 'jappixmini_script');
-	unregister_hook('authenticate', 'addon/jappixmini/jappixmini.php', 'jappixmini_login');
+	Addon::unregisterHook('page_end', 'addon/jappixmini/jappixmini.php', 'jappixmini_script');
+	Addon::unregisterHook('authenticate', 'addon/jappixmini/jappixmini.php', 'jappixmini_login');
 
-	unregister_hook('cron', 'addon/jappixmini/jappixmini.php', 'jappixmini_cron');
+	Addon::unregisterHook('cron', 'addon/jappixmini/jappixmini.php', 'jappixmini_cron');
 
-	unregister_hook('about_hook', 'addon/jappixmini/jappixmini.php', 'jappixmini_download_source');
+	Addon::unregisterHook('about_hook', 'addon/jappixmini/jappixmini.php', 'jappixmini_download_source');
 }
 
-function jappixmini_plugin_admin(App $a, &$o)
+function jappixmini_addon_admin(App $a, &$o)
 {
 	// display instructions and warnings on addon settings page for admin
 	if (!file_exists("addon/jappixmini.tgz")) {
@@ -158,7 +160,7 @@ function jappixmini_plugin_admin(App $a, &$o)
 	$o .= '<input type="submit" name="jappixmini-admin-settings" value="OK" />';
 }
 
-function jappixmini_plugin_admin_post(App $a)
+function jappixmini_addon_admin_post(App $a)
 {
 	// set info text
 	$submit = $_REQUEST['jappixmini-admin-settings'];
@@ -229,7 +231,7 @@ function jappixmini_init()
 
 	}
 
-	// do not return an address if user deactivated plugin
+	// do not return an address if user deactivated addon
 	$activated = PConfig::get($uid, 'jappixmini', 'activate');
 	if (!$activated) {
 		killme();
@@ -246,10 +248,10 @@ function jappixmini_init()
 
 		$encrypted_address_hex = bin2hex($encrypted_address);
 
-		$answer = Array(
+		$answer = [
 			"status" => "ok",
 			"encrypted_address" => $encrypted_address_hex
-		);
+		];
 
 		$answer_json = json_encode($answer);
 		echo $answer_json;
@@ -325,58 +327,58 @@ function jappixmini_settings(App $a, &$s)
 	}
 
 	$s .= '<span id="settings_jappixmini_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_jappixmini_expanded\'); openClose(\'settings_jappixmini_inflated\');">';
-	$s .= '<h3>' . t('Jappix Mini') . '</h3>';
+	$s .= '<h3>' . L10n::t('Jappix Mini') . '</h3>';
 	$s .= '</span>';
 	$s .= '<div id="settings_jappixmini_expanded" class="settings-block" style="display: none;">';
 	$s .= '<span class="fakelink" onclick="openClose(\'settings_jappixmini_expanded\'); openClose(\'settings_jappixmini_inflated\');">';
-	$s .= '<h3>' . t('Jappix Mini') . '</h3>';
+	$s .= '<h3>' . L10n::t('Jappix Mini') . '</h3>';
 	$s .= '</span>';
 
-	$s .= '<label for="jappixmini-activate">' . t('Activate addon') . '</label>';
+	$s .= '<label for="jappixmini-activate">' . L10n::t('Activate addon') . '</label>';
 	$s .= ' <input id="jappixmini-activate" type="checkbox" name="jappixmini-activate" value="1"' . $activate . ' />';
 	$s .= '<br />';
-	$s .= '<label for"jappixmini-dont-insertchat">' . t('Do <em>not</em> insert the Jappixmini Chat-Widget into the webinterface') . '</label>';
+	$s .= '<label for"jappixmini-dont-insertchat">' . L10n::t('Do <em>not</em> insert the Jappixmini Chat-Widget into the webinterface') . '</label>';
 	$s .= '<input id="jappixmini-dont-insertchat" type="checkbox" name="jappixmini-dont-insertchat" value="1"' . $insertchat . ' />';
 	$s .= '<br />';
-	$s .= '<label for="jappixmini-username">' . t('Jabber username') . '</label>';
+	$s .= '<label for="jappixmini-username">' . L10n::t('Jabber username') . '</label>';
 	$s .= ' <input id="jappixmini-username" type="text" name="jappixmini-username" value="' . $username . '" />';
 	$s .= '<br />';
-	$s .= '<label for="jappixmini-server">' . t('Jabber server') . '</label>';
+	$s .= '<label for="jappixmini-server">' . L10n::t('Jabber server') . '</label>';
 	$s .= ' <input id="jappixmini-server" type="text" name="jappixmini-server" value="' . $server . '" />';
 	$s .= '<br />';
 
 	if ($defaultbosh == "") {
-		$s .= '<label for="jappixmini-bosh">' . t('Jabber BOSH host') . '</label>';
+		$s .= '<label for="jappixmini-bosh">' . L10n::t('Jabber BOSH host') . '</label>';
 		$s .= ' <input id="jappixmini-bosh" type="text" name="jappixmini-bosh" value="' . $bosh . '" />';
 		$s .= '<br />';
 	}
 
-	$s .= '<label for="jappixmini-password">' . t('Jabber password') . '</label>';
+	$s .= '<label for="jappixmini-password">' . L10n::t('Jabber password') . '</label>';
 	$s .= ' <input type="hidden" id="jappixmini-password" name="jappixmini-encrypted-password" value="' . $password . '" />';
 	$s .= ' <input id="jappixmini-clear-password" type="password" value="" onchange="jappixmini_set_password();" />';
 	$s .= '<br />';
 	$onchange = "document.getElementById('jappixmini-friendica-password').disabled = !this.checked;jappixmini_set_password();";
-	$s .= '<label for="jappixmini-encrypt">' . t('Encrypt Jabber password with Friendica password (recommended)') . '</label>';
+	$s .= '<label for="jappixmini-encrypt">' . L10n::t('Encrypt Jabber password with Friendica password (recommended)') . '</label>';
 	$s .= ' <input id="jappixmini-encrypt" type="checkbox" name="jappixmini-encrypt" onchange="' . $onchange . '" value="1"' . $encrypt_checked . ' />';
 	$s .= '<br />';
-	$s .= '<label for="jappixmini-friendica-password">' . t('Friendica password') . '</label>';
+	$s .= '<label for="jappixmini-friendica-password">' . L10n::t('Friendica password') . '</label>';
 	$s .= ' <input id="jappixmini-friendica-password" name="jappixmini-friendica-password" type="password" onchange="jappixmini_set_password();" value=""' . $encrypt_disabled . ' />';
 	$s .= '<br />';
-	$s .= '<label for="jappixmini-autoapprove">' . t('Approve subscription requests from Friendica contacts automatically') . '</label>';
+	$s .= '<label for="jappixmini-autoapprove">' . L10n::t('Approve subscription requests from Friendica contacts automatically') . '</label>';
 	$s .= ' <input id="jappixmini-autoapprove" type="checkbox" name="jappixmini-autoapprove" value="1"' . $autoapprove . ' />';
 	$s .= '<br />';
-	$s .= '<label for="jappixmini-autosubscribe">' . t('Subscribe to Friendica contacts automatically') . '</label>';
+	$s .= '<label for="jappixmini-autosubscribe">' . L10n::t('Subscribe to Friendica contacts automatically') . '</label>';
 	$s .= ' <input id="jappixmini-autosubscribe" type="checkbox" name="jappixmini-autosubscribe" value="1"' . $autosubscribe . ' />';
 	$s .= '<br />';
-	$s .= '<label for="jappixmini-purge">' . t('Purge internal list of jabber addresses of contacts') . '</label>';
+	$s .= '<label for="jappixmini-purge">' . L10n::t('Purge internal list of jabber addresses of contacts') . '</label>';
 	$s .= ' <input id="jappixmini-purge" type="checkbox" name="jappixmini-purge" value="1" />';
 	$s .= '<br />';
 	if ($info_text) {
 		$s .= '<br />Configuration help:<p style="margin-left:2em;">' . $info_text . '</p>';
 	}
 	$s .= '<br />Status:<p style="margin-left:2em;">Addon knows ' . $address_cnt . ' Jabber addresses of ' . $contact_cnt . ' Friendica contacts (takes some time, usually 10 minutes, to update).</p>';
-	$s .= '<input type="submit" name="jappixmini-submit" value="' . t('Save Settings') . '" />';
-	$s .= ' <input type="button" value="' . t('Add contact') . '" onclick="jappixmini_addon_subscribe();" />';
+	$s .= '<input type="submit" name="jappixmini-submit" value="' . L10n::t('Save Settings') . '" />';
+	$s .= ' <input type="button" value="' . L10n::t('Add contact') . '" onclick="jappixmini_addon_subscribe();" />';
 
 	$s .= '</div>';
 
@@ -429,11 +431,7 @@ function jappixmini_settings_post(App $a, &$b)
 		if ($encrypt) {
 			// check that Jabber password was encrypted with correct Friendica password
 			$friendica_password = trim($b['jappixmini-friendica-password']);
-			$encrypted = hash('whirlpool',$friendica_password);
-			$r = q("SELECT * FROM `user` WHERE `uid`=$uid AND `password`='%s'",
-				dbesc($encrypted)
-			);
-			if (!count($r)) {
+			if (!User::authenticate((int) $uid, $friendica_password)) {
 				info("Wrong friendica password!");
 				return;
 			}
@@ -518,7 +516,7 @@ function jappixmini_script(App $a)
 	}
 
 	// get a list of jabber accounts of the contacts
-	$contacts = Array();
+	$contacts = [];
 	$uid = local_user();
 	$rows = q("SELECT * FROM `pconfig` WHERE `uid`=$uid AND `cat`='jappixmini' AND `k` LIKE 'id:%%'");
 	foreach ($rows as $row) {