From 1a1c268638edef31fc8015101253f79bc78ecf56 Mon Sep 17 00:00:00 2001 From: Cohan Robinson Date: Tue, 14 Aug 2012 17:22:31 +0100 Subject: [PATCH 01/11] Changed piwik image failback to work with HTTPS installs --- piwik/piwik.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/piwik/piwik.php b/piwik/piwik.php index 3e0d718f..c4d38467 100755 --- a/piwik/piwik.php +++ b/piwik/piwik.php @@ -65,9 +65,9 @@ function piwik_analytics($a,&$b) { */ if ($async) { $a->page['htmlhead'] .= " \r\n\r\n"; - $b .= "
\r\n\r\n
"; + $b .= "
\r\n\r\n
"; } else { - $b .= "
\r\n \r\n\r\n\r\n
"; + $b .= "
\r\n \r\n\r\n\r\n
"; } /* @@ -78,7 +78,7 @@ function piwik_analytics($a,&$b) { $b .= ""; } From cfaf6d96f0154a3424e9fd384748e5b8064599cc Mon Sep 17 00:00:00 2001 From: Cohan Robinson Date: Tue, 14 Aug 2012 17:25:00 +0100 Subject: [PATCH 02/11] gzipped new change up --- piwik.tgz | Bin 3366 -> 3353 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/piwik.tgz b/piwik.tgz index a1fc2ecd22ca28e2fbd9e0bcaaee44c4ab9e3e37..fc848e06e5701f4bb585ada0cdf2557e577db8df 100755 GIT binary patch literal 3353 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 From cb654f24bb0813a091ef6a679af81ca885326f3a Mon Sep 17 00:00:00 2001 From: Cohan Robinson Date: Tue, 14 Aug 2012 17:26:54 +0100 Subject: [PATCH 03/11] Changed iframe to work nicely with HTTPS --- irc.tgz | Bin 1716 -> 1689 bytes irc/irc.php | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/irc.tgz b/irc.tgz index a43cde7ede0e810152adb8fc0a320525d9235499..af216a43d261e98ae59ee889e003d2ae8af3a257 100644 GIT binary patch literal 1689 zcmV;K24?vmiwFQrd@4`?1MOICZ`(!;&R6?aaH>%$L2TJ>UI52-P-MkcU|5Pa*gm9z zahA^3A@WJkotgwg|NF?(d*U?fimV$Z0&OH7$s-@~$dg6lxjWBHL!{&5L;5=!4jX?9 z+8K?9qw&G<;rL*L{Nsbs;SL-=w_`-9(kubkiNu%Xo?8EplED1qzd;iTsE%zW3~+w1PZuWZ97@b>)~oCQq7yD(h~ ziToeA@)8ki5y=TK-v=h)t<*e`T*G@Fvb#*d!~c>f+MvpBJW)n`G#KLR>r@9(G65aQ zJ6N*NzY!9qf!48_xb7<9ydSVnTn?gS?Z!#85+QdtCXaSM z--95P4G>cK%`iML@ohkm$4!@;GS15$+ke?pblKF-ZVpJf7$4xHpp$duG7HqgL*v!J*S>VozX?;vSN~;Poce!zJBoDWp9b!{FogN`a%|O8n z$QhJciM2!NvG?tA6>~#d+&7)sAoJOY+-9R(B^zX9%Sq0lRT+@J_yk_altLtnuaGyj&;NGmX4;ZdPh3TuUJK$vnp>7hTJCd(~z5?TqNLu3}UA7 zl0{iG)34LZ2M0R$#3(WKA5jpdXtG&h#vk4OAX+`r*#G))$jYVUP$l&WO@14PkKyb(Ueg-NW2$^FJv8z|E>>r>eBIP(H0_nRp&PuaanOFz;AT~Ywrx|{k8SRv<5kmuoN8AFDh2QHk@l5SJ}ZWjQxrp1ShL#D zYL-B;?l`yD0)BdPVbY!_VHZxpFfS|S6-=O3ER=M*Uif|yk2!y^O0fHyj~Nx=1Kryw zA^-1 z@|DKMW)9>8#=~KJi?18(3PSdE6i;AeSa|SWG_L)*$!h36u=%)=>~=;P4VlAC=6fUA jQcEqh)KW_=wbW8eEw$8AOD(nZ@1#EgLBjhi04M+eFdJ4= literal 1716 zcmV;l221%LiwFQrA?)3m*_mhF))C70HlCOUNJmGbjlI#q(ca#{ z#$a@~cX%+g>p5)__}6lCFHJ& zlQ9hK(wA z(NR_Z2LoIG2M2BaKL<@tF!Eh*d%L?0zq2(T!`lz1aEhe~@1qop4A+0=+E*emB9>!d zK>$p`TWPqG+`tDOv71bQ3R=bS8b$u#N?Z0}e}J#AQxnE&3?`O0uwYSeB_vEjV-h{~ zyrtrNH)Nl=?8j>5B`RKuhta_z^MFgXh&Z4a3)Wcrv&34byRZ#6aSB%=iok?i z0x1H=HnrRy2O^;jN4pL2Dr!C+OA;&0WI%F&@0k*n$_689BEBH@(>0fd5e&pY)}!%c zW$sab&ApIadqI4eQbC=FV7gR-%Ru;Soa?dXgO3nuL=RhQ8e#tBy^-1^__37SH`y9_ zjEqLel`fnv7rNB5yUSGi)+jt-j*u7@MZGO*lZvm%aWxO)__F7si*s}#b$7tUFvilW zRX;6~f|6O|?_<3>s*Y(gw#rn9mc@k^$4JtGKEju0>5TvpJLMp!-hC3?04+yfj zX>yaN_i~f%yxi1eez)5Z%id2Q^qjJBZqui?wbkt)oF-Kg)d3Qg$ZM=jOj^+9CgM8e zm|mDol-mhganLbbahrH+cF8l&{6L7%E0DtHHlaG33{wqd&fUKJ})JiJLb5GuZ$Ixh5qRIRv~FPP@3qLB2#^_pOz2(h{jta%{V z)WO&};LT{!`J_Hcr*bkkxluThNB7kZEt5Z;&FZ!>1u_P?mSWYT@VGl}xr?!(BW|nC zbd)!kdv%n%q=S^)Q^^^$Is-BgpTUoq)`(2n;Yx<;mgm4SRtS3Gf>RuMngP(mL_}vA9`*cqy=EAVgeiut zb*nJRYHS=UWRjZ3vDqoLq;Wvv=&73kpIMahB85um`>xH4nsyJJp4HLxBhHjF%Qlen zet0m(k0MlFdvk!wJShQspJ&QxktzQgmP+?Mu+%o|u$0T+jmqsr%r4ryR|>lzR}Rc_ zYctcbU8k}=f6t7quiUS<;RT}j(XM7lkt4bFm8oT;yWQ#U83=jrT-etCXy+u3&H4Lx zAJ5L+%5e9>N_X^E%6!Ktu`Xq+^@}YU825-)U8X5ot>>cD1~fEv+mnqUW~hDS}P zBjhsf72Tlh-WqQ_LEi%S=G||km-T;-b0a{8VkzcLA=h%lwvnMx4aml1a0O2 z7RU*4SAu;)S8f)lWd z=hfl`jG>k+6m+^?1VQ1Ctv^^Q?7sG6M#uO-_crnf080YlnM@|w8_v3uaBoI+OL7?Q zy;*mXR52?)X`&#pUt+($`}6Fbhy30G@4sk|(tXm5Ly9ScXX?xs5tDdlc?|`Jt6`O5 zSP0)#6YePAhjT73vOp$yrpV0I$}bPS;tMjWPalI4E2)nkmsOgS&^cg#bDBDbg8|+% zxmblJdqLHi+F2JpMVPWCg8&@cY_QGdM}Ka&)KW_=wbW8eEw$8AOD(n3QcEp8JN*qo KP-%hyC;$MwN@_m< diff --git a/irc/irc.php b/irc/irc.php index 50eddb8c..bd7444a9 100644 --- a/irc/irc.php +++ b/irc/irc.php @@ -110,7 +110,7 @@ function irc_content(&$a) { $o .= <<< EOT

IRC chat

A beginner's guide to using IRC. [en]

- + EOT; return $o; From 179bf75565f263d996728c1888b46bb74d0bd342 Mon Sep 17 00:00:00 2001 From: Cohan Robinson Date: Tue, 14 Aug 2012 17:28:43 +0100 Subject: [PATCH 04/11] Include js with HTTPS-friendly URL --- dav/timepicker/index.htm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dav/timepicker/index.htm b/dav/timepicker/index.htm index 4f7d6f4d..e4d1dad4 100644 --- a/dav/timepicker/index.htm +++ b/dav/timepicker/index.htm @@ -24,7 +24,7 @@ } - + - From 0fe4dbe5980984195218759c61caa5d023e3dc15 Mon Sep 17 00:00:00 2001 From: Cohan Robinson Date: Tue, 14 Aug 2012 17:33:24 +0100 Subject: [PATCH 06/11] That one didn't need changing for https installs --- piwik.tgz | Bin 3353 -> 3349 bytes piwik/piwik.php | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/piwik.tgz b/piwik.tgz index fc848e06e5701f4bb585ada0cdf2557e577db8df..080dd9e32c6bfd1513b54dcd98fa04ace138b5ed 100755 GIT binary patch literal 3349 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 analytics tool."); $b .= " "; - $the_url = "//".$baseurl ."index.php?module=CoreAdminHome&action=optOut"; + $the_url = "http://".$baseurl ."index.php?module=CoreAdminHome&action=optOut"; $b .= sprintf(t("If you do not want that your visits are logged this way you can set a cookie to prevent Piwik from tracking further visits of the site (opt-out)."), $the_url); $b .= ""; } From e63e8bb2f031608912412aab2296f0338f4b8995 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Mon, 27 Aug 2012 17:39:52 +0200 Subject: [PATCH 07/11] IMPRESSUM: added 'clear' before footer --- impressum/impressum.php | 1 + 1 file changed, 1 insertion(+) diff --git a/impressum/impressum.php b/impressum/impressum.php index a4e7199c..9d038178 100755 --- a/impressum/impressum.php +++ b/impressum/impressum.php @@ -29,6 +29,7 @@ function impressum_footer($a, &$b) { $text = bbcode(get_config('impressum','footer_text'), true); if (! $text == '') { $a->page['htmlhead'] .= ''; + $b .= '
'; $b .= ''; } } From fc2f3ef757baa1fd0b16b3fe2a0f456b67b591f1 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Tue, 28 Aug 2012 09:17:35 +0200 Subject: [PATCH 08/11] jappixmini: made the settings strings translateable and the insertion of the chat widget optional --- jappixmini/jappixmini.php | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) diff --git a/jappixmini/jappixmini.php b/jappixmini/jappixmini.php index 5d6f8446..df0d474e 100644 --- a/jappixmini/jappixmini.php +++ b/jappixmini/jappixmini.php @@ -221,6 +221,8 @@ function jappixmini_settings(&$a, &$s) { $activate = get_pconfig(local_user(),'jappixmini','activate'); $activate = intval($activate) ? ' checked="checked"' : ''; + $insertchat = get_pconfig(local_user(),'jappixmini','insertchat'); + $insertchat = intval($insertchat) ? ' checked="checked"' : ''; $username = get_pconfig(local_user(),'jappixmini','username'); $username = htmlentities($username); @@ -261,46 +263,49 @@ function jappixmini_settings(&$a, &$s) { $s .= '
'; - $s .= '

Jappix Mini addon settings

'; + $s .= '

'.t('Jappix Mini addon settings').'

'; $s .= '
'; - $s .= ''; + $s .= ''; $s .= ' '; $s .= '
'; - $s .= ''; + $s .= ''; + $s .= ''; + $s .= '
'; + $s .= ''; $s .= ' '; $s .= '
'; - $s .= ''; + $s .= ''; $s .= ' '; $s .= '
'; - $s .= ''; + $s .= ''; $s .= ' '; $s .= '
'; - $s .= ''; + $s .= ''; $s .= ' '; $s .= ' '; $s .= '
'; $onchange = "document.getElementById('jappixmini-friendica-password').disabled = !this.checked;jappixmini_set_password();"; - $s .= ''; + $s .= ''; $s .= ' '; $s .= '
'; - $s .= ''; + $s .= ''; $s .= ' '; $s .= '
'; - $s .= ''; + $s .= ''; $s .= ' '; $s .= '
'; - $s .= ''; + $s .= ''; $s .= ' '; $s .= '
'; - $s .= ''; + $s .= ''; $s .= ' '; $s .= '
'; if ($info_text) $s .= '
Configuration help:

'.$info_text.'

'; $s .= '
Status:

Addon knows '.$address_cnt.' Jabber addresses of '.$contact_cnt.' Friendica contacts (takes some time, usually 10 minutes, to update).

'; $s .= ''; - $s .= ' '; + $s .= ' '; $s .= '
'; $s .= '
'; @@ -379,6 +384,7 @@ function jappixmini_settings_post(&$a,&$b) { set_pconfig($uid,'jappixmini','autosubscribe',intval($b['jappixmini-autosubscribe'])); set_pconfig($uid,'jappixmini','autoapprove',intval($b['jappixmini-autoapprove'])); set_pconfig($uid,'jappixmini','activate',intval($b['jappixmini-activate'])); + set_pconfig($uid,'jappixmini','insertchat',intval($b['jappixmini-insertchat'])); set_pconfig($uid,'jappixmini','encrypt',$encrypt); info( 'Jappix Mini settings saved.' ); @@ -395,7 +401,8 @@ function jappixmini_script(&$a,&$s) { if(! local_user()) return; $activate = get_pconfig(local_user(),'jappixmini','activate'); - if (!$activate) return; + $insertchat = get_pconfig(local_user(), 'jappixmini','insertchat'); + if (!$activate or !$insertchat) return; $a->page['htmlhead'] .= ''."\r\n"; $a->page['htmlhead'] .= ''."\r\n"; From 5b3bb96178c74d8e367ba8000b571a9b575f24d9 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Tue, 28 Aug 2012 09:56:00 +0200 Subject: [PATCH 09/11] jappixmini: reverse logic for the option to do not add so not set yields the known behavior of inserting the chat witget --- jappixmini/jappixmini.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/jappixmini/jappixmini.php b/jappixmini/jappixmini.php index df0d474e..f5ed71c7 100644 --- a/jappixmini/jappixmini.php +++ b/jappixmini/jappixmini.php @@ -221,8 +221,8 @@ function jappixmini_settings(&$a, &$s) { $activate = get_pconfig(local_user(),'jappixmini','activate'); $activate = intval($activate) ? ' checked="checked"' : ''; - $insertchat = get_pconfig(local_user(),'jappixmini','insertchat'); - $insertchat = intval($insertchat) ? ' checked="checked"' : ''; + $dontinsertchat = get_pconfig(local_user(),'jappixmini','dontinsertchat'); + $insertchat = !(intval($dontinsertchat) ? ' checked="checked"' : ''); $username = get_pconfig(local_user(),'jappixmini','username'); $username = htmlentities($username); @@ -268,8 +268,8 @@ function jappixmini_settings(&$a, &$s) { $s .= ''; $s .= ' '; $s .= '
'; - $s .= ''; - $s .= ''; + $s .= ''; + $s .= ''; $s .= '
'; $s .= ''; $s .= ' '; @@ -384,7 +384,7 @@ function jappixmini_settings_post(&$a,&$b) { set_pconfig($uid,'jappixmini','autosubscribe',intval($b['jappixmini-autosubscribe'])); set_pconfig($uid,'jappixmini','autoapprove',intval($b['jappixmini-autoapprove'])); set_pconfig($uid,'jappixmini','activate',intval($b['jappixmini-activate'])); - set_pconfig($uid,'jappixmini','insertchat',intval($b['jappixmini-insertchat'])); + set_pconfig($uid,'jappixmini','dontinsertchat',intval($b['jappixmini-dont-insertchat'])); set_pconfig($uid,'jappixmini','encrypt',$encrypt); info( 'Jappix Mini settings saved.' ); @@ -401,8 +401,8 @@ function jappixmini_script(&$a,&$s) { if(! local_user()) return; $activate = get_pconfig(local_user(),'jappixmini','activate'); - $insertchat = get_pconfig(local_user(), 'jappixmini','insertchat'); - if (!$activate or !$insertchat) return; + $dontinsertchat = get_pconfig(local_user(), 'jappixmini','dontinsertchat'); + if (!$activate or $dontinsertchat) return; $a->page['htmlhead'] .= ''."\r\n"; $a->page['htmlhead'] .= ''."\r\n"; From b25823602257423435e73b0cdcea677e366afb9d Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Tue, 28 Aug 2012 10:02:46 +0200 Subject: [PATCH 10/11] jappixmini: mark the changes in the version number --- jappixmini/jappixmini.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jappixmini/jappixmini.php b/jappixmini/jappixmini.php index f5ed71c7..69c58e94 100644 --- a/jappixmini/jappixmini.php +++ b/jappixmini/jappixmini.php @@ -3,7 +3,7 @@ /** * Name: jappixmini * Description: Provides a Facebook-like chat using Jappix Mini -* Version: 1.0 +* Version: 1.0.1 * Author: leberwurscht * */ From 16ff3a8268bb8a9e2cafea10b3394f88204848b9 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Sat, 1 Sep 2012 00:59:12 +0100 Subject: [PATCH 11/11] Morepokes - get rid of a translation PITA --- morepokes/morepokes.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/morepokes/morepokes.php b/morepokes/morepokes.php index bdbd7dcf..717643ec 100644 --- a/morepokes/morepokes.php +++ b/morepokes/morepokes.php @@ -19,9 +19,8 @@ function morepokes_poke_verbs($a,&$b) { $b['bitchslap'] = array('bitchslapped', t('bitchslap'), t('bitchslapped')); $b['shag'] = array('shag', t('shag'), t('shagged')); $b['somethingobscenelybiological'] = array('something obscenely biological', t('do something obscenely biological to'), t('did something obscenely biological to')); - $b['newpokefeature'] = array('pointed out the new poke feature to', t('point out the new poke feature to'), t('pointed out the new poke feature to')); + $b['newpokefeature'] = array('pointed out the poke feature to', t('point out the poke feature to'), t('pointed out the poke feature to')); $b['declareundyinglove'] = array('declared undying love for', t('declare undying love for'), t('declared undying love for')); - $b['setfireto'] = array('set fire to', t('set fire to'), t('set fire to')); $b['patent'] = array('patented', t('patent'), t('patented')); $b['strokebeard'] = array('stroked their beard at', t('stroke beard'), t('stroked their beard at')); $b['bemoan'] = array('bemoaned the declining standards of modern secondary and tertiary education to', t('bemoan the declining standards of modern secondary and tertiary education to'), t('bemoans the declining standards of modern secondary and tertiary education to')); @@ -35,4 +34,4 @@ function morepokes_poke_verbs($a,&$b) { $b['giggleandfawn'] = array('giggled and fawned at', t('giggle and fawn at'), t('giggled and fawned at')); $b['doubt'] = array('doubted', t('doubt'), t('doubted')); $b['glare'] = array('glared at', t('glare'), t('glared at')); -;} \ No newline at end of file +;}