X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=showmore%2Fshowmore.php;h=af158a55a3006aa9410df296d6d175acf8f5e4e0;hb=c3e93f1ed9a487f823bcc75ddd43024334c25bfc;hp=096fd3f704b69e3f825daeffdc84048967e4beb0;hpb=bbdf6c1f78fbaa50673d5897e0aa9c483e021c56;p=friendica-addons.git
diff --git a/showmore/showmore.php b/showmore/showmore.php
index 096fd3f7..af158a55 100755
--- a/showmore/showmore.php
+++ b/showmore/showmore.php
@@ -8,6 +8,8 @@
*
*/
+use Friendica\Core\PConfig;
+
function showmore_install() {
register_hook('prepare_body', 'addon/showmore/showmore.php', 'showmore_prepare_body');
register_hook('plugin_settings', 'addon/showmore/showmore.php', 'showmore_addon_settings');
@@ -29,13 +31,19 @@ function showmore_addon_settings(&$a,&$s) {
$a->page['htmlhead'] .= ''."\r\n";
- $enable_checked = (intval(get_pconfig(local_user(),'showmore','disable')) ? '' : ' checked="checked"');
- $chars = get_pconfig(local_user(),'showmore','chars');
+ $enable_checked = (intval(PConfig::get(local_user(),'showmore','disable')) ? '' : ' checked="checked"');
+ $chars = PConfig::get(local_user(),'showmore','chars');
if(!$chars)
$chars = '1100';
- $s .= '
';
+ $s .= '
';
+ $s .= '' . t('"Show more" Settings').'
';
+ $s .= '';
+ $s .= '
';
+ $s .= '
';
$s .= '' . t('"Show more" Settings').'
';
+ $s .= '';
+
$s .= '
';
$s .= '';
@@ -45,7 +53,7 @@ function showmore_addon_settings(&$a,&$s) {
$s .= '';
$s .= '
';
- $s .= '
';
+ $s .= '
';
// $s .= '
' . t('Use /expression/ to provide regular expressions') . '
';
$s .= '
';
@@ -58,10 +66,10 @@ function showmore_addon_settings_post(&$a,&$b) {
return;
if($_POST['showmore-submit']) {
- set_pconfig(local_user(),'showmore','chars',trim($_POST['showmore-chars']));
+ PConfig::set(local_user(),'showmore','chars',trim($_POST['showmore-chars']));
$enable = ((x($_POST,'showmore-enable')) ? intval($_POST['showmore-enable']) : 0);
$disable = 1-$enable;
- set_pconfig(local_user(),'showmore','disable', $disable);
+ PConfig::set(local_user(),'showmore','disable', $disable);
info( t('Show More Settings saved.') . EOL);
}
}
@@ -69,6 +77,11 @@ function showmore_addon_settings_post(&$a,&$b) {
function get_body_length($body) {
$string = trim($body);
+ // DomDocument doesn't like empty strings
+ if(! strlen($string)) {
+ return 0;
+ }
+
// We need to get rid of hidden tags (display: none)
// Get rid of the warning. It would be better to have some valid html as input
@@ -96,10 +109,10 @@ function get_body_length($body) {
function showmore_prepare_body(&$a,&$b) {
$words = null;
- if(get_pconfig(local_user(),'showmore','disable'))
+ if(PConfig::get(local_user(),'showmore','disable'))
return;
- $chars = (int)get_pconfig(local_user(),'showmore','chars');
+ $chars = (int)PConfig::get(local_user(),'showmore','chars');
if(!$chars)
$chars = 1100;
@@ -110,9 +123,9 @@ function showmore_prepare_body(&$a,&$b) {
if($found) {
$rnd = random_string(8);
- $b['html'] = '
'.$shortened." ".
- ''.sprintf(t('show more')).''.
- '
'.$b['html'].'
';
+ $b['html'] = '
'.$shortened." ".
+ ''.sprintf(t('show more')).''.
+ '
'.$b['html'].'
';
}
}