'
+ $b .= '
'
. t('Post to blogger') . '
';
}
}
-function blpost_settings(&$a,&$s) {
+function blogger_settings(&$a,&$s) {
if(! local_user())
return;
/* Add our stylesheet to the page so we can make our settings look nice */
- $a->page['htmlhead'] .= '' . "\r\n";
+ $a->page['htmlhead'] .= '' . "\r\n";
/* Get the current state of our config variables */
- $enabled = get_pconfig(local_user(),'blpost','post');
+ $enabled = get_pconfig(local_user(),'blogger','post');
$checked = (($enabled) ? ' checked="checked" ' : '');
- $def_enabled = get_pconfig(local_user(),'blpost','post_by_default');
+ $def_enabled = get_pconfig(local_user(),'blogger','post_by_default');
$def_checked = (($def_enabled) ? ' checked="checked" ' : '');
- $bl_username = get_pconfig(local_user(), 'blpost', 'bl_username');
- $bl_password = get_pconfig(local_user(), 'blpost', 'bl_password');
- $bl_blog = get_pconfig(local_user(), 'blpost', 'bl_blog');
+ $bl_username = get_pconfig(local_user(), 'blogger', 'bl_username');
+ $bl_password = get_pconfig(local_user(), 'blogger', 'bl_password');
+ $bl_blog = get_pconfig(local_user(), 'blogger', 'bl_blog');
/* Add some HTML to the existing form */
$s .= '';
$s .= '
' . t('Blogger Post Settings') . '
'; - $s .= '';
- $s .= '';
- $s .= '';
+ $s .= '
';
+ $s .= '';
+ $s .= '';
$s .= '
';
- $s .= '';
- $s .= '';
- $s .= '';
+ $s .= '
';
+ $s .= '';
+ $s .= '';
$s .= '
';
- $s .= '';
- $s .= '';
- $s .= '';
+ $s .= '
- * Tobias Hößl
'; $working_connection = true; - } else $o .= t('The correctness of the API Key could not be detected. Somthing strange\'s going on.') . '
'; + } else $o .= t('The correctness of the API Key could not be detected. Something strange\'s going on.') . '
'; } $o .= '
'; @@ -940,7 +950,7 @@ function facebook_post_hook(&$a,&$b) { if($fb_token && ($toplevel || $b['private'] || $reply)) { logger('facebook: able to post'); require_once('library/facebook.php'); - require_once('include/bbcode.php'); + require_once('include/bbcode.php'); $msg = $b['body']; @@ -1015,7 +1025,7 @@ function facebook_post_hook(&$a,&$b) { } // At first convert the text to html - $html = bbcode($body); + $html = bbcode($body, false, false); // Then convert it to plain text $msg = trim($b['title']." \n\n".html2plain($html, 0, true)); @@ -1132,8 +1142,8 @@ function facebook_post_hook(&$a,&$b) { } else { // if its only a message and a subject and the message is larger than 500 characters then post it as note $postvars = array( - 'access_token' => $fb_token, - 'message' => bbcode($b['body']), + 'access_token' => $fb_token, + 'message' => bbcode($b['body'], false, false), 'subject' => $b['title'], ); $url = 'https://graph.facebook.com/me/notes'; diff --git a/fromgplus/README b/fromgplus/README new file mode 100644 index 000000000..cecbb2b9d --- /dev/null +++ b/fromgplus/README @@ -0,0 +1 @@ +This extension is a preparation of the upcoming import of items via Google+ diff --git a/fromgplus/fromgplus.php b/fromgplus/fromgplus.php new file mode 100644 index 000000000..88d2622ff --- /dev/null +++ b/fromgplus/fromgplus.php @@ -0,0 +1,183 @@ + + * + */ + +function fromgplus_install() { + register_hook('plugin_settings', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings'); + register_hook('plugin_settings_post', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings_post'); +} + +function fromgplus_uninstall() { + unregister_hook('plugin_settings', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings'); + unregister_hook('plugin_settings_post', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings_post'); +} + +function fromgplus_addon_settings(&$a,&$s) { + + if(! local_user()) + return; + + $enable_checked = (intval(get_pconfig(local_user(),'fromgplus','enable')) ? ' checked="checked"' : ''); + $account = get_pconfig(local_user(),'fromgplus','account'); + + $s .= '", ""), array("[s]", "[/s]"), $bbcode);
+ $bbcode = str_replace(array("
"), array("\n"), $bbcode); + + $bbcode = trim(strip_tags($bbcode)); + return($bbcode); +} + +function friendicapost($post) { + global $friendica; + + $api = new Statusnet($friendica["user"], $friendica["pw"], "GooglePlus", $friendica["server"]); + $ret = $api->updateStatus($post); + $api->endSession(); +} + +function handleattachments($item) { + $post = ""; + + foreach ($item->object->attachments as $attachment) { + switch($attachment->objectType) { + case "video": + //$post .= "\n\n[url=".$attachment->url."]". + // "[size=large][b]".html2bbcode($attachment->displayName)."[/b][/size][/url]\n"; + $post .= "\n\n[bookmark=".$attachment->url."]".html2bbcode($attachment->displayName)."[/bookmark]\n"; + + //if (strpos($attachment->embed->url, "youtube.com")) + // $post .= "[youtube]".$attachment->url."[/youtube]\n"; + //else + /// $post .= "[url=".$attachment->url."][img]".$attachment->image->url."[/img][/url]\n"; + + ///$post .= "[quote]".trim(html2bbcode($attachment->content))."[/quote]"; + break; + + case "article": + //$post .= "\n\n[url=".$attachment->url."]". + // "[size=large][b]".html2bbcode($attachment->displayName)."[/b][/size][/url]\n"; + $post .= "\n\n[bookmark=".$attachment->url."]".html2bbcode($attachment->displayName)."[/bookmark]\n"; + $post .= "[quote]".trim(html2bbcode($attachment->content))."[/quote]"; + break; + + case "photo": + //$post .= "\n\n[url=".$attachment->fullImage->url."]". + // "[img]".$attachment->fullImage->url."[/img][/url]\n"; + $post .= "\n\n[img]".$attachment->fullImage->url."[/img]\n"; + if ($attachment->displayName != "") + $post .= html2bbcode($attachment->displayName)."\n"; + break; + + case "photo-album": + $post .= "\n\n[url=".$attachment->url."]". + "[size=large][b]".html2bbcode($attachment->displayName)."[/b][/size][/url]\n"; + break; + + default: + print_r($attachment); + die(); + break; + } + } + return($post); +} + +$result = +file_get_contents("https://www.googleapis.com/plus/v1/people/".$google["id"]."/activities/public?alt=json&pp=1&key=".$google["key"]."&maxResults=".$google["maxfetch"]); +$activities = json_decode($result); + +$state = array("lastid"=>''); +if (file_exists($statefile)) + $state = unserialize(file_get_contents($statefile)); + +$lastid = ""; + +foreach($activities->items as $item) { + if ($item->id == $state["lastid"]) + break; + + if ($lastid == "") + $lastid = $item->id; + + switch($item->object->objectType) { + case "note": + $post = html2bbcode($item->object->content); + + if (is_array($item->object->attachments)) + $post .= handleattachments($item); + friendicapost($post); + break; + + case "activity": + $post = html2bbcode($item->annotation)."\n"; + //$post .= html2bbcode("♲ "); + $post .= html2bbcode("♻ "); + $post .= "[url=".$item->object->actor->url."]".$item->object->actor->displayName."[/url]"; + $post .= " \n"; + //$post .= "[quote]"; + + $post .= html2bbcode($item->object->content); + + if (is_array($item->object->attachments)) + $post .= "\n".trim(handleattachments($item)); + + //$post .= "[/quote]"; + + friendicapost($post); + break; + + default: + print_r($item); + die(); + break; + } +} + +if ($lastid != "") { + $state['lastid'] = $lastid; + file_put_contents($statefile, serialize($state)); +} +*/ diff --git a/gravatar.tgz b/gravatar.tgz index 38e942f89..25106f265 100644 Binary files a/gravatar.tgz and b/gravatar.tgz differ diff --git a/gravatar/gravatar.php b/gravatar/gravatar.php index b9435a317..fc5358eb4 100644 --- a/gravatar/gravatar.php +++ b/gravatar/gravatar.php @@ -2,7 +2,7 @@ /** * Name: Gravatar Support * Description: If there is no avatar image for a new user or contact this plugin will look for one at Gravatar. - * Version: 1.0 + * Version: 1.1 * Author: Klaus Weidenbach
*/
@@ -12,7 +12,7 @@
function gravatar_install() {
register_hook('avatar_lookup', 'addon/gravatar/gravatar.php', 'gravatar_lookup');
- logger("installed gravatar");
+ logger("registered gravatar in avatar_lookup hook");
}
/**
@@ -21,7 +21,7 @@ function gravatar_install() {
function gravatar_uninstall() {
unregister_hook('avatar_lookup', 'addon/gravatar/gravatar.php', 'gravatar_lookup');
- logger("uninstalled gravatar");
+ logger("unregistered gravatar in avatar_lookup hook");
}
/**
@@ -81,7 +81,16 @@ function gravatar_plugin_admin (&$a, &$o) {
'x' => 'x'
);
- $o = '';
+ // Check if Libravatar is enabled and show warning
+ $r = q("SELECT * FROM `addon` WHERE `name` = '%s' and `installed` = 1",
+ dbesc('libravatar')
+ );
+ if (count($r)) {
+ $o = '
'; + } + + // output Gravatar settings + $o .= ''; $o .= replace_macros( $t, array( '$submit' => t('Submit'), '$default_avatar' => array('avatar', t('Default avatar image'), $default_avatar, t('Select default avatar image if none was found at Gravatar. See README'), $default_avatars), diff --git a/infiniteimprobabilitydrive.tgz b/infiniteimprobabilitydrive.tgz index 6d10fb691..8d9a2203f 100644 Binary files a/infiniteimprobabilitydrive.tgz and b/infiniteimprobabilitydrive.tgz differ diff --git a/infiniteimprobabilitydrive/infiniteimprobabilitydrive.css b/infiniteimprobabilitydrive/infiniteimprobabilitydrive.css index f4be60515..7fb4019c9 100644 --- a/infiniteimprobabilitydrive/infiniteimprobabilitydrive.css +++ b/infiniteimprobabilitydrive/infiniteimprobabilitydrive.css @@ -1,4 +1,3 @@ -section { - padding-left: 0px; - -} \ No newline at end of file +section {padding-left: 0px;} + +iframe {border: none;} \ No newline at end of file diff --git a/jappixmini.tgz b/jappixmini.tgz index c7fc99a41..212bb25e6 100644 Binary files a/jappixmini.tgz and b/jappixmini.tgz differ diff --git a/jappixmini/jappixmini.php b/jappixmini/jappixmini.php index d4b1993f7..5d6f8446a 100644 --- a/jappixmini/jappixmini.php +++ b/jappixmini/jappixmini.php @@ -435,7 +435,7 @@ function jappixmini_script(&$a,&$s) { $key = $row['k']; $pos = strpos($key, ":"); $dfrn_id = substr($key, $pos+1); - $r = q("SELECT `name` FROM `contact` WHERE `uid`=$uid AND `dfrn-id`='%s' OR `issued-id`='%s'", + $r = q("SELECT `name` FROM `contact` WHERE `uid`=$uid AND (`dfrn-id`='%s' OR `issued-id`='%s')", dbesc($dfrn_id), dbesc($dfrn_id) ); @@ -488,6 +488,9 @@ function jappixmini_cron(&$a, $d) { $users = q("SELECT `uid` FROM `pconfig` WHERE `cat`='jappixmini' AND (`k`='autosubscribe' OR `k`='autoapprove') AND `v`='1'"); logger("jappixmini: Update list of contacts' jabber accounts for ".count($users)." users."); + if(! count($users)) + return; + foreach ($users as $row) { $uid = $row["uid"]; diff --git a/libertree.tgz b/libertree.tgz index a817c140b..f467bc00c 100644 Binary files a/libertree.tgz and b/libertree.tgz differ diff --git a/libertree/libertree.php b/libertree/libertree.php index 4f0c814d2..0e7e1a819 100755 --- a/libertree/libertree.php +++ b/libertree/libertree.php @@ -118,7 +118,7 @@ function libertree_post_local(&$a,&$b) { if($b['private'] || $b['parent']) return; - $ltree_post = intval(get_pconfig(local_user(),'libertree','post')); + $ltree_post = intval(get_pconfig(local_user(),'libertree','post')); $ltree_enable = (($ltree_post && x($_REQUEST,'libertree_enable')) ? intval($_REQUEST['libertree_enable']) : 0); @@ -153,8 +153,8 @@ function libertree_send(&$a,&$b) { $ltree_api_token = get_pconfig($b['uid'],'libertree','libertree_api_token'); $ltree_url = get_pconfig($b['uid'],'libertree','libertree_url'); $ltree_blog = "$ltree_url/api/v1/posts/create/?token=$ltree_api_token"; - - if($ltree_url && $ltree_api_token && $ltree_blog) { + $ltree_source = "Friendica"; + if($ltree_url && $ltree_api_token && $ltree_blog && $ltree_source) { require_once('include/bb2diaspora.php'); $tag_arr = array(); @@ -167,16 +167,42 @@ function libertree_send(&$a,&$b) { } } if(count($tag_arr)) - $tags = implode(',',$tag_arr); + $tags = implode(',',$tag_arr); + $title = $b['title']; + $body = $b['body']; + // Insert a newline before and after a quote + $body = str_ireplace("[quote", "\n\n[quote", $body); + $body = str_ireplace("[/quote]", "[/quote]\n\n", $body); + + // Removal of tags and mentions + // #-tags + $body = preg_replace('/#\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', '#$2', $body); + // @-mentions + $body = preg_replace('/@\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', '@$2', $body); + + // remove multiple newlines + do { + $oldbody = $body; + $body = str_replace("\n\n\n", "\n\n", $body); + } while ($oldbody != $body); + + // convert to markdown + $body = bb2diaspora($body); + + // Adding the title + if(strlen($title)) + $body = "## ".html_entity_decode($title)."\n\n".$body; + $params = array( - 'text' => bb2diaspora($b['body']) + 'text' => $body, + 'source' => $ltree_source // 'token' => $ltree_api_token ); $result = post_url($ltree_blog,$params); - logger('libertree: ' . $result); + logger('libertree: ' . $result); } } diff --git a/libravatar.tgz b/libravatar.tgz new file mode 100644 index 000000000..0405af9bd Binary files /dev/null and b/libravatar.tgz differ diff --git a/libravatar/README.md b/libravatar/README.md new file mode 100644 index 000000000..16fbd85a2 --- /dev/null +++ b/libravatar/README.md @@ -0,0 +1,36 @@ +# Libravatar Plugin +by [Klaus Weidenbach](http://friendica.dszdw.net/profile/klaus) + +This addon allows you to look up an avatar image for new users and contacts at [Libravatar](http://www.libravatar.com). It will be used if there have not been found any other avatar images yet for example through OpenID. + +Libravatar is a free and open replacement for Gravatar. It is a service where people can store an avatar image for their email-addresses. These avatar images can get looked up for example in comment functions, profile pages, etc. on other sites. There exists a central installation at [www.libravatar.com](http://www.libravatar.com), but you can also host it on your own server. If no avatar was found Libravatar will look up at Gravatar as a fallback. +There is no rating available, as it is on Gravatar, so all avatar lookups are g-rated. (Suitable for all audiences.) + +PHP >= 5.3 is required for this plugin! + +You can not use the Libravatar and Gravatar addon at the same time. You need to choose one. If you need other ratings than g you better stay with Gravatar, otherwise it is safe to use Libravatar, because it will fall back to Gravatar if nothing was found at Libravatar. + +* * * + +# Configuration +## Default Avatar Image +If no avatar was found for an email Libravatar can create some pseudo-random generated avatars based on an email hash. You can choose between these presets: + +* __MM__: (mystery-man) a static image +* __Identicon__: a generated geometric pattern based on email hash +* __Monsterid__: a generated 'monster' with different colors, faces, etc. based on email hash +* __Wavatar__: faces with different features and backgrounds based on email hash +* __Retro__: 8-bit arcade-styled pixelated faces based on email hash + +See examples at [Libravatar][1]. + +## Alternative Configuration +Open the .htconfig.php file and add "libravatar" to the list of activated addons: + + $a->config['system']['addon'] = "..., libravatar"; + +You can add one configuration variable for the addon: + + $a->config['libravatar']['default_avatar'] = "identicon"; + +[1]: http://wiki.libravatar.org/api/ "See API documentation at Libravatar for more information" diff --git a/libravatar/Services/Libravatar.php b/libravatar/Services/Libravatar.php new file mode 100644 index 000000000..1b6d022e3 --- /dev/null +++ b/libravatar/Services/Libravatar.php @@ -0,0 +1,669 @@ + + * @copyright 2011 Services_Libravatar committers. + * @license http://www.opensource.org/licenses/mit-license.html MIT License + * @link http://pear.php.net/package/Services_Libravatar + * @since File available since Release 0.1.0 + */ + +/** + * PHP support for the Libravatar.org service. + * + * Using this class is easy. After including or requiring + * Services/Libravatar.php simply do: + *
+ * @copyright 2011 Services_Libravatar committers.
+ * @license http://www.opensource.org/licenses/mit-license.html MIT License
+ * @version Release: 0.2.1
+ * @link http://pear.php.net/package/Services_Libravatar
+ * @since Class available since Release 0.1.0
+ */
+class Services_Libravatar
+{
+ /**
+ * Hashing algorithm to use
+ *
+ * @var string
+ * @see processAlgorithm()
+ * @see setAlgorithm()
+ */
+ protected $algorithm = 'md5';
+
+ /**
+ * Default image URL to use
+ *
+ * @var string
+ * @see processDefault()
+ * @see setDefault()
+ */
+ protected $default;
+
+ /**
+ * If HTTPS URLs should be used
+ *
+ * @var boolean
+ * @see detectHttps()
+ * @see setHttps()
+ */
+ protected $https;
+
+ /**
+ * Image size in pixels
+ *
+ * @var integer
+ * @see processSize()
+ * @see setSize()
+ */
+ protected $size;
+
+
+ /**
+ * Composes a URL for the identifier and options passed in
+ *
+ * Compose a full URL as specified by the Libravatar API, based on the
+ * email address or openid URL passed in, and the options specified.
+ *
+ * @param string $identifier a string of either an email address
+ * or an openid url
+ * @param array $options an array of (bool) https, (string) algorithm
+ * (string) size, (string) default.
+ * See the set* methods.
+ *
+ * @return string A string of a full URL for an avatar image
+ *
+ * @since Method available since Release 0.2.0
+ * @deprecated Use getUrl() instead
+ */
+ public function url($identifier, $options = array())
+ {
+ return $this->getUrl($identifier, $options);
+ }
+
+ /**
+ * Composes a URL for the identifier and options passed in
+ *
+ * Compose a full URL as specified by the Libravatar API, based on the
+ * email address or openid URL passed in, and the options specified.
+ *
+ * @param string $identifier a string of either an email address
+ * or an openid url
+ * @param array $options an array of (bool) https, (string) algorithm
+ * (string) size, (string) default.
+ * See the set* methods.
+ *
+ * @return string A string of a full URL for an avatar image
+ *
+ * @since Method available since Release 0.2.0
+ * @throws InvalidArgumentException When an invalid option is passed
+ */
+ public function getUrl($identifier, $options = array())
+ {
+ // If no identifier has been passed, set it to a null.
+ // This way, there'll always be something returned.
+ if (!$identifier) {
+ $identifier = null;
+ } else {
+ $identifier = $this->normalizeIdentifier($identifier);
+ }
+
+ // Load all options
+ $options = $this->checkOptionsArray($options);
+ $https = $this->https;
+ if (isset($options['https'])) {
+ $https = (bool)$options['https'];
+ }
+
+ $algorithm = $this->algorithm;
+ if (isset($options['algorithm'])) {
+ $algorithm = $this->processAlgorithm($options['algorithm']);
+ }
+
+ $default = $this->default;
+ if (isset($options['default'])) {
+ $default = $this->processDefault($options['default']);
+ }
+ $size = $this->size;
+ if (isset($options['size'])) {
+ $size = $this->processSize($options['size']);
+ }
+
+
+ $identifierHash = $this->identifierHash($identifier, $algorithm);
+
+ // Get the domain so we can determine the SRV stuff for federation
+ $domain = $this->domainGet($identifier);
+
+ // If https has been specified in $options, make sure we make the
+ // correct SRV lookup
+ $service = $this->srvGet($domain, $https);
+ $protocol = $https ? 'https' : 'http';
+
+ $params = array();
+ if ($size !== null) {
+ $params['size'] = $size;
+ }
+ if ($default !== null) {
+ $params['default'] = $default;
+ }
+ $paramString = '';
+ if (count($params) > 0) {
+ $paramString = '?' . http_build_query($params);
+ }
+
+ // Compose the URL from the pieces we generated
+ $url = $protocol . '://' . $service . '/avatar/' . $identifierHash
+ . $paramString;
+
+ // Return the URL string
+ return $url;
+ }
+
+ /**
+ * Checks the options array and verify that only allowed options are in it.
+ *
+ * @param array $options Array of options for getUrl()
+ *
+ * @return void
+ * @throws Exception When an invalid option is used
+ */
+ protected function checkOptionsArray($options)
+ {
+ //this short options are deprecated!
+ if (isset($options['s'])) {
+ $options['size'] = $options['s'];
+ unset($options['s']);
+ }
+ if (isset($options['d'])) {
+ $options['default'] = $options['d'];
+ unset($options['d']);
+ }
+
+ $allowedOptions = array(
+ 'algorithm' => true,
+ 'default' => true,
+ 'https' => true,
+ 'size' => true,
+ );
+ foreach ($options as $key => $value) {
+ if (!isset($allowedOptions[$key])) {
+ throw new InvalidArgumentException(
+ 'Invalid option in array: ' . $key
+ );
+ }
+ }
+
+ return $options;
+ }
+
+ /**
+ * Normalizes the identifier (E-mail address or OpenID)
+ *
+ * @param string $identifier E-Mail address or OpenID
+ *
+ * @return string Normalized identifier
+ */
+ protected function normalizeIdentifier($identifier)
+ {
+ if (filter_var($identifier, FILTER_VALIDATE_EMAIL)) {
+ return strtolower($identifier);
+ } else {
+ return self::normalizeOpenId($identifier);
+ }
+ }
+
+ /**
+ * Create a hash of the identifier.
+ *
+ * Create a hash of the email address or openid passed in. Algorithm
+ * used for email address ONLY can be varied. Either md5 or sha256
+ * are supported by the Libravatar API. Will be ignored for openid.
+ *
+ * @param string $identifier A string of the email address or openid URL
+ * @param string $hash A string of the hash algorithm type to make
+ * Uses the php implementation of hash()
+ * MD5 preferred for Gravatar fallback
+ *
+ * @return string A string hash of the identifier.
+ *
+ * @since Method available since Release 0.1.0
+ */
+ protected function identifierHash($identifier, $hash = 'md5')
+ {
+ if (filter_var($identifier, FILTER_VALIDATE_EMAIL) || $identifier === null) {
+ // If email, we can select our algorithm. Default to md5 for
+ // gravatar fallback.
+ return hash($hash, $identifier);
+ }
+
+ //no email, so the identifier has to be an OpenID
+ return hash('sha256', $identifier);
+ }
+
+ /**
+ * Normalizes an identifier (URI or XRI)
+ *
+ * @param mixed $identifier URI or XRI to be normalized
+ *
+ * @return string Normalized Identifier.
+ * Empty string when the OpenID is invalid.
+ *
+ * @internal Adapted from OpenID::normalizeIdentifier()
+ */
+ public static function normalizeOpenId($identifier)
+ {
+ // XRI
+ if (preg_match('@^xri://@i', $identifier)) {
+ return preg_replace('@^xri://@i', '', $identifier);
+ }
+
+ if (in_array($identifier[0], array('=', '@', '+', '$', '!'))) {
+ return $identifier;
+ }
+
+ // URL
+ if (!preg_match('@^http[s]?://@i', $identifier)) {
+ $identifier = 'http://' . $identifier;
+ }
+ if (strpos($identifier, '/', 8) === false) {
+ $identifier .= '/';
+ }
+ if (!filter_var($identifier, FILTER_VALIDATE_URL)) {
+ return '';
+ }
+
+ $parts = parse_url($identifier);
+ $parts['scheme'] = strtolower($parts['scheme']);
+ $parts['host'] = strtolower($parts['host']);
+
+ //http://openid.net/specs/openid-authentication-2_0.html#normalization
+ return $parts['scheme'] . '://'
+ . (isset($parts['user']) ? $parts['user'] : '')
+ . (isset($parts['pass']) ? ':' . $parts['pass'] : '')
+ . (isset($parts['user']) || isset($parts['pass']) ? '@' : '')
+ . $parts['host']
+ . (
+ (isset($parts['port'])
+ && $parts['scheme'] === 'http' && $parts['port'] != 80)
+ || (isset($parts['port'])
+ && $parts['scheme'] === 'https' && $parts['port'] != 443)
+ ? ':' . $parts['port'] : ''
+ )
+ . $parts['path']
+ . (isset($parts['query']) ? '?' . $parts['query'] : '');
+ //leave out fragment as requested by the spec
+ }
+
+ /**
+ * Grab the domain from the identifier.
+ *
+ * Extract the domain from the Email or OpenID.
+ *
+ * @param string $identifier A string of the email address or openid URL
+ *
+ * @return string A string of the domain to use
+ *
+ * @since Method available since Release 0.1.0
+ */
+ protected function domainGet($identifier)
+ {
+ if ($identifier === null) {
+ return null;
+ }
+
+ // What are we, email or openid? Split ourself up and get the
+ // important bit out.
+ if (filter_var($identifier, FILTER_VALIDATE_EMAIL)) {
+ $email = explode('@', $identifier);
+ return $email[1];
+ }
+
+ //OpenID
+ $url = parse_url($identifier);
+ $domain = $url['host'];
+ if (isset($url['port']) && $url['scheme'] === 'http'
+ && $url['port'] != 80
+ || isset($url['port']) && $url['scheme'] === 'https'
+ && $url['port'] != 443
+ ) {
+ $domain .= ':' . $url['port'];
+ }
+
+ return $domain;
+ }
+
+ /**
+ * Get the target to use.
+ *
+ * Get the SRV record, filtered by priority and weight. If our domain
+ * has no SRV records, fall back to Libravatar.org
+ *
+ * @param string $domain A string of the domain we extracted from the
+ * provided identifier with domainGet()
+ * @param boolean $https Whether or not to look for https records
+ *
+ * @return string The target URL.
+ *
+ * @since Method available since Release 0.1.0
+ */
+ protected function srvGet($domain, $https = false)
+ {
+
+ // Are we going secure? Set up a fallback too.
+ if (isset($https) && $https === true) {
+ $subdomain = '_avatars-sec._tcp.';
+ $fallback = 'seccdn.';
+ } else {
+ $subdomain = '_avatars._tcp.';
+ $fallback = 'cdn.';
+ }
+
+ // Lets try get us some records based on the choice of subdomain
+ // and the domain we had passed in.
+ $srv = dns_get_record($subdomain . $domain, DNS_SRV);
+
+ // Did we get anything? No?
+ if (count($srv) == 0) {
+ // Then let's try Libravatar.org.
+ return $fallback . 'libravatar.org';
+ }
+
+ // Sort by the priority. We must get the lowest.
+ usort($srv, array($this, 'comparePriority'));
+
+ $top = $srv[0];
+ $sum = 0;
+
+ // Try to adhere to RFC2782's weighting algorithm, page 3
+ // "arrange all SRV RRs (that have not been ordered yet) in any order,
+ // except that all those with weight 0 are placed at the beginning of
+ // the list."
+ shuffle($srv);
+ $srvs = array();
+ foreach ($srv as $s) {
+ if ($s['weight'] == 0) {
+ array_unshift($srvs, $s);
+ } else {
+ array_push($srvs, $s);
+ }
+ }
+
+ foreach ($srvs as $s) {
+ if ($s['pri'] == $top['pri']) {
+ // "Compute the sum of the weights of those RRs"
+ $sum += (int) $s['weight'];
+ // "and with each RR associate the running sum in the selected
+ // order."
+ $pri[$sum] = $s;
+ }
+ }
+
+ // "Then choose a uniform random number between 0 and the sum computed
+ // (inclusive)"
+ $random = rand(0, $sum);
+
+ // "and select the RR whose running sum value is the first in the selected
+ // order which is greater than or equal to the random number selected"
+ foreach ($pri as $k => $v) {
+ if ($k >= $random) {
+ return $v['target'];
+ }
+ }
+ }
+
+ /**
+ * Sorting function for record priorities.
+ *
+ * @param mixed $a A mixed value passed by usort()
+ * @param mixed $b A mixed value passed by usort()
+ *
+ * @return mixed The result of the comparison
+ *
+ * @since Method available since Release 0.1.0
+ */
+ protected function comparePriority($a, $b)
+ {
+ return $a['pri'] - $b['pri'];
+ }
+
+ /**
+ * Automatically set the https option depending on the current connection
+ * value.
+ *
+ * If the current connection is HTTPS, the https options is activated.
+ * If it is not HTTPS, the https option is deactivated.
+ *
+ * @return self
+ */
+ public function detectHttps()
+ {
+ $this->setHttps(
+ isset($_SERVER['HTTPS']) && $_SERVER['HTTPS']
+ );
+
+ return $this;
+ }
+
+ /**
+ * Verify and cast the email address hashing algorithm to use.
+ *
+ * @param string $algorithm Algorithm to use, "sha256" or "md5".
+ *
+ * @return string Algorithm
+ *
+ * @throws InvalidArgumentException When an unsupported algorithm is given
+ */
+ protected function processAlgorithm($algorithm)
+ {
+ $algorithm = (string)$algorithm;
+ if ($algorithm !== 'md5' && $algorithm !== 'sha256') {
+ throw new InvalidArgumentException(
+ 'Only md5 and sha256 hashing supported'
+ );
+ }
+
+ return $algorithm;
+ }
+
+ /**
+ * Verify and cast the default URL to use when no avatar image can be found.
+ * If none is set, the libravatar logo is returned.
+ *
+ * @param string $url Full URL to use OR one of the following:
+ * - "404" - give a "404 File not found" instead of an image
+ * - "mm"
+ * - "identicon"
+ * - "monsterid"
+ * - "wavatar"
+ * - "retro"
+ *
+ * @return string Default URL
+ *
+ * @throws InvalidArgumentException When an invalid URL is given
+ */
+ protected function processDefault($url)
+ {
+ if ($url === null) {
+ return $url;
+ }
+
+ $url = (string)$url;
+
+ switch ($url) {
+ case '404':
+ case 'mm':
+ case 'identicon':
+ case 'monsterid':
+ case 'wavatar':
+ case 'retro':
+ break;
+ default:
+ $valid = filter_var($url, FILTER_VALIDATE_URL);
+ if (!$valid) {
+ throw new InvalidArgumentException('Invalid default avatar URL');
+ }
+ break;
+ }
+
+ return $url;
+ }
+
+ /**
+ * Verify and cast the required size of the images.
+ *
+ * @param integer $size Size (width and height in pixels) of the image.
+ * NULL for the default width.
+ *
+ * @return integer Size
+ *
+ * @throws InvalidArgumentException When a size <= 0 is given
+ */
+ protected function processSize($size)
+ {
+ if ($size === null) {
+ return $size;
+ }
+
+ $size = (int)$size;
+ if ($size <= 0) {
+ throw new InvalidArgumentException('Size has to be larger than 0');
+ }
+
+ return (int)$size;
+ }
+
+
+ /**
+ * Set the email address hashing algorithm to use.
+ * To keep gravatar compatibility, use "md5".
+ *
+ * @param string $algorithm Algorithm to use, "sha256" or "md5".
+ *
+ * @return self
+ * @throws InvalidArgumentException When an unsupported algorithm is given
+ */
+ public function setAlgorithm($algorithm)
+ {
+ $this->algorithm = $this->processAlgorithm($algorithm);
+
+ return $this;
+ }
+
+ /**
+ * Set the default URL to use when no avatar image can be found.
+ * If none is set, the gravatar logo is returned.
+ *
+ * @param string $url Full URL to use OR one of the following:
+ * - "404" - give a "404 File not found" instead of an image
+ * - "mm"
+ * - "identicon"
+ * - "monsterid"
+ * - "wavatar"
+ * - "retro"
+ *
+ * @return self
+ * @throws InvalidArgumentException When an invalid URL is given
+ */
+ public function setDefault($url)
+ {
+ $this->default = $this->processDefault($url);
+
+ return $this;
+ }
+
+ /**
+ * Set if HTTPS URLs shall be returned.
+ *
+ * @param boolean $useHttps If HTTPS url shall be returned
+ *
+ * @return self
+ *
+ * @see detectHttps()
+ */
+ public function setHttps($useHttps)
+ {
+ $this->https = (bool)$useHttps;
+
+ return $this;
+ }
+
+ /**
+ * Set the required size of the images.
+ * Every avatar image is square sized, which means you need to set only number.
+ *
+ * @param integer $size Size (width and height) of the image
+ *
+ * @return self
+ * @throws InvalidArgumentException When a size <= 0 is given
+ */
+ public function setSize($size)
+ {
+ $this->size = $this->processSize($size);
+
+ return $this;
+ }
+
+}
+
+/*
+ * Local variables:
+ * tab-width: 4
+ * c-basic-offset: 4
+ * c-hanging-comment-ender-p: nil
+ * End:
+ */
+
+?>
diff --git a/libravatar/admin.tpl b/libravatar/admin.tpl
new file mode 100644
index 000000000..814f4a44a
--- /dev/null
+++ b/libravatar/admin.tpl
@@ -0,0 +1,2 @@
+{{ inc field_select.tpl with $field=$default_avatar}}{{ endinc }}
+
diff --git a/libravatar/libravatar.php b/libravatar/libravatar.php
new file mode 100644
index 000000000..08ed6d00b
--- /dev/null
+++ b/libravatar/libravatar.php
@@ -0,0 +1,114 @@
+= 5.3)
+ * Version: 1.1
+ * Author: Klaus Weidenbach
+ */
+
+/**
+ * Installs the plugin hook
+ */
+function libravatar_install() {
+ if (! version_compare(PHP_VERSION, '5.3.0', '>=')) {
+ info(t('Could NOT install Libravatar successfully.
It requires PHP >= 5.3') .EOL); + // avoid registering the hook + return false; + } + register_hook('avatar_lookup', 'addon/libravatar/libravatar.php', 'libravatar_lookup'); + + logger("registered libravatar in avatar_lookup hook"); +} + +/** + * Removes the plugin hook + */ +function libravatar_uninstall() { + unregister_hook('avatar_lookup', 'addon/libravatar/libravatar.php', 'libravatar_lookup'); + + logger("unregistered libravatar in avatar_lookup hook"); +} + +/** + * Looks up the avatar at Libravatar and returns the URL. + * + * @param $a array + * @param &$b array + */ +function libravatar_lookup($a, &$b) { + $default_avatar = get_config('libravatar', 'default_img'); + + if (! $default_avatar) { + // if not set, look up if there was one from the gravatar addon + $default_avatar = get_config('gravatar', 'default_img'); + // setting default avatar if nothing configured + if (! $default_avatar) + $default_avatar = 'identicon'; // default image will be a random pattern + } + + require_once 'Services/Libravatar.php'; + $libravatar = new Services_Libravatar(); + $libravatar->setSize($b['size']); + $libravatar->setDefault($default_avatar); + $avatar_url = $libravatar->getUrl($b['email']); + + $b['url'] = $avatar_url; + $b['success'] = true; +} + +/** + * Display admin settings for this addon + */ +function libravatar_plugin_admin (&$a, &$o) { + $t = file_get_contents( dirname(__file__)."/admin.tpl"); + + $default_avatar = get_config('libravatar', 'default_img'); + + // set default values for first configuration + if(! $default_avatar) + $default_avatar = 'identicon'; // pseudo-random geometric pattern based on email hash + + // Available options for the select boxes + $default_avatars = array( + 'mm' => t('generic profile image'), + 'identicon' => t('random geometric pattern'), + 'monsterid' => t('monster face'), + 'wavatar' => t('computer generated face'), + 'retro' => t('retro arcade style face'), + ); + + // Show warning if PHP version is too old + if (! version_compare(PHP_VERSION, '5.3.0', '>=')) { + $o = '
'; + } + + // output Libravatar settings + $o .= ''; + $o .= replace_macros( $t, array( + '$submit' => t('Submit'), + '$default_avatar' => array('avatar', t('Default avatar image'), $default_avatar, t('Select default avatar image if none was found. See README'), $default_avatars), + )); +} + +/** + * Save admin settings + */ +function libravatar_plugin_admin_post (&$a) { + check_form_security_token('libravatarrsave'); + + $default_avatar = ((x($_POST, 'avatar')) ? notags(trim($_POST['avatar'])) : 'identicon'); + set_config('libravatar', 'default_img', $default_avatar); + info(t('Libravatar settings updated.') .EOL); +} +?> diff --git a/page.tgz b/page.tgz index c94f01b21..7e95737fd 100644 Binary files a/page.tgz and b/page.tgz differ diff --git a/page/page.css b/page/page.css new file mode 100644 index 000000000..0c0fe3cdf --- /dev/null +++ b/page/page.css @@ -0,0 +1,13 @@ + + + +#page-settings-label, #page-random-label, #page-profile-label { + float: left; + width: 200px; + margin-bottom: 25px; +} + +#page-max-pages, #page-random, #page-profile { + float: left; +} + diff --git a/page/page.php b/page/page.php index 129af4124..3f0f04190 100755 --- a/page/page.php +++ b/page/page.php @@ -1,7 +1,7 @@ * based on pages plugin by @@ -10,22 +10,35 @@ */ function page_install() { - register_hook('page_end', 'addon/page/page.php', 'page_page_end'); + register_hook('network_mod_init', 'addon/page/page.php', 'page_network_mod_init'); + register_hook('plugin_settings', 'addon/page/page.php', 'page_plugin_settings'); + register_hook('plugin_settings_post', 'addon/page/page.php', 'page_plugin_settings_post'); + register_hook('profile_advanced', 'addon/page/page.php', 'page_profile_advanced'); + } function page_uninstall() { + unregister_hook('network_mod_init', 'addon/page/page.php', 'page_network_mod_init'); + unregister_hook('plugin_settings', 'addon/page/page.php', 'page_plugin_settings'); + unregister_hook('plugin_settings_post', 'addon/page/page.php', 'page_plugin_settings_post'); + unregister_hook('profile_advanced', 'addon/page/page.php', 'page_profile_advanced'); + + // remove only - obsolete unregister_hook('page_end', 'addon/page/page.php', 'page_page_end'); } -function page_getpage($uid) { +function page_getpage($uid,$showhidden = true,$randomise = false) { $pagelist = array(); - $contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact` + $order = (($showhidden) ? '' : " and hidden = 0 "); + $order .= (($randomise) ? ' order by rand() ' : ' order by name asc '); + + $contacts = q("SELECT `id`, `url`, `name`, `micro` FROM `contact` WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d - order by name asc ", + $order ", intval($uid) ); @@ -55,7 +68,7 @@ function page_page_end($a,&$b) { $more = false; foreach($contacts as $contact) { - $page .= '![' . $contact['url'] . '](' . $contact['micro'] .')
'.
+ $page .= ' '.
$contact["name"]." ";
$total_shown ++;
if($total_shown == 6) {
@@ -71,5 +84,131 @@ function page_page_end($a,&$b) {
$a->page['aside'] = $page . $a->page['aside'];
}
+function page_network_mod_init($a,$b) {
+
+ $page = ' . '/addon/smiley_pack/icons/animals/bunnyflowers.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':chick';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/animals/chick.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':bumblebee';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/animals/bee.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':ladybird';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/animals/ladybird.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':bigspider';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/animals/bigspider.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':cat';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/animals/cat.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':bunny';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/animals/bunny.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':cow';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/animals/cow.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':crab';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/animals/crab.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':dolphin';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/animals/dolphin.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':dragonfly';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/animals/dragonfly.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':frog';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/animals/frog.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':hamster';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/animals/hamster.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':monkey';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/animals/monkey.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':horse';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/animals/horse.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':parrot';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/animals/parrot.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':tux';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/animals/tux.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':snail';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/animals/snail.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':sheep';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/animals/sheep.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':dog';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/animals/dog.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':elephant';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/animals/elephant.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':fish';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/animals/fish.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':giraffe';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/animals/giraffe.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':pig';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/animals/pig.gif' . ')
';
+ $b['icons'][] = '';
#Baby Smileys
$b['texts'][] = ':baby';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/babies/baby.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':babycot';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/babies/babycot.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':pregnant';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/babies/pregnant.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':stork';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/babies/stork.gif' . ')
';
+ $b['icons'][] = '';
#Confused Smileys
$b['texts'][] = ':confused';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/confused/confused.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':shrug';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/confused/shrug.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':stupid';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/confused/stupid.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':dazed';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/confused/dazed.gif' . ')
';
+ $b['icons'][] = '';
#Cool Smileys
$b['texts'][] = ':affro';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/cool/affro.gif' . ')
';
+ $b['icons'][] = '';
#Devil/Angel Smileys
$b['texts'][] = ':angel';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/devilangel/angel.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':cherub';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/devilangel/cherub.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':devilangel';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/devilangel/blondedevil.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':catdevil';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/devilangel/catdevil.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':devillish';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/devilangel/devil.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':daseesaw';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/devilangel/daseesaw.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':turnevil';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/devilangel/turnevil.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':saint';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/devilangel/saint.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':graveside';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/devilangel/graveside.gif' . ')
';
+ $b['icons'][] = '';
#Unpleasent smileys.
$b['texts'][] = ':toilet';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/disgust/toilet.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':fartinbed';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/disgust/fartinbed.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':fartblush';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/disgust/fartblush.gif' . ')
';
+ $b['icons'][] = '';
#Drinks
$b['texts'][] = ':tea';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/drink/tea.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':drool';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/drool/drool.gif' . ')
';
+ $b['icons'][] = '';
#Sad smileys
$b['texts'][] = ':crying';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/sad/crying.png' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':prisoner';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/sad/prisoner.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':sigh';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/sad/sigh.gif' . ')
';
+ $b['icons'][] = '';
#Smoking - only one smiley in here, maybe it needs moving elsewhere?
$b['texts'][] = ':smoking';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/smoking/smoking.gif' . ')
';
+ $b['icons'][] = '';
#Sport smileys
$b['texts'][] = ':basketball';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/sport/basketball.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = '~bowling';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/sport/bowling.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':cycling';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/sport/cycling.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':darts';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/sport/darts.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':fencing';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/sport/fencing.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':juggling';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/sport/juggling.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':skipping';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/sport/skipping.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':archery';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/sport/archery.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':surfing';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/sport/surfing.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':snooker';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/sport/snooker.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':horseriding';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/sport/horseriding.gif' . ')
';
+ $b['icons'][] = '';
#Love smileys
$b['texts'][] = ':iloveyou';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/love/iloveyou.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':inlove';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/love/inlove.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = '~love';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/love/love.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':lovebear';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/love/lovebear.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':lovebed';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/love/lovebed.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':loveheart';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/love/loveheart.gif' . ')
';
+ $b['icons'][] = '';
#Tired/Sleep smileys
$b['texts'][] = ':countsheep';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/tired/countsheep.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':hammock';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/tired/hammock.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':pillow';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/tired/pillow.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':yawn';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/tired/yawn.gif' . ')
';
+ $b['icons'][] = '';
#Fight/Flame/Violent smileys
$b['texts'][] = ':2guns';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/fight/2guns.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':alienfight';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/fight/alienfight.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':army';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/fight/army.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':arrowhead';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/fight/arrowhead.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':bfg';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/fight/bfg.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':bowman';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/fight/bowman.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':chainsaw';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/fight/chainsaw.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':crossbow';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/fight/crossbow.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':crusader';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/fight/crusader.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':dead';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/fight/dead.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':hammersplat';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/fight/hammersplat.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':lasergun';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/fight/lasergun.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':machinegun';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/fight/machinegun.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':acid';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/fight/acid.gif' . ')
';
+ $b['icons'][] = '';
#Fantasy smileys - monsters and dragons fantasy. The other type of fantasy belongs in adult smileys
$b['texts'][] = ':alienmonster';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/fantasy/alienmonster.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':barbarian';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/fantasy/barbarian.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':dinosaur';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/fantasy/dinosaur.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':dragon';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/fantasy/dragon.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':draco';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/fantasy/dragonwhelp.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':ghost';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/fantasy/ghost.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':mummy';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/fantasy/mummy.gif' . ')
';
+ $b['icons'][] = '';
#Food smileys
$b['texts'][] = ':apple';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/food/apple.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':broccoli';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/food/broccoli.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':cake';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/food/cake.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':carrot';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/food/carrot.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':popcorn';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/food/popcorn.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':tomato';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/food/tomato.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':banana';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/food/banana.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':cooking';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/food/cooking.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':fryegg';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/food/fryegg.gif' . ')
';
+ $b['icons'][] = '';
#Happy smileys
$b['texts'][] = ':cloud9';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/happy/cloud9.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':tearsofjoy';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/happy/tearsofjoy.gif' . ')
';
+ $b['icons'][] = '';
#Repsect smileys
$b['texts'][] = ':bow';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/respect/bow.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':bravo';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/respect/bravo.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':hailking';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/respect/hailking.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':number1';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/respect/number1.gif' . ')
';
+ $b['icons'][] = '';
#Laugh smileys
$b['texts'][] = ':hahaha';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/laugh/hahaha.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':loltv';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/laugh/loltv.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':rofl';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/laugh/rofl.gif' . ')
';
+ $b['icons'][] = '';
#Music smileys
$b['texts'][] = ':drums';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/music/drums.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':guitar';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/music/guitar.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':trumpet';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/music/trumpet.gif' . ')
';
+ $b['icons'][] = '';
#Smileys that used to be in core
$b['texts'][] = ':headbang';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/oldcore/headbang.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':beard';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/oldcore/beard.png' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':whitebeard';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/oldcore/whitebeard.png' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':shaka';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/oldcore/shaka.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':\\.../';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':\\ooo/';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':headdesk';
- $b['icons'][] = '';
+ $b['icons'][] = '';
#These two are still in core, so oldcore isn't strictly right, but we don't want too many directories
$b['texts'][] = ':-d';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/oldcore/laughing.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':-o';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/oldcore/surprised.gif' . ')
';
+ $b['icons'][] = '';
# Regex killers - stick these at the bottom so they appear at the end of the English and
# at the start of $OtherLanguage.
$b['texts'][] = ':cool';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/cool/cool.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':vomit';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/disgust/vomit.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':golf';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/sport/golf.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':football';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/sport/football.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':tennis';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/sport/tennis.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':alpha';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/fight/alpha.png' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':marine';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/fight/marine.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':sabre';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/fight/sabre.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':tank';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/fight/tank.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':viking';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/fight/viking.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':gangs';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/fight/gangs.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':dj';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/music/dj.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':elvis';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/music/elvis.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':violin';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/music/violin.gif' . ')
';
+ $b['icons'][] = '';
}
diff --git a/smilies_adult.tgz b/smilies_adult.tgz
index 971547d73..95f12161a 100644
Binary files a/smilies_adult.tgz and b/smilies_adult.tgz differ
diff --git a/smilies_adult/smilies_adult.php b/smilies_adult/smilies_adult.php
index 19c13b406..82b30a980 100644
--- a/smilies_adult/smilies_adult.php
+++ b/smilies_adult/smilies_adult.php
@@ -22,21 +22,21 @@ function smilies_adult_uninstall() {
function smilies_adult_smilies(&$a,&$b) {
$b['texts'][] = '(o)(o)';
- $b['icons'][] = ' . '/addon/smilies_adult/icons/tits.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = '(.)(.)';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':bong';
- $b['icons'][] = ' . '/addon/smilies_adult/icons/bong.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':sperm';
- $b['icons'][] = ' . '/addon/smilies_adult/icons/sperm.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':drunk';
- $b['icons'][] = ' . '/addon/smilies_adult/icons/drunk.gif' . ')
';
+ $b['icons'][] = '';
$b['texts'][] = ':finger';
- $b['icons'][] = ' . '/addon/smilies_adult/icons/finger.gif' . ')
';
+ $b['icons'][] = '';
}
\ No newline at end of file
diff --git a/statusnet.tgz b/statusnet.tgz
index 33fbc68a9..51390d305 100755
Binary files a/statusnet.tgz and b/statusnet.tgz differ
diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index dd8761680..99e844752 100755
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -426,15 +426,15 @@ function statusnet_post_hook(&$a,&$b) {
if($ckey && $csecret && $otoken && $osecret) {
- require_once('include/bbcode.php');
+ require_once('include/bbcode.php');
$dent = new StatusNetOAuth($api,$ckey,$csecret,$otoken,$osecret);
$max_char = $dent->get_maxlength(); // max. length for a dent
// 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
- // information during shortening of potential links but do not
+ // we can later send to StatusNet. 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.
if (! $b['title']=='') {
- $tmp = $b['title'] . ' : '. $b['body'];
+ $tmp = $b['title'].": \n".$b['body'];
// $tmp = substr($tmp, 0, 4*$max_char);
} else {
$tmp = $b['body']; // substr($b['body'], 0, 3*$max_char);
@@ -453,10 +453,16 @@ function statusnet_post_hook(&$a,&$b) {
// that is, don't send if the option is not set in the
// connector settings
if ($linksenabled=='0') {
- // #-tags
- $tmp = preg_replace( '/#\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', '#$2', $tmp);
- // @-mentions
- $tmp = preg_replace( '/@\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', '@$2', $tmp);
+ // #-tags
+ $tmp = preg_replace( '/#\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', '#$2', $tmp);
+ // @-mentions
+ $tmp = preg_replace( '/@\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', '@$2', $tmp);
+ // recycle 1
+ $recycle = html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8');
+ $tmp = preg_replace( '/'.$recycle.'\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', $recycle.'$2', $tmp);
+ // recycle 2
+ //$recycle = html_entity_decode("♻ ", ENT_QUOTES, 'UTF-8');
+ //$tmp = preg_replace( '/'.$recycle.'\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', 'RT @$2:', $tmp);
}
// preserve links to webpages
$tmp = preg_replace( '/\[url\=(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)\](\w+.*?)\[\/url\]/i', '$2 $1', $tmp);
@@ -476,7 +482,7 @@ function statusnet_post_hook(&$a,&$b) {
}
// ok, all the links we want to send out are save, now strip
// away the remaining bbcode
- $msg = strip_tags(bbcode($tmp));
+ $msg = strip_tags(bbcode($tmp, false, false));
// quotes not working - let's try this
$msg = html_entity_decode($msg);
if (( strlen($msg) > $max_char) && $max_char > 0) {
diff --git a/tumblr.tgz b/tumblr.tgz
index d5a34c218..2a137b54f 100755
Binary files a/tumblr.tgz and b/tumblr.tgz differ
diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php
index 723bdef0b..03a67949b 100755
--- a/tumblr/tumblr.php
+++ b/tumblr/tumblr.php
@@ -166,19 +166,58 @@ function tumblr_send(&$a,&$b) {
}
}
if(count($tag_arr))
- $tags = implode(',',$tag_arr);
+ $tags = implode(',',$tag_arr);
+ $link = "";
+ $video = false;
+ $title = trim($b['title']);
+
+ // Checking for a bookmark
+ if(preg_match("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/is",$b['body'],$matches)) {
+ $link = $matches[1];
+ if ($title == '')
+ $title = html_entity_decode($matches[2],ENT_QUOTES,'UTF-8');
+
+ $body = $b['body'];
+ // splitting the text in two parts:
+ // before and after the bookmark
+ $pos = strpos($body, "[bookmark");
+ $body1 = substr($body, 0, $pos);
+ $body2 = substr($body, $pos);
+
+ // Removing the bookmark
+ $body2 = preg_replace("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism",'',$body2);
+ $body = $body1.$body2;
+
+ $video = ((stristr($link,'youtube')) || (stristr($link,'youtu.be')) || (stristr($mtch[1],'vimeo')));
+ }
$params = array(
'email' => $tmbl_username,
'password' => $tmbl_password,
- 'title' => $b['title'],
- 'type' => 'regular',
'format' => 'html',
'generator' => 'Friendica',
- 'tags' => $tags,
- 'body' => bbcode($b['body'])
- );
+ 'tags' => $tags);
+
+ if (($link != '') and $video) {
+ $params['type'] = "video";
+ $params['embed'] = $link;
+ if ($title != '')
+ $params['caption'] = '' . (($b['title']) ? $b['title'] : t('Post from Friendica')) . ' ';
+ $title = '' . (($wptitle) ? $wptitle : t('Post from Friendica')) . ' ';
$post = $title . bbcode($b['body']);
$wp_backlink = intval(get_pconfig($b['uid'],'wppost','backlink'));
';
+ $s .= '';
+ $s .= '';
$s .= '
';
- $s .= '';
- $s .= '';
- $s .= '';
+ $s .= '
';
}
-function blpost_settings_post(&$a,&$b) {
+function blogger_settings_post(&$a,&$b) {
- if(x($_POST,'blpost-submit')) {
+ if(x($_POST,'blogger-submit')) {
- set_pconfig(local_user(),'blpost','post',intval($_POST['blpost']));
- set_pconfig(local_user(),'blpost','post_by_default',intval($_POST['bl_bydefault']));
- set_pconfig(local_user(),'blpost','bl_username',trim($_POST['bl_username']));
- set_pconfig(local_user(),'blpost','bl_password',trim($_POST['bl_password']));
- set_pconfig(local_user(),'blpost','bl_blog',trim($_POST['bl_blog']));
+ set_pconfig(local_user(),'blogger','post',intval($_POST['blogger']));
+ set_pconfig(local_user(),'blogger','post_by_default',intval($_POST['bl_bydefault']));
+ set_pconfig(local_user(),'blogger','bl_username',trim($_POST['bl_username']));
+ set_pconfig(local_user(),'blogger','bl_password',trim($_POST['bl_password']));
+ set_pconfig(local_user(),'blogger','bl_blog',trim($_POST['bl_blog']));
}
}
-function blpost_post_local(&$a,&$b) {
+function blogger_post_local(&$a,&$b) {
// This can probably be changed to allow editing by pointing to a different API endpoint
@@ -131,11 +131,11 @@ function blpost_post_local(&$a,&$b) {
if($b['private'] || $b['parent'])
return;
- $bl_post = intval(get_pconfig(local_user(),'blpost','post'));
+ $bl_post = intval(get_pconfig(local_user(),'blogger','post'));
- $bl_enable = (($bl_post && x($_REQUEST,'blpost_enable')) ? intval($_REQUEST['blpost_enable']) : 0);
+ $bl_enable = (($bl_post && x($_REQUEST,'blogger_enable')) ? intval($_REQUEST['blogger_enable']) : 0);
- if($_REQUEST['api_source'] && intval(get_pconfig(local_user(),'blpost','post_by_default')))
+ if($_REQUEST['api_source'] && intval(get_pconfig(local_user(),'blogger','post_by_default')))
$bl_enable = 1;
if(! $bl_enable)
@@ -143,27 +143,27 @@ function blpost_post_local(&$a,&$b) {
if(strlen($b['postopts']))
$b['postopts'] .= ',';
- $b['postopts'] .= 'blpost';
+ $b['postopts'] .= 'blogger';
}
-function blpost_send(&$a,&$b) {
+function blogger_send(&$a,&$b) {
if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited']))
return;
- if(! strstr($b['postopts'],'blpost'))
+ if(! strstr($b['postopts'],'blogger'))
return;
if($b['parent'] != $b['id'])
return;
- $bl_username = xmlify(get_pconfig($b['uid'],'blpost','bl_username'));
- $bl_password = xmlify(get_pconfig($b['uid'],'blpost','bl_password'));
- $bl_blog = get_pconfig($b['uid'],'blpost','bl_blog');
+ $bl_username = xmlify(get_pconfig($b['uid'],'blogger','bl_username'));
+ $bl_password = xmlify(get_pconfig($b['uid'],'blogger','bl_password'));
+ $bl_blog = get_pconfig($b['uid'],'blogger','bl_blog');
if($bl_username && $bl_password && $bl_blog) {
@@ -189,7 +189,7 @@ function blpost_send(&$a,&$b) {
EOT;
- logger('blpost: data: ' . $xml, LOGGER_DATA);
+ logger('blogger: data: ' . $xml, LOGGER_DATA);
if($bl_blog !== 'test')
$x = post_url($bl_blog,$xml);
diff --git a/communityhome.tgz b/communityhome.tgz
index dbb235bbb..129081b61 100755
Binary files a/communityhome.tgz and b/communityhome.tgz differ
diff --git a/communityhome/communityhome.php b/communityhome/communityhome.php
index 14c40328e..2b14fd338 100755
--- a/communityhome/communityhome.php
+++ b/communityhome/communityhome.php
@@ -55,7 +55,7 @@ function communityhome_home(&$a, &$o){
$entry = replace_macros($tpl,array(
'$id' => $rr['id'],
'$profile-link' => $profile_link,
- '$photo' => $rr[$photo],
+ '$photo' => $a->get_cached_avatar_image($rr[$photo]),
'$alt-text' => $rr['name'],
));
$aside['$lastusers_items'][] = $entry;
diff --git a/dav/virtual_cal_source_friendica.inc.php b/dav/virtual_cal_source_friendica.inc.php
index 5123e4edd..7434fbbc0 100644
--- a/dav/virtual_cal_source_friendica.inc.php
+++ b/dav/virtual_cal_source_friendica.inc.php
@@ -52,8 +52,11 @@ class FriendicaVirtualCalSourceBackend extends VirtualCalSourceBackend
}
*/
- $subject = substr(preg_replace("/\[[^\]]*\]/", "", $row["desc"]), 0, 100);
- $description = preg_replace("/\[[^\]]*\]/", "", $row["desc"]);
+ // 2012-06-29 - change to Friendica new event behaviour where summary is present and required,
+ // but use desc for older events where summary wasn't present or required (but desc was)
+
+ $subject = (($row["summary"]) ? $row["summary"] : substr(preg_replace("/\[[^\]]*\]/", "", $row["desc"]), 0, 100));
+ $description = (($row["desc"]) ? preg_replace("/\[[^\]]*\]/", "", $row["desc"]) : $row["summary"]);
$vevent = dav_create_vevent(wdcal_mySql2icalTime($row["start"]), wdcal_mySql2icalTime($row["finish"]), false);
$vevent->setLocation(icalendar_sanitize_string($row["location"]));
diff --git a/facebook.tgz b/facebook.tgz
index b83351785..6ec94f3a8 100644
Binary files a/facebook.tgz and b/facebook.tgz differ
diff --git a/facebook/facebook.php b/facebook/facebook.php
index a59036dd6..127456af5 100644
--- a/facebook/facebook.php
+++ b/facebook/facebook.php
@@ -3,7 +3,8 @@
* Name: Facebook Connector
* Version: 1.3
* Author: Mike Macgirvin ';
+ $s .= '';
+ $s .= '';
$s .= '
';
- $s .= '';
- $s .= '';
- $s .= '';
+ $s .= '
';
+ $s .= '';
+ $s .= '';
+ $s .= '';
$s .= '
';
/* provide a submit button */
- $s .= ''; $working_connection = true; - } else $o .= t('The correctness of the API Key could not be detected. Somthing strange\'s going on.') . '
'; + } else $o .= t('The correctness of the API Key could not be detected. Something strange\'s going on.') . '
'; } $o .= '
'; @@ -940,7 +950,7 @@ function facebook_post_hook(&$a,&$b) { if($fb_token && ($toplevel || $b['private'] || $reply)) { logger('facebook: able to post'); require_once('library/facebook.php'); - require_once('include/bbcode.php'); + require_once('include/bbcode.php'); $msg = $b['body']; @@ -1015,7 +1025,7 @@ function facebook_post_hook(&$a,&$b) { } // At first convert the text to html - $html = bbcode($body); + $html = bbcode($body, false, false); // Then convert it to plain text $msg = trim($b['title']." \n\n".html2plain($html, 0, true)); @@ -1132,8 +1142,8 @@ function facebook_post_hook(&$a,&$b) { } else { // if its only a message and a subject and the message is larger than 500 characters then post it as note $postvars = array( - 'access_token' => $fb_token, - 'message' => bbcode($b['body']), + 'access_token' => $fb_token, + 'message' => bbcode($b['body'], false, false), 'subject' => $b['title'], ); $url = 'https://graph.facebook.com/me/notes'; diff --git a/fromgplus/README b/fromgplus/README new file mode 100644 index 000000000..cecbb2b9d --- /dev/null +++ b/fromgplus/README @@ -0,0 +1 @@ +This extension is a preparation of the upcoming import of items via Google+ diff --git a/fromgplus/fromgplus.php b/fromgplus/fromgplus.php new file mode 100644 index 000000000..88d2622ff --- /dev/null +++ b/fromgplus/fromgplus.php @@ -0,0 +1,183 @@ + + * + */ + +function fromgplus_install() { + register_hook('plugin_settings', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings'); + register_hook('plugin_settings_post', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings_post'); +} + +function fromgplus_uninstall() { + unregister_hook('plugin_settings', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings'); + unregister_hook('plugin_settings_post', 'addon/fromgplus/fromgplus.php', 'fromgplus_addon_settings_post'); +} + +function fromgplus_addon_settings(&$a,&$s) { + + if(! local_user()) + return; + + $enable_checked = (intval(get_pconfig(local_user(),'fromgplus','enable')) ? ' checked="checked"' : ''); + $account = get_pconfig(local_user(),'fromgplus','account'); + + $s .= '
';
+ $s .= '
';
+
+ return;
+}
+
+function fromgplus_addon_settings_post(&$a,&$b) {
+
+ if(! local_user())
+ return;
+
+ if($_POST['fromgplus-submit']) {
+ set_pconfig(local_user(),'fromgplus','account',trim($_POST['fromgplus-account']));
+ $enable = ((x($_POST,'fromgplus-enable')) ? intval($_POST['fromgplus-enable']) : 0);
+ set_pconfig(local_user(),'fromgplus','enable', $enable);
+ info( t('Google+ Import Settings saved.') . EOL);
+ }
+}
+/*
+function html2bbcode($html) {
+
+ $bbcode = html_entity_decode($html, ENT_QUOTES, 'UTF-8');
+
+ $bbcode = str_replace(array("\n"), array(""), $bbcode);
+ $bbcode = str_replace(array("", ""), array("[b]", "[/b]"), $bbcode);
+ $bbcode = str_replace(array("", ""), array("[i]", "[/i]"), $bbcode);
+ $bbcode = str_replace(array("' . t('Google+ Import Settings').'
'; + $s .= '';
+
+ $s .= '';
+ $s .= '';
+ $s .= '';
+ $s .= '';
+ $s .= '';
+ $s .= '
';
+
+ $s .= '';
+ $s .= '"), array("\n"), $bbcode); + + $bbcode = trim(strip_tags($bbcode)); + return($bbcode); +} + +function friendicapost($post) { + global $friendica; + + $api = new Statusnet($friendica["user"], $friendica["pw"], "GooglePlus", $friendica["server"]); + $ret = $api->updateStatus($post); + $api->endSession(); +} + +function handleattachments($item) { + $post = ""; + + foreach ($item->object->attachments as $attachment) { + switch($attachment->objectType) { + case "video": + //$post .= "\n\n[url=".$attachment->url."]". + // "[size=large][b]".html2bbcode($attachment->displayName)."[/b][/size][/url]\n"; + $post .= "\n\n[bookmark=".$attachment->url."]".html2bbcode($attachment->displayName)."[/bookmark]\n"; + + //if (strpos($attachment->embed->url, "youtube.com")) + // $post .= "[youtube]".$attachment->url."[/youtube]\n"; + //else + /// $post .= "[url=".$attachment->url."][img]".$attachment->image->url."[/img][/url]\n"; + + ///$post .= "[quote]".trim(html2bbcode($attachment->content))."[/quote]"; + break; + + case "article": + //$post .= "\n\n[url=".$attachment->url."]". + // "[size=large][b]".html2bbcode($attachment->displayName)."[/b][/size][/url]\n"; + $post .= "\n\n[bookmark=".$attachment->url."]".html2bbcode($attachment->displayName)."[/bookmark]\n"; + $post .= "[quote]".trim(html2bbcode($attachment->content))."[/quote]"; + break; + + case "photo": + //$post .= "\n\n[url=".$attachment->fullImage->url."]". + // "[img]".$attachment->fullImage->url."[/img][/url]\n"; + $post .= "\n\n[img]".$attachment->fullImage->url."[/img]\n"; + if ($attachment->displayName != "") + $post .= html2bbcode($attachment->displayName)."\n"; + break; + + case "photo-album": + $post .= "\n\n[url=".$attachment->url."]". + "[size=large][b]".html2bbcode($attachment->displayName)."[/b][/size][/url]\n"; + break; + + default: + print_r($attachment); + die(); + break; + } + } + return($post); +} + +$result = +file_get_contents("https://www.googleapis.com/plus/v1/people/".$google["id"]."/activities/public?alt=json&pp=1&key=".$google["key"]."&maxResults=".$google["maxfetch"]); +$activities = json_decode($result); + +$state = array("lastid"=>''); +if (file_exists($statefile)) + $state = unserialize(file_get_contents($statefile)); + +$lastid = ""; + +foreach($activities->items as $item) { + if ($item->id == $state["lastid"]) + break; + + if ($lastid == "") + $lastid = $item->id; + + switch($item->object->objectType) { + case "note": + $post = html2bbcode($item->object->content); + + if (is_array($item->object->attachments)) + $post .= handleattachments($item); + friendicapost($post); + break; + + case "activity": + $post = html2bbcode($item->annotation)."\n"; + //$post .= html2bbcode("♲ "); + $post .= html2bbcode("♻ "); + $post .= "[url=".$item->object->actor->url."]".$item->object->actor->displayName."[/url]"; + $post .= " \n"; + //$post .= "[quote]"; + + $post .= html2bbcode($item->object->content); + + if (is_array($item->object->attachments)) + $post .= "\n".trim(handleattachments($item)); + + //$post .= "[/quote]"; + + friendicapost($post); + break; + + default: + print_r($item); + die(); + break; + } +} + +if ($lastid != "") { + $state['lastid'] = $lastid; + file_put_contents($statefile, serialize($state)); +} +*/ diff --git a/gravatar.tgz b/gravatar.tgz index 38e942f89..25106f265 100644 Binary files a/gravatar.tgz and b/gravatar.tgz differ diff --git a/gravatar/gravatar.php b/gravatar/gravatar.php index b9435a317..fc5358eb4 100644 --- a/gravatar/gravatar.php +++ b/gravatar/gravatar.php @@ -2,7 +2,7 @@ /** * Name: Gravatar Support * Description: If there is no avatar image for a new user or contact this plugin will look for one at Gravatar. - * Version: 1.0 + * Version: 1.1 * Author: Klaus Weidenbach
' .t('Information') .'
' .t('Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar addon.
The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar.') .'
'; + } + + // output Gravatar settings + $o .= ''; $o .= replace_macros( $t, array( '$submit' => t('Submit'), '$default_avatar' => array('avatar', t('Default avatar image'), $default_avatar, t('Select default avatar image if none was found at Gravatar. See README'), $default_avatars), diff --git a/infiniteimprobabilitydrive.tgz b/infiniteimprobabilitydrive.tgz index 6d10fb691..8d9a2203f 100644 Binary files a/infiniteimprobabilitydrive.tgz and b/infiniteimprobabilitydrive.tgz differ diff --git a/infiniteimprobabilitydrive/infiniteimprobabilitydrive.css b/infiniteimprobabilitydrive/infiniteimprobabilitydrive.css index f4be60515..7fb4019c9 100644 --- a/infiniteimprobabilitydrive/infiniteimprobabilitydrive.css +++ b/infiniteimprobabilitydrive/infiniteimprobabilitydrive.css @@ -1,4 +1,3 @@ -section { - padding-left: 0px; - -} \ No newline at end of file +section {padding-left: 0px;} + +iframe {border: none;} \ No newline at end of file diff --git a/jappixmini.tgz b/jappixmini.tgz index c7fc99a41..212bb25e6 100644 Binary files a/jappixmini.tgz and b/jappixmini.tgz differ diff --git a/jappixmini/jappixmini.php b/jappixmini/jappixmini.php index d4b1993f7..5d6f8446a 100644 --- a/jappixmini/jappixmini.php +++ b/jappixmini/jappixmini.php @@ -435,7 +435,7 @@ function jappixmini_script(&$a,&$s) { $key = $row['k']; $pos = strpos($key, ":"); $dfrn_id = substr($key, $pos+1); - $r = q("SELECT `name` FROM `contact` WHERE `uid`=$uid AND `dfrn-id`='%s' OR `issued-id`='%s'", + $r = q("SELECT `name` FROM `contact` WHERE `uid`=$uid AND (`dfrn-id`='%s' OR `issued-id`='%s')", dbesc($dfrn_id), dbesc($dfrn_id) ); @@ -488,6 +488,9 @@ function jappixmini_cron(&$a, $d) { $users = q("SELECT `uid` FROM `pconfig` WHERE `cat`='jappixmini' AND (`k`='autosubscribe' OR `k`='autoapprove') AND `v`='1'"); logger("jappixmini: Update list of contacts' jabber accounts for ".count($users)." users."); + if(! count($users)) + return; + foreach ($users as $row) { $uid = $row["uid"]; diff --git a/libertree.tgz b/libertree.tgz index a817c140b..f467bc00c 100644 Binary files a/libertree.tgz and b/libertree.tgz differ diff --git a/libertree/libertree.php b/libertree/libertree.php index 4f0c814d2..0e7e1a819 100755 --- a/libertree/libertree.php +++ b/libertree/libertree.php @@ -118,7 +118,7 @@ function libertree_post_local(&$a,&$b) { if($b['private'] || $b['parent']) return; - $ltree_post = intval(get_pconfig(local_user(),'libertree','post')); + $ltree_post = intval(get_pconfig(local_user(),'libertree','post')); $ltree_enable = (($ltree_post && x($_REQUEST,'libertree_enable')) ? intval($_REQUEST['libertree_enable']) : 0); @@ -153,8 +153,8 @@ function libertree_send(&$a,&$b) { $ltree_api_token = get_pconfig($b['uid'],'libertree','libertree_api_token'); $ltree_url = get_pconfig($b['uid'],'libertree','libertree_url'); $ltree_blog = "$ltree_url/api/v1/posts/create/?token=$ltree_api_token"; - - if($ltree_url && $ltree_api_token && $ltree_blog) { + $ltree_source = "Friendica"; + if($ltree_url && $ltree_api_token && $ltree_blog && $ltree_source) { require_once('include/bb2diaspora.php'); $tag_arr = array(); @@ -167,16 +167,42 @@ function libertree_send(&$a,&$b) { } } if(count($tag_arr)) - $tags = implode(',',$tag_arr); + $tags = implode(',',$tag_arr); + $title = $b['title']; + $body = $b['body']; + // Insert a newline before and after a quote + $body = str_ireplace("[quote", "\n\n[quote", $body); + $body = str_ireplace("[/quote]", "[/quote]\n\n", $body); + + // Removal of tags and mentions + // #-tags + $body = preg_replace('/#\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', '#$2', $body); + // @-mentions + $body = preg_replace('/@\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', '@$2', $body); + + // remove multiple newlines + do { + $oldbody = $body; + $body = str_replace("\n\n\n", "\n\n", $body); + } while ($oldbody != $body); + + // convert to markdown + $body = bb2diaspora($body); + + // Adding the title + if(strlen($title)) + $body = "## ".html_entity_decode($title)."\n\n".$body; + $params = array( - 'text' => bb2diaspora($b['body']) + 'text' => $body, + 'source' => $ltree_source // 'token' => $ltree_api_token ); $result = post_url($ltree_blog,$params); - logger('libertree: ' . $result); + logger('libertree: ' . $result); } } diff --git a/libravatar.tgz b/libravatar.tgz new file mode 100644 index 000000000..0405af9bd Binary files /dev/null and b/libravatar.tgz differ diff --git a/libravatar/README.md b/libravatar/README.md new file mode 100644 index 000000000..16fbd85a2 --- /dev/null +++ b/libravatar/README.md @@ -0,0 +1,36 @@ +# Libravatar Plugin +by [Klaus Weidenbach](http://friendica.dszdw.net/profile/klaus) + +This addon allows you to look up an avatar image for new users and contacts at [Libravatar](http://www.libravatar.com). It will be used if there have not been found any other avatar images yet for example through OpenID. + +Libravatar is a free and open replacement for Gravatar. It is a service where people can store an avatar image for their email-addresses. These avatar images can get looked up for example in comment functions, profile pages, etc. on other sites. There exists a central installation at [www.libravatar.com](http://www.libravatar.com), but you can also host it on your own server. If no avatar was found Libravatar will look up at Gravatar as a fallback. +There is no rating available, as it is on Gravatar, so all avatar lookups are g-rated. (Suitable for all audiences.) + +PHP >= 5.3 is required for this plugin! + +You can not use the Libravatar and Gravatar addon at the same time. You need to choose one. If you need other ratings than g you better stay with Gravatar, otherwise it is safe to use Libravatar, because it will fall back to Gravatar if nothing was found at Libravatar. + +* * * + +# Configuration +## Default Avatar Image +If no avatar was found for an email Libravatar can create some pseudo-random generated avatars based on an email hash. You can choose between these presets: + +* __MM__: (mystery-man) a static image +* __Identicon__: a generated geometric pattern based on email hash +* __Monsterid__: a generated 'monster' with different colors, faces, etc. based on email hash +* __Wavatar__: faces with different features and backgrounds based on email hash +* __Retro__: 8-bit arcade-styled pixelated faces based on email hash + +See examples at [Libravatar][1]. + +## Alternative Configuration +Open the .htconfig.php file and add "libravatar" to the list of activated addons: + + $a->config['system']['addon'] = "..., libravatar"; + +You can add one configuration variable for the addon: + + $a->config['libravatar']['default_avatar'] = "identicon"; + +[1]: http://wiki.libravatar.org/api/ "See API documentation at Libravatar for more information" diff --git a/libravatar/Services/Libravatar.php b/libravatar/Services/Libravatar.php new file mode 100644 index 000000000..1b6d022e3 --- /dev/null +++ b/libravatar/Services/Libravatar.php @@ -0,0 +1,669 @@ + + * @copyright 2011 Services_Libravatar committers. + * @license http://www.opensource.org/licenses/mit-license.html MIT License + * @link http://pear.php.net/package/Services_Libravatar + * @since File available since Release 0.1.0 + */ + +/** + * PHP support for the Libravatar.org service. + * + * Using this class is easy. After including or requiring + * Services/Libravatar.php simply do: + *
+ * $libravatar = new Services_Libravatar();
+ * $url = $libravatar->getUrl('melissa@meldraweb.com');
+ *
+ *
+ * This would populate $url with the string:
+ *
+ * http://cdn.libravatar.org/avatar/4db84629c121f2d443d33bdb9fd149bc
+ *
+ *
+ * A complicated lookup using all the options is:
+ *
+ * $libravatar = new Services_Libravatar();
+ * $libravatar->setSize(40);
+ * $libravatar->setAlgorithm('sha256');
+ * $libravatar->setHttps(true);
+ * $libravatar->setDefault(
+ * 'http://upload.wikimedia.org/wikipedia/commons/a/af/Tux.png'
+ * );
+ * $url = $libravatar->getUrl('melissa@meldraweb.com');
+ *
+ *
+ * @category Services
+ * @package Services_Libravatar
+ * @author Melissa Draper It requires PHP >= 5.3') .EOL); + // avoid registering the hook + return false; + } + register_hook('avatar_lookup', 'addon/libravatar/libravatar.php', 'libravatar_lookup'); + + logger("registered libravatar in avatar_lookup hook"); +} + +/** + * Removes the plugin hook + */ +function libravatar_uninstall() { + unregister_hook('avatar_lookup', 'addon/libravatar/libravatar.php', 'libravatar_lookup'); + + logger("unregistered libravatar in avatar_lookup hook"); +} + +/** + * Looks up the avatar at Libravatar and returns the URL. + * + * @param $a array + * @param &$b array + */ +function libravatar_lookup($a, &$b) { + $default_avatar = get_config('libravatar', 'default_img'); + + if (! $default_avatar) { + // if not set, look up if there was one from the gravatar addon + $default_avatar = get_config('gravatar', 'default_img'); + // setting default avatar if nothing configured + if (! $default_avatar) + $default_avatar = 'identicon'; // default image will be a random pattern + } + + require_once 'Services/Libravatar.php'; + $libravatar = new Services_Libravatar(); + $libravatar->setSize($b['size']); + $libravatar->setDefault($default_avatar); + $avatar_url = $libravatar->getUrl($b['email']); + + $b['url'] = $avatar_url; + $b['success'] = true; +} + +/** + * Display admin settings for this addon + */ +function libravatar_plugin_admin (&$a, &$o) { + $t = file_get_contents( dirname(__file__)."/admin.tpl"); + + $default_avatar = get_config('libravatar', 'default_img'); + + // set default values for first configuration + if(! $default_avatar) + $default_avatar = 'identicon'; // pseudo-random geometric pattern based on email hash + + // Available options for the select boxes + $default_avatars = array( + 'mm' => t('generic profile image'), + 'identicon' => t('random geometric pattern'), + 'monsterid' => t('monster face'), + 'wavatar' => t('computer generated face'), + 'retro' => t('retro arcade style face'), + ); + + // Show warning if PHP version is too old + if (! version_compare(PHP_VERSION, '5.3.0', '>=')) { + $o = '
' .t('Warning') .'
';
+ $o .= sprintf(t('Your PHP version %s is lower than the required PHP >= 5.3.'), PHP_VERSION);
+ $o .= '
' .t('This addon is not functional on your server.') .'
';
+ return;
+ }
+
+ // Libravatar falls back to gravatar, so show warning about gravatar addon if enabled
+ $r = q("SELECT * FROM `addon` WHERE `name` = '%s' and `installed` = 1",
+ dbesc('gravatar')
+ );
+ if (count($r)) {
+ $o = '
' .t('Information') .'
' .t('Gravatar addon is installed. Please disable the Gravatar addon.
The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar.') .'
'; + } + + // output Libravatar settings + $o .= ''; + $o .= replace_macros( $t, array( + '$submit' => t('Submit'), + '$default_avatar' => array('avatar', t('Default avatar image'), $default_avatar, t('Select default avatar image if none was found. See README'), $default_avatars), + )); +} + +/** + * Save admin settings + */ +function libravatar_plugin_admin_post (&$a) { + check_form_security_token('libravatarrsave'); + + $default_avatar = ((x($_POST, 'avatar')) ? notags(trim($_POST['avatar'])) : 'identicon'); + set_config('libravatar', 'default_img', $default_avatar); + info(t('Libravatar settings updated.') .EOL); +} +?> diff --git a/page.tgz b/page.tgz index c94f01b21..7e95737fd 100644 Binary files a/page.tgz and b/page.tgz differ diff --git a/page/page.css b/page/page.css new file mode 100644 index 000000000..0c0fe3cdf --- /dev/null +++ b/page/page.css @@ -0,0 +1,13 @@ + + + +#page-settings-label, #page-random-label, #page-profile-label { + float: left; + width: 200px; + margin-bottom: 25px; +} + +#page-max-pages, #page-random, #page-profile { + float: left; +} + diff --git a/page/page.php b/page/page.php index 129af4124..3f0f04190 100755 --- a/page/page.php +++ b/page/page.php @@ -1,7 +1,7 @@ * based on pages plugin by @@ -10,22 +10,35 @@ */ function page_install() { - register_hook('page_end', 'addon/page/page.php', 'page_page_end'); + register_hook('network_mod_init', 'addon/page/page.php', 'page_network_mod_init'); + register_hook('plugin_settings', 'addon/page/page.php', 'page_plugin_settings'); + register_hook('plugin_settings_post', 'addon/page/page.php', 'page_plugin_settings_post'); + register_hook('profile_advanced', 'addon/page/page.php', 'page_profile_advanced'); + } function page_uninstall() { + unregister_hook('network_mod_init', 'addon/page/page.php', 'page_network_mod_init'); + unregister_hook('plugin_settings', 'addon/page/page.php', 'page_plugin_settings'); + unregister_hook('plugin_settings_post', 'addon/page/page.php', 'page_plugin_settings_post'); + unregister_hook('profile_advanced', 'addon/page/page.php', 'page_profile_advanced'); + + // remove only - obsolete unregister_hook('page_end', 'addon/page/page.php', 'page_page_end'); } -function page_getpage($uid) { +function page_getpage($uid,$showhidden = true,$randomise = false) { $pagelist = array(); - $contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact` + $order = (($showhidden) ? '' : " and hidden = 0 "); + $order .= (($randomise) ? ' order by rand() ' : ' order by name asc '); + + $contacts = q("SELECT `id`, `url`, `name`, `micro` FROM `contact` WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d - order by name asc ", + $order ", intval($uid) ); @@ -55,7 +68,7 @@ function page_page_end($a,&$b) { $more = false; foreach($contacts as $contact) { - $page .= '
+
";
+ if (sizeof($contacts) > 0)
+ $a->page['aside'] = $page . $a->page['aside'];
+}
+
+
+function page_profile_advanced($a,&$b) {
+
+ $profile = intval(get_pconfig($a->profile['profile_uid'],'page','show_on_profile'));
+ if(! $profile)
+ return;
+
+ $page = '
+
+ '.t("Forums").'
- ';
+
+ $show_total = intval(get_pconfig(local_user(),'page','max_pages'));
+ if($show_total === false)
+ $show_total = 6;
+ $randomise = intval(get_pconfig(local_user(),'page','randomise'));
+
+ $contacts = page_getpage($a->user['uid'],true,$randomise);
+
+ $total_shown = 0;
+ $more = false;
+
+ foreach($contacts as $contact) {
+ $page .= '
- ";
+ $total_shown ++;
+ if(($show_total) && ($total_shown == $show_total)) {
+ $more = true;
+ $page .= '
' . t('show more')
+ . '
';
+ $page .= "
+
';
+
+ if(count($contacts) > 0)
+ $b .= $page;
+
+}
+
+
+
+function page_plugin_settings_post($a,$post) {
+ if(! local_user() || (! x($_POST,'page-settings-submit')))
+ return;
+
+ set_pconfig(local_user(),'page','max_pages',intval($_POST['page_max_pages']));
+ set_pconfig(local_user(),'page','randomise',intval($_POST['page_random']));
+ set_pconfig(local_user(),'page','show_on_profile',intval($_POST['page_profile']));
+
+ info( t('Page settings updated.') . EOL);
+}
+
+
+function page_plugin_settings(&$a,&$s) {
+
+ if(! local_user())
+ return;
+
+ /* Add our stylesheet to the page so we can make our settings look nice */
+
+ $a->page['htmlhead'] .= '' . "\r\n";
+
+ /* Get the current state of our config variable */
+
+ $max_pages = get_pconfig(local_user(),'page','max_pages');
+ if($max_pages === false)
+ $max_pages = 6;
+
+ $randomise = intval(get_pconfig(local_user(),'page','randomise'));
+ $randomise_checked = (($randomise) ? ' checked="checked" ' : '');
+
+ $profile = intval(get_pconfig(local_user(),'page','show_on_profile'));
+ $profile_checked = (($profile) ? ' checked="checked" ' : '');
+
+
+ /* Add some HTML to the existing form */
+
+ $s .= ''.t("Forums:").'
+ ';
+
+ // place holder in case somebody wants configurability
+ $show_total = 9999;
+
+ $randomise = true;
+
+ $contacts = page_getpage($a->user['uid'],false,$randomise);
+
+ $total_shown = 0;
+ $more = false;
+
+ foreach($contacts as $contact) {
+ $page .= micropro($contact,false,'page-profile-advanced');
+ $total_shown ++;
+ if($total_shown == $show_total)
+ break;
+ }
+ $page .= '
';
+ $s .= '
';
+
+}
diff --git a/poormancron.tgz b/poormancron.tgz
index cdf40ee10..8eda6264a 100755
Binary files a/poormancron.tgz and b/poormancron.tgz differ
diff --git a/poormancron/poormancron.php b/poormancron/poormancron.php
index bbe023cd7..7c48e0fa8 100755
--- a/poormancron/poormancron.php
+++ b/poormancron/poormancron.php
@@ -1,7 +1,7 @@
*/
diff --git a/privacy_image_cache.tgz b/privacy_image_cache.tgz
index bf3869380..27943df53 100644
Binary files a/privacy_image_cache.tgz and b/privacy_image_cache.tgz differ
diff --git a/privacy_image_cache/privacy_image_cache.php b/privacy_image_cache/privacy_image_cache.php
index d3202c4d7..b7236d09d 100644
--- a/privacy_image_cache/privacy_image_cache.php
+++ b/privacy_image_cache/privacy_image_cache.php
@@ -36,16 +36,18 @@ function privacy_image_cache_init() {
}
$urlhash = 'pic:' . sha1($_REQUEST['url']);
- $r = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' LIMIT 1", $urlhash );
- if (count($r)) {
- $img_str = $r[0]['data'];
+ // Double encoded url - happens with Diaspora
+ $urlhash2 = 'pic:' . sha1(urldecode($_REQUEST['url']));
+
+ $r = q("SELECT * FROM `photo` WHERE `resource-id` in ('%s', '%s') LIMIT 1", $urlhash, $urlhash2);
+ if (count($r)) {
+ $img_str = $r[0]['data'];
$mime = $r[0]["desc"];
if ($mime == "") $mime = "image/jpeg";
- }
- else {
- require_once("Photo.php");
+ } else {
+ require_once("Photo.php");
- $img_str = fetch_url($_REQUEST['url'],true);
+ $img_str = fetch_url($_REQUEST['url'],true);
if (substr($img_str, 0, 6) == "GIF89a") {
$mime = "image/gif";
$image = @imagecreatefromstring($img_str);
@@ -77,16 +79,16 @@ function privacy_image_cache_init() {
}
$mime = "image/jpeg";
}
- }
+ }
- header("Content-type: $mime");
- header("Expires: " . gmdate("D, d M Y H:i:s", time() + (3600*24)) . " GMT");
- header("Cache-Control: max-age=" . (3600*24));
+ header("Content-type: $mime");
+ header("Expires: " . gmdate("D, d M Y H:i:s", time() + (3600*24)) . " GMT");
+ header("Cache-Control: max-age=" . (3600*24));
- echo $img_str;
+ echo $img_str;
- killme();
+ killme();
}
/**
@@ -210,4 +212,4 @@ function privacy_image_cache_plugin_admin_post(&$a = null, &$o = null){
if (isset($_REQUEST['delete_all'])) {
q('DELETE FROM `photo` WHERE `uid` = 0 AND `resource-id` LIKE "pic:%%"');
}
-}
\ No newline at end of file
+}
diff --git a/smiley_pack.tgz b/smiley_pack.tgz
index a1358539e..8c184414c 100644
Binary files a/smiley_pack.tgz and b/smiley_pack.tgz differ
diff --git a/smiley_pack/smiley_pack.php b/smiley_pack/smiley_pack.php
index 258ade767..4623ded5a 100644
--- a/smiley_pack/smiley_pack.php
+++ b/smiley_pack/smiley_pack.php
@@ -33,463 +33,463 @@ function smiley_pack_smilies(&$a,&$b) {
#Animal smileys.
$b['texts'][] = ':bunnyflowers';
- $b['icons'][] = '' . t('Page Settings') . '
'; + $s .= '';
+ $s .= '';
+ $s .= '';
+ $s .= '';
+ $s .= '';
+ $s .= '';
+ $s .= '';
+ $s .= '';
+ $s .= '';
+ $s .= '';
+
+ $s .= '
';
+
+ /* provide a submit button */
+
+ $s .= '';
+ $b['icons'][] = '';
$b['texts'][] = ':chick';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':bumblebee';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':ladybird';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':bigspider';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':cat';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':bunny';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':cow';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':crab';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':dolphin';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':dragonfly';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':frog';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':hamster';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':monkey';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':horse';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':parrot';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':tux';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':snail';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':sheep';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':dog';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':elephant';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':fish';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':giraffe';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':pig';
- $b['icons'][] = '';
+ $b['icons'][] = '';
#Baby Smileys
$b['texts'][] = ':baby';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':babycot';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':pregnant';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':stork';
- $b['icons'][] = '';
+ $b['icons'][] = '';
#Confused Smileys
$b['texts'][] = ':confused';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':shrug';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':stupid';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':dazed';
- $b['icons'][] = '';
+ $b['icons'][] = '';
#Cool Smileys
$b['texts'][] = ':affro';
- $b['icons'][] = '';
+ $b['icons'][] = '';
#Devil/Angel Smileys
$b['texts'][] = ':angel';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':cherub';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':devilangel';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':catdevil';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':devillish';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':daseesaw';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':turnevil';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':saint';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':graveside';
- $b['icons'][] = '';
+ $b['icons'][] = '';
#Unpleasent smileys.
$b['texts'][] = ':toilet';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':fartinbed';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':fartblush';
- $b['icons'][] = '';
+ $b['icons'][] = '';
#Drinks
$b['texts'][] = ':tea';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':drool';
- $b['icons'][] = '';
+ $b['icons'][] = '';
#Sad smileys
$b['texts'][] = ':crying';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':prisoner';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':sigh';
- $b['icons'][] = '';
+ $b['icons'][] = '';
#Smoking - only one smiley in here, maybe it needs moving elsewhere?
$b['texts'][] = ':smoking';
- $b['icons'][] = '';
+ $b['icons'][] = '';
#Sport smileys
$b['texts'][] = ':basketball';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = '~bowling';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':cycling';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':darts';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':fencing';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':juggling';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':skipping';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':archery';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':surfing';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':snooker';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':horseriding';
- $b['icons'][] = '';
+ $b['icons'][] = '';
#Love smileys
$b['texts'][] = ':iloveyou';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':inlove';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = '~love';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':lovebear';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':lovebed';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':loveheart';
- $b['icons'][] = '';
+ $b['icons'][] = '';
#Tired/Sleep smileys
$b['texts'][] = ':countsheep';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':hammock';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':pillow';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':yawn';
- $b['icons'][] = '';
+ $b['icons'][] = '';
#Fight/Flame/Violent smileys
$b['texts'][] = ':2guns';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':alienfight';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':army';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':arrowhead';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':bfg';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':bowman';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':chainsaw';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':crossbow';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':crusader';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':dead';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':hammersplat';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':lasergun';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':machinegun';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':acid';
- $b['icons'][] = '';
+ $b['icons'][] = '';
#Fantasy smileys - monsters and dragons fantasy. The other type of fantasy belongs in adult smileys
$b['texts'][] = ':alienmonster';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':barbarian';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':dinosaur';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':dragon';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':draco';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':ghost';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':mummy';
- $b['icons'][] = '';
+ $b['icons'][] = '';
#Food smileys
$b['texts'][] = ':apple';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':broccoli';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':cake';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':carrot';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':popcorn';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':tomato';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':banana';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':cooking';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':fryegg';
- $b['icons'][] = '';
+ $b['icons'][] = '';
#Happy smileys
$b['texts'][] = ':cloud9';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':tearsofjoy';
- $b['icons'][] = '';
+ $b['icons'][] = '';
#Repsect smileys
$b['texts'][] = ':bow';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':bravo';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':hailking';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':number1';
- $b['icons'][] = '';
+ $b['icons'][] = '';
#Laugh smileys
$b['texts'][] = ':hahaha';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':loltv';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':rofl';
- $b['icons'][] = '';
+ $b['icons'][] = '';
#Music smileys
$b['texts'][] = ':drums';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':guitar';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':trumpet';
- $b['icons'][] = '';
+ $b['icons'][] = '';
#Smileys that used to be in core
$b['texts'][] = ':headbang';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':beard';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':whitebeard';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':shaka';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':\\.../';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':\\ooo/';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':headdesk';
- $b['icons'][] = '';
+ $b['icons'][] = '';
#These two are still in core, so oldcore isn't strictly right, but we don't want too many directories
$b['texts'][] = ':-d';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':-o';
- $b['icons'][] = '';
+ $b['icons'][] = '';
# Regex killers - stick these at the bottom so they appear at the end of the English and
# at the start of $OtherLanguage.
$b['texts'][] = ':cool';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':vomit';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':golf';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':football';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':tennis';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':alpha';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':marine';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':sabre';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':tank';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':viking';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':gangs';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':dj';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':elvis';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':violin';
- $b['icons'][] = '';
+ $b['icons'][] = '';
}
diff --git a/smilies_adult.tgz b/smilies_adult.tgz
index 971547d73..95f12161a 100644
Binary files a/smilies_adult.tgz and b/smilies_adult.tgz differ
diff --git a/smilies_adult/smilies_adult.php b/smilies_adult/smilies_adult.php
index 19c13b406..82b30a980 100644
--- a/smilies_adult/smilies_adult.php
+++ b/smilies_adult/smilies_adult.php
@@ -22,21 +22,21 @@ function smilies_adult_uninstall() {
function smilies_adult_smilies(&$a,&$b) {
$b['texts'][] = '(o)(o)';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = '(.)(.)';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':bong';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':sperm';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':drunk';
- $b['icons'][] = '';
+ $b['icons'][] = '';
$b['texts'][] = ':finger';
- $b['icons'][] = '';
+ $b['icons'][] = '';
}
\ No newline at end of file
diff --git a/statusnet.tgz b/statusnet.tgz
index 33fbc68a9..51390d305 100755
Binary files a/statusnet.tgz and b/statusnet.tgz differ
diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index dd8761680..99e844752 100755
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -426,15 +426,15 @@ function statusnet_post_hook(&$a,&$b) {
if($ckey && $csecret && $otoken && $osecret) {
- require_once('include/bbcode.php');
+ require_once('include/bbcode.php');
$dent = new StatusNetOAuth($api,$ckey,$csecret,$otoken,$osecret);
$max_char = $dent->get_maxlength(); // max. length for a dent
// 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
- // information during shortening of potential links but do not
+ // we can later send to StatusNet. 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.
if (! $b['title']=='') {
- $tmp = $b['title'] . ' : '. $b['body'];
+ $tmp = $b['title'].": \n".$b['body'];
// $tmp = substr($tmp, 0, 4*$max_char);
} else {
$tmp = $b['body']; // substr($b['body'], 0, 3*$max_char);
@@ -453,10 +453,16 @@ function statusnet_post_hook(&$a,&$b) {
// that is, don't send if the option is not set in the
// connector settings
if ($linksenabled=='0') {
- // #-tags
- $tmp = preg_replace( '/#\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', '#$2', $tmp);
- // @-mentions
- $tmp = preg_replace( '/@\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', '@$2', $tmp);
+ // #-tags
+ $tmp = preg_replace( '/#\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', '#$2', $tmp);
+ // @-mentions
+ $tmp = preg_replace( '/@\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', '@$2', $tmp);
+ // recycle 1
+ $recycle = html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8');
+ $tmp = preg_replace( '/'.$recycle.'\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', $recycle.'$2', $tmp);
+ // recycle 2
+ //$recycle = html_entity_decode("♻ ", ENT_QUOTES, 'UTF-8');
+ //$tmp = preg_replace( '/'.$recycle.'\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', 'RT @$2:', $tmp);
}
// preserve links to webpages
$tmp = preg_replace( '/\[url\=(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)\](\w+.*?)\[\/url\]/i', '$2 $1', $tmp);
@@ -476,7 +482,7 @@ function statusnet_post_hook(&$a,&$b) {
}
// ok, all the links we want to send out are save, now strip
// away the remaining bbcode
- $msg = strip_tags(bbcode($tmp));
+ $msg = strip_tags(bbcode($tmp, false, false));
// quotes not working - let's try this
$msg = html_entity_decode($msg);
if (( strlen($msg) > $max_char) && $max_char > 0) {
diff --git a/tumblr.tgz b/tumblr.tgz
index d5a34c218..2a137b54f 100755
Binary files a/tumblr.tgz and b/tumblr.tgz differ
diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php
index 723bdef0b..03a67949b 100755
--- a/tumblr/tumblr.php
+++ b/tumblr/tumblr.php
@@ -166,19 +166,58 @@ function tumblr_send(&$a,&$b) {
}
}
if(count($tag_arr))
- $tags = implode(',',$tag_arr);
+ $tags = implode(',',$tag_arr);
+ $link = "";
+ $video = false;
+ $title = trim($b['title']);
+
+ // Checking for a bookmark
+ if(preg_match("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/is",$b['body'],$matches)) {
+ $link = $matches[1];
+ if ($title == '')
+ $title = html_entity_decode($matches[2],ENT_QUOTES,'UTF-8');
+
+ $body = $b['body'];
+ // splitting the text in two parts:
+ // before and after the bookmark
+ $pos = strpos($body, "[bookmark");
+ $body1 = substr($body, 0, $pos);
+ $body2 = substr($body, $pos);
+
+ // Removing the bookmark
+ $body2 = preg_replace("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism",'',$body2);
+ $body = $body1.$body2;
+
+ $video = ((stristr($link,'youtube')) || (stristr($link,'youtu.be')) || (stristr($mtch[1],'vimeo')));
+ }
$params = array(
'email' => $tmbl_username,
'password' => $tmbl_password,
- 'title' => $b['title'],
- 'type' => 'regular',
'format' => 'html',
'generator' => 'Friendica',
- 'tags' => $tags,
- 'body' => bbcode($b['body'])
- );
+ 'tags' => $tags);
+
+ if (($link != '') and $video) {
+ $params['type'] = "video";
+ $params['embed'] = $link;
+ if ($title != '')
+ $params['caption'] = ''.$title. + "
".bbcode($body)."
"; + else + $params['caption'] = bbcode($body); + } else if (($link != '') and !$video) { + $params['type'] = "link"; + $params['name'] = $title; + $params['url'] = $link; + //$params['description'] = bbcode($body); + $params['description'] = bbcode($b["body"]); + } else { + $params['type'] = "regular"; + $params['title'] = $title; + $params['body'] = bbcode($b['body']); + } $x = post_url($tmbl_blog,$params); $ret_code = $a->get_curl_code(); @@ -187,7 +226,7 @@ function tumblr_send(&$a,&$b) { elseif($ret_code == 403) logger('tumblr_send: authentication failure'); else - logger('tumblr_send: general error: ' . print_r($x,true)); + logger('tumblr_send: general error: ' . print_r($x,true)); } } diff --git a/twitter.tgz b/twitter.tgz index e011308e2..192d6f85d 100755 Binary files a/twitter.tgz and b/twitter.tgz differ diff --git a/twitter/twitter.php b/twitter/twitter.php index 0ac9396df..9984f3695 100755 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -290,7 +290,7 @@ function twitter_post_hook(&$a,&$b) { logger('twitter: we have customer key and oauth stuff, going to send.', LOGGER_DEBUG); require_once('library/twitteroauth.php'); - require_once('include/bbcode.php'); + require_once('include/bbcode.php'); $tweet = new TwitterOAuth($ckey,$csecret,$otoken,$osecret); // in theory max char is 140 but T. uses t.co to make links // longer so we give them 10 characters extra @@ -316,18 +316,24 @@ function twitter_post_hook(&$a,&$b) { $tmp = preg_replace( '/\[\\/?audio(\\s+.*?\]|\])/i', '', $tmp); $linksenabled = get_pconfig($b['uid'],'twitter','post_taglinks'); // if a #tag is linked, don't send the [url] over to SN - // that is, don't send if the option is not set in the + // that is, don't send if the option is not set in the // connector settings if ($linksenabled=='0') { - // #-tags - $tmp = preg_replace( '/#\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', '#$2', $tmp); - // @-mentions - $tmp = preg_replace( '/@\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', '@$2', $tmp); + // #-tags + $tmp = preg_replace( '/#\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', '#$2', $tmp); + // @-mentions + $tmp = preg_replace( '/@\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', '@$2', $tmp); + // recycle 1 + $recycle = html_entity_decode("♲ ", ENT_QUOTES, 'UTF-8'); + $tmp = preg_replace( '/'.$recycle.'\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', $recycle.'$2', $tmp); + // recycle 2 + //$recycle = html_entity_decode("♻ ", ENT_QUOTES, 'UTF-8'); + //$tmp = preg_replace( '/'.$recycle.'\[url\=(\w+.*?)\](\w+.*?)\[\/url\]/i', 'RT @$2:', $tmp); } $tmp = preg_replace( '/\[url\=(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)\](\w+.*?)\[\/url\]/i', '$2 $1', $tmp); $tmp = preg_replace( '/\[bookmark\=(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)\](\w+.*?)\[\/bookmark\]/i', '$2 $1', $tmp); - // find all http or https links in the body of the entry and - // apply the shortener if the link is longer then 20 characters + // find all http or https links in the body of the entry and + // apply the shortener if the link is longer then 20 characters if (( strlen($tmp)>$max_char ) && ( $max_char > 0 )) { preg_match_all ( '/(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/i', $tmp, $allurls ); foreach ($allurls as $url) { @@ -341,7 +347,7 @@ function twitter_post_hook(&$a,&$b) { } // ok, all the links we want to send out are save, now strip // away the remaining bbcode - $msg = strip_tags(bbcode($tmp)); + $msg = strip_tags(bbcode($tmp, false, false)); // quotes not working - let's try this $msg = html_entity_decode($msg); if (( strlen($msg) > $max_char) && $max_char > 0) { diff --git a/wppost.tgz b/wppost.tgz index 21546b375..dc4338ac7 100755 Binary files a/wppost.tgz and b/wppost.tgz differ diff --git a/wppost/wppost.php b/wppost/wppost.php index ee9acb0d4..e8b6fc6d5 100755 --- a/wppost/wppost.php +++ b/wppost/wppost.php @@ -179,24 +179,26 @@ function wppost_send(&$a,&$b) { require_once('include/bbcode.php'); require_once('include/html2plain.php'); + $wptitle = trim($b['title']); + // If the title is empty then try to guess - if ($b['title'] == '') { + if ($wptitle == '') { // Take the description from the bookmark if(preg_match("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/is",$b['body'],$matches)) - $b['title'] = $matches[2]; + $wptitle = $matches[2]; // If no bookmark is found then take the first line - if ($b['title'] == '') { + if ($wptitle == '') { $title = html2plain(bbcode($b['body']), 0, true); $pos = strpos($title, "\n"); if (($pos == 0) or ($pos > 60)) $pos = 60; - $b['title'] = substr($title, 0, $pos); + $wptitle = substr($title, 0, $pos); } } - $title = '