Merge pull request #439 from zeroadam/Issue3873

[friendica-addons.git] / nsfw / nsfw.php

diff --git a/nsfw/nsfw.php b/nsfw/nsfw.php
index d8a5926b75ebcaf4e2874858cebf36346cf4b2fa..6d8acbf034d7d440899cbf06609497ca0ccaade5 100755 (executable)
--- a/nsfw/nsfw.php
+++ b/nsfw/nsfw.php
@@ -9,6 +9,8 @@
  * 
  */
 
+use Friendica\Core\PConfig;
+
 function nsfw_install() {
        register_hook('prepare_body', 'addon/nsfw/nsfw.php', 'nsfw_prepare_body', 10);
        register_hook('plugin_settings', 'addon/nsfw/nsfw.php', 'nsfw_addon_settings');
@@ -69,17 +71,17 @@ function nsfw_addon_settings(&$a,&$s) {
 
     $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->get_baseurl() . '/addon/nsfw/nsfw.css' . '" media="all" />' . "\r\n";
 
-       $enable_checked = (intval(get_pconfig(local_user(),'nsfw','disable')) ? '' : ' checked="checked" ');
-       $words = get_pconfig(local_user(),'nsfw','words');
+       $enable_checked = (intval(PConfig::get(local_user(),'nsfw','disable')) ? '' : ' checked="checked" ');
+       $words = PConfig::get(local_user(),'nsfw','words');
        if(! $words)
                $words = 'nsfw,';
 
     $s .= '<span id="settings_nsfw_inflated" class="settings-block fakelink" style="display: block;" onclick="openClose(\'settings_nsfw_expanded\'); openClose(\'settings_nsfw_inflated\');">';
-    $s .= '<h3>' . t('Not Safe For Work (General Purpose Content Filter) settings') . '</h3>';
+    $s .= '<h3>' . t('Not Safe For Work (General Purpose Content Filter)') . '</h3>';
     $s .= '</span>';
     $s .= '<div id="settings_nsfw_expanded" class="settings-block" style="display: none;">';
     $s .= '<span class="fakelink" onclick="openClose(\'settings_nsfw_expanded\'); openClose(\'settings_nsfw_inflated\');">';
-    $s .= '<h3>' . t('Not Safe For Work (General Purpose Content Filter) settings') . '</h3>';
+    $s .= '<h3>' . t('Not Safe For Work (General Purpose Content Filter)') . '</h3>';
     $s .= '</span>';
 
     $s .= '<div id="nsfw-wrapper">';
@@ -88,7 +90,7 @@ function nsfw_addon_settings(&$a,&$s) {
     $s .= '<input id="nsfw-enable" type="checkbox" name="nsfw-enable" value="1"' . $enable_checked . ' />';
        $s .= '<div class="clear"></div>';
     $s .= '<label id="nsfw-label" for="nsfw-words">' . t('Comma separated list of keywords to hide') . ' </label>';
-    $s .= '<input id="nsfw-words" type="text" name="nsfw-words" value="' . $words .'" />';
+    $s .= '<textarea id="nsfw-words" type="text" name="nsfw-words">' . $words .'</textarea>';
     $s .= '</div><div class="clear"></div>';
 
     $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="nsfw-submit" name="nsfw-submit" class="settings-submit" value="' . t('Save Settings') . '" /></div>';
@@ -104,10 +106,10 @@ function nsfw_addon_settings_post(&$a,&$b) {
                return;
 
        if($_POST['nsfw-submit']) {
-               set_pconfig(local_user(),'nsfw','words',trim($_POST['nsfw-words']));
+               PConfig::set(local_user(),'nsfw','words',trim($_POST['nsfw-words']));
                $enable = ((x($_POST,'nsfw-enable')) ? intval($_POST['nsfw-enable']) : 0);
                $disable = 1-$enable;
-               set_pconfig(local_user(),'nsfw','disable', $disable);
+               PConfig::set(local_user(),'nsfw','disable', $disable);
                info( t('NSFW Settings saved.') . EOL);
        }
 }
@@ -116,11 +118,11 @@ function nsfw_prepare_body(&$a,&$b) {
 
 
        $words = null;
-       if(get_pconfig(local_user(),'nsfw','disable'))
+       if(PConfig::get(local_user(),'nsfw','disable'))
                return;
 
        if(local_user()) {
-               $words = get_pconfig(local_user(),'nsfw','words');
+               $words = PConfig::get(local_user(),'nsfw','words');
        }
        if($words) {
                $arr = explode(',',$words);