X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=windowsphonepush%2Fwindowsphonepush.php;h=3aaf1d3092e90434cf12eb25cd10bde10da3a8ae;hb=5f1ae105614586eea4ee8c4cf229815709231462;hp=66b23a7ccbc4ec4acce5eb6049900369c0da5ad1;hpb=461b3db9f449fdb1ce780a337cf2f1bb7aa35ac5;p=friendica-addons.git

diff --git a/windowsphonepush/windowsphonepush.php b/windowsphonepush/windowsphonepush.php
index 66b23a7c..3aaf1d30 100644
--- a/windowsphonepush/windowsphonepush.php
+++ b/windowsphonepush/windowsphonepush.php
@@ -10,7 +10,7 @@
  * Pre-requisite: Windows Phone mobile device (at least WP 7.0)
  *                Friendica mobile app on Windows Phone
  *
- * When plugin is installed, the system calls the plugin
+ * When addon is installed, the system calls the addon
  * name_install() function, located in 'addon/name/name.php',
  * where 'name' is the name of the addon.
  * If the addon is removed from the configuration list, the
@@ -25,25 +25,30 @@
  *        sets the counter back
  *        count only unseen elements which are not type=activity (likes and dislikes not seen as new elements)
  */
+
 use Friendica\App;
+use Friendica\Content\Text\BBCode;
+use Friendica\Content\Text\HTML;
+use Friendica\Core\Addon;
+use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 use Friendica\Model\User;
 
 function windowsphonepush_install()
 {
-	/* Our plugin will attach in three places.
+	/* Our addon will attach in three places.
 	 * The first is within cron - so the push notifications will be
 	 * sent every 10 minutes (or whatever is set in crontab).
 	 */
-	register_hook('cron', 'addon/windowsphonepush/windowsphonepush.php', 'windowsphonepush_cron');
+	Addon::registerHook('cron', 'addon/windowsphonepush/windowsphonepush.php', 'windowsphonepush_cron');
 
-	/* Then we'll attach into the plugin settings page, and also the
+	/* Then we'll attach into the addon settings page, and also the
 	 * settings post hook so that we can create and update
-	 * user preferences. User shall be able to activate the plugin and
+	 * user preferences. User shall be able to activate the addon and
 	 * define whether he allows pushing first characters of item text
 	 */
-	register_hook('plugin_settings', 'addon/windowsphonepush/windowsphonepush.php', 'windowsphonepush_settings');
-	register_hook('plugin_settings_post', 'addon/windowsphonepush/windowsphonepush.php', 'windowsphonepush_settings_post');
+	Addon::registerHook('addon_settings', 'addon/windowsphonepush/windowsphonepush.php', 'windowsphonepush_settings');
+	Addon::registerHook('addon_settings_post', 'addon/windowsphonepush/windowsphonepush.php', 'windowsphonepush_settings_post');
 
 	logger("installed windowsphonepush");
 }
@@ -53,9 +58,9 @@ function windowsphonepush_uninstall()
 	/* uninstall unregisters any hooks created with register_hook
 	 * during install. Don't delete data in table `pconfig`.
 	 */
-	unregister_hook('cron', 'addon/windowsphonepush/windowsphonepush.php', 'windowsphonepush_cron');
-	unregister_hook('plugin_settings', 'addon/windowsphonepush/windowsphonepush.php', 'windowsphonepush_settings');
-	unregister_hook('plugin_settings_post', 'addon/windowsphonepush/windowsphonepush.php', 'windowsphonepush_settings_post');
+	Addon::unregisterHook('cron', 'addon/windowsphonepush/windowsphonepush.php', 'windowsphonepush_cron');
+	Addon::unregisterHook('addon_settings', 'addon/windowsphonepush/windowsphonepush.php', 'windowsphonepush_settings');
+	Addon::unregisterHook('addon_settings_post', 'addon/windowsphonepush/windowsphonepush.php', 'windowsphonepush_settings_post');
 
 	logger("removed windowsphonepush");
 }
@@ -85,10 +90,10 @@ function windowsphonepush_settings_post($a, $post)
 
 	PConfig::set(local_user(), 'windowsphonepush', 'senditemtext', intval($_POST['windowsphonepush-senditemtext']));
 
-	info(t('WindowsPhonePush settings updated.') . EOL);
+	info(L10n::t('WindowsPhonePush settings updated.') . EOL);
 }
 
-/* Called from the Plugin Setting form.
+/* Called from the Addon Setting form.
  * Add our own settings info to the page.
  */
 function windowsphonepush_settings(&$a, &$s)
@@ -111,20 +116,20 @@ function windowsphonepush_settings(&$a, &$s)
 
 	/* Add some HTML to the existing form */
 	$s .= '<div class="settings-block">';
-	$s .= '<h3>' . t('WindowsPhonePush Settings') . '</h3>';
+	$s .= '<h3>' . L10n::t('WindowsPhonePush Settings') . '</h3>';
 
 	$s .= '<div id="windowsphonepush-enable-wrapper">';
-	$s .= '<label id="windowsphonepush-enable-label" for="windowsphonepush-enable-chk">' . t('Enable WindowsPhonePush Plugin') . '</label>';
+	$s .= '<label id="windowsphonepush-enable-label" for="windowsphonepush-enable-chk">' . L10n::t('Enable WindowsPhonePush Addon') . '</label>';
 	$s .= '<input id="windowsphonepush-enable-chk" type="checkbox" name="windowsphonepush" value="1" ' . $checked_enabled . '/>';
 	$s .= '</div><div class="clear"></div>';
 
 	$s .= '<div id="windowsphonepush-senditemtext-wrapper">';
-	$s .= '<label id="windowsphonepush-senditemtext-label" for="windowsphonepush-senditemtext-chk">' . t('Push text of new item') . '</label>';
+	$s .= '<label id="windowsphonepush-senditemtext-label" for="windowsphonepush-senditemtext-chk">' . L10n::t('Push text of new item') . '</label>';
 	$s .= '<input id="windowsphonepush-senditemtext-chk" type="checkbox" name="windowsphonepush-senditemtext" value="1" ' . $checked_senditemtext . '/>';
 	$s .= '</div><div class="clear"></div>';
 
 	/* provide a submit button - enable und senditemtext can be changed by the user */
-	$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="windowsphonepush-submit" name="windowsphonepush-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div><div class="clear"></div>';
+	$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="windowsphonepush-submit" name="windowsphonepush-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div><div class="clear"></div>';
 
 	/* provide further read-only information concerning the addon (useful for */
 	$s .= '<div id="windowsphonepush-device_url-wrapper">';
@@ -135,12 +140,12 @@ function windowsphonepush_settings(&$a, &$s)
 	return;
 }
 
-/* Cron function used to regularly check all users on the server with active windowsphonepushplugin and send
+/* Cron function used to regularly check all users on the server with active windowsphonepushaddon and send
  * notifications to the Microsoft servers and consequently to the Windows Phone device
  */
 function windowsphonepush_cron()
 {
-	// retrieve all UID's for which the plugin windowsphonepush is enabled and loop through every user
+	// retrieve all UID's for which the addon windowsphonepush is enabled and loop through every user
 	$r = q("SELECT * FROM `pconfig` WHERE `cat` = 'windowsphonepush' AND `k` = 'enable' AND `v` = 1");
 	if (count($r)) {
 		foreach ($r as $rr) {
@@ -151,7 +156,7 @@ function windowsphonepush_cron()
 			// pushing only possible if device_url (the URI on Microsoft server) is available or not "NA" (which will be sent
 			// by app if user has switched the server setting in app - sending blank not possible as this would return an update error)
 			if (( $device_url == "" ) || ( $device_url == "NA" )) {
-				// no Device-URL for the user availabe, but plugin is enabled --> write info to Logger
+				// no Device-URL for the user availabe, but addon is enabled --> write info to Logger
 				logger("WARN: windowsphonepush is enable for user " . $rr['uid'] . ", but no Device-URL is specified for the user.");
 			} else {
 				// retrieve the number of unseen items and the id of the latest one (if there are more than
@@ -207,10 +212,8 @@ function windowsphonepush_cron()
 						if (substr($body, 0, 4) == "[url") {
 							$body = "URL/Image ...";
 						} else {
-							require_once('include/bbcode.php');
-							require_once("include/html2plain.php");
-							$body = bbcode($body, false, false, 2, true);
-							$body = html2plain($body, 0);
+							$body = BBCode::convert($body, false, 2, true);
+							$body = HTML::toPlaintext($body, 0);
 							$body = ((strlen($body) > 137) ? substr($body, 0, 137) . "..." : $body);
 						}
 					} else {
@@ -392,7 +395,7 @@ function windowsphonepush_updatesettings()
 		return "Not Authenticated";
 	}
 
-	// no updating if user hasn't enabled the plugin
+	// no updating if user hasn't enabled the addon
 	$enable = PConfig::get(local_user(), 'windowsphonepush', 'enable');
 	if (!$enable) {
 		return "Plug-in not enabled";
@@ -433,7 +436,7 @@ function windowsphonepush_updatecounterunseen()
 		return "Not Authenticated";
 	}
 
-	// no updating if user hasn't enabled the plugin
+	// no updating if user hasn't enabled the addon
 	$enable = PConfig::get(local_user(), 'windowsphonepush', 'enable');
 	if (!$enable) {
 		return "Plug-in not enabled";
@@ -469,5 +472,5 @@ function windowsphonepush_login(App $a)
 	require_once 'include/security.php';
 	authenticate_success($record);
 	$_SESSION["allow_api"] = true;
-	call_hooks('logged_in', $a->user);
+	Addon::callHooks('logged_in', $a->user);
 }