From bda43f7315209cbef7bbe9ceaaf991aa15552f79 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 1 Apr 2012 17:54:17 -0700 Subject: [PATCH 1/4] improved irc with some alternate channel selections --- irc.tgz | Bin 920 -> 1075 bytes irc/irc.php | 21 +++++++++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/irc.tgz b/irc.tgz index c6ba1bffea99337a2a278039f796c4fdc599649b..b5285cee705913acb91b57491b711d429a3785aa 100644 GIT binary patch literal 1075 zcmV-31kC#%iwFR-_;^nM1MO99PvbZc?pOLNM%ii;P-)uI7t~FQ(C+FE>2$0RclQCI z%1PYD!nGsEfkmhN?>FPV0lR!UvG?KpNKnTa&ph+Ycp^*|H{KXs#CSYx^oN6SzdvYn zhok;z&~y76GCbs zgVRrh!207~r!2}hi$Mh*jRvpP|Kwyieo_CE?qJw}?wc`sg8zB_lQXP*Gd?MQy z#V2ra^$|W6%)%F0FNMPWPrS;ED6P$l&=!xudoz*L@EF&4nfY>8>V!6qvv*K~VzQ(z}tLZ|WiF~>+f~#C)Y_j%) z*(_?6IVZR?#}q7+GCG96n}#omrD6oxOR zRI6YXLI-RVZo7}_79QeWn8a+B#OPucx)h&NSn0f$d?TN&jrxI2rm*AK81kT{DG6NRl3J?5M`jFrjKW=Y!*)ooHa{uL?r>RX zYwHvj=qP0d7db=uDYJHHIW?2KbHbu$qZBz*{H;5Kjeo3}85C*>iL zaf;CJqRYOW46rab^V|%mG%gCel62YAM_>|5CDhW{2fIXfE(0i;v7i^u;E$`{+HMYI zj3!hb8@|%_E|5Fd0U*EU7M>5gHe755*4g(V+I!oe4OmHV_gQ7Ujgu5~iPP@g&e~=1 zZhyoL8vyKH)HO*G_I69D> zsX8Q40Qk+sj+h4XR5EoJ%+6tJ5mvCQv7W@Ru1G*U-+>#hZr2@9Vob5ty)xM@=mSrQ zREH8!I_Dkyxa>9A^+13_I=96%7<>B3PWGat4FN_2+n@u{S$#^yzjXTL? zI+~7$*1kh$IGmkMW~a$4LHlqx8ILZKH_-=xj({GIh_ycl_#dG98|so&5|> zKM@S)kDsWn>KChF20WdPzc>F89-quV!TFyir_&B3FUIHz{^#>g&vEiz-0ypR_((Q% z4i{JN;9W&D{Lb5w3AF!0n_RJ4Gb!dkiUNp$3!$kJRKpeJt-IuYenfvMeeDHq$=ZD$u;9NHqM#Xk3FOZRFD;? zfMKNAFmaOAmR;jPA0A~34~%or6%}9-fsdL#@bQ7OMpNXijW06OG$wUzgNZ0i9N>AI zM783XBW5ywh0NOx6`Ghf7ze{1$s3lt8$}x$SLAbC$h+1o)Hy2_YsIK2SWf2KJb0UR zD{`9zEla$DCY*;o_{&qYG(6R^lJYJLkkJw=w!r`b?79^3lVvqV6Mt~(z45;MEq5!P zW^cuh=KrR^{?D*W2Cus-Q>DAQIVQfnxrGG;X~FIx=cH*CKK^&2nda2bQUaBt>xG$> zp9K(s4oyufCNsC7hqfS%NtVW#A`9#lpHtY#qUChgKHVzu4?ej>u?ii&?h@mN97#i4 z#gSW=oMa`{%bg{(72`uUuwqx5E8q{Wi+U1*@&*lI_&Mw@e|>*F2=>;X*MoDg#+#$@ z7UmEfL}0s!YBoz`M7LKctQGE_)nX&@N2NF1h;H==gyY1RD6PN0&wJFB4>eI53-lokwyd;i#D@nZj8|(nK-bnM` ue(@a~92^`R92^`R92^`R92^`R92^`R92^`R92^|}i}(sKil!I'; +$b['app_menu'][] = '
' . t('IRC Chatroom') . '
'; } @@ -33,8 +33,21 @@ return; function irc_content(&$a) { -$baseurl = $a->get_baseurl() . '/addon/irc'; -$o = ''; + $baseurl = $a->get_baseurl() . '/addon/irc'; + $o = ''; + + $chats = array('friendica','chat','chatback','hottub','ircbar','dateroom','teentalk'); + + + $a->page['aside'] .= '

' . t('Popular Channels') . '

    '; + foreach($chats as $chat) { + $a->page['aside'] .= '
  • ' . '#' . $chat . '
    • '; + } + $a->page['aside'] .= '
'; + + + + $channels = ((x($_GET,'channels')) ? $_GET['channels'] : 'friendica'); @@ -44,7 +57,7 @@ $channels = ((x($_GET,'channels')) ? $_GET['channels'] : 'friendica'); */ $o .= <<< EOT

IRC chat

-

a beginner's guide to using IRC.

+

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

EOT; From 3b2cf61a554bd852aed0bfafc37dc2b14ee83729 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 1 Apr 2012 18:11:11 -0700 Subject: [PATCH 2/4] provide optional sitewide channel list --- irc.tgz | Bin 1075 -> 1117 bytes irc/irc.php | 6 +++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/irc.tgz b/irc.tgz index b5285cee705913acb91b57491b711d429a3785aa..cb86460599f429d1304f82ec46525225d70f591f 100644 GIT binary patch literal 1117 zcmV-j1fu&NiwFRv{CH0Q1MOAYZrer>)vNdw14amGLl!03k_?5CVYoqSpr`}GZ66Fn zSduGo;ngm&T>63{|K1tuYA1dwoIYd^ka)G6%b7XDp)hIGcxQAGqtT$zADoQ({gXy_ zFzgRcdiDJpjb3kbJnW5z-NC5Q?ezwOK?4TwO^i^LmKlJ?lBEk_9)x9)z0=dv zAHnGdLZJTmuT$j3yX7E(hr^S%^gkZ-hp+TM?hbkl=)N1HJ^bYQ$7iU#7abmYhwukm z@-bXqU%*AqEPRpGLMXidg_o%jg%w(jfn^ym1((Wlqqv1@F4^c7VSCc)-m*kbLEt%S0)lG|P2yW2aMKoDo*0aD4za^mB&BP*=r{xoKg8$O?q zR{k`A4%jf*OdshM9N=9LM{F8L7-AaKCBCGv)LA9@x_!1X>N_^6#$i=9{Mce-=QUdi zD|uxkl54S}>4MwY`X;PXM%#8^%4SPb5qQEQO$3cqiC5%?q32=|QmcY?fKQa-vZQ7; z#XQ`ZA9&4XYvahD3aK+5qDOnr1bxt#?^`ls*mD?chiH|W4Z} z?biXIxaSsL?$kD1uJ_{Ew<+2?TfYscB-Cp|rM!&`8+3t7^~2V>uHwVarQT@(_>y2> z<2Z)TS2tdq_owtGQv+~L`cp41c4BWfr_73a;s18^_svy=_ECZx3fY;mLoMIa5ig`Ij>DeApiJJ^6v*aqxBt)Kt2$0RclQCI z%1PYD!nGsEfkmhN?>FPV0lR!UvG?KpNKnTa&ph+Ycp^*|H{KXs#CSYx^oN6SzdvYn zhok;z&~y76GCbs zgVRrh!207~r!2}hi$Mh*jRvpP|Kwyieo_CE?qJw}?wc`sg8zB_lQXP*Gd?MQy z#V2ra^$|W6%)%F0FNMPWPrS;ED6P$l&=!xudoz*L@EF&4nfY>8>V!6qvv*K~VzQ(z}tLZ|WiF~>+f~#C)Y_j%) z*(_?6IVZR?#}q7+GCG96n}#omrD6oxOR zRI6YXLI-RVZo7}_79QeWn8a+B#OPucx)h&NSn0f$d?TN&jrxI2rm*AK81kT{DG6NRl3J?5M`jFrjKW=Y!*)ooHa{uL?r>RX zYwHvj=qP0d7db=uDYJHHIW?2KbHbu$qZBz*{H;5Kjeo3}85C*>iL zaf;CJqRYOW46rab^V|%mG%gCel62YAM_>|5CDhW{2fIXfE(0i;v7i^u;E$`{+HMYI zj3!hb8@|%_E|5Fd0U*EU7M>5gHe755*4g(V+I!oe4OmHV_gQ7Ujgu5~iPP@g&e~=1 zZhyoL8vyKH)HO*G_I69D> zsX8Q40Qk+sj+h4XR5EoJ%+6tJ5mvCQv7W@Ru1G*U-+>#hZr2@9Vob5ty)xM@=mSrQ zREH8!I_Dkyxa>9A^+13_I=96%7get_baseurl() . '/addon/irc'; $o = ''; - $chats = array('friendica','chat','chatback','hottub','ircbar','dateroom','teentalk'); + $sitechats = get_config('irc','channels'); + if($sitechats) + $chats = explode(',',$sitechats); + else + $chats = array('friendica','chat','chatback','hottub','ircbar','dateroom','teentalk'); $a->page['aside'] .= '

' . t('Popular Channels') . '

    '; From c1935f6eabafc1e6b32916b544883d513a82f48b Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 1 Apr 2012 22:27:10 -0700 Subject: [PATCH 3/4] make pageheader work on all themes --- pageheader.tgz | Bin 1194 -> 1198 bytes pageheader/pageheader.php | 9 ++++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pageheader.tgz b/pageheader.tgz index 876d37e400b36711ff92d02129d9aebdc5983817..a253238de444fb6b268dbb8010139605016dbfed 100755 GIT binary patch literal 1198 zcmV;f1X24RiwFQ0IC)P11MOFBZ`(Ey_E+myTs5z9idd5011I)SASpKNrNL6{OIsMU zL|a58N)V}}*^vLfBPH8P9M{7 zkj!WZe;M_87!x^ykj~|?QNL!s3`Wp(-Q){?jYzs+yd~pg1Z{nEYZzrQ*Kz8LO))#~ ziEI`zsV?53_6w@LrXmLrl75jb60!v!fk(Nd>C#$M;C_EkXGaUF&tooIg8fPHq_E

    D zk>ku$M!C-}i5=0N&7_m0@tlR!xm4_lx{rU3Vazk`DaEj^&MD)VvoLHP6muY@3nsAp zr$HQFHZ8@Rdf4VT5~kSt)*)EL_hasCEp|mIDVS5~1=ayhi~FL(4Cl#IP$?N-h<`3w zv)A``tC%LSkpERrE(DdSIr?BoGk!m)8Q)`AH-+yZu)CD(A+%efd-qE7b%PwfZU_}= z!>F@)^A#{L6--iOMvONP4vae1h0Icpf>kyg>?hxcI7>mun~;itQVB8!8PL2DMGV&z zJi;L&mo#S<3L!-IfisWlmQwN>q%~33K3ai{LS?4)8SF7wCn4jP*iqrwTq`p1xArEX zV^jU&I=CE~5TtZIHZ8EVs0EeN84)x~RRP&xIbVw@3Q!j<6C&y}GB&a9OmHUZ(EOBs z;^wgmOe0?;#-OBQ;mz5iSxSU;Xeo1as&x!=z6#yyreziJYlz%CpIw0$5+TsNB08;E z7<-rI1gT|a(ADLKJtPio4GEJZ`E0ls4dH9fBZN)VFm| z&ffo`__y2K*Ymeo^7r3Nf-QqU%Tn0aKqw0H5z|01^MQcFU};ukIS%rt(8PmR>LjPs z8?%j?FSWh4M771Thpcbqy`hwl-_PEj{(80t9lPHDJNWtT`+s-Xt=|8i1?5%Wco(as zA-%%+qKBV=n1?sEamqvzk{h-3t0u!P6++#cEB*~`SP>A;V;ng&!tGF4#s^$WmMkVf zznoJa7}pDn77oPo@QMT?SDVTqoa-HJbzpxJO;({og$flaRH#s)LWK$yDpaUYp~4H{ MZvwA$r~oJc05bDZ8~^|S literal 1194 zcmV;b1XcSViwFR^uU=081MOE^Z{kK2<`w^nvo2ke6<~8QL?lqHl&o6yvQe|@%kByd z_JBvR$ChVEHm&mCduD9Fgs`M-NTjVlDG`jnbH6Z7$eae0_%yXEhk}C`xNfE6_6D6! zuj07u-CnobuQ=_l)9+NkJ(x!YEQBN}KqVsHoTb-{@8BhKx8FWK zK7J0Lo)O8q{_Bq|PlzY9q3b``UH_ibQ}u6m9Cy$jbg}+!-|bbvc|sp{;(uQM@77gs zhGa@Z_{*ry!kEY*gmflPjOq>ZWiW)U<0N13YedpH<4qYSLul)xJHsfdxrtL>Y^&KT zCl=F)NhP>Jb#rQKO+^kMB>f_rBxG|w1dnn_)1|j)!1?~3&5l-7oyA->1^biYN$$l< z*We}b@cbu1@`N__%zv+k&o=kJ+aC@5kKU+2@K<&^@El3#=nt6!*1;3tS}=L8WATF8;Y@&0fpzH!(?K zA^)qLObHrOEA+u^F8KX?F8El$git_hW7!>F=Z{S`1V z5lm8KMvT{wj*Kd{gj}Q?6{|wnI7Pk>@gfBwZ$l~qN+rk`WI(g=6EWOS@Cb*9T+xh~ z8-x(U2hKdI2TAFxk>*&5eY64@h00CqGqgrvora8G;T(k{b8X1PU)bA(j!gACYvYyB zgdnA}k!e9otC~|enG!)4sp_2;SoYU)iVBpVWkN)KMn)#KoC)?=9h#rgPux6FiK%7R zhY=|4Ud(4~UN02FYFNr0U22`fjIUC+k}S|0R-Ve5$O84*HFzNr0wc{6)trX0cV&)| zT4V-Y?V7Ax=31W#m#bz|!JOKPcCuxH`J;kV^Cl%pg3|Y?j3*1ZMOI;$h1{EW);OR~ethb(Mg^6?oZ)AjmcKTRJJ{?|)JJ zyItYyRa`H``)`)Qj-8-&DI97yl=A-DAeQk^S5Weo*%%*zW4tQe%^fl?+&`<`~S0`c-1%F#p?QyUgLVv zyH7yO!`qf|#zYd5TXpGIGloMdgp!*n{w?0MA|RZ{xN&HN@8QBSKHvpq$zlTZ%Q^Ld zaeZ~s%7J(uibx=Gb!Tb7g}$w=4qD&BjFl)+qC|-jB}$YiQKCeN5+zEMDDhJG8#QP- IsQ@Sd0Kqz1X8-^I diff --git a/pageheader/pageheader.php b/pageheader/pageheader.php index d9b187de..cf92204a 100755 --- a/pageheader/pageheader.php +++ b/pageheader/pageheader.php @@ -10,7 +10,7 @@ */ function pageheader_install() { - register_hook('page_header', 'addon/pageheader/pageheader.php', 'pageheader_fetch'); + register_hook('page_content_top', 'addon/pageheader/pageheader.php', 'pageheader_fetch'); register_hook('plugin_settings', 'addon/pageheader/pageheader.php', 'pageheader_addon_settings'); register_hook('plugin_settings_post', 'addon/pageheader/pageheader.php', 'pageheader_addon_settings_post'); @@ -18,10 +18,13 @@ function pageheader_install() { function pageheader_uninstall() { - unregister_hook('page_header', 'addon/pageheader/pageheader.php', 'pageheader_fetch'); + unregister_hook('page_content_top', 'addon/pageheader/pageheader.php', 'pageheader_fetch'); unregister_hook('plugin_settings', 'addon/pageheader/pageheader.php', 'pageheader_addon_settings'); unregister_hook('plugin_settings_post', 'addon/pageheader/pageheader.php', 'pageheader_addon_settings_post'); + // hook moved, uninstall the old one if still there. + unregister_hook('page_header', 'addon/pageheader/pageheader.php', 'pageheader_fetch'); + } @@ -41,7 +44,7 @@ function pageheader_addon_settings(&$a,&$s) { $words = get_config('pageheader','text'); if(! $words) - $words = 'pageheader,'; + $words = ''; $s .= '

    '; $s .= '

    ' . t('"pageheader" Settings') . '

    '; From 3c119e62a3f17b952f794cc777f09e826b6e7418 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 1 Apr 2012 22:27:32 -0700 Subject: [PATCH 4/4] update packages --- pageheader.tgz | Bin 1198 -> 1233 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/pageheader.tgz b/pageheader.tgz index a253238de444fb6b268dbb8010139605016dbfed..80ecd94b4669e09e5cdbe61075e1b35177d3a729 100755 GIT binary patch literal 1233 zcmV;?1TOm@iwFR}IC)P11MOE^Z`w!{<`w^nQ!iVS3T*B~Bv4gKs$K1+(Wcs$wnBqF z#-rF{%QGa+uJYga%-DbvLdZ5DeW*Vv5sbe%_j5Q-$eae0cr?Ij^S}ORyFxsp4xRtu_Wbu+J(d4UQTsX7UQ>|+2uZ)nCJEV`kHDo|(sXGpDro(DM`uS1s`@dPO~L-5c#>Q3 zy>swAaex0OLGp|`cJzM_o4zprv;H5H{r@63ev7#_48wWz#(+2QCyB5z&ae{T7hMYK z@PrCCWr<`lHrlUT&{PT_py~yJ73*)B3e9NSE%p7~LI!aVyOV;f5 z{oN|2Ni5`3^<+X&nVO^bhIGO226e&r7}ibUdkE|3c$$b+)%8{I(bM*EQ03T@xz#=n3=duYifEV3Hy;V!VEE zU{tYG;xm0(# zl2;?miMsa53S<;2Gp#RRkHI<)8Na|L569+Ok%>S5*9je)Y6);~Uo{~}sXsO?u(hZ; zmD3p!bdjo>w!v~9iXsY77cCPa>M=4lF>fX~6Ln~QPCs+=NCl>r?KWdj(y*X zuZmuIaO^1B(S{1}w$8h53kSpqSY}z+td7tF{~m*;AQl?yy_#|1W~#s&BlH)h~2YlIo*SNPtKsb-FziEWqp|FgPxC1O%On`nlryek_w*xI4i0k4N2}G{e vf(D%F9c^`B|IjbzB}$YiQKCeN5+zEMC{dzBi4rABJQ4o^z6Q0(04M+eW~gA# literal 1198 zcmV;f1X24RiwFQ0IC)P11MOFBZ`(Ey_E+myTs5z9idd5011I)SASpKNrNL6{OIsMU zL|a58N)V}}*^vLfBPH8P9M{7 zkj!WZe;M_87!x^ykj~|?QNL!s3`Wp(-Q){?jYzs+yd~pg1Z{nEYZzrQ*Kz8LO))#~ ziEI`zsV?53_6w@LrXmLrl75jb60!v!fk(Nd>C#$M;C_EkXGaUF&tooIg8fPHq_E

    D zk>ku$M!C-}i5=0N&7_m0@tlR!xm4_lx{rU3Vazk`DaEj^&MD)VvoLHP6muY@3nsAp zr$HQFHZ8@Rdf4VT5~kSt)*)EL_hasCEp|mIDVS5~1=ayhi~FL(4Cl#IP$?N-h<`3w zv)A``tC%LSkpERrE(DdSIr?BoGk!m)8Q)`AH-+yZu)CD(A+%efd-qE7b%PwfZU_}= z!>F@)^A#{L6--iOMvONP4vae1h0Icpf>kyg>?hxcI7>mun~;itQVB8!8PL2DMGV&z zJi;L&mo#S<3L!-IfisWlmQwN>q%~33K3ai{LS?4)8SF7wCn4jP*iqrwTq`p1xArEX zV^jU&I=CE~5TtZIHZ8EVs0EeN84)x~RRP&xIbVw@3Q!j<6C&y}GB&a9OmHUZ(EOBs z;^wgmOe0?;#-OBQ;mz5iSxSU;Xeo1as&x!=z6#yyreziJYlz%CpIw0$5+TsNB08;E z7<-rI1gT|a(ADLKJtPio4GEJZ`E0ls4dH9fBZN)VFm| z&ffo`__y2K*Ymeo^7r3Nf-QqU%Tn0aKqw0H5z|01^MQcFU};ukIS%rt(8PmR>LjPs z8?%j?FSWh4M771Thpcbqy`hwl-_PEj{(80t9lPHDJNWtT`+s-Xt=|8i1?5%Wco(as zA-%%+qKBV=n1?sEamqvzk{h-3t0u!P6++#cEB*~`SP>A;V;ng&!tGF4#s^$WmMkVf zznoJa7}pDn77oPo@QMT?SDVTqoa-HJbzpxJO;({og$flaRH#s)LWK$yDpaUYp~4H{ MZvwA$r~oJc05bDZ8~^|S