buffer addon updated CA translation THX Joan Bar

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

diff --git a/nsfw/nsfw.php b/nsfw/nsfw.php
index 6d615589b958dd4af17765b084a1a64ed3389d70..b9240103c2dfdb25abe8eac9efbe386b034da5f9 100644 (file)
--- a/nsfw/nsfw.php
+++ b/nsfw/nsfw.php
@@ -7,23 +7,23 @@
  * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
  *
  */
-use Friendica\Core\Addon;
+use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\PConfig;
 
 function nsfw_install()
 {
-       Addon::registerHook('content_filter', 'addon/nsfw/nsfw.php', 'nsfw_content_filter', 10);
-       Addon::registerHook('addon_settings', 'addon/nsfw/nsfw.php', 'nsfw_addon_settings');
-       Addon::registerHook('addon_settings_post', 'addon/nsfw/nsfw.php', 'nsfw_addon_settings_post');
+       Hook::register('prepare_body_content_filter', 'addon/nsfw/nsfw.php', 'nsfw_prepare_body_content_filter', 10);
+       Hook::register('addon_settings', 'addon/nsfw/nsfw.php', 'nsfw_addon_settings');
+       Hook::register('addon_settings_post', 'addon/nsfw/nsfw.php', 'nsfw_addon_settings_post');
 }
 
 function nsfw_uninstall()
 {
-       Addon::unregisterHook('content_filter', 'addon/nsfw/nsfw.php', 'nsfw_content_filter');
-       Addon::unregisterHook('prepare_body', 'addon/nsfw/nsfw.php', 'nsfw_prepare_body');
-       Addon::unregisterHook('addon_settings', 'addon/nsfw/nsfw.php', 'nsfw_addon_settings');
-       Addon::unregisterHook('addon_settings_post', 'addon/nsfw/nsfw.php', 'nsfw_addon_settings_post');
+       Hook::unregister('prepare_body_content_filter', 'addon/nsfw/nsfw.php', 'nsfw_prepare_body_content_filter');
+       Hook::unregister('prepare_body', 'addon/nsfw/nsfw.php', 'nsfw_prepare_body');
+       Hook::unregister('addon_settings', 'addon/nsfw/nsfw.php', 'nsfw_addon_settings');
+       Hook::unregister('addon_settings_post', 'addon/nsfw/nsfw.php', 'nsfw_addon_settings_post');
 }
 
 // This function isn't perfect and isn't trying to preserve the html structure - it's just a
@@ -65,7 +65,7 @@ function nsfw_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/nsfw/nsfw.css' . '" media="all" />' . "\r\n";
+       $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->getBaseURL() . '/addon/nsfw/nsfw.css' . '" media="all" />' . "\r\n";
 
        $enable_checked = (intval(PConfig::get(local_user(), 'nsfw', 'disable')) ? '' : ' checked="checked" ');
        $words = PConfig::get(local_user(), 'nsfw', 'words');
@@ -101,16 +101,16 @@ function nsfw_addon_settings_post(&$a, &$b)
                return;
        }
 
-       if ($_POST['nsfw-submit']) {
+       if (!empty($_POST['nsfw-submit'])) {
                PConfig::set(local_user(), 'nsfw', 'words', trim($_POST['nsfw-words']));
-               $enable = (x($_POST, 'nsfw-enable') ? intval($_POST['nsfw-enable']) : 0);
+               $enable = (!empty($_POST['nsfw-enable']) ? intval($_POST['nsfw-enable']) : 0);
                $disable = 1 - $enable;
                PConfig::set(local_user(), 'nsfw', 'disable', $disable);
                info(L10n::t('NSFW Settings saved.') . EOL);
        }
 }
 
-function nsfw_content_filter(\Friendica\App $a, &$hook_data)
+function nsfw_prepare_body_content_filter(\Friendica\App $a, &$hook_data)
 {
        $words = null;
        if (PConfig::get(local_user(), 'nsfw', 'disable')) {