Merge commit 'upstream/master'

This commit is contained in:
Michael Vogel 2012-03-15 21:12:25 +01:00
commit 96d8df11f7
43 changed files with 36 additions and 2 deletions

BIN
adult_smile.tgz Normal file

Binary file not shown.

View file

@ -0,0 +1,34 @@
<?php
/*
* Name: Adult Smilies
* Description: Smily icons that could or should not be included in core
* Version: 1.0
* Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
*
* This is a template for how to extend the "smily" code.
*
*/
function adult_smile_install() {
register_hook('smilie', 'addon/adult_smile/adult_smile.php', 'adult_smile_smilies');
}
function adult_smile_uninstall() {
unregister_hook('smilie', 'addon/adult_smile/adult_smile.php', 'adult_smile_smilies');
}
function adult_smile_smilies(&$a,&$b) {
$b['texts'][] = '(o)(o)';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/adult_smile/icons/tits.gif' . '" alt="' . '(o)(o)' . '" />';
$b['texts'][] = '(.)(.)';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/adult_smile/icons/tits.gif' . '" alt="' . '(.)(.)' . '" />';
$b['texts'][] = ':bong';
$b['icons'][] = '<img src="' . $a->get_baseurl() . '/addon/adult_smile/icons/bong.gif' . '" alt="' . ':bong' . '" />';
}

BIN
adult_smile/icons/bong.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.8 KiB

BIN
adult_smile/icons/tits.gif Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 696 B

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
calc.tgz

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
gnot.tgz

Binary file not shown.

Binary file not shown.

BIN
irc.tgz Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
nsfw.tgz

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
piwik.tgz

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View file

@ -1,7 +1,7 @@
<?php
/**
* Name: Twitter Connector
* Description: Relay public postings to a connected StatusNet account
* Description: Relay public postings to a connected Twitter account
* Version: 1.0.2
* Author: Tobias Diekershoff <https://diekershoff.homeunix.net/friendika/profile/tobias>
*/
@ -288,7 +288,7 @@ function twitter_post_hook(&$a,&$b) {
// longer so we give them 10 characters extra
$max_char = 130; // max. length for a tweet
// we will only work with up to two times the length of the dent
// we can later send to StatusNet. This way we can "gain" some
// we can later send to Twitter. This way we can "gain" some
// information during shortening of potential links but do not
// shorten all the links in a 200000 character long essay.
$tmp = substr($b['body'], 0, 2*$max_char);

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.