diff --git a/dav/timepicker/index.htm b/dav/timepicker/index.htm index 4f7d6f4d..e6babf7d 100644 --- a/dav/timepicker/index.htm +++ b/dav/timepicker/index.htm @@ -24,7 +24,7 @@ } - + - diff --git a/impressum/impressum.php b/impressum/impressum.php index a4e7199c..9d038178 100755 --- a/impressum/impressum.php +++ b/impressum/impressum.php @@ -29,6 +29,7 @@ function impressum_footer($a, &$b) { $text = bbcode(get_config('impressum','footer_text'), true); if (! $text == '') { $a->page['htmlhead'] .= ''; + $b .= '
'; $b .= ''; } } diff --git a/irc.tgz b/irc.tgz index a43cde7e..af216a43 100644 Binary files a/irc.tgz and b/irc.tgz differ diff --git a/irc/irc.php b/irc/irc.php index 50eddb8c..bd7444a9 100644 --- a/irc/irc.php +++ b/irc/irc.php @@ -110,7 +110,7 @@ function irc_content(&$a) { $o .= <<< EOT

IRC chat

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

- + EOT; return $o; diff --git a/jappixmini/jappixmini.php b/jappixmini/jappixmini.php index 5d6f8446..69c58e94 100644 --- a/jappixmini/jappixmini.php +++ b/jappixmini/jappixmini.php @@ -3,7 +3,7 @@ /** * Name: jappixmini * Description: Provides a Facebook-like chat using Jappix Mini -* Version: 1.0 +* Version: 1.0.1 * Author: leberwurscht * */ @@ -221,6 +221,8 @@ function jappixmini_settings(&$a, &$s) { $activate = get_pconfig(local_user(),'jappixmini','activate'); $activate = intval($activate) ? ' checked="checked"' : ''; + $dontinsertchat = get_pconfig(local_user(),'jappixmini','dontinsertchat'); + $insertchat = !(intval($dontinsertchat) ? ' checked="checked"' : ''); $username = get_pconfig(local_user(),'jappixmini','username'); $username = htmlentities($username); @@ -261,46 +263,49 @@ function jappixmini_settings(&$a, &$s) { $s .= '
'; - $s .= '

Jappix Mini addon settings

'; + $s .= '

'.t('Jappix Mini addon settings').'

'; $s .= '
'; - $s .= ''; + $s .= ''; $s .= ' '; $s .= '
'; - $s .= ''; + $s .= ''; + $s .= ''; + $s .= '
'; + $s .= ''; $s .= ' '; $s .= '
'; - $s .= ''; + $s .= ''; $s .= ' '; $s .= '
'; - $s .= ''; + $s .= ''; $s .= ' '; $s .= '
'; - $s .= ''; + $s .= ''; $s .= ' '; $s .= ' '; $s .= '
'; $onchange = "document.getElementById('jappixmini-friendica-password').disabled = !this.checked;jappixmini_set_password();"; - $s .= ''; + $s .= ''; $s .= ' '; $s .= '
'; - $s .= ''; + $s .= ''; $s .= ' '; $s .= '
'; - $s .= ''; + $s .= ''; $s .= ' '; $s .= '
'; - $s .= ''; + $s .= ''; $s .= ' '; $s .= '
'; - $s .= ''; + $s .= ''; $s .= ' '; $s .= '
'; if ($info_text) $s .= '
Configuration help:

'.$info_text.'

'; $s .= '
Status:

Addon knows '.$address_cnt.' Jabber addresses of '.$contact_cnt.' Friendica contacts (takes some time, usually 10 minutes, to update).

'; $s .= ''; - $s .= ' '; + $s .= ' '; $s .= '
'; $s .= '
'; @@ -379,6 +384,7 @@ function jappixmini_settings_post(&$a,&$b) { set_pconfig($uid,'jappixmini','autosubscribe',intval($b['jappixmini-autosubscribe'])); set_pconfig($uid,'jappixmini','autoapprove',intval($b['jappixmini-autoapprove'])); set_pconfig($uid,'jappixmini','activate',intval($b['jappixmini-activate'])); + set_pconfig($uid,'jappixmini','dontinsertchat',intval($b['jappixmini-dont-insertchat'])); set_pconfig($uid,'jappixmini','encrypt',$encrypt); info( 'Jappix Mini settings saved.' ); @@ -395,7 +401,8 @@ function jappixmini_script(&$a,&$s) { if(! local_user()) return; $activate = get_pconfig(local_user(),'jappixmini','activate'); - if (!$activate) return; + $dontinsertchat = get_pconfig(local_user(), 'jappixmini','dontinsertchat'); + if (!$activate or $dontinsertchat) return; $a->page['htmlhead'] .= ''."\r\n"; $a->page['htmlhead'] .= ''."\r\n"; diff --git a/morepokes/morepokes.php b/morepokes/morepokes.php index bdbd7dcf..717643ec 100644 --- a/morepokes/morepokes.php +++ b/morepokes/morepokes.php @@ -19,9 +19,8 @@ function morepokes_poke_verbs($a,&$b) { $b['bitchslap'] = array('bitchslapped', t('bitchslap'), t('bitchslapped')); $b['shag'] = array('shag', t('shag'), t('shagged')); $b['somethingobscenelybiological'] = array('something obscenely biological', t('do something obscenely biological to'), t('did something obscenely biological to')); - $b['newpokefeature'] = array('pointed out the new poke feature to', t('point out the new poke feature to'), t('pointed out the new poke feature to')); + $b['newpokefeature'] = array('pointed out the poke feature to', t('point out the poke feature to'), t('pointed out the poke feature to')); $b['declareundyinglove'] = array('declared undying love for', t('declare undying love for'), t('declared undying love for')); - $b['setfireto'] = array('set fire to', t('set fire to'), t('set fire to')); $b['patent'] = array('patented', t('patent'), t('patented')); $b['strokebeard'] = array('stroked their beard at', t('stroke beard'), t('stroked their beard at')); $b['bemoan'] = array('bemoaned the declining standards of modern secondary and tertiary education to', t('bemoan the declining standards of modern secondary and tertiary education to'), t('bemoans the declining standards of modern secondary and tertiary education to')); @@ -35,4 +34,4 @@ function morepokes_poke_verbs($a,&$b) { $b['giggleandfawn'] = array('giggled and fawned at', t('giggle and fawn at'), t('giggled and fawned at')); $b['doubt'] = array('doubted', t('doubt'), t('doubted')); $b['glare'] = array('glared at', t('glare'), t('glared at')); -;} \ No newline at end of file +;} diff --git a/piwik.tgz b/piwik.tgz index a1fc2ecd..080dd9e3 100755 Binary files a/piwik.tgz and b/piwik.tgz differ diff --git a/piwik/piwik.php b/piwik/piwik.php index 3e0d718f..9ba15db6 100755 --- a/piwik/piwik.php +++ b/piwik/piwik.php @@ -65,9 +65,9 @@ function piwik_analytics($a,&$b) { */ if ($async) { $a->page['htmlhead'] .= " \r\n\r\n"; - $b .= "
\r\n\r\n
"; + $b .= "
\r\n\r\n
"; } else { - $b .= "
\r\n \r\n\r\n\r\n
"; + $b .= "
\r\n \r\n\r\n\r\n
"; } /*