From bda43f7315209cbef7bbe9ceaaf991aa15552f79 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 1 Apr 2012 17:54:17 -0700
Subject: [PATCH 1/2] 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&~y76G<v=9$*4CTbbI4Qx7S0<1`OYt7@@8#GXRYh%a+323-yX!xg3sqr>Cbs
zgVRrh!207~r!2}hi$Mh*jRvpP|Kwyieo_CE?qJw}?wc`sg8zB_lQXP*Gd?<M9>MQy
z#V2ra^$|W6%)%F0FNMPWPrS;ED6P<H0xZvgDY#IU8^tYLamgOn2QvI;v|iznKe?%#
zd9TyO$Mf12+DyP|^$01G`GZi96xNp2B#sw`^W%cubJfvi8J9*cgyb<9&zeVZ6X^k0
zER`Ja7|T~e9nVU~u4=*&Jn9-Agp^<lu7DgtfIYqA6Mz(z<;dHTEi$t_W@YIPGnLah
zz~{9SQ>$l&=!xudoz*L@EF&4nfY>8>V!6qvv*K~VzQ(z}tLZ|WiF~>+f~#C)Y_j%)
z*(_?6IVZR?#}q7+GCG96n}#omr<oU8-$fxZnq$N|Y(t2uYZX7ath7nzcSeUFn%`dd
zuGLfTwfeXIzYDN^8MRpZeJiCXt@LK^`1a-&rVu8%xQ9%#s+tD)?$`<|c`!>D6oxOR
zRI6YXLI-RVZo7}_79QeWn8a+B#OPucx)h&NSn0f$d?TN&jrxI2rm<O-jo!By*)<PZ
zDXVyGB$8{f<Jpqi`DQ0_A>*AK81kT{DG6NRl3J?5M`jFrjKW=Y!*)ooHa{uL?r>RX
zYwHvj=qP0d7db=uDYJHHIW?2KbHbu$<WaIENA)U^^Y9irFO+)_ITA(Lij%EaUvybZ
zoL(rHQe0MB!O$Y9CFymr(1x?Dh&Iew1#U$;9K04(ihXS;(vLO5q|UNU;Hfhs$Mh-y
zM=*T%Y<FEp^i8zBy_#{1#CPR(Xl<jQ?osqLYR!N7eC>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_<VWYOp5-Dt{4e`ebS#blX73|?MRb(=_c{7mw#Pf#%Ld>I69D>
zsX8Q40Qk+sj+h4XR5EoJ%+6tJ5mvCQv7W@Ru1G*U-+>#hZr2@9Vob5ty)xM@=mSrQ
zREH8!I_Dkyxa>9A^+13_I=96%7<Ib=6kIF|yM92|Yqzr|W{UM*&jS?T1ImE<(_Hwk
tKerwp9v&VZ9v&VZ9v&VZ9v&VZ9v&VZ9v&VZ9v*Loe*liD!K?r%004p54k!Qs

literal 920
zcmV;J184jniwFSIv3E}Z1MO68Z`(Ey_GkTygKAW=;YhOMm%x=36kV|eD4HS2x(`8M
z&=M^Xp-F+Fk_JQndyn*6vaX+sbil?3uwkC><>B3PWGat4FN_2+n@u{S$#^yzjXTL?
zI+~7$*1kh$IGmkMW~a$4LHlqx8IL<Kd1+z>ZKH_-=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!$kJRKpeJ<Z&C2<Cl_hgCU=&YOMP(
zO7Qr$)s<9p&{90Yityrr2}mog>t-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>eI5<k~v?
zarI$f_aP@{Q;Jy8jl8#oY+M9j^1jvZeCY;ov0I$;Z%Yi0zWxB#Qi0W#$msw#8f1-I
z_v+wnZ}I9FVnq*teT){6rYXF?y!O&+l$nRdG$4)f;HC9Z5c}2QMQvY%-!A{WzKqd7
zUZI4MooXV}A|LSW#_=uu<%$z==Vt`=9zg?T%L-~3wvA~Z#z$K*)mV;gTi&SrQ15}R
z44=qw7qXxczHi5N9LDeCJ5lIr;ZKvqhl;YY(%S>3-lokwyd;i#D@nZj8|(nK-bnM`
ue(@a~92^`R92^`R92^`R92^`R92^`R92^`R92^|}i}(sKil!I<C;$K*B)?q%

diff --git a/irc/irc.php b/irc/irc.php
index f2c65b17..24cfb7b4 100644
--- a/irc/irc.php
+++ b/irc/irc.php
@@ -22,7 +22,7 @@ unregister_hook('app_menu', 'addon/irc/irc.php', 'irc_app_menu');
 }
 
 function irc_app_menu($a,&$b) {
-$b['app_menu'][] = '<div class="app-title"><a href="irc">' . t('irc Chatroom') . '</a></div>';
+$b['app_menu'][] = '<div class="app-title"><a href="irc">' . t('IRC Chatroom') . '</a></div>';
 }
 
 
@@ -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'] .= '<div class="widget"><h3>' . t('Popular Channels') . '</h3><ul>';
+	foreach($chats as $chat) {
+		$a->page['aside'] .= '<li><a href="' . $a->get_baseurl() . '/irc?channels=' . $chat . '" >' . '#' . $chat . '</a></li>';
+	}
+	$a->page['aside'] .= '</ul></div>';
+
+
+
+
 
 $channels = ((x($_GET,'channels')) ? $_GET['channels'] : 'friendica');
 
@@ -44,7 +57,7 @@ $channels = ((x($_GET,'channels')) ? $_GET['channels'] : 'friendica');
  */
   $o .= <<< EOT
 <h2>IRC chat</h2>
-<p><a href="http://tldp.org/HOWTO/IRC/beginners.html" target="_blank">a beginner's guide to using IRC.</a></p>
+<p><a href="http://tldp.org/HOWTO/IRC/beginners.html" target="_blank">A beginner's guide to using IRC. [en]</a></p>
 <iframe src="http://webchat.freenode.net?channels=$channels" width="600" height="600"></iframe>
 EOT;
 

From 3b2cf61a554bd852aed0bfafc37dc2b14ee83729 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Sun, 1 Apr 2012 18:11:11 -0700
Subject: [PATCH 2/2] 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)x<su2>9)z0=dv
zAHnGdLZJTmuT$j3yX7E(hr^S%^gkZ-hp+TM?hbkl=)N1HJ^bYQ$7iU#7abmYhwukm
z@-bXqU%*AqEPRpGLMXidg_o%jg%w(jfn^ym1((Wlqqv1@F4^<SA;tfU)=PBxi<`1G
z?{&KP^SrXTHe;|_Jww7|_9zs@xwS<(j-t8Y{3vG+Ty?ZrM1|3FA$df`Q|~bHkREWw
z63GGGShf`EXj;_lN)Ha<Sy%8Vqy(FD1r!K;oarqeAEYQPN8Xlfk(uQYD~j5gsf_#p
zf3Jd=O1&_|NMx7kv|4gy8MT27h&_@gmg|Z-OCIIyDa!PHMK9Eu$R=|mxXMJz#;Z73
z&Ad`+9RzP?Sb}9zh6nJEXZV76npv*(eHb948D^}4HU!vpt)jh`l`hGDYjp6*`}!(&
zrS_v&>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|<uKy$~y~ks&t*sI~Ac=$-
zJY)=2rUteH%V}oieXSoBfaMl!!BM1AWIVWo&MSc)MTUi;I{EQNlP|icBreH|ZFwtQ
z&?2rR$<mx_!&#b#Yv!zk`b6z+zLivp-3U;o?@NJ2oo)I$sm&-bJ@TO@7<_nfyBZga
zO|-tgS#gBKw^LQ4waJ2g55uRhHT(7R&Az4wa0d0|?e6jp#;_+3H5r!`?MT`wn*{`O
zgR8Y(HKoQwZkLjFO7aX$qEtdHYI}cM=r*Je1v3`(yf*mr`uBFd?ovjJFpCUd>W4Z}
z?biXIxaSsL?$kD1uJ_{Ew<+2?TfYscB-Cp|rM!&`8+3t7^~2V>uHwVarQT@(_>y2>
z<2Z)TS2tdq_owtGQv+~L`cp41c4BWfr_73a;s18^_svy=_ECZx3fY;mLoM<FKg~E1
z6MvRSrtbaeIczL~5*8KeNeru!8i@WKxaI0@H30?Y6sx|MCfz1|<Oz}LPyq^G!VZ4J
zc0Jk7fREpT%;pn+*zNj|bFs+n>Ia5ig`Ij>DeApiJJ^6v*aqxBt)Kt<tM1_7;Nalk
j;Nalk;Nalk;Nalk;Nalk;Nalk@H66HzMYZ304M+e{y;te

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&~y76G<v=9$*4CTbbI4Qx7S0<1`OYt7@@8#GXRYh%a+323-yX!xg3sqr>Cbs
zgVRrh!207~r!2}hi$Mh*jRvpP|Kwyieo_CE?qJw}?wc`sg8zB_lQXP*Gd?<M9>MQy
z#V2ra^$|W6%)%F0FNMPWPrS;ED6P<H0xZvgDY#IU8^tYLamgOn2QvI;v|iznKe?%#
zd9TyO$Mf12+DyP|^$01G`GZi96xNp2B#sw`^W%cubJfvi8J9*cgyb<9&zeVZ6X^k0
zER`Ja7|T~e9nVU~u4=*&Jn9-Agp^<lu7DgtfIYqA6Mz(z<;dHTEi$t_W@YIPGnLah
zz~{9SQ>$l&=!xudoz*L@EF&4nfY>8>V!6qvv*K~VzQ(z}tLZ|WiF~>+f~#C)Y_j%)
z*(_?6IVZR?#}q7+GCG96n}#omr<oU8-$fxZnq$N|Y(t2uYZX7ath7nzcSeUFn%`dd
zuGLfTwfeXIzYDN^8MRpZeJiCXt@LK^`1a-&rVu8%xQ9%#s+tD)?$`<|c`!>D6oxOR
zRI6YXLI-RVZo7}_79QeWn8a+B#OPucx)h&NSn0f$d?TN&jrxI2rm<O-jo!By*)<PZ
zDXVyGB$8{f<Jpqi`DQ0_A>*AK81kT{DG6NRl3J?5M`jFrjKW=Y!*)ooHa{uL?r>RX
zYwHvj=qP0d7db=uDYJHHIW?2KbHbu$<WaIENA)U^^Y9irFO+)_ITA(Lij%EaUvybZ
zoL(rHQe0MB!O$Y9CFymr(1x?Dh&Iew1#U$;9K04(ihXS;(vLO5q|UNU;Hfhs$Mh-y
zM=*T%Y<FEp^i8zBy_#{1#CPR(Xl<jQ?osqLYR!N7eC>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_<VWYOp5-Dt{4e`ebS#blX73|?MRb(=_c{7mw#Pf#%Ld>I69D>
zsX8Q40Qk+sj+h4XR5EoJ%+6tJ5mvCQv7W@Ru1G*U-+>#hZr2@9Vob5ty)xM@=mSrQ
zREH8!I_Dkyxa>9A^+13_I=96%7<Ib=6kIF|yM92|Yqzr|W{UM*&jS?T1ImE<(_Hwk
tKerwp9v&VZ9v&VZ9v&VZ9v&VZ9v&VZ9v&VZ9v*Loe*liD!K?r%004p54k!Qs

diff --git a/irc/irc.php b/irc/irc.php
index 24cfb7b4..065e4808 100644
--- a/irc/irc.php
+++ b/irc/irc.php
@@ -36,7 +36,11 @@ function irc_content(&$a) {
 	$baseurl = $a->get_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'] .= '<div class="widget"><h3>' . t('Popular Channels') . '</h3><ul>';