diff --git a/buildtgz b/buildtgz
index 37c734f8..94eee464 100755
--- a/buildtgz
+++ b/buildtgz
@@ -12,13 +12,13 @@ for a in $SUBDIRS; do
if [[ ! -f $TGZ ]]; then
echo "Building: " $TGZ
# git log $a > $a/$a.log
- tar zcvf $TGZ $a
+ tar zcvf $TGZ --exclude=.[a-z]* $a
else
TOUCHED=`find $a -cnewer $TGZ`
if [[ -n $TOUCHED ]]; then
echo "Building: " $TGZ
# git log $a > $a/$a.log
- tar zcvf $TGZ $a
+ tar zcvf $TGZ --exclude=.[a-z]* $a
fi
fi
done
diff --git a/facebook.tgz b/facebook.tgz
index e3709ec4..ca4a858c 100644
Binary files a/facebook.tgz and b/facebook.tgz differ
diff --git a/facebook/README b/facebook/README.md
similarity index 70%
rename from facebook/README
rename to facebook/README.md
index 5f74d2d4..a02461e7 100755
--- a/facebook/README
+++ b/facebook/README.md
@@ -1,7 +1,7 @@
Installing the Friendica/Facebook connector
Detailed instructions how to use this plugin can be found at
-https://github.com/friendica/friendica/wiki/How-to:-Friendica%E2%80%99s-Facebook-connector
+the [How to: Friendica's Facebook Connector](https://github.com/friendica/friendica/wiki/How-to:-Friendica%E2%80%99s-Facebook-connector) page.
Vidoes and embeds will not be posted if there is no other content. Links
and images will be converted to a format suitable for the Facebook API and
@@ -12,5 +12,4 @@ authenticate to your site to establish identity. We will address this
in a future release.
Info: please make sure that you understand all aspects due to Friendica's
-default licence which is: MIT License (further info:
-https://github.com/friendica/friendica/blob/master/LICENSE)
+default licence which is: [MIT License](https://github.com/friendica/friendica/blob/master/LICENSE)
diff --git a/facebook/facebook.php b/facebook/facebook.php
index 4f534a0b..2c48c7aa 100644
--- a/facebook/facebook.php
+++ b/facebook/facebook.php
@@ -1,7 +1,7 @@
* Tobias Hößl
' . t('Facebook conversations consist of your profile wall and your friend stream.');
@@ -592,7 +615,7 @@ function facebook_cron($a,$b) {
$poll_interval = FACEBOOK_DEFAULT_POLL_INTERVAL;
if($last) {
- $next = $last + $poll_interval;
+ $next = $last + ($poll_interval * 60);
if($next > time())
return;
}
@@ -643,8 +666,15 @@ function facebook_cron($a,$b) {
logger('facebook_cron: Successful', LOGGER_NORMAL);
else {
logger('facebook_cron: Failed', LOGGER_NORMAL);
-
- if(strlen($a->config['admin_email']) && !get_config('facebook', 'realtime_err_mailsent')) {
+
+ $first_err = get_config('facebook', 'realtime_first_err');
+ if (!$first_err) {
+ $first_err = time();
+ set_config('facebook', 'realtime_first_err', $first_err);
+ }
+ $first_err_ago = (time() - $first_err);
+
+ if(strlen($a->config['admin_email']) && !get_config('facebook', 'realtime_err_mailsent') && $first_err_ago > (FACEBOOK_RTU_ERR_MAIL_AFTER_MINUTES * 60)) {
mail($a->config['admin_email'], t('Problems with Facebook Real-Time Updates'),
"Hi!\n\nThere's a problem with the Facebook Real-Time Updates that cannot be solved automatically. Maybe a permission issue?\n\nPlease try to re-activate it on " . $a->config["system"]["url"] . "/admin/plugins/facebook\n\nThis e-mail will only be sent once.",
'From: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n"
@@ -657,6 +687,7 @@ function facebook_cron($a,$b) {
}
} else { // !facebook_check_realtime_active()
del_config('facebook', 'realtime_err_mailsent');
+ del_config('facebook', 'realtime_first_err');
}
}
@@ -693,6 +724,7 @@ function facebook_plugin_admin(&$a, &$o){
$appid = get_config('facebook', 'appid' );
$appsecret = get_config('facebook', 'appsecret' );
$poll_interval = get_config('facebook', 'poll_interval' );
+ $sync_comments = get_config('facebook', 'sync_comments' );
if (!$poll_interval) $poll_interval = FACEBOOK_DEFAULT_POLL_INTERVAL;
$ret1 = q("SELECT `v` FROM `config` WHERE `cat` = 'facebook' AND `k` = 'appid' LIMIT 1");
@@ -709,9 +741,10 @@ function facebook_plugin_admin(&$a, &$o){
} else $o .= t('The correctness of the API Key could not be detected. Somthing strange\'s going on.') . '
';
}
- $o .= '
';
- $o .= '
';
- $o .= '
';
+ $o .= '
';
+ $o .= '
';
+ $o .= '
';
+ $o .= '
';
$o .= '';
if ($working_connection) {
@@ -729,9 +762,9 @@ function facebook_plugin_admin(&$a, &$o){
/**
* @param App $a
- * @param null|object $o
*/
-function facebook_plugin_admin_post(&$a, &$o){
+
+function facebook_plugin_admin_post(&$a){
check_form_security_token_redirectOnErr('/admin/plugins/facebook', 'fbsave');
if (x($_REQUEST,'fb_save_keys')) {
@@ -739,6 +772,7 @@ function facebook_plugin_admin_post(&$a, &$o){
set_config('facebook', 'appsecret', $_REQUEST['appsecret']);
$poll_interval = IntVal($_REQUEST['poll_interval']);
if ($poll_interval >= FACEBOOK_MIN_POLL_INTERVAL) set_config('facebook', 'poll_interval', $poll_interval);
+ set_config('facebook', 'sync_comments', (x($_REQUEST, 'sync_comments') ? 1 : 0));
del_config('facebook', 'app_access_token');
info(t('The new values have been saved.'));
}
@@ -1361,6 +1395,219 @@ function fb_get_photo($uid,$link) {
return "";
}
+
+/**
+ * @param App $a
+ * @param array $user
+ * @param array $self
+ * @param string $fb_id
+ * @param bool $wall
+ * @param array $orig_post
+ * @param object $cmnt
+ */
+function fb_consume_comment(&$a, &$user, &$self, $fb_id, $wall, &$orig_post, &$cmnt) {
+
+ if(! $orig_post)
+ return;
+
+ $top_item = $orig_post['id'];
+ $uid = IntVal($user[0]['uid']);
+
+ $r = q("SELECT * FROM `item` WHERE `uid` = %d AND ( `uri` = '%s' OR `extid` = '%s' ) LIMIT 1",
+ intval($uid),
+ dbesc('fb::' . $cmnt->id),
+ dbesc('fb::' . $cmnt->id)
+ );
+ if(count($r))
+ return;
+
+ $cmntdata = array();
+ $cmntdata['parent'] = $top_item;
+ $cmntdata['verb'] = ACTIVITY_POST;
+ $cmntdata['gravity'] = 6;
+ $cmntdata['uid'] = $uid;
+ $cmntdata['wall'] = (($wall) ? 1 : 0);
+ $cmntdata['uri'] = 'fb::' . $cmnt->id;
+ $cmntdata['parent-uri'] = $orig_post['uri'];
+ if($cmnt->from->id == $fb_id) {
+ $cmntdata['contact-id'] = $self[0]['id'];
+ }
+ else {
+ $r = q("SELECT * FROM `contact` WHERE `notify` = '%s' AND `uid` = %d LIMIT 1",
+ dbesc($cmnt->from->id),
+ intval($uid)
+ );
+ if(count($r)) {
+ $cmntdata['contact-id'] = $r[0]['id'];
+ if($r[0]['blocked'] || $r[0]['readonly'])
+ return;
+ }
+ }
+ if(! x($cmntdata,'contact-id'))
+ $cmntdata['contact-id'] = $orig_post['contact-id'];
+
+ $cmntdata['app'] = 'facebook';
+ $cmntdata['created'] = datetime_convert('UTC','UTC',$cmnt->created_time);
+ $cmntdata['edited'] = datetime_convert('UTC','UTC',$cmnt->created_time);
+ $cmntdata['verb'] = ACTIVITY_POST;
+ $cmntdata['author-name'] = $cmnt->from->name;
+ $cmntdata['author-link'] = 'http://facebook.com/profile.php?id=' . $cmnt->from->id;
+ $cmntdata['author-avatar'] = 'https://graph.facebook.com/' . $cmnt->from->id . '/picture';
+ $cmntdata['body'] = $cmnt->message;
+ $item = item_store($cmntdata);
+
+ $myconv = q("SELECT `author-link`, `author-avatar`, `parent` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 AND `deleted` = 0",
+ dbesc($orig_post['uri']),
+ intval($uid)
+ );
+
+ if(count($myconv)) {
+ $importer_url = $a->get_baseurl() . '/profile/' . $user[0]['nickname'];
+
+ foreach($myconv as $conv) {
+
+ // now if we find a match, it means we're in this conversation
+
+ if(! link_compare($conv['author-link'],$importer_url))
+ continue;
+
+ require_once('include/enotify.php');
+
+ $conv_parent = $conv['parent'];
+
+ notification(array(
+ 'type' => NOTIFY_COMMENT,
+ 'notify_flags' => $user[0]['notify-flags'],
+ 'language' => $user[0]['language'],
+ 'to_name' => $user[0]['username'],
+ 'to_email' => $user[0]['email'],
+ 'uid' => $user[0]['uid'],
+ 'item' => $cmntdata,
+ 'link' => $a->get_baseurl() . '/display/' . $user[0]['nickname'] . '/' . $item,
+ 'source_name' => $cmntdata['author-name'],
+ 'source_link' => $cmntdata['author-link'],
+ 'source_photo' => $cmntdata['author-avatar'],
+ 'verb' => ACTIVITY_POST,
+ 'otype' => 'item',
+ 'parent' => $conv_parent,
+ ));
+
+ // only send one notification
+ break;
+ }
+ }
+}
+
+
+/**
+ * @param App $a
+ * @param array $user
+ * @param array $self
+ * @param string $fb_id
+ * @param bool $wall
+ * @param array $orig_post
+ * @param object $likes
+ */
+function fb_consume_like(&$a, &$user, &$self, $fb_id, $wall, &$orig_post, &$likes) {
+
+ $top_item = $orig_post['id'];
+ $uid = IntVal($user[0]['uid']);
+
+ if(! $orig_post)
+ return;
+
+ // If we posted the like locally, it will be found with our url, not the FB url.
+
+ $second_url = (($likes->id == $fb_id) ? $self[0]['url'] : 'http://facebook.com/profile.php?id=' . $likes->id);
+
+ $r = q("SELECT * FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `verb` = '%s'
+ AND ( `author-link` = '%s' OR `author-link` = '%s' ) LIMIT 1",
+ dbesc($orig_post['uri']),
+ intval($uid),
+ dbesc(ACTIVITY_LIKE),
+ dbesc('http://facebook.com/profile.php?id=' . $likes->id),
+ dbesc($second_url)
+ );
+
+ if(count($r))
+ return;
+
+ $likedata = array();
+ $likedata['parent'] = $top_item;
+ $likedata['verb'] = ACTIVITY_LIKE;
+ $likedata['gravity'] = 3;
+ $likedata['uid'] = $uid;
+ $likedata['wall'] = (($wall) ? 1 : 0);
+ $likedata['uri'] = item_new_uri($a->get_baseurl(), $uid);
+ $likedata['parent-uri'] = $orig_post['uri'];
+ if($likes->id == $fb_id)
+ $likedata['contact-id'] = $self[0]['id'];
+ else {
+ $r = q("SELECT * FROM `contact` WHERE `notify` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1",
+ dbesc($likes->id),
+ intval($uid)
+ );
+ if(count($r))
+ $likedata['contact-id'] = $r[0]['id'];
+ }
+ if(! x($likedata,'contact-id'))
+ $likedata['contact-id'] = $orig_post['contact-id'];
+
+ $likedata['app'] = 'facebook';
+ $likedata['verb'] = ACTIVITY_LIKE;
+ $likedata['author-name'] = $likes->name;
+ $likedata['author-link'] = 'http://facebook.com/profile.php?id=' . $likes->id;
+ $likedata['author-avatar'] = 'https://graph.facebook.com/' . $likes->id . '/picture';
+
+ $author = '[url=' . $likedata['author-link'] . ']' . $likedata['author-name'] . '[/url]';
+ $objauthor = '[url=' . $orig_post['author-link'] . ']' . $orig_post['author-name'] . '[/url]';
+ $post_type = t('status');
+ $plink = '[url=' . $orig_post['plink'] . ']' . $post_type . '[/url]';
+ $likedata['object-type'] = ACTIVITY_OBJ_NOTE;
+
+ $likedata['body'] = sprintf( t('%1$s likes %2$s\'s %3$s'), $author, $objauthor, $plink);
+ $likedata['object'] = '';
+
+ item_store($likedata);
+}
+
+/**
+ * @param App $a
+ * @param array $user
+ * @param object $entry
+ * @param array $self
+ * @param string $fb_id
+ * @param bool $wall
+ * @param array $orig_post
+ */
+function fb_consume_status(&$a, &$user, &$entry, &$self, $fb_id, $wall, &$orig_post) {
+ $uid = IntVal($user[0]['uid']);
+ $access_token = get_pconfig($uid, 'facebook', 'access_token');
+
+ $s = fetch_url('https://graph.facebook.com/' . $entry->id . '?access_token=' . $access_token);
+ if($s) {
+ $j = json_decode($s);
+ if (isset($j->comments) && isset($j->comments->data))
+ foreach ($j->comments->data as $cmnt)
+ fb_consume_comment($a, $user, $self, $fb_id, $wall, $orig_post, $cmnt);
+
+ if (isset($j->likes) && isset($j->likes->data) && isset($j->likes->count)) {
+ if (count($j->likes->data) == $j->likes->count) {
+ foreach ($j->likes->data as $likers) fb_consume_like($a, $user, $self, $fb_id, $wall, $orig_post, $likers);
+ } else {
+ $t = fetch_url('https://graph.facebook.com/' . $entry->id . '/likes?access_token=' . $access_token);
+ if ($t) {
+ $k = json_decode($t);
+ if (isset($k->data))
+ foreach ($k->data as $likers)
+ fb_consume_like($a, $user, $self, $fb_id, $wall, $orig_post, $likers);
+ }
+ }
+ }
+ }
+}
+
/**
* @param int $uid
* @param object $j
@@ -1370,7 +1617,6 @@ function fb_consume_stream($uid,$j,$wall = false) {
$a = get_app();
-
$user = q("SELECT * FROM `user` WHERE `uid` = %d AND `account_expired` = 0 LIMIT 1",
intval($uid)
);
@@ -1390,6 +1636,9 @@ function fb_consume_stream($uid,$j,$wall = false) {
$blocked_apps = get_pconfig($uid,'facebook','blocked_apps');
$blocked_apps_arr = explode(',',$blocked_apps);
+ $sync_comments = get_config('facebook', 'sync_comments');
+
+ /** @var string $self_id */
$self_id = get_pconfig($uid,'facebook','self_id');
if(! count($j->data) || (! strlen($self_id)))
return;
@@ -1591,169 +1840,53 @@ function fb_consume_stream($uid,$j,$wall = false) {
}
}
+ /** @var array $orig_post */
+
+ $likers_num = (isset($entry->likes) && isset($entry->likes->count) ? IntVal($entry->likes->count) : 0 );
if(isset($entry->likes) && isset($entry->likes->data))
$likers = $entry->likes->data;
else
$likers = null;
+ $comments_num = (isset($entry->comments) && isset($entry->comments->count) ? IntVal($entry->comments->count) : 0 );
if(isset($entry->comments) && isset($entry->comments->data))
$comments = $entry->comments->data;
else
$comments = null;
- if(is_array($likers)) {
- foreach($likers as $likes) {
+ $needs_sync = false;
- if(! $orig_post)
- continue;
-
- // If we posted the like locally, it will be found with our url, not the FB url.
-
- $second_url = (($likes->id == $self_id) ? $self[0]['url'] : 'http://facebook.com/profile.php?id=' . $likes->id);
-
- $r = q("SELECT * FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `verb` = '%s'
- AND ( `author-link` = '%s' OR `author-link` = '%s' ) LIMIT 1",
- dbesc($orig_post['uri']),
- intval($uid),
- dbesc(ACTIVITY_LIKE),
- dbesc('http://facebook.com/profile.php?id=' . $likes->id),
- dbesc($second_url)
- );
-
- if(count($r))
- continue;
-
- $likedata = array();
- $likedata['parent'] = $top_item;
- $likedata['verb'] = ACTIVITY_LIKE;
- $likedata['gravity'] = 3;
- $likedata['uid'] = $uid;
- $likedata['wall'] = (($wall) ? 1 : 0);
- $likedata['uri'] = item_new_uri($a->get_baseurl(), $uid);
- $likedata['parent-uri'] = $orig_post['uri'];
- if($likes->id == $self_id)
- $likedata['contact-id'] = $self[0]['id'];
- else {
- $r = q("SELECT * FROM `contact` WHERE `notify` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1",
- dbesc($likes->id),
- intval($uid)
- );
- if(count($r))
- $likedata['contact-id'] = $r[0]['id'];
- }
- if(! x($likedata,'contact-id'))
- $likedata['contact-id'] = $orig_post['contact-id'];
-
- $likedata['app'] = 'facebook';
- $likedata['verb'] = ACTIVITY_LIKE;
- $likedata['author-name'] = $likes->name;
- $likedata['author-link'] = 'http://facebook.com/profile.php?id=' . $likes->id;
- $likedata['author-avatar'] = 'https://graph.facebook.com/' . $likes->id . '/picture';
-
- $author = '[url=' . $likedata['author-link'] . ']' . $likedata['author-name'] . '[/url]';
- $objauthor = '[url=' . $orig_post['author-link'] . ']' . $orig_post['author-name'] . '[/url]';
- $post_type = t('status');
- $plink = '[url=' . $orig_post['plink'] . ']' . $post_type . '[/url]';
- $likedata['object-type'] = ACTIVITY_OBJ_NOTE;
-
- $likedata['body'] = sprintf( t('%1$s likes %2$s\'s %3$s'), $author, $objauthor, $plink);
- $likedata['object'] = '';
-
- item_store($likedata);
- }
+ if(is_array($likers)) {
+ foreach($likers as $likes) fb_consume_like($a, $user, $self, $self_id, $wall, $orig_post, $likes);
+ if ($sync_comments) {
+ $r = q("SELECT COUNT(*) likes FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `verb` = '%s' AND `parent-uri` != `uri`",
+ dbesc($orig_post['uri']),
+ intval($uid),
+ dbesc(ACTIVITY_LIKE)
+ );
+ if ($r[0]['likes'] < $likers_num) {
+ logger('fb_consume_stream: missing likes found for ' . $orig_post['uri'] . ' (we have ' . $r[0]['likes'] . ' of ' . $likers_num . '). Synchronizing...', LOGGER_DEBUG);
+ $needs_sync = true;
+ }
+ }
}
+
if(is_array($comments)) {
- foreach($comments as $cmnt) {
-
- if(! $orig_post)
- continue;
-
- $r = q("SELECT * FROM `item` WHERE `uid` = %d AND ( `uri` = '%s' OR `extid` = '%s' ) LIMIT 1",
- intval($uid),
- dbesc('fb::' . $cmnt->id),
- dbesc('fb::' . $cmnt->id)
- );
- if(count($r))
- continue;
-
- $cmntdata = array();
- $cmntdata['parent'] = $top_item;
- $cmntdata['verb'] = ACTIVITY_POST;
- $cmntdata['gravity'] = 6;
- $cmntdata['uid'] = $uid;
- $cmntdata['wall'] = (($wall) ? 1 : 0);
- $cmntdata['uri'] = 'fb::' . $cmnt->id;
- $cmntdata['parent-uri'] = $orig_post['uri'];
- if($cmnt->from->id == $self_id) {
- $cmntdata['contact-id'] = $self[0]['id'];
- }
- else {
- $r = q("SELECT * FROM `contact` WHERE `notify` = '%s' AND `uid` = %d LIMIT 1",
- dbesc($cmnt->from->id),
- intval($uid)
- );
- if(count($r)) {
- $cmntdata['contact-id'] = $r[0]['id'];
- if($r[0]['blocked'] || $r[0]['readonly'])
- continue;
- }
- }
- if(! x($cmntdata,'contact-id'))
- $cmntdata['contact-id'] = $orig_post['contact-id'];
-
- $cmntdata['app'] = 'facebook';
- $cmntdata['created'] = datetime_convert('UTC','UTC',$cmnt->created_time);
- $cmntdata['edited'] = datetime_convert('UTC','UTC',$cmnt->created_time);
- $cmntdata['verb'] = ACTIVITY_POST;
- $cmntdata['author-name'] = $cmnt->from->name;
- $cmntdata['author-link'] = 'http://facebook.com/profile.php?id=' . $cmnt->from->id;
- $cmntdata['author-avatar'] = 'https://graph.facebook.com/' . $cmnt->from->id . '/picture';
- $cmntdata['body'] = $cmnt->message;
- $item = item_store($cmntdata);
-
- $myconv = q("SELECT `author-link`, `author-avatar`, `parent` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 ",
- dbesc($orig_post['uri']),
- intval($uid)
- );
-
- if(count($myconv)) {
- $importer_url = $a->get_baseurl() . '/profile/' . $user[0]['nickname'];
-
- foreach($myconv as $conv) {
-
- // now if we find a match, it means we're in this conversation
-
- if(! link_compare($conv['author-link'],$importer_url))
- continue;
-
- require_once('include/enotify.php');
-
- $conv_parent = $conv['parent'];
-
- notification(array(
- 'type' => NOTIFY_COMMENT,
- 'notify_flags' => $user[0]['notify-flags'],
- 'language' => $user[0]['language'],
- 'to_name' => $user[0]['username'],
- 'to_email' => $user[0]['email'],
- 'uid' => $user[0]['uid'],
- 'item' => $cmntdata,
- 'link' => $a->get_baseurl() . '/display/' . $user[0]['nickname'] . '/' . $item,
- 'source_name' => $cmntdata['author-name'],
- 'source_link' => $cmntdata['author-link'],
- 'source_photo' => $cmntdata['author-avatar'],
- 'verb' => ACTIVITY_POST,
- 'otype' => 'item',
- 'parent' => $conv_parent,
- ));
-
- // only send one notification
- break;
- }
- }
+ foreach($comments as $cmnt) fb_consume_comment($a, $user, $self, $self_id, $wall, $orig_post, $cmnt);
+ if ($sync_comments) {
+ $r = q("SELECT COUNT(*) comments FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `verb` = '%s' AND `parent-uri` != `uri`",
+ dbesc($orig_post['uri']),
+ intval($uid),
+ ACTIVITY_POST
+ );
+ if ($r[0]['comments'] < $comments_num) {
+ logger('fb_consume_stream: missing comments found for ' . $orig_post['uri'] . ' (we have ' . $r[0]['comments'] . ' of ' . $comments_num . '). Synchronizing...', LOGGER_DEBUG);
+ $needs_sync = true;
+ }
}
}
+
+ if ($needs_sync) fb_consume_status($a, $user, $entry, $self, $self_id, $wall, $orig_post);
}
}
diff --git a/facebook_restrict.tgz b/facebook_restrict.tgz
new file mode 100644
index 00000000..7688fd8f
Binary files /dev/null and b/facebook_restrict.tgz differ
diff --git a/facebook_restrict/facebook_restrict.php b/facebook_restrict/facebook_restrict.php
new file mode 100644
index 00000000..a30d8805
--- /dev/null
+++ b/facebook_restrict/facebook_restrict.php
@@ -0,0 +1,18 @@
+
+ */
+
+
+function facebook_restrict_install() {
+ set_config('facebook','restrict',1);
+}
+
+function facebook_restrict_uninstall() {
+ set_config('facebook','restrict',0);
+}
+
diff --git a/hangman.tar.gz b/hangman.tar.gz
new file mode 100644
index 00000000..ea720f4d
Binary files /dev/null and b/hangman.tar.gz differ
diff --git a/hangman/hang.css b/hangman/hang.css
new file mode 100644
index 00000000..2a5114a9
--- /dev/null
+++ b/hangman/hang.css
@@ -0,0 +1,4 @@
+.hanga {font:bold 14pt Courier, "Courier New", monospace;text-align:center;}
+.hangt {font:normal 16pt Courier, "Courier New", monospace;text-align:center;color:#efefef;}
+.hangb {width:800px;height:430px;overflow:hidden;background:#777;border:#000000 1px solid;}
+
diff --git a/hangman/hang0.gif b/hangman/hang0.gif
new file mode 100644
index 00000000..3ed630ea
Binary files /dev/null and b/hangman/hang0.gif differ
diff --git a/hangman/hang1.gif b/hangman/hang1.gif
new file mode 100644
index 00000000..d3704fc1
Binary files /dev/null and b/hangman/hang1.gif differ
diff --git a/hangman/hang10.gif b/hangman/hang10.gif
new file mode 100644
index 00000000..c7252ffa
Binary files /dev/null and b/hangman/hang10.gif differ
diff --git a/hangman/hang2.gif b/hangman/hang2.gif
new file mode 100644
index 00000000..d613f892
Binary files /dev/null and b/hangman/hang2.gif differ
diff --git a/hangman/hang3.gif b/hangman/hang3.gif
new file mode 100644
index 00000000..6dd5ee8c
Binary files /dev/null and b/hangman/hang3.gif differ
diff --git a/hangman/hang4.gif b/hangman/hang4.gif
new file mode 100644
index 00000000..42dfb469
Binary files /dev/null and b/hangman/hang4.gif differ
diff --git a/hangman/hang5.gif b/hangman/hang5.gif
new file mode 100644
index 00000000..0690482a
Binary files /dev/null and b/hangman/hang5.gif differ
diff --git a/hangman/hang6.gif b/hangman/hang6.gif
new file mode 100644
index 00000000..8de1f672
Binary files /dev/null and b/hangman/hang6.gif differ
diff --git a/hangman/hang7.gif b/hangman/hang7.gif
new file mode 100644
index 00000000..6976754e
Binary files /dev/null and b/hangman/hang7.gif differ
diff --git a/hangman/hang8.gif b/hangman/hang8.gif
new file mode 100644
index 00000000..af3e0c41
Binary files /dev/null and b/hangman/hang8.gif differ
diff --git a/hangman/hang9.gif b/hangman/hang9.gif
new file mode 100644
index 00000000..f9898d6c
Binary files /dev/null and b/hangman/hang9.gif differ
diff --git a/hangman/hangans.js b/hangman/hangans.js
new file mode 100644
index 00000000..28c28fcd
--- /dev/null
+++ b/hangman/hangans.js
@@ -0,0 +1,51 @@
+var img = ''
+var opts = new Array(); var r = 0;
+opts[r++] = '^!33#`4!<^#`/9~1$4>-';
+opts[r++] = '#:#0# 9 66@28?>0?/@+';
+opts[r++] = '@!45::!@9/5/1>*5_2>7';
+opts[r++] = '1`-52:#<<9_`2:2#8/9!';
+opts[r++] = '4! $:5 $9_=^+59-9:25';
+opts[r++] = '1+`2-52+-<917:0*!1#3';
+opts[r++] = '65<@#::! /9<6649 *6>';
+opts[r++] = '6+4#`!25+ 9_7^2?~:+<';
+opts[r++] = '1-`250#:/933:5!>679 ';
+opts[r++] = '^!88# <2! @#99/*_^`>';
+opts[r++] = '!68:52-4#9_53*24:$>4';
+opts[r++] = '$!`$! 2-! 9+$$~+71?$';
+opts[r++] = '#:#8^! 2525<9--4>~-+';
+opts[r++] = '2#<25@-:!`9:335^~+9/';
+opts[r++] = '8+45!2`5<294 57#52#6';
+opts[r++] = '@!`45+:+$/9_@4` -42`';
+opts[r++] = '2#68#<2-+-<933$=4@`~';
+opts[r++] = '5 @+ <+:!3:#9-~$8+-+';
+opts[r++] = '- @+ <@5+ !3:#957?=1';
+opts[r++] = '<5 5<2#`9`58$$462$!9';
+opts[r++] = '8+`2# 25+-<99<^4<14*';
+opts[r++] = '^!33#`4!<^#`/9$5-<$3';
+opts[r++] = '6+`25@5! 9<:**6 *!`<';
+opts[r++] = '1!::+85! 9181+!>$8- ';
+opts[r++] = '>+`@#<2#`<^5`#91>!=?';
+opts[r++] = '6!$ 515@# 29+:21?750+';
+opts[r++] = '45<@+ <+:!2#9//_*35$';
+opts[r++] = '^+``515@92/>@5:?5_@4';
+opts[r++] = '<+:52-4#9+#8>?6_4#*7';
+opts[r++] = '568#`@#8253:#96+?0!@';
+opts[r++] = '8525!3:#917_~ 2^16!*';
+opts[r++] = '@/ 5@!:9!32`20#?6^@3';
+opts[r++] = '@+ 4#6 #494`0`-`2-~=';
+opts[r++] = '4#<+:!2#96@@<*^:!/~=';
+opts[r++] = ':-$-3`5+-<9_*3=*?842';
+opts[r++] = '4#<8+ 4# 2902+83>#8^';
+opts[r++] = ' #@`+25@95?3<_+`*+3^';
+opts[r++] = '1- #3`5+-<90*@>3?-->';
+opts[r++] = ':!6# 2!3:#9>6/9@_6>3';
+opts[r++] = '+352-!`/9 #9~--1<<1<';
+opts[r++] = '@`565 !:95^@3701#$~$';
+opts[r++] = '6#:! @^+:/9>:<4_$/>@';
+
diff --git a/hangman/hangman.js b/hangman/hangman.js
new file mode 100644
index 00000000..4d050c54
--- /dev/null
+++ b/hangman/hangman.js
@@ -0,0 +1,22 @@
+// Hangman Javascript
+// copyright 10th June 2005, 8th December 2005 by Stephen Chapman
+// permission to use this Javascript on your web page is granted
+// provided that all of the code in this script (including these
+// comments) is used without any alteration
+
+var page = self.location.toString(); page = page.substr(0,page.indexOf('?'));
+var qsParm = new Array();function qs() {var query = window.location.search.substring(1);var parms = query.split('&');for (var i=0; i
');} document.write('<\/div>');}
+function displayAnswer() {var correct = ''; document.write('
'); for (var i = 0; i < answer.length; i++) {if (answer.substr(i,1) == ' ') {document.write(' '); correct += ' ';} else {var ltr = ''; if (win == 0) ltr = al.charAt(answer.charCodeAt(i)-65); else ltr = answer.substr(i,1); document.write(ltr + ' '); correct += ltr;}} document.write('<\/div>'); if (win == 0) {var opty = Math.floor(Math.random()*165)*71 + opt; if (wr.charAt(wx) == 'z') top.location = page + '?win=1&opt='+opty+'&w='+wr.charAt(wx); if (correct == answer.toUpperCase()) top.location = page + '?win=4&opt='+ opty+'&w='+wr.charAt(wx);}}
+document.write('
Try Again<\/a><\/div>'); else document.write('";
if (sizeof($contacts) > 0)
$a->page['aside'] = $page . $a->page['aside'];
}
-?>
+
+
+
diff --git a/pages.tgz b/pages.tgz
deleted file mode 100644
index 5fd23f73..00000000
Binary files a/pages.tgz and /dev/null differ
diff --git a/posterous.tgz b/posterous.tgz
index 88643513..f8080587 100755
Binary files a/posterous.tgz and b/posterous.tgz differ
diff --git a/posterous/posterous.php b/posterous/posterous.php
index 5ecf0c29..25a009c5 100755
--- a/posterous/posterous.php
+++ b/posterous/posterous.php
@@ -5,6 +5,7 @@
* Description: Post to Posterous accounts
* Version: 1.0
* Author: Mike Macgirvin ]*src *= *[\"'])([^\"']+)([\"'][^>]*>)/siU", "privacy_image_cache_img_cb", $o);
+}
+
+
+/**
+ * @param App $a
+ * @param string $o
+ */
+function privacy_image_cache_display_item_hook(&$a, &$o) {
+ if (isset($o["output"])) {
+ if (isset($o["output"]["thumb"]) && !privacy_image_cache_is_local_image($o["output"]["thumb"]))
+ $o["output"]["thumb"] = "/privacy_image_cache/?url=" . escape_tags(addslashes($o["output"]["thumb"]));
+ if (isset($o["output"]["author-avatar"]) && !privacy_image_cache_is_local_image($o["output"]["author-avatar"]))
+ $o["output"]["author-avatar"] = "/privacy_image_cache/?url=" . escape_tags(addslashes($o["output"]["author-avatar"]));
+ }
+}
+
+
+/**
+ * @param App $a
+ * @param string $o
+ */
+function privacy_image_cache_ping_xmlize_hook(&$a, &$o) {
+ if ($o["photo"] != "" && !privacy_image_cache_is_local_image($o["photo"]))
+ $o["photo"] = "/privacy_image_cache/?url=" . escape_tags(addslashes($o["photo"]));
+}
+
+
+/**
+ * @param App $a
+ * @param null|object $b
+ */
+function privacy_image_cache_cron(&$a, &$b) {
+ $cachetime = get_config('privacy_image_cache','cache_time');
+ if (!$cachetime) $cachetime = PRIVACY_IMAGE_CACHE_DEFAULT_TIME;
+
+ $last = get_config('pi_cache','last_delete');
+ $time = time();
+ if ($time < ($last + 3600)) return;
+
+ logger("Purging old Cache of the Privacy Image Cache", LOGGER_DEBUG);
+ q('DELETE FROM `photo` WHERE `uid` = 0 AND `resource-id` LIKE "pic:%%" AND `created` < NOW() - INTERVAL %d SECOND', $cachetime);
+ set_config('pi_cache', 'last_delete', $time);
+}
+
+
+
+
+/**
+ * @param App $a
+ * @param null|object $o
+ */
+function privacy_image_cache_plugin_admin(&$a, &$o){
+
+
+ $o = '';
+
+ $cachetime = get_config('privacy_image_cache','cache_time');
+ if (!$cachetime) $cachetime = PRIVACY_IMAGE_CACHE_DEFAULT_TIME;
+ $cachetime_h = Ceil($cachetime / 3600);
+
+ $o .= '
+
';
+
+ $o .= '';
+
+ $o .= '' . t('Cache Statistics') . '
';
+
+ $num = q('SELECT COUNT(*) num, SUM(LENGTH(data)) size FROM `photo` WHERE `uid`=0 AND `contact-id`=0 AND `resource-id` LIKE "pic:%%"');
+ $o .= '
';
+ $size = Ceil($num[0]['size'] / (1024 * 1024));
+ $o .= '
';
+
+ $o .= '';
+}
+
+
+/**
+ * @param App $a
+ * @param null|object $o
+ */
+function privacy_image_cache_plugin_admin_post(&$a, &$o){
+ check_form_security_token_redirectOnErr('/admin/plugins/privacy_image_cache', 'picsave');
+
+ if (isset($_REQUEST['save'])) {
+ $cachetime_h = IntVal($_REQUEST['cachetime']);
+ if ($cachetime_h < 1) $cachetime_h = 1;
+ set_config('privacy_image_cache','cache_time', $cachetime_h * 3600);
+ }
+ 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 7ef9d884..790bc064 100644
Binary files a/smiley_pack.tgz and b/smiley_pack.tgz differ
diff --git a/smiley_pack/icons/animals/cat.gif b/smiley_pack/icons/animals/cat.gif
index 3a0db669..a612c476 100644
Binary files a/smiley_pack/icons/animals/cat.gif and b/smiley_pack/icons/animals/cat.gif differ
diff --git a/smiley_pack/icons/tired/yawn.gif b/smiley_pack/icons/tired/yawn.gif
new file mode 100644
index 00000000..d4514801
Binary files /dev/null and b/smiley_pack/icons/tired/yawn.gif differ
diff --git a/smiley_pack/smiley_pack.php b/smiley_pack/smiley_pack.php
index 7f4bfb7b..ed4d0e65 100644
--- a/smiley_pack/smiley_pack.php
+++ b/smiley_pack/smiley_pack.php
@@ -214,8 +214,8 @@ function smiley_pack_smilies(&$a,&$b) {
$b['texts'][] = ':basketball';
$b['icons'][] = '';
- $b['texts'][] = ':bowling';
- $b['icons'][] = '
';
+ $b['texts'][] = '~bowling';
+ $b['icons'][] = '
';
$b['texts'][] = ':cycling';
$b['icons'][] = '
';
@@ -284,6 +284,9 @@ function smiley_pack_smilies(&$a,&$b) {
$b['texts'][] = ':pillow';
$b['icons'][] = '
';
+ $b['texts'][] = ':yawn';
+ $b['icons'][] = '
';
+
#Fight/Flame/Violent smileys
$b['texts'][] = ':2guns';
diff --git a/smilies_adult.tgz b/smilies_adult.tgz
index e4e86ba2..13cc1443 100644
Binary files a/smilies_adult.tgz and b/smilies_adult.tgz differ
diff --git a/statusnet.tgz b/statusnet.tgz
index 2b41f5a4..ce00f8e7 100755
Binary files a/statusnet.tgz and b/statusnet.tgz differ
diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index c4100e88..469b3ab8 100755
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -2,7 +2,7 @@
/**
* Name: StatusNet Connector
* Description: Relay public postings to a connected StatusNet account
- * Version: 1.0.4
+ * Version: 1.0.5
* Author: Tobias Diekershoff