From 8f94568ada11948c5f69dbb7da721e27d82b69ab Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 24 Sep 2012 17:21:30 -0700
Subject: [PATCH] fromapp force setting

---
 fromapp.tgz         | Bin 1181 -> 1356 bytes
 fromapp/fromapp.css |   4 ++--
 fromapp/fromapp.php |  22 +++++++++++++++++++---
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/fromapp.tgz b/fromapp.tgz
index dbe45ebe0578d594bbd4cd34e04a6eff39f02493..30d84e90533032bb09de73f10074a0345476a86f 100644
GIT binary patch
literal 1356
zcmV-S1+)4eiwFP$`Cw201MOICZ`(Ey_Sg7VTva2I3&)m~I4RONMX{~hhi)CvZXcEg
z1})Jx5s4H?%1N;Hzwby<b`-mFhNUgA>0mfEU!J>r`1p>>Op1);`JnX$Ekrvx8MUI(
z(Mc2?wZhSHbbK_l<IY;cC_D^@Cr9{dg~RA5I&Q(}O9oY0p)`>It&GHTCYOwVW?eoX
z9S@&BfBrRM`ieGl=kNaZ^F{vXK6ae{ad<eocm7Am!>9$}qersE{^#d^_7YFLJ$Ux4
z4bR{glF?ImjZ%1(=Vsu0s$$7<%>+M%?-qp5Dd+`-gsD6ww=@CNOv++nR=}+&fJh3t
zP@3^M7)=?J->Fm<Vb~AN_g95p2#J6q%Lq@Xgg=DF349IO?e?tTvBh(moG^}Ol%_!!
z{%p7RB%L#*shli?xC(sZY?6wYq<#;4k|cr;wustHR(N)c+3j~<Y~rQGobidG+T@@f
z47%E|8`B2xkAcfwh~C~y#e7a>;5lOO7~EnHr$23@u;6tP3;x(NZX!Mgk-Jd;EtP97
zCC$WggUJmdYY;()^g8B)A$5<<f+t`poD>QnyYTTN;LuIbnf&_p-TPh@$AK!Q8N&d&
z-S!@8MHiBrV@2#q9t%EW^WZMdYNOxt?R$xLvBG0KFSLJY2zv;|Ovsq}J;wEtq``f#
za`v)omB#o?1fT=|bvX-F{!ruz(KPA%UFgFPZ{O_TE7(V__B*PS-v(86A_iC^k_1E{
zLFwC+ss*JQw6L`&Cs>4(fNKgd;gFFlTCS`jOHnAmSxjv?+3S#lbF=5dU+64dP?GqU
z&>w?;mNI??lBQ#C?ZpGow>ceqn%?L^tds`}NoQlv$21Mp90{HhMGI+uOMUPM+ogwF
z%@*H-j3$hXJ^b-`FgQ1Z-Us=CdoI%-O=_4|Tu4c|#*C3y5Hp)pd6KXsl96dzW#oLo
z80HU@jFASCzTP<=!;GYg8shKZ`Th&*z-R!!I*B~QODUUDHRb*Z<tF9?ae|;6>cUI#
zAzsk<iY8;veeiJX6kXfBtJ7B^qwv%FpWjpmPj8s(D?(<D300nC!j=%HL@7K<Cxe42
zMtbF)V?wKCi$hDllQZ@>c(*Dx=B&;JX2pv-F2g{p-^R7XcPi_sDVfr=w#<%rCeHPk
z{f&B+|M!^B-PXym^V<G-Es8XOl%c3GZM6{BW?0&usz6AF)sL*YYrl%ydaOld{ner>
zBe)}P&$``MfG1v1C-_PkR>)S*gAIZl@o`ECGIKV-vGY<!pC!nOVJl5`W<}F)%G@`Y
z+T@BZDF-$K!UbwW))rh7EKjPcO%G(JbnMu%!kmhm`wY27j-g>m$vw4K9Ic&MM*f~E
z)O;?*k|ih$DBA-}3#~DmokA~{ue1s0F1s?7a`t{A)#!Gtng;L~-no8N%3$CEUx&Y~
z@ULzMuJSWYGgJHlU`zD}XR96n<+@rseKH0MbKw^Zi}+`Db#_!nSQjl=)y4-`JlJ0H
zT)07}UR>P`Kxvs$ZYR6jk~O8-t<jQYfy>f(!9EQ8`v$~S(0ZpdkP5@5H+d=&8emjC
z>&E1C2L+du$Y%XTrY90F-a*)lMZtAB+C3O{FU!lTL;v)xA5I$k;<n}5^5{Nx{r@M5
z4y)(?!%-C3=l?Klp8vmw;Umz~+O?$zPq%bw^L#T)1<|LF(wW98am^CFIE5$-^Beq{
z5s5dGgQ>utmErKnjDETUZhO*w@C{h=@cOMOX{@ov8f&bv#u{s^vBnx}tg*%#Ypk*V
OjQs^dYxmaxC;$LzhpKM?

literal 1181
zcmV;O1Y-LiiwFRBvtUpF1MOGeZ`(Ey_N)C@Ts5PT1ILmb+X>P-L$R&fL$?k{u!p6A
zK})nngc1dk$`7ph-*==WJDOd%!;<Ww`Vctrk^Fe~-SNmQrASDY`K@O}fH*#$v__Nh
z@n|$|1(WG$Iv!ekiPmrw90kLp;ba=Lg5hX9oVH-{oK989l_nCPm5^}7<PA%|FfUt8
zro)qylb7)61+gsiU;Z9sarWeU?8*Pw{9Vugcp4nFAb4_5cHkS&|J&~|;~oFtpaTc+
z8%gLXyvI^_mu1HABUPbfnPwtAg&$&)t|;i3Lc~<Y$vuq#YlgFsm>F;{av+jICX{CB
z3QSEImOrRemSH#u%=dS>j)g=*kt8IIsDwX-#sU2CJDtulPeaRB*5sU}m?O@;9{knm
zv?X0JrKz09LR@>U*=){5NVwYvmqd|B{T)SZ1}i?h#H@CEZ?^e(zGCTIQEg&SUroAR
zu%FX9@UMxBRmk3HbFo@c={cn^n1*t)gToKIB+S#gh<W<dGHx?Ig^>GL|ErW6EhSCF
z&6bi|Le?m}F6np8A4b$RTY9g+N;uCIQug5UXF$`P*PZ|V@%*A+`EjW7MZ(a5Ua!-}
zTG6>oO<IwAo`oV^vX%FkXT8wvyY{o-yIh;Ej8rUL3J<jBzAvm$xe9p}5ly3k+k*l8
z^zp-<(7e|e*6Xe+DrGCGy3aly=O_Y^OHlfrQx#LHK?~a^GJ^d=3Am*Yk`xkhO^cb8
zXB=}1DGRAR`Ry(_JTq%9-B>3)rX+H&U@!ysEobR9NXlo<W)}xQ-)D5@XnLppP$>su
zNtZLn#V`%k3iVtNMRRG&egLk&yGn4WS>ig7(1?+lgXhEn|I8SjPx4dhl#%{yLc_Si
zTuPd1j2LwVv9v)IiGv#=8CmcuqH+(I!RjlsYje5uHY;Z{SQ4(N5&jXM>*B<90+dK7
z{BrT@he~^T$I31&WKue#3Na&g10g3$p_*kT4j1UswR2`Tt7-9(RiLaWyb<7heKd_+
zZ+$c4O`VrTGp8!^TZx}k)>%1OP+ps6EspVXZF8!fFEEnFS4@gGl)YzeMb0DO3@Zu)
zR<XD>W@+yp1wu0H5@dY~4JwcAUNwJMn&rCYkF_|DYRj?PZk)p$^PHA-RwcyNk1Zp=
z#_yvlXOAThIVGq`G2oV!l}T~KB8(M^-T;eSYm9eq-iqmKso|^)sPMiR{fGaDm322)
zEj&!YdD*Or2>sIWjr+S=$@*$2dkNDtG3^8ZcJvb{vF<8R%&Ya%S2M6Qmu}9mEqq~B
zch6aa&0&M;v{l=A-THAW+qcq^)6@?3b~)QNBMLXAcNrHE_3#|`?QBy8h0C@{;}k7f
zVwu!sqURDHKVHxeMV{)y+B+Qfu8Idl$^P)n@4p?r@X7bs_y6B;d|bT$@gKinGBWS~
z$#L`ke-Ypl=(}1YHZPea7et=|r%R2sc*`OkpTZ~zvOD~m5Q)9@a3QckC1{=)>%)d-
vi@-cc|L-sxG-%MEL4yVj8Z>Coph1HM4H`6P(4awsZwh|{)aK+U04M+eJ*!IY

diff --git a/fromapp/fromapp.css b/fromapp/fromapp.css
index 90aeec49..422624a1 100644
--- a/fromapp/fromapp.css
+++ b/fromapp/fromapp.css
@@ -1,13 +1,13 @@
 
 
 
-#fromapp-label {
+#fromapp-label, #fromapp-force-label {
 	float: left;
 	width: 200px;
 	margin-bottom: 25px;
 }
 
-#fromapp {
+#fromapp-input, #fromapp-force {
 	float: left;
 }
 
diff --git a/fromapp/fromapp.php b/fromapp/fromapp.php
index 51c95906..9a9fa12b 100644
--- a/fromapp/fromapp.php
+++ b/fromapp/fromapp.php
@@ -32,7 +32,9 @@ function fromapp_settings_post($a,$post) {
 	if(! local_user() || (! x($_POST,'fromapp-submit')))
 		return;
 
-	set_pconfig(local_user(),'fromapp','app',$_POST['fromapp']);
+	set_pconfig(local_user(),'fromapp','app',$_POST['fromapp-input']);
+	set_pconfig(local_user(),'fromapp','force',intval($_POST['fromapp-force']));
+
 	info( t('Fromapp settings updated.') . EOL);
 }
 
@@ -50,14 +52,24 @@ function fromapp_settings(&$a,&$s) {
 	$fromapp = get_pconfig(local_user(),'fromapp','app');
 	if($fromapp === false)
 		$fromapp = '';
+
+	$force = intval(get_pconfig(local_user(),'fromapp','force'));
+
+	$force_enabled = (($force) ? ' checked="checked" ' : '');
+
 	
 	/* Add some HTML to the existing form */
 
 	$s .= '<div class="settings-block">';
 	$s .= '<h3>' . t('FromApp Settings') . '</h3>';
 	$s .= '<div id="fromapp-wrapper">';
-	$s .= '<label id="fromapp-label" for="fromapp">' . t('The application name you would like to show your posts originating from.') . '</label>';
-	$s .= '<input id="fromapp-input" type="text" name="fromapp" value="' . $fromapp . '" ' . '/>';
+	$s .= '<label id="fromapp-label" for="fromapp-input">' . t('The application name you would like to show your posts originating from.') . '</label>';
+	$s .= '<input id="fromapp-input" type="text" name="fromapp-input" value="' . $fromapp . '" ' . '/>';
+	$s .= '<div class="clear"></div>';
+
+	$s .= '<label id="fromapp-force-label" for="fromapp-force">' . t('Use this application name even if another application was used.') . '</label>';
+	$s .= '<input id="fromapp-force" type="checkbox" name="fromapp-force" value="1" ' . $force_enabled . '/>';
+
 	$s .= '</div><div class="clear"></div>';
 
 	/* provide a submit button */
@@ -74,10 +86,14 @@ function fromapp_post_hook(&$a,&$item) {
         return;
 
     $app = get_pconfig(local_user(), 'fromapp', 'app');
+	$force = intval(get_pconfig(local_user(), 'fromapp','force'));
 
     if(($app === false) || (! strlen($app)))
         return;
 
+	if(strlen(trim($item['app'])) && (! $force))
+		return;
+
 	$apps = explode(',',$app);
 	$item['app'] = trim($apps[mt_rand(0,count($apps)-1)]);
 	return;