Merge https://github.com/friendica/friendica-addons into apull
This commit is contained in:
commit
62f275a9a1
8 changed files with 28 additions and 25 deletions
|
@ -24,7 +24,7 @@
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.js"></script>
|
<script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.js"></script>
|
||||||
<script type="text/javascript" src="jquery.timePicker.js"></script>
|
<script type="text/javascript" src="jquery.timePicker.js"></script>
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
jQuery(function() {
|
jQuery(function() {
|
||||||
|
@ -74,10 +74,6 @@
|
||||||
|
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
<script type="text/javascript">
|
|
||||||
// Analytics.
|
|
||||||
var _gaq=_gaq||[];_gaq.push(["_setAccount","UA-123444-3"]),_gaq.push(["_trackPageview"]),function(){var a=document.createElement("script");a.type="text/javascript",a.async=!0,a.src=("https:"==document.location.protocol?"https://ssl":"http://www")+".google-analytics.com/ga.js";var b=document.getElementsByTagName("script")[0];b.parentNode.insertBefore(a,b)}()
|
|
||||||
</script>
|
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body>
|
<body>
|
||||||
|
|
|
@ -29,6 +29,7 @@ function impressum_footer($a, &$b) {
|
||||||
$text = bbcode(get_config('impressum','footer_text'), true);
|
$text = bbcode(get_config('impressum','footer_text'), true);
|
||||||
if (! $text == '') {
|
if (! $text == '') {
|
||||||
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="'.$a->get_baseurl().'/addon/impressum/impressum.css" media="all" />';
|
$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="'.$a->get_baseurl().'/addon/impressum/impressum.css" media="all" />';
|
||||||
|
$b .= '<div class="clear"></div>';
|
||||||
$b .= '<div id="impressum_footer">'.$text.'</div>';
|
$b .= '<div id="impressum_footer">'.$text.'</div>';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
BIN
irc.tgz
BIN
irc.tgz
Binary file not shown.
|
@ -110,7 +110,7 @@ function irc_content(&$a) {
|
||||||
$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. [en]</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="//webchat.freenode.net?channels=$channels" width="600" height="600"></iframe>
|
||||||
EOT;
|
EOT;
|
||||||
|
|
||||||
return $o;
|
return $o;
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
/**
|
/**
|
||||||
* Name: jappixmini
|
* Name: jappixmini
|
||||||
* Description: Provides a Facebook-like chat using Jappix Mini
|
* Description: Provides a Facebook-like chat using Jappix Mini
|
||||||
* Version: 1.0
|
* Version: 1.0.1
|
||||||
* Author: leberwurscht <leberwurscht@hoegners.de>
|
* Author: leberwurscht <leberwurscht@hoegners.de>
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
@ -221,6 +221,8 @@ function jappixmini_settings(&$a, &$s) {
|
||||||
|
|
||||||
$activate = get_pconfig(local_user(),'jappixmini','activate');
|
$activate = get_pconfig(local_user(),'jappixmini','activate');
|
||||||
$activate = intval($activate) ? ' checked="checked"' : '';
|
$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 = get_pconfig(local_user(),'jappixmini','username');
|
||||||
$username = htmlentities($username);
|
$username = htmlentities($username);
|
||||||
|
@ -261,46 +263,49 @@ function jappixmini_settings(&$a, &$s) {
|
||||||
|
|
||||||
$s .= '<div class="settings-block">';
|
$s .= '<div class="settings-block">';
|
||||||
|
|
||||||
$s .= '<h3>Jappix Mini addon settings</h3>';
|
$s .= '<h3>'.t('Jappix Mini addon settings').'</h3>';
|
||||||
$s .= '<div>';
|
$s .= '<div>';
|
||||||
$s .= '<label for="jappixmini-activate">Activate addon</label>';
|
$s .= '<label for="jappixmini-activate">'.t('Activate addon').'</label>';
|
||||||
$s .= ' <input id="jappixmini-activate" type="checkbox" name="jappixmini-activate" value="1"'.$activate.' />';
|
$s .= ' <input id="jappixmini-activate" type="checkbox" name="jappixmini-activate" value="1"'.$activate.' />';
|
||||||
$s .= '<br />';
|
$s .= '<br />';
|
||||||
$s .= '<label for="jappixmini-username">Jabber username</label>';
|
$s .= '<label for"jappixmini-dont-insertchat">'.t('Do <em>not</em> insert the Jappixmini Chat-Widget into the webinterface').'</label>';
|
||||||
|
$s .= '<input id="jappixmini-dont-insertchat" type="checkbox" name="jappixmini-dont-insertchat" value="1"'.$insertchat.' />';
|
||||||
|
$s .= '<br />';
|
||||||
|
$s .= '<label for="jappixmini-username">'.t('Jabber username').'</label>';
|
||||||
$s .= ' <input id="jappixmini-username" type="text" name="jappixmini-username" value="'.$username.'" />';
|
$s .= ' <input id="jappixmini-username" type="text" name="jappixmini-username" value="'.$username.'" />';
|
||||||
$s .= '<br />';
|
$s .= '<br />';
|
||||||
$s .= '<label for="jappixmini-server">Jabber server</label>';
|
$s .= '<label for="jappixmini-server">'.t('Jabber server').'</label>';
|
||||||
$s .= ' <input id="jappixmini-server" type="text" name="jappixmini-server" value="'.$server.'" />';
|
$s .= ' <input id="jappixmini-server" type="text" name="jappixmini-server" value="'.$server.'" />';
|
||||||
$s .= '<br />';
|
$s .= '<br />';
|
||||||
|
|
||||||
$s .= '<label for="jappixmini-bosh">Jabber BOSH host</label>';
|
$s .= '<label for="jappixmini-bosh">'.t('Jabber BOSH host').'</label>';
|
||||||
$s .= ' <input id="jappixmini-bosh" type="text" name="jappixmini-bosh" value="'.$bosh.'" />';
|
$s .= ' <input id="jappixmini-bosh" type="text" name="jappixmini-bosh" value="'.$bosh.'" />';
|
||||||
$s .= '<br />';
|
$s .= '<br />';
|
||||||
|
|
||||||
$s .= '<label for="jappixmini-password">Jabber password</label>';
|
$s .= '<label for="jappixmini-password">'.t('Jabber password').'</label>';
|
||||||
$s .= ' <input type="hidden" id="jappixmini-password" name="jappixmini-encrypted-password" value="'.$password.'" />';
|
$s .= ' <input type="hidden" id="jappixmini-password" name="jappixmini-encrypted-password" value="'.$password.'" />';
|
||||||
$s .= ' <input id="jappixmini-clear-password" type="password" value="" onchange="jappixmini_set_password();" />';
|
$s .= ' <input id="jappixmini-clear-password" type="password" value="" onchange="jappixmini_set_password();" />';
|
||||||
$s .= '<br />';
|
$s .= '<br />';
|
||||||
$onchange = "document.getElementById('jappixmini-friendica-password').disabled = !this.checked;jappixmini_set_password();";
|
$onchange = "document.getElementById('jappixmini-friendica-password').disabled = !this.checked;jappixmini_set_password();";
|
||||||
$s .= '<label for="jappixmini-encrypt">Encrypt Jabber password with Friendica password (recommended)</label>';
|
$s .= '<label for="jappixmini-encrypt">'.t('Encrypt Jabber password with Friendica password (recommended)').'</label>';
|
||||||
$s .= ' <input id="jappixmini-encrypt" type="checkbox" name="jappixmini-encrypt" onchange="'.$onchange.'" value="1"'.$encrypt_checked.' />';
|
$s .= ' <input id="jappixmini-encrypt" type="checkbox" name="jappixmini-encrypt" onchange="'.$onchange.'" value="1"'.$encrypt_checked.' />';
|
||||||
$s .= '<br />';
|
$s .= '<br />';
|
||||||
$s .= '<label for="jappixmini-friendica-password">Friendica password</label>';
|
$s .= '<label for="jappixmini-friendica-password">'.t('Friendica password').'</label>';
|
||||||
$s .= ' <input id="jappixmini-friendica-password" name="jappixmini-friendica-password" type="password" onchange="jappixmini_set_password();" value=""'.$encrypt_disabled.' />';
|
$s .= ' <input id="jappixmini-friendica-password" name="jappixmini-friendica-password" type="password" onchange="jappixmini_set_password();" value=""'.$encrypt_disabled.' />';
|
||||||
$s .= '<br />';
|
$s .= '<br />';
|
||||||
$s .= '<label for="jappixmini-autoapprove">Approve subscription requests from Friendica contacts automatically</label>';
|
$s .= '<label for="jappixmini-autoapprove">'.t('Approve subscription requests from Friendica contacts automatically').'</label>';
|
||||||
$s .= ' <input id="jappixmini-autoapprove" type="checkbox" name="jappixmini-autoapprove" value="1"'.$autoapprove.' />';
|
$s .= ' <input id="jappixmini-autoapprove" type="checkbox" name="jappixmini-autoapprove" value="1"'.$autoapprove.' />';
|
||||||
$s .= '<br />';
|
$s .= '<br />';
|
||||||
$s .= '<label for="jappixmini-autosubscribe">Subscribe to Friendica contacts automatically</label>';
|
$s .= '<label for="jappixmini-autosubscribe">'.t('Subscribe to Friendica contacts automatically').'</label>';
|
||||||
$s .= ' <input id="jappixmini-autosubscribe" type="checkbox" name="jappixmini-autosubscribe" value="1"'.$autosubscribe.' />';
|
$s .= ' <input id="jappixmini-autosubscribe" type="checkbox" name="jappixmini-autosubscribe" value="1"'.$autosubscribe.' />';
|
||||||
$s .= '<br />';
|
$s .= '<br />';
|
||||||
$s .= '<label for="jappixmini-purge">Purge internal list of jabber addresses of contacts</label>';
|
$s .= '<label for="jappixmini-purge">'.t('Purge internal list of jabber addresses of contacts').'</label>';
|
||||||
$s .= ' <input id="jappixmini-purge" type="checkbox" name="jappixmini-purge" value="1" />';
|
$s .= ' <input id="jappixmini-purge" type="checkbox" name="jappixmini-purge" value="1" />';
|
||||||
$s .= '<br />';
|
$s .= '<br />';
|
||||||
if ($info_text) $s .= '<br />Configuration help:<p style="margin-left:2em;">'.$info_text.'</p>';
|
if ($info_text) $s .= '<br />Configuration help:<p style="margin-left:2em;">'.$info_text.'</p>';
|
||||||
$s .= '<br />Status:<p style="margin-left:2em;">Addon knows '.$address_cnt.' Jabber addresses of '.$contact_cnt.' Friendica contacts (takes some time, usually 10 minutes, to update).</p>';
|
$s .= '<br />Status:<p style="margin-left:2em;">Addon knows '.$address_cnt.' Jabber addresses of '.$contact_cnt.' Friendica contacts (takes some time, usually 10 minutes, to update).</p>';
|
||||||
$s .= '<input type="submit" name="jappixmini-submit" value="' . t('Submit') . '" />';
|
$s .= '<input type="submit" name="jappixmini-submit" value="' . t('Submit') . '" />';
|
||||||
$s .= ' <input type="button" value="Add contact" onclick="jappixmini_addon_subscribe();" />';
|
$s .= ' <input type="button" value="'.t('Add contact').'" onclick="jappixmini_addon_subscribe();" />';
|
||||||
$s .= '</div>';
|
$s .= '</div>';
|
||||||
|
|
||||||
$s .= '</div>';
|
$s .= '</div>';
|
||||||
|
@ -379,6 +384,7 @@ function jappixmini_settings_post(&$a,&$b) {
|
||||||
set_pconfig($uid,'jappixmini','autosubscribe',intval($b['jappixmini-autosubscribe']));
|
set_pconfig($uid,'jappixmini','autosubscribe',intval($b['jappixmini-autosubscribe']));
|
||||||
set_pconfig($uid,'jappixmini','autoapprove',intval($b['jappixmini-autoapprove']));
|
set_pconfig($uid,'jappixmini','autoapprove',intval($b['jappixmini-autoapprove']));
|
||||||
set_pconfig($uid,'jappixmini','activate',intval($b['jappixmini-activate']));
|
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);
|
set_pconfig($uid,'jappixmini','encrypt',$encrypt);
|
||||||
info( 'Jappix Mini settings saved.' );
|
info( 'Jappix Mini settings saved.' );
|
||||||
|
|
||||||
|
@ -395,7 +401,8 @@ function jappixmini_script(&$a,&$s) {
|
||||||
if(! local_user()) return;
|
if(! local_user()) return;
|
||||||
|
|
||||||
$activate = get_pconfig(local_user(),'jappixmini','activate');
|
$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'] .= '<script type="text/javascript" src="' . $a->get_baseurl() . '/addon/jappixmini/jappix/php/get.php?t=js&g=mini.xml"></script>'."\r\n";
|
$a->page['htmlhead'] .= '<script type="text/javascript" src="' . $a->get_baseurl() . '/addon/jappixmini/jappix/php/get.php?t=js&g=mini.xml"></script>'."\r\n";
|
||||||
$a->page['htmlhead'] .= '<script type="text/javascript" src="' . $a->get_baseurl() . '/addon/jappixmini/jappix/php/get.php?t=js&f=presence.js~caps.js~name.js~roster.js"></script>'."\r\n";
|
$a->page['htmlhead'] .= '<script type="text/javascript" src="' . $a->get_baseurl() . '/addon/jappixmini/jappix/php/get.php?t=js&f=presence.js~caps.js~name.js~roster.js"></script>'."\r\n";
|
||||||
|
|
|
@ -19,9 +19,8 @@ function morepokes_poke_verbs($a,&$b) {
|
||||||
$b['bitchslap'] = array('bitchslapped', t('bitchslap'), t('bitchslapped'));
|
$b['bitchslap'] = array('bitchslapped', t('bitchslap'), t('bitchslapped'));
|
||||||
$b['shag'] = array('shag', t('shag'), t('shagged'));
|
$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['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['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['patent'] = array('patented', t('patent'), t('patented'));
|
||||||
$b['strokebeard'] = array('stroked their beard at', t('stroke beard'), t('stroked their beard at'));
|
$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'));
|
$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'));
|
||||||
|
|
BIN
piwik.tgz
BIN
piwik.tgz
Binary file not shown.
|
@ -65,9 +65,9 @@ function piwik_analytics($a,&$b) {
|
||||||
*/
|
*/
|
||||||
if ($async) {
|
if ($async) {
|
||||||
$a->page['htmlhead'] .= "<!-- Piwik --> <script type=\"text/javascript\">\r\nvar _paq = _paq || [];\r\n(function(){ var u=((\"https:\" == document.location.protocol) ? \"https://".$baseurl."\" : \"http://".$baseurl."\");\r\n_paq.push(['setSiteId', ".$siteid."]);\r\n_paq.push(['setTrackerUrl', u+'piwik.php']);\r\n_paq.push(['trackPageView']);\r\n_paq.push(['enableLinkTracking']);\r\nvar d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; g.type='text/javascript';\r\ng.defer=true; g.async=true; g.src=u+'piwik.js';\r\ns.parentNode.insertBefore(g,s); })();\r\n </script>\r\n<!-- End Piwik Code -->\r\n";
|
$a->page['htmlhead'] .= "<!-- Piwik --> <script type=\"text/javascript\">\r\nvar _paq = _paq || [];\r\n(function(){ var u=((\"https:\" == document.location.protocol) ? \"https://".$baseurl."\" : \"http://".$baseurl."\");\r\n_paq.push(['setSiteId', ".$siteid."]);\r\n_paq.push(['setTrackerUrl', u+'piwik.php']);\r\n_paq.push(['trackPageView']);\r\n_paq.push(['enableLinkTracking']);\r\nvar d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; g.type='text/javascript';\r\ng.defer=true; g.async=true; g.src=u+'piwik.js';\r\ns.parentNode.insertBefore(g,s); })();\r\n </script>\r\n<!-- End Piwik Code -->\r\n";
|
||||||
$b .= "<div id='piwik-code-block'> <!-- Piwik -->\r\n<noscript><p><img src=\"http://".$baseurl."piwik.php?idsite=".$siteid."\" style=\"border:0\" alt=\"\" /></p></noscript>\r\n <!-- End Piwik Tracking Tag --> </div>";
|
$b .= "<div id='piwik-code-block'> <!-- Piwik -->\r\n<noscript><p><img src=\"//".$baseurl."piwik.php?idsite=".$siteid."\" style=\"border:0\" alt=\"\" /></p></noscript>\r\n <!-- End Piwik Tracking Tag --> </div>";
|
||||||
} else {
|
} else {
|
||||||
$b .= "<div id='piwik-code-block'> <!-- Piwik -->\r\n <script type=\"text/javascript\">\r\n var pkBaseURL = ((\"https:\" == document.location.protocol) ? \"https://".$baseurl."\" : \"http://".$baseurl."\");\r\n document.write(unescape(\"%3Cscript src='\" + pkBaseURL + \"piwik.js' type='text/javascript'%3E%3C/script%3E\"));\r\n </script>\r\n<script type=\"text/javascript\">\r\n try {\r\n var piwikTracker = Piwik.getTracker(pkBaseURL + \"piwik.php\", ".$siteid.");\r\n piwikTracker.trackPageView();\r\n piwikTracker.enableLinkTracking();\r\n }\r\n catch( err ) {}\r\n </script>\r\n<noscript><p><img src=\"http://".$baseurl."piwik.php?idsite=".$siteid."\" style=\"border:0\" alt=\"\" /></p></noscript>\r\n <!-- End Piwik Tracking Tag --> </div>";
|
$b .= "<div id='piwik-code-block'> <!-- Piwik -->\r\n <script type=\"text/javascript\">\r\n var pkBaseURL = ((\"https:\" == document.location.protocol) ? \"https://".$baseurl."\" : \"http://".$baseurl."\");\r\n document.write(unescape(\"%3Cscript src='\" + pkBaseURL + \"piwik.js' type='text/javascript'%3E%3C/script%3E\"));\r\n </script>\r\n<script type=\"text/javascript\">\r\n try {\r\n var piwikTracker = Piwik.getTracker(pkBaseURL + \"piwik.php\", ".$siteid.");\r\n piwikTracker.trackPageView();\r\n piwikTracker.enableLinkTracking();\r\n }\r\n catch( err ) {}\r\n </script>\r\n<noscript><p><img src=\"//".$baseurl."piwik.php?idsite=".$siteid."\" style=\"border:0\" alt=\"\" /></p></noscript>\r\n <!-- End Piwik Tracking Tag --> </div>";
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
Loading…
Reference in a new issue