friendica
/
friendica-addons
mirror of https://git.friendi.ca/friendica/friendica-addons.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' of git://github.com/friendica/friendica-addons

pull/35/head
Tobias Hößl 2012-04-02 20:12:37 +00:00
parent dc7bdfcec6 3c119e62a3
commit 02165e7464
5 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
facebook.tgz
View File

Binary file not shown.

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) {
$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) {
$baseurl = $a->get_baseurl() . '/addon/irc';
$o = '';
$baseurl = $a->get_baseurl() . '/addon/irc';
$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');
@ -44,7 +61,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;

BIN
pageheader.tgz
View File

Binary file not shown.

9
pageheader/pageheader.php
View File

@ -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 .= '<div class="settings-block">';
$s .= '<h3>' . t('"pageheader" Settings') . '</h3>';