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

* remotes/upstream/master:
  added comments and link to documentation to irc.php

* master:
This commit is contained in:
Simon L'nu 2012-03-18 18:30:44 -04:00
commit d9786544f4

View file

@ -6,6 +6,11 @@
* Author: tony baldwin <https://free-haven.org/profile/tony> * Author: tony baldwin <https://free-haven.org/profile/tony>
*/ */
/* enable in admin->plugins
* you will then have "irc chatroom" listed at yoursite/apps
* and the app will run at yoursite/irc
* documentation at http://tonybaldwin.me/hax/doku.php?id=friendica:irc
*/
function irc_install() { function irc_install() {
register_hook('app_menu', 'addon/irc/irc.php', 'irc_app_menu'); register_hook('app_menu', 'addon/irc/irc.php', 'irc_app_menu');
@ -32,10 +37,13 @@ $baseurl = $a->get_baseurl() . '/addon/irc';
$o = ''; $o = '';
// add the chatroom frame and some html /* add the chatroom frame and some html
* by altering the "channels=friendica" part of the URL, you can add/remove channels.
* At free-haven.org, I have "?channels=friendica,free-haven", for instance, to open #friendica and #free-haven
*/
$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 guid to using IRC.</a></p> <p><a href="http://tldp.org/HOWTO/IRC/beginners.html" target="_blank">a beginner's guide to using IRC.</a></p>
<iframe src="http://webchat.freenode.net?channels=friendica" width="600" height="600"></iframe> <iframe src="http://webchat.freenode.net?channels=friendica" width="600" height="600"></iframe>
EOT; EOT;