X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=showmore%2Fshowmore.php;h=f7bb0c505e9ae2e05ad5ba3d9fec19373bf87ec3;hb=f3804ee7ddcaf1d6edee2b1fcc235f024aacee0b;hp=e7140d193637031783157f8b9d6b59eb4c3572f2;hpb=347e4eff142dacd7088d8fcda45434eb3a8b1696;p=friendica-addons.git

diff --git a/showmore/showmore.php b/showmore/showmore.php
index e7140d19..f7bb0c50 100644
--- a/showmore/showmore.php
+++ b/showmore/showmore.php
@@ -7,22 +7,23 @@
  *         based upon NSFW from Mike Macgirvin <http://macgirvin.com/profile/mike>
  *
  */
-use Friendica\Core\Addon;
+use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
+use Friendica\Util\Strings;
 
 function showmore_install()
 {
-	Addon::registerHook('prepare_body', 'addon/showmore/showmore.php', 'showmore_prepare_body');
-	Addon::registerHook('addon_settings', 'addon/showmore/showmore.php', 'showmore_addon_settings');
-	Addon::registerHook('addon_settings_post', 'addon/showmore/showmore.php', 'showmore_addon_settings_post');
+	Hook::register('prepare_body', 'addon/showmore/showmore.php', 'showmore_prepare_body');
+	Hook::register('addon_settings', 'addon/showmore/showmore.php', 'showmore_addon_settings');
+	Hook::register('addon_settings_post', 'addon/showmore/showmore.php', 'showmore_addon_settings_post');
 }
 
 function showmore_uninstall()
 {
-	Addon::unregisterHook('prepare_body', 'addon/showmore/showmore.php', 'showmore_prepare_body');
-	Addon::unregisterHook('addon_settings', 'addon/showmore/showmore.php', 'showmore_addon_settings');
-	Addon::unregisterHook('addon_settings_post', 'addon/showmore/showmore.php', 'showmore_addon_settings_post');
+	Hook::unregister('prepare_body', 'addon/showmore/showmore.php', 'showmore_prepare_body');
+	Hook::unregister('addon_settings', 'addon/showmore/showmore.php', 'showmore_addon_settings');
+	Hook::unregister('addon_settings_post', 'addon/showmore/showmore.php', 'showmore_addon_settings_post');
 }
 
 function showmore_addon_settings(&$a, &$s)
@@ -33,7 +34,7 @@ function showmore_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/showmore/showmore.css'.'" media="all"/>'."\r\n";
+	$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="'.$a->getBaseURL().'/addon/showmore/showmore.css'.'" media="all"/>'."\r\n";
 
 	$enable_checked = (intval(PConfig::get(local_user(), 'showmore', 'disable')) ? '' : ' checked="checked"');
 	$chars = PConfig::get(local_user(), 'showmore', 'chars', 1100);
@@ -70,7 +71,7 @@ function showmore_addon_settings_post(&$a, &$b)
 
 	if (!empty($_POST['showmore-submit'])) {
 		PConfig::set(local_user(), 'showmore', 'chars', trim($_POST['showmore-chars']));
-		$enable = (x($_POST, 'showmore-enable') ? intval($_POST['showmore-enable']) : 0);
+		$enable = (!empty($_POST['showmore-enable']) ? intval($_POST['showmore-enable']) : 0);
 		$disable = 1-$enable;
 		PConfig::set(local_user(), 'showmore', 'disable', $disable);
 		info(L10n::t('Show More Settings saved.') . EOL);
@@ -131,7 +132,7 @@ function showmore_prepare_body(\Friendica\App $a, &$hook_data)
 	}
 
 	if ($found) {
-		$rnd = random_string(8);
+		$rnd = Strings::getRandomHex(8);
 		$hook_data['html'] = '<span id="showmore-teaser-' . $rnd . '" class="showmore-teaser" style="display: block;">' . $shortened . " " .
 			'<span id="showmore-wrap-' . $rnd . '" style="white-space:nowrap;" class="showmore-wrap fakelink" onclick="openClose(\'showmore-' . $rnd . '\'); openClose(\'showmore-teaser-' . $rnd . '\');" >' . L10n::t('show more') . '</span></span>' .
 			'<div id="showmore-' . $rnd . '" class="showmore-content" style="display: none;">' . $hook_data['html'] . '</div>';