X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=superblock%2Fsuperblock.php;h=e0b3ff83e9f859803e5e173aca6053c25492d9ee;hb=b46a23eab3c37a50b109406167493a3a2414ab25;hp=5d4b93fe45d0fe64dd0a6cbf4cf27b565c466849;hpb=16439189e4e49976d1419f59481995c9a8bd2794;p=friendica-addons.git

diff --git a/superblock/superblock.php b/superblock/superblock.php
index 5d4b93fe..e0b3ff83 100644
--- a/superblock/superblock.php
+++ b/superblock/superblock.php
@@ -6,26 +6,26 @@
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
  *
  */
-use Friendica\Core\Addon;
-use Friendica\Core\L10n;
-use Friendica\Core\PConfig;
+use Friendica\Core\Hook;
+use Friendica\DI;
+use Friendica\Util\Strings;
 
 function superblock_install()
 {
-	Addon::registerHook('addon_settings', 'addon/superblock/superblock.php', 'superblock_addon_settings');
-	Addon::registerHook('addon_settings_post', 'addon/superblock/superblock.php', 'superblock_addon_settings_post');
-	Addon::registerHook('conversation_start', 'addon/superblock/superblock.php', 'superblock_conversation_start');
-	Addon::registerHook('item_photo_menu', 'addon/superblock/superblock.php', 'superblock_item_photo_menu');
-	Addon::registerHook('enotify_store', 'addon/superblock/superblock.php', 'superblock_enotify_store');
+	Hook::register('addon_settings', 'addon/superblock/superblock.php', 'superblock_addon_settings');
+	Hook::register('addon_settings_post', 'addon/superblock/superblock.php', 'superblock_addon_settings_post');
+	Hook::register('conversation_start', 'addon/superblock/superblock.php', 'superblock_conversation_start');
+	Hook::register('item_photo_menu', 'addon/superblock/superblock.php', 'superblock_item_photo_menu');
+	Hook::register('enotify_store', 'addon/superblock/superblock.php', 'superblock_enotify_store');
 }
 
 function superblock_uninstall()
 {
-	Addon::unregisterHook('addon_settings', 'addon/superblock/superblock.php', 'superblock_addon_settings');
-	Addon::unregisterHook('addon_settings_post', 'addon/superblock/superblock.php', 'superblock_addon_settings_post');
-	Addon::unregisterHook('conversation_start', 'addon/superblock/superblock.php', 'superblock_conversation_start');
-	Addon::unregisterHook('item_photo_menu', 'addon/superblock/superblock.php', 'superblock_item_photo_menu');
-	Addon::unregisterHook('enotify_store', 'addon/superblock/superblock.php', 'superblock_enotify_store');
+	Hook::unregister('addon_settings', 'addon/superblock/superblock.php', 'superblock_addon_settings');
+	Hook::unregister('addon_settings_post', 'addon/superblock/superblock.php', 'superblock_addon_settings_post');
+	Hook::unregister('conversation_start', 'addon/superblock/superblock.php', 'superblock_conversation_start');
+	Hook::unregister('item_photo_menu', 'addon/superblock/superblock.php', 'superblock_item_photo_menu');
+	Hook::unregister('enotify_store', 'addon/superblock/superblock.php', 'superblock_enotify_store');
 }
 
 function superblock_addon_settings(&$a, &$s)
@@ -36,26 +36,26 @@ function superblock_addon_settings(&$a, &$s)
 
 	/* Add our stylesheet to the page so we can make our settings look nice */
 
-	$a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->get_baseurl() . '/addon/superblock/superblock.css' . '" media="all" />' . "\r\n";
+	DI::page()['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . DI::baseUrl()->get() . '/addon/superblock/superblock.css' . '" media="all" />' . "\r\n";
 
-	$words = PConfig::get(local_user(), 'system', 'blocked');
+	$words = DI::pConfig()->get(local_user(), 'system', 'blocked');
 	if (!$words) {
 		$words = '';
 	}
 
 	$s .= '<span id="settings_superblock_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_superblock_expanded\'); openClose(\'settings_superblock_inflated\');">';
-	$s .= '<h3>' . L10n::t('Superblock') . '</h3>';
+	$s .= '<h3>' . DI::l10n()->t('Superblock') . '</h3>';
 	$s .= '</span>';
 	$s .= '<div id="settings_superblock_expanded" class="settings-block" style="display: none;">';
 	$s .= '<span class="fakelink" onclick="openClose(\'settings_superblock_expanded\'); openClose(\'settings_superblock_inflated\');">';
-	$s .= '<h3>' . L10n::t('Superblock') . '</h3>';
+	$s .= '<h3>' . DI::l10n()->t('Superblock') . '</h3>';
 	$s .= '</span>';
 	$s .= '<div id="superblock-wrapper">';
-	$s .= '<label id="superblock-label" for="superblock-words">' . L10n::t('Comma separated profile URLS to block') . ' </label>';
+	$s .= '<label id="superblock-label" for="superblock-words">' . DI::l10n()->t('Comma separated profile URLS to block') . ' </label>';
 	$s .= '<textarea id="superblock-words" type="text" name="superblock-words" >' . htmlspecialchars($words) . '</textarea>';
 	$s .= '</div><div class="clear"></div>';
 
-	$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="superblock-submit" name="superblock-submit" class="settings-submit" value="' . L10n::t('Save Settings') . '" /></div></div>';
+	$s .= '<div class="settings-submit-wrapper" ><input type="submit" id="superblock-submit" name="superblock-submit" class="settings-submit" value="' . DI::l10n()->t('Save Settings') . '" /></div></div>';
 
 	return;
 }
@@ -67,14 +67,14 @@ function superblock_addon_settings_post(&$a, &$b)
 	}
 
 	if (!empty($_POST['superblock-submit'])) {
-		PConfig::set(local_user(), 'system', 'blocked',trim($_POST['superblock-words']));
-		info(L10n::t('SUPERBLOCK Settings saved.') . EOL);
+		DI::pConfig()->set(local_user(), 'system', 'blocked',trim($_POST['superblock-words']));
+		info(DI::l10n()->t('SUPERBLOCK Settings saved.') . EOL);
 	}
 }
 
 function superblock_enotify_store(&$a,&$b) {
 
-	$words = PConfig::get($b['uid'], 'system', 'blocked');
+	$words = DI::pConfig()->get($b['uid'], 'system', 'blocked');
 	if ($words) {
 		$arr = explode(',', $words);
 	} else {
@@ -88,14 +88,15 @@ function superblock_enotify_store(&$a,&$b) {
 				continue;
 			}
 
-			if (link_compare($b['url'], $word)) {
+			if (Strings::compareLink($b['url'], $word)) {
 				$found = true;
 				break;
 			}
 		}
 	}
 	if ($found) {
-		$b['abort'] = true;
+		// Empty out the fields
+		$b = [];
 	}
 }
 
@@ -106,11 +107,11 @@ function superblock_conversation_start(&$a, &$b)
 		return;
 	}
 
-	$words = PConfig::get(local_user(), 'system', 'blocked');
+	$words = DI::pConfig()->get(local_user(), 'system', 'blocked');
 	if ($words) {
 		$a->data['superblock'] = explode(',', $words);
 	}
-	$a->page['htmlhead'] .= <<< EOT
+	DI::page()['htmlhead'] .= <<< EOT
 
 <script>
 function superblockBlock(author) {
@@ -134,14 +135,14 @@ function superblock_item_photo_menu(&$a, &$b)
 	$author = $b['item']['author-link'];
 	if (!empty($a->data['superblock'])) {
 		foreach ($a->data['superblock'] as $bloke) {
-			if (link_compare($bloke, $author)) {
+			if (Strings::compareLink($bloke, $author)) {
 				$blocked = true;
 				break;
 			}
 		}
 	}
 
-	$b['menu'][L10n::t('Block Completely')] = 'javascript:superblockBlock(\'' . $author . '\'); return false;';
+	$b['menu'][DI::l10n()->t('Block Completely')] = 'javascript:superblockBlock(\'' . $author . '\'); return false;';
 }
 
 function superblock_module() {}
@@ -153,7 +154,7 @@ function superblock_init(&$a)
 		return;
 	}
 
-	$words = PConfig::get(local_user(), 'system', 'blocked');
+	$words = DI::pConfig()->get(local_user(), 'system', 'blocked');
 
 	if (array_key_exists('block', $_GET) && $_GET['block']) {
 		if (strlen($words))
@@ -161,7 +162,7 @@ function superblock_init(&$a)
 		$words .= trim($_GET['block']);
 	}
 
-	PConfig::set(local_user(), 'system', 'blocked', $words);
-	info(L10n::t('superblock settings updated') . EOL );
-	killme();
+	DI::pConfig()->set(local_user(), 'system', 'blocked', $words);
+	info(DI::l10n()->t('superblock settings updated') . EOL );
+	exit();
 }