X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=showmore%2Fshowmore.php;h=e39acdeea60cd2498bfd8baafe674f410663af44;hb=814edd45411175e03aac12f1faf80bacc9008f85;hp=8f0e6693c89c87cf647061a3ec21cd2da4a8df68;hpb=0afd633346b517894ff8e92c705bd5d052dd06a2;p=friendica-addons.git
diff --git a/showmore/showmore.php b/showmore/showmore.php
index 8f0e6693..e39acdee 100644
--- a/showmore/showmore.php
+++ b/showmore/showmore.php
@@ -8,18 +8,19 @@
*
*/
use Friendica\Core\Addon;
+use Friendica\Core\L10n;
use Friendica\Core\PConfig;
function showmore_install() {
Addon::registerHook('prepare_body', 'addon/showmore/showmore.php', 'showmore_prepare_body');
- Addon::registerHook('plugin_settings', 'addon/showmore/showmore.php', 'showmore_addon_settings');
- Addon::registerHook('plugin_settings_post', 'addon/showmore/showmore.php', 'showmore_addon_settings_post');
+ Addon::registerHook('addon_settings', 'addon/showmore/showmore.php', 'showmore_addon_settings');
+ Addon::registerHook('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('plugin_settings', 'addon/showmore/showmore.php', 'showmore_addon_settings');
- Addon::unregisterHook('plugin_settings_post', 'addon/showmore/showmore.php', 'showmore_addon_settings_post');
+ Addon::unregisterHook('addon_settings', 'addon/showmore/showmore.php', 'showmore_addon_settings');
+ Addon::unregisterHook('addon_settings_post', 'addon/showmore/showmore.php', 'showmore_addon_settings_post');
}
function showmore_addon_settings(&$a,&$s) {
@@ -37,24 +38,24 @@ function showmore_addon_settings(&$a,&$s) {
$chars = '1100';
$s .= '';
- $s .= '' . t('"Show more" Settings').'
';
+ $s .= '' . L10n::t('"Show more" Settings').'
';
$s .= '';
$s .= '
';
$s .= '
';
- $s .= '' . t('"Show more" Settings').'
';
+ $s .= '' . L10n::t('"Show more" Settings').'
';
$s .= '';
$s .= '
';
- $s .= '
';
+ $s .= '
';
$s .= '
';
$s .= '
';
- $s .= '
';
+ $s .= '
';
$s .= '
';
$s .= '
';
- $s .= '
';
-// $s .= '
' . t('Use /expression/ to provide regular expressions') . '
';
+ $s .= '
';
+// $s .= '
' . L10n::t('Use /expression/ to provide regular expressions') . '
';
$s .= '
';
return;
@@ -70,7 +71,7 @@ function showmore_addon_settings_post(&$a,&$b) {
$enable = ((x($_POST,'showmore-enable')) ? intval($_POST['showmore-enable']) : 0);
$disable = 1-$enable;
PConfig::set(local_user(),'showmore','disable', $disable);
- info( t('Show More Settings saved.') . EOL);
+ info(L10n::t('Show More Settings saved.') . EOL);
}
}
@@ -106,26 +107,32 @@ function get_body_length($body) {
return strlen($string);
}
-function showmore_prepare_body(&$a,&$b) {
+function showmore_prepare_body(\Friendica\App $a, &$hook_data)
+{
+ // No combination with content filters
+ if (!empty($hook_data['filter_reasons'])) {
+ return;
+ }
- $words = null;
- if(PConfig::get(local_user(),'showmore','disable'))
+ if (PConfig::get(local_user(), 'showmore', 'disable')) {
return;
+ }
- $chars = (int)PConfig::get(local_user(),'showmore','chars');
- if(!$chars)
+ $chars = (int) PConfig::get(local_user(), 'showmore', 'chars');
+ if (!$chars) {
$chars = 1100;
+ }
- if (get_body_length($b['html']) > $chars) {
+ if (get_body_length($hook_data['html']) > $chars) {
$found = true;
- $shortened = trim(showmore_cutitem($b['html'], $chars))."...";
+ $shortened = trim(showmore_cutitem($hook_data['html'], $chars)) . "...";
}
- if($found) {
+ if ($found) {
$rnd = random_string(8);
- $b['html'] = ''.$shortened." ".
- ''.sprintf(t('show more')).''.
- ''.$b['html'].'
';
+ $hook_data['html'] = '' . $shortened . " " .
+ '' . L10n::t('show more') . '' .
+ '' . $hook_data['html'] . '
';
}
}