Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Michael Vogel 2013-08-05 20:34:10 +02:00
commit 004e02c5ca
17 changed files with 22 additions and 10 deletions

Binary file not shown.

BIN
cal.tgz

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View file

@ -2,7 +2,7 @@
/**
* Name: Impressum
* Description: Plugin to add contact information to the about page (/friendica)
* Version: 1.2
* Version: 1.3
* Author: Tobias Diekershoff <https://f.diekershoff.de/profile/tobias>
* License: 3-clause BSD license
*/
@ -20,6 +20,14 @@ function impressum_uninstall() {
unregister_hook('page_end', 'addon/impressum/impressum.php', 'impressum_footer');
logger("uninstalled impressum plugin");
}
function impressum_module() {
}
function impressum_content() {
$a = get_app();
goaway($a->get_baseurl().'/friendica/');
}
function obfuscate_email ($s) {
$s = str_replace('@','(at)',$s);
$s = str_replace('.','(dot)',$s);

Binary file not shown.

Binary file not shown.

BIN
nsfw.tgz

Binary file not shown.

View file

@ -126,7 +126,7 @@ function nsfw_prepare_body(&$a,&$b) {
$found = false;
if(count($arr)) {
$body = nsfw_extract_photos($b['html']);
$body = $b['item']['title'] . "\n" . nsfw_extract_photos($b['html']);
foreach($arr as $word) {
$word = trim($word);
@ -144,13 +144,16 @@ function nsfw_prepare_body(&$a,&$b) {
$found = true;
break;
}
if(stristr($b['item']['tag'], ']' . $word . '[' )) {
$found = true;
break;
if(is_array($b['item']['tags']) && count($b['item']['tags'])) {
foreach($b['item']['tags'] as $t) {
if(stristr($t, '>' . $word . '<' )) {
$found = true;
break;
}
}
}
}
}
}
}
if($found) {
$rnd = random_string(8);

BIN
piwik.tgz

Binary file not shown.

BIN
pumpio.tgz Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

View file

@ -622,11 +622,12 @@ function twitter_post_hook(&$a,&$b) {
}
$msg = trim($msg);
} else
$image = "";
} else {
$msgarr = twitter_shortenmsg($b);
$msg = $msgarr["msg"];
$image = $msgarr["image"];
}
// and now tweet it :-)
if(strlen($msg) and ($image != "")) {
$img_str = fetch_url($image);

Binary file not shown.

View file

@ -19,6 +19,6 @@ question).
If the test is successful then proceed with copying the webrtc instance you
would like to use and place it in the config window and save. Now when you
opent he app it will load the webrtc instance for you to use.
open the app it will load the webrtc instance for you to use.
[1]: https://en.wikipedia.org/wiki/WebRTC