Merge remote-tracking branch 'upstream/master'
commit
004e02c5ca
BIN
blackout.tgz
BIN
blackout.tgz
Binary file not shown.
BIN
fromgplus.tgz
BIN
fromgplus.tgz
Binary file not shown.
BIN
gpluspost.tgz
BIN
gpluspost.tgz
Binary file not shown.
BIN
impressum.tgz
BIN
impressum.tgz
Binary file not shown.
|
@ -2,7 +2,7 @@
|
||||||
/**
|
/**
|
||||||
* Name: Impressum
|
* Name: Impressum
|
||||||
* Description: Plugin to add contact information to the about page (/friendica)
|
* 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>
|
* Author: Tobias Diekershoff <https://f.diekershoff.de/profile/tobias>
|
||||||
* License: 3-clause BSD license
|
* License: 3-clause BSD license
|
||||||
*/
|
*/
|
||||||
|
@ -20,6 +20,14 @@ function impressum_uninstall() {
|
||||||
unregister_hook('page_end', 'addon/impressum/impressum.php', 'impressum_footer');
|
unregister_hook('page_end', 'addon/impressum/impressum.php', 'impressum_footer');
|
||||||
logger("uninstalled impressum plugin");
|
logger("uninstalled impressum plugin");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function impressum_module() {
|
||||||
|
}
|
||||||
|
function impressum_content() {
|
||||||
|
$a = get_app();
|
||||||
|
goaway($a->get_baseurl().'/friendica/');
|
||||||
|
}
|
||||||
|
|
||||||
function obfuscate_email ($s) {
|
function obfuscate_email ($s) {
|
||||||
$s = str_replace('@','(at)',$s);
|
$s = str_replace('@','(at)',$s);
|
||||||
$s = str_replace('.','(dot)',$s);
|
$s = str_replace('.','(dot)',$s);
|
||||||
|
|
BIN
jappixmini.tgz
BIN
jappixmini.tgz
Binary file not shown.
BIN
mathjax.tgz
BIN
mathjax.tgz
Binary file not shown.
|
@ -126,7 +126,7 @@ function nsfw_prepare_body(&$a,&$b) {
|
||||||
$found = false;
|
$found = false;
|
||||||
if(count($arr)) {
|
if(count($arr)) {
|
||||||
|
|
||||||
$body = nsfw_extract_photos($b['html']);
|
$body = $b['item']['title'] . "\n" . nsfw_extract_photos($b['html']);
|
||||||
|
|
||||||
foreach($arr as $word) {
|
foreach($arr as $word) {
|
||||||
$word = trim($word);
|
$word = trim($word);
|
||||||
|
@ -144,13 +144,16 @@ function nsfw_prepare_body(&$a,&$b) {
|
||||||
$found = true;
|
$found = true;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if(stristr($b['item']['tag'], ']' . $word . '[' )) {
|
if(is_array($b['item']['tags']) && count($b['item']['tags'])) {
|
||||||
$found = true;
|
foreach($b['item']['tags'] as $t) {
|
||||||
break;
|
if(stristr($t, '>' . $word . '<' )) {
|
||||||
|
$found = true;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
if($found) {
|
if($found) {
|
||||||
$rnd = random_string(8);
|
$rnd = random_string(8);
|
||||||
|
|
Binary file not shown.
BIN
statusnet.tgz
BIN
statusnet.tgz
Binary file not shown.
BIN
twitter.tgz
BIN
twitter.tgz
Binary file not shown.
|
@ -622,11 +622,12 @@ function twitter_post_hook(&$a,&$b) {
|
||||||
}
|
}
|
||||||
|
|
||||||
$msg = trim($msg);
|
$msg = trim($msg);
|
||||||
} else
|
$image = "";
|
||||||
|
} else {
|
||||||
$msgarr = twitter_shortenmsg($b);
|
$msgarr = twitter_shortenmsg($b);
|
||||||
$msg = $msgarr["msg"];
|
$msg = $msgarr["msg"];
|
||||||
$image = $msgarr["image"];
|
$image = $msgarr["image"];
|
||||||
|
}
|
||||||
// and now tweet it :-)
|
// and now tweet it :-)
|
||||||
if(strlen($msg) and ($image != "")) {
|
if(strlen($msg) and ($image != "")) {
|
||||||
$img_str = fetch_url($image);
|
$img_str = fetch_url($image);
|
||||||
|
|
BIN
webrtc.tgz
BIN
webrtc.tgz
Binary file not shown.
|
@ -19,6 +19,6 @@ question).
|
||||||
|
|
||||||
If the test is successful then proceed with copying the webrtc instance you
|
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
|
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
|
[1]: https://en.wikipedia.org/wiki/WebRTC
|
||||||
|
|
Loading…
Reference in New Issue