From ca6e43ef495f360541ca78d3637697c6c87e6646 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sat, 4 Feb 2012 03:56:55 -0800
Subject: [PATCH] provide ability to disable n-s-f-w filter as a personal
 preference

---
 nsfw.tgz      | Bin 1524 -> 1687 bytes
 nsfw/nsfw.css |   4 ++--
 nsfw/nsfw.php |  12 +++++++++++-
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/nsfw.tgz b/nsfw.tgz
index 4e465f683b496c0bc7a08d0cc30f6c0227105cf6..8a1e3a3ca1e55134adbce3d0840ae29d6b182d3d 100755
GIT binary patch
literal 1687
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

literal 1524
zcmV<Q1q=EgiwFP@Fe^_01MOE|Z`(Ey&#Uz*Zdz6;g=5)H90yLEp-9`OwH=mieMka>
zmMELBL<%I8G#K*TcO(_rj@zc)mK5l8Kmv=rzrW+%kzA$M(bnTq7il;cZ1o5G!+w8%
zt2;R8AME$+dPQ5k-mup{=nsc`xQ-wDgDn_5vR{@;rHKUC%1Jz9@`~|K@D;PcLGSSJ
z@F{$HLgFU>=3ggP>XB^N{0~2!|NgMQlK(E|e{UbRq5DYwtkM5G|K5)#`MVjJ(hUCc
zT4^ST9zjM^edM*SS)%77*z0zS5BQlAIb(cRi(&*lyL9VS3a*7r)TV;ZNT_m}Gi^lH
zm<AP7$1){U#TzV6&$mYI`ygBYzrA|#^3AJ9v+;2KSN*>`81{yHSpV1w4x0LZ3VM6?
z`n~7*Z-oX$QVOY%fVI5vJ?|_gT!Efb$f;6fMj;klQ?4zOSyx&zK7+s<q5!-wCW->%
zigLv?yP`Wlcmga%ff9d6T4W@qPG_adyJmV01pGK-@dC5}QBWSmnNZY+jPXSq5}J}S
z)4&wi^`zr@-x{~?g_iTbm=}*^<AM4g9PAy`^MBCqx%oeA>i;R|_-D+!=Xufd=N>$V
zw<M<{uuTEKUgGqXtk6vG5uA!FBLx<CA(U2N>y~j+6jBtD5xp#Fl>C!QWu<zZuK9jZ
z>ba03c*7PH-rPYA$8)WVQ54nScVdx8s4-<3jdEl@G1B-Kd0txb*ti1bxK6OmXp&{&
zj=3I4I%7&xIhhNw2!jGU4Uu#*70FG|hJYlA;L+MqH_KMf8t=~0rmn2So5w^^t+Cgs
zht%1<CHKP$CkD>1)9OS}wYewVgQetaz?A&Igl1FQzXs<amH!%^4TRR2!)M#1{cKwq
zv^=lH((nh!L`<?tsi+KhcDxoQP?wUUK0u1_FeeF!QsVf#$*7uBs?FRoL#;4VQVF=m
zVjvuHf~VbbR@P9pSO8}+wI|x>+a|jwM(jM8>pYuNk_4B~8AEVvh9Az%Z0s)$`2hN+
zpkrUt4?4mpn-6nI)3F~w$Euo9J(=PdE~PmE9SEZPz@d;~4tyNz2_s`44~q}ciCOe7
z<OTPS3=-S!Mn49lvB1(!*(_W|rtQXlJFtv4nHD`KXmG1lSk87(A-Jtvd<nb4c}|qV
z04scUr)Xi}pCIch=X}q4r^CQrRL;yr<u%?x-kXaGoYm*agmoMl?xPJ$EE)Umr6RFs
zQMqBnJ%MUA`{|pj&YheI#=mpqROC6qykdc1>r23eYL0=VL<3Q_i8`0yII`OATV%W_
z^@?NGz)F67;Mk7WcdtlR(kk7~W+$-OTUQ-n$S11^#~CFUv)lNROt|M+jTW3#?mG9}
zuD^8tZehjayQPn7UJC^QJ+rG0FcVPiY3n0i)^Ec)AAjIris%PyS;`Ea$fN@2$Q4T{
z*3hiXaL6yW>$75Esxets`t9ethHWub>zLZs@j&M=+uM_0-<|z_9;|>9T-q+(QeReM
zZM<*i>w4VA<&G)87UQW14I1X`)pdav`zyRN+mK(q`^9kHZU(s8?AIf!%b1s0=Bj)x
zP8-2LX&1K+7S}JF79u6;z(i#tp&@d&t8K?lGfeXeBmO5hq0{VG&|UY~7(+^s+xZ*g
zk`9ef<t~;rCGp%YnPRn8+?LBEK5a6}LkGCstR!14bIoDAG^$(1DJy~ecqSZcJBSeM
z@puf~I~n9afM=7OXk*oKZBJd#H`%M$md<Ng8ECbp=<34#zO7BxNZeV+87jl2%68@S
z*C@WPiD{Y#m*;^dGgJt{W!-g5@tg<nm41U~e^qI>5>?uzm6iBf6#2xxD#Js2q?ZxF
zM?3kh^~uQFzESmu6bG*vpFRj~AC_bDsysE1$MC`x&Z^u69v-lrMB!DI>(my}PYQP7
zbn{sn>^N{?wTG-Zw(gUi-eW&u3ZK6>BjAG5Bk-NUmH299!4ZI~(Qo}aXsDrv8fvJa
ah8k+9p@tf2sG)|w2l^WXr3S44C;$K~IR~}?

diff --git a/nsfw/nsfw.css b/nsfw/nsfw.css
index 57bb570e..a8c1bfe8 100755
--- a/nsfw/nsfw.css
+++ b/nsfw/nsfw.css
@@ -1,11 +1,11 @@
 
-#nsfw-label {
+#nsfw-label, #nsfw-enable-label {
 	float: left;
 	width: 300px;
 	margin-top: 10px;
 }
 
-#nsfw-words {
+#nsfw-words, #nsfw-enable {
 	float: left;
 	margin-top: 10px;
 }
diff --git a/nsfw/nsfw.php b/nsfw/nsfw.php
index fdfd5a27..a5b3ede1 100755
--- a/nsfw/nsfw.php
+++ b/nsfw/nsfw.php
@@ -38,7 +38,7 @@ 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');
 	if(! $words)
 		$words = 'nsfw,';
@@ -46,6 +46,10 @@ function nsfw_addon_settings(&$a,&$s) {
     $s .= '<div class="settings-block">';
     $s .= '<h3>' . t('"Not Safe For Work" Settings') . '</h3>';
     $s .= '<div id="nsfw-wrapper">';
+	
+    $s .= '<label id="nsfw-enable-label" for="nsfw-enable">' . t('Enable NSFW filter') . ' </label>';
+    $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 words to treat as NSFW') . ' </label>';
     $s .= '<input id="nsfw-words" type="text" name="nsfw-words" value="' . $words .'" />';
     $s .= '</div><div class="clear"></div>';
@@ -64,6 +68,9 @@ function nsfw_addon_settings_post(&$a,&$b) {
 
 	if($_POST['nsfw-submit']) {
 		set_pconfig(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);
 		info( t('NSFW Settings saved.') . EOL);
 	}
 }
@@ -71,6 +78,9 @@ function nsfw_addon_settings_post(&$a,&$b) {
 function nsfw_prepare_body(&$a,&$b) {
 
 	$words = null;
+	if(get_pconfig(local_user(),'nsfw','disable'))
+		return;
+
 	if(local_user()) {
 		$words = get_pconfig(local_user(),'nsfw','words');
 	}