diff --git a/blackout.tgz b/blackout.tgz index 30fc200a..cbfb7b70 100644 Binary files a/blackout.tgz and b/blackout.tgz differ diff --git a/cal.tgz b/cal.tgz index 2c080ac5..04c36883 100644 Binary files a/cal.tgz and b/cal.tgz differ diff --git a/fromgplus.tgz b/fromgplus.tgz index 82a4744f..ce6f1b14 100644 Binary files a/fromgplus.tgz and b/fromgplus.tgz differ diff --git a/gpluspost.tgz b/gpluspost.tgz index da04520d..cb0083dc 100644 Binary files a/gpluspost.tgz and b/gpluspost.tgz differ diff --git a/impressum.tgz b/impressum.tgz index c483e085..d1c70af7 100755 Binary files a/impressum.tgz and b/impressum.tgz differ diff --git a/impressum/impressum.php b/impressum/impressum.php index 8bcc8b7d..6714dfc1 100755 --- a/impressum/impressum.php +++ b/impressum/impressum.php @@ -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 * 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); diff --git a/jappixmini.tgz b/jappixmini.tgz index 4f32a616..6eb62f16 100644 Binary files a/jappixmini.tgz and b/jappixmini.tgz differ diff --git a/mathjax.tgz b/mathjax.tgz index c639f90f..923ff2be 100644 Binary files a/mathjax.tgz and b/mathjax.tgz differ diff --git a/nsfw.tgz b/nsfw.tgz index c402fb99..9d34dc0a 100755 Binary files a/nsfw.tgz and b/nsfw.tgz differ diff --git a/nsfw/nsfw.php b/nsfw/nsfw.php index 96e1a9bf..3f00a2f2 100755 --- a/nsfw/nsfw.php +++ b/nsfw/nsfw.php @@ -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); diff --git a/piwik.tgz b/piwik.tgz index c2922924..aaaf4375 100755 Binary files a/piwik.tgz and b/piwik.tgz differ diff --git a/pumpio.tgz b/pumpio.tgz new file mode 100644 index 00000000..e2492b16 Binary files /dev/null and b/pumpio.tgz differ diff --git a/statusnet.tgz b/statusnet.tgz index dce1dd52..d560e9b5 100755 Binary files a/statusnet.tgz and b/statusnet.tgz differ diff --git a/twitter.tgz b/twitter.tgz index 5e814714..945586cf 100755 Binary files a/twitter.tgz and b/twitter.tgz differ diff --git a/twitter/twitter.php b/twitter/twitter.php index 7a4c491a..51bdfbd8 100755 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -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); diff --git a/webrtc.tgz b/webrtc.tgz index 52671702..0901c264 100644 Binary files a/webrtc.tgz and b/webrtc.tgz differ diff --git a/webrtc/README.md b/webrtc/README.md index d29500a6..4f6c55ca 100644 --- a/webrtc/README.md +++ b/webrtc/README.md @@ -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