toddy/friendica-addons
1
0
Fork 0
forked from friendica/friendica-addons
Code Pull requests Activity

Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

Browse source 
* remotes/upstream/master:
  provide optional sitewide channel list
  improved irc with some alternate channel selections

* master:
This commit is contained in:
Simon L'nu 2012-04-02 00:00:38 -04:00
parent e5f3080f9c 3b2cf61a55
commit d1638405a0
2 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
irc.tgz
View file

Binary file not shown.

25
irc/irc.php
View file

@ -22,7 +22,7 @@ unregister_hook('app_menu', 'addon/irc/irc.php', 'irc_app_menu');
} }
function irc_app_menu($a,&$b) { 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,25 @@ return;
function irc_content(&$a) { function irc_content(&$a) {
$baseurl = $a->get_baseurl() . '/addon/irc'; $baseurl = $a->get_baseurl() . '/addon/irc';
$o = ''; $o = '';
$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>';
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'); $channels = ((x($_GET,'channels')) ? $_GET['channels'] : 'friendica');
@ -44,7 +61,7 @@ $channels = ((x($_GET,'channels')) ? $_GET['channels'] : 'friendica');
*/ */
$o .= <<< EOT $o .= <<< EOT
<h2>IRC chat</h2> <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> <iframe src="http://webchat.freenode.net?channels=$channels" width="600" height="600"></iframe>
EOT; EOT;