'; } - $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
'); for (var i = 0; i < al.length; i++) {
+var ltr = String.fromCharCode(i+65); if (al.charAt(i) == ltr) document.write(' '); else document.write(''+ ltr+'<\/a> '); if (i == 12) document.write('
');} 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('
');} 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('
'); if (win == 0) availLetter(); else if (win == 4) document.write('
YOU WIN
Try Again<\/a><\/div>'); else document.write('
+ * Author: Tony Baldwin
*/
function posterous_install() {
@@ -59,6 +60,8 @@ function posterous_settings(&$a,&$s) {
$pstr_username = get_pconfig(local_user(), 'posterous', 'posterous_username');
$pstr_password = get_pconfig(local_user(), 'posterous', 'posterous_password');
+ $pstr_site_id = get_pconfig(local_user(), 'posterous', 'posterous_site_id');
+ $pstr_api_token = get_pconfig(local_user(), 'posterous', 'posterous_api_token');
/* Add some HTML to the existing form */
@@ -80,6 +83,16 @@ function posterous_settings(&$a,&$s) {
$s .= '';
$s .= '
';
+ $s .= 'Try Again<\/a><\/div>'); else document.write('
YOU LOSE
Try Again<\/a><\/div>'); document.write('
<\/div>'); displayAnswer(); document.write('<\/div>'); + diff --git a/hangman/hangman.php b/hangman/hangman.php new file mode 100644 index 00000000..e8524179 --- /dev/null +++ b/hangman/hangman.php @@ -0,0 +1,49 @@ + +*/ + +function hangman_install() { +register_hook('app_menu', 'addon/hangman/hangman.php', 'hangman_app_menu'); +} + +function hangman_uninstall() { +unregister_hook('hangman_menu', 'addon/hangman/hangman.php', 'hangman_app_menu'); + +} + +function hangman_app_menu($a,&$b) { +$b['app_menu'][] = ''; +} + + +function hangman_module() { +return; +} + + +function hangman_content(&$a) { + +$baseurl = $a->get_baseurl() . '/addon/hangman'; +$a->page['htmlhead'] .= '' . "\r\n"; +$a->page['htmlhead'] .= '' . "\r\n"; +$o = ''; + + + + $o .= <<< EOT + + + +EOT; +return $o; + +} diff --git a/impressum.tgz b/impressum.tgz index 3e4ecd75..d87f17f7 100755 Binary files a/impressum.tgz and b/impressum.tgz differ diff --git a/impressum/admin.tpl b/impressum/admin.tpl index 849c11f9..901df73f 100755 --- a/impressum/admin.tpl +++ b/impressum/admin.tpl @@ -1,7 +1,7 @@ {{ inc field_input.tpl with $field=$owner }}{{ endinc }} {{ inc field_input.tpl with $field=$ownerprofile }}{{ endinc }} -{{ inc field_input.tpl with $field=$postal }}{{ endinc }} -{{ inc field_input.tpl with $field=$notes }}{{ endinc }} +{{ inc field_textarea.tpl with $field=$postal }}{{ endinc }} +{{ inc field_textarea.tpl with $field=$notes }}{{ endinc }} {{ inc field_input.tpl with $field=$email }}{{ endinc }} -{{ inc field_input.tpl with $field=$footer_text }}{{ endinc }} +{{ inc field_textarea.tpl with $field=$footer_text }}{{ endinc }} diff --git a/impressum/impressum.php b/impressum/impressum.php index 76002279..a4e7199c 100755 --- a/impressum/impressum.php +++ b/impressum/impressum.php @@ -2,11 +2,13 @@ /** * Name: Impressum * Description: Plugin to add contact information to the about page (/friendica) - * Version: 1.1 + * Version: 1.2 * Author: Tobias Diekershoff
* License: 3-clause BSD license
*/
+require_once('include/bbcode.php');
+
function impressum_install() {
register_hook('about_hook', 'addon/impressum/impressum.php', 'impressum_show');
register_hook('page_end', 'addon/impressum/impressum.php', 'impressum_footer');
@@ -24,7 +26,7 @@ function obfuscate_email ($s) {
return $s;
}
function impressum_footer($a, &$b) {
- $text = get_config('impressum','footer_text');
+ $text = bbcode(get_config('impressum','footer_text'), true);
if (! $text == '') {
$a->page['htmlhead'] .= '';
$b .= '';
@@ -34,8 +36,8 @@ function impressum_show($a,&$b) {
$b .= '
";
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 Try Again<\/a><\/div>'); document.write('
<\/div>'); displayAnswer(); document.write('<\/div>'); + diff --git a/hangman/hangman.php b/hangman/hangman.php new file mode 100644 index 00000000..e8524179 --- /dev/null +++ b/hangman/hangman.php @@ -0,0 +1,49 @@ + +*/ + +function hangman_install() { +register_hook('app_menu', 'addon/hangman/hangman.php', 'hangman_app_menu'); +} + +function hangman_uninstall() { +unregister_hook('hangman_menu', 'addon/hangman/hangman.php', 'hangman_app_menu'); + +} + +function hangman_app_menu($a,&$b) { +$b['app_menu'][] = ''; +} + + +function hangman_module() { +return; +} + + +function hangman_content(&$a) { + +$baseurl = $a->get_baseurl() . '/addon/hangman'; +$a->page['htmlhead'] .= '' . "\r\n"; +$a->page['htmlhead'] .= '' . "\r\n"; +$o = ''; + + + + $o .= <<< EOT + + + +EOT; +return $o; + +} diff --git a/impressum.tgz b/impressum.tgz index 3e4ecd75..d87f17f7 100755 Binary files a/impressum.tgz and b/impressum.tgz differ diff --git a/impressum/admin.tpl b/impressum/admin.tpl index 849c11f9..901df73f 100755 --- a/impressum/admin.tpl +++ b/impressum/admin.tpl @@ -1,7 +1,7 @@ {{ inc field_input.tpl with $field=$owner }}{{ endinc }} {{ inc field_input.tpl with $field=$ownerprofile }}{{ endinc }} -{{ inc field_input.tpl with $field=$postal }}{{ endinc }} -{{ inc field_input.tpl with $field=$notes }}{{ endinc }} +{{ inc field_textarea.tpl with $field=$postal }}{{ endinc }} +{{ inc field_textarea.tpl with $field=$notes }}{{ endinc }} {{ inc field_input.tpl with $field=$email }}{{ endinc }} -{{ inc field_input.tpl with $field=$footer_text }}{{ endinc }} +{{ inc field_textarea.tpl with $field=$footer_text }}{{ endinc }} diff --git a/impressum/impressum.php b/impressum/impressum.php index 76002279..a4e7199c 100755 --- a/impressum/impressum.php +++ b/impressum/impressum.php @@ -2,11 +2,13 @@ /** * Name: Impressum * Description: Plugin to add contact information to the about page (/friendica) - * Version: 1.1 + * Version: 1.2 * Author: Tobias Diekershoff
'.t('Impressum').'
'; $owner = get_config('impressum', 'owner'); $owner_profile = get_config('impressum','ownerprofile'); - $postal = get_config('impressum', 'postal'); - $notes = get_config('impressum', 'notes'); + $postal = bbcode(get_config('impressum', 'postal'), true); + $notes = bbcode(get_config('impressum', 'notes'), true); $email = obfuscate_email( get_config('impressum','email') ); if (strlen($owner)) { if (strlen($owner_profile)) { @@ -66,12 +68,12 @@ function impressum_plugin_admin_post (&$a) { $notes = ((x($_POST, 'notes')) ? (trim($_POST['notes'])) : ''); $email = ((x($_POST, 'email')) ? notags(trim($_POST['email'])) : ''); $footer_text = ((x($_POST, 'footer_text')) ? (trim($_POST['footer_text'])) : ''); - set_config('impressum','owner',$owner); - set_config('impressum','ownerprofile',$ownerprofile); - set_config('impressum','postal',$postal); - set_config('impressum','email',$email); - set_config('impressum','notes',$notes); - set_config('impressum','footer_text',$footer_text); + set_config('impressum','owner',strip_tags($owner)); + set_config('impressum','ownerprofile',strip_tags($ownerprofile)); + set_config('impressum','postal',strip_tags($postal)); + set_config('impressum','email',strip_tags($email)); + set_config('impressum','notes',strip_tags($notes)); + set_config('impressum','footer_text',strip_tags($footer_text)); info( t('Settings updated.'). EOL ); } function impressum_plugin_admin (&$a, &$o) { @@ -80,9 +82,9 @@ function impressum_plugin_admin (&$a, &$o) { '$submit' => t('Submit'), '$owner' => array('owner', t('Site Owner'), get_config('impressum','owner'), t('The page operators name.')), '$ownerprofile' => array('ownerprofile', t('Site Owners Profile'), get_config('impressum','ownerprofile'), t('Profile address of the operator.')), - '$postal' => array('postal', t('Postal Address'), get_config('impressum','postal'), t('How to contact the operator via snail mail.')), - '$notes' => array('notes', t('Notes'), get_config('impressum','notes'), t('Additional notes that are displayed beneath the contact information.')), + '$postal' => array('postal', t('Postal Address'), get_config('impressum','postal'), t('How to contact the operator via snail mail. You can use BBCode here.')), + '$notes' => array('notes', t('Notes'), get_config('impressum','notes'), t('Additional notes that are displayed beneath the contact information. You can use BBCode here.')), '$email' => array('email', t('Email Address'), get_config('impressum','email'), t('How to contact the operator via email. (will be displayed obfuscated)')), - '$footer_text' => array('footer_text', t('Footer note'), get_config('impressum','footer_text'), t('Text for the footer.')), + '$footer_text' => array('footer_text', t('Footer note'), get_config('impressum','footer_text'), t('Text for the footer. You can use BBCode here.')), )); } diff --git a/jappixmini.tgz b/jappixmini.tgz index e936f4e8..c7fc99a4 100644 Binary files a/jappixmini.tgz and b/jappixmini.tgz differ diff --git a/page.tgz b/page.tgz index 84fb7b81..c94f01b2 100644 Binary files a/page.tgz and b/page.tgz differ diff --git a/page/page.php b/page/page.php index 72972ede..129af412 100755 --- a/page/page.php +++ b/page/page.php @@ -24,7 +24,8 @@ function page_getpage($uid) { $pagelist = array(); $contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact` - WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d", + WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d + order by name asc ", intval($uid) ); @@ -47,14 +48,28 @@ function page_page_end($a,&$b) {'.t("Forums").'
- ';
+
$contacts = page_getpage($a->user['uid']);
+ $total_shown = 0;
+ $more = false;
+
foreach($contacts as $contact) {
$page .= '
'. $contact["name"]."
";
+ $total_shown ++;
+ if($total_shown == 6) {
+ $more = true;
+ $page .= '
' . t('show more')
+ . '
';
$page .= "';
+ $s .= '';
+ $s .= '';
+ $s .= '
';
+
+ $s .= '';
+ $s .= '';
+ $s .= '';
+ $s .= '
';
+
$s .= '';
$s .= '';
$s .= '';
@@ -100,6 +113,8 @@ function posterous_settings_post(&$a,&$b) {
set_pconfig(local_user(),'posterous','post_by_default',intval($_POST['posterous_bydefault']));
set_pconfig(local_user(),'posterous','posterous_username',trim($_POST['posterous_username']));
set_pconfig(local_user(),'posterous','posterous_password',trim($_POST['posterous_password']));
+ set_pconfig(local_user(),'posterous','posterous_site_id',trim($_POST['posterous_site_id']));
+ set_pconfig(local_user(),'posterous','posterous_api_token',trim($_POST['posterous_api_token']));
}
@@ -138,6 +153,9 @@ function posterous_post_local(&$a,&$b) {
function posterous_send(&$a,&$b) {
+ logger('posterous_send: invoked');
+ return;
+
if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited']))
return;
@@ -150,12 +168,13 @@ function posterous_send(&$a,&$b) {
$pstr_username = get_pconfig($b['uid'],'posterous','posterous_username');
$pstr_password = get_pconfig($b['uid'],'posterous','posterous_password');
- $pstr_blog = 'http://www.posterous.com/api/write';
+ $pstr_site_id = get_pconfig($b['uid'],'posterous','posterous_site_id');
+ $pstr_blog = "http://posterous.com/api/2/sites/$pstr_site_id/posts";
+ $pstr_api_token = get_pconfig($b['uid'],'posterous','posterous_api_token');
if($pstr_username && $pstr_password && $pstr_blog) {
require_once('include/bbcode.php');
- require_once('posterous-api.php');
$tag_arr = array();
$tags = '';
$x = preg_match_all('/\#\[(.*?)\](.*?)\[/',$b['tag'],$matches,PREG_SET_ORDER);
@@ -170,18 +189,28 @@ function posterous_send(&$a,&$b) {
$params = array(
- 'title' => (($b['title']) ? $b['title'] : t('Post from Friendica')),
- 'type' => 'regular',
- 'autopost' => 1,
- 'source' => 'Friendica',
- 'is_private' => false,
- 'tags' => $tags,
- 'body' => bbcode($b['body'])
+ 'post[title]' => (($b['title']) ? $b['title'] : t('Post from Friendica')),
+ 'post[source]' => 'Friendica',
+ 'post[tags]' => $tags,
+ 'post[body]' => bbcode($b['body']),
+ 'api_token' => $pstr_api_token,
+ 'site_id' => $pstr_site_id
);
+
+ $ch = curl_init();
+ curl_setopt($ch, CURLOPT_URL, $pstr_blog);
+ curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+ curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 5);
+ curl_setopt($ch, CURLOPT_HEADER, false);
+ curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_BASIC);
+ curl_setopt($ch, CURLOPT_USERPWD, $pstr_username . ':' . $pstr_password);
+ curl_setopt($ch, CURLOPT_POST, true);
+ curl_setopt($ch, CURLOPT_POSTFIELDS, $params);
- $api = new PosterousAPI($pstr_username,$pstr_password);
+ $data = curl_exec($ch);
+ $result = curl_multi_getcontent($ch);
+ curl_close($ch);
- $result = $api->newpost($params);
logger('posterous_send: ' . $result);
}
}
diff --git a/privacy_image_cache/README.md b/privacy_image_cache/README.md
new file mode 100644
index 00000000..63970d3d
--- /dev/null
+++ b/privacy_image_cache/README.md
@@ -0,0 +1,4 @@
+Once activated, this addon acs as a proxy between the user and external image resources.
+If external images are to be shown, like avatars or embedded images, the server retrieves the image and the local link is sent to the user.
+By using this proxy, the server hosting the original image cannot retrieve personal information of the user like the IP address, User Agent or Cookies.
+However, the remote server will be able to track the IP address of the server hosting the friendica installation.
\ No newline at end of file
diff --git a/privacy_image_cache/privacy_image_cache.php b/privacy_image_cache/privacy_image_cache.php
new file mode 100644
index 00000000..45aeb080
--- /dev/null
+++ b/privacy_image_cache/privacy_image_cache.php
@@ -0,0 +1,175 @@
+
+ */
+
+define("PRIVACY_IMAGE_CACHE_DEFAULT_TIME", 86400); // 1 Day
+
+require_once('include/security.php');
+
+function privacy_image_cache_install() {
+ register_hook('bbcode', 'addon/privacy_image_cache/privacy_image_cache.php', 'privacy_image_cache_bbcode_hook');
+ register_hook('display_item', 'addon/privacy_image_cache/privacy_image_cache.php', 'privacy_image_cache_display_item_hook');
+ register_hook('ping_xmlize', 'addon/privacy_image_cache/privacy_image_cache.php', 'privacy_image_cache_ping_xmlize_hook');
+ register_hook('cron', 'addon/privacy_image_cache/privacy_image_cache.php', 'privacy_image_cache_cron');
+}
+
+
+function privacy_image_cache_uninstall() {
+ unregister_hook('bbcode', 'addon/privacy_image_cache/privacy_image_cache.php', 'privacy_image_cache_bbcode_hook');
+ unregister_hook('display_item', 'addon/privacy_image_cache/privacy_image_cache.php', 'privacy_image_cache_display_item_hook');
+ unregister_hook('ping_xmlize', 'addon/privacy_image_cache/privacy_image_cache.php', 'privacy_image_cache_ping_xmlize_hook');
+ unregister_hook('cron', 'addon/privacy_image_cache/privacy_image_cache.php', 'privacy_image_cache_cron');
+}
+
+
+function privacy_image_cache_module() {}
+
+
+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'];
+ }
+ else {
+ require_once("Photo.php");
+
+ $img_str = fetch_url($_REQUEST['url'],true);
+ $img = new Photo($img_str);
+ if($img->is_valid()) {
+ $img->store(0, 0, $urlhash, $_REQUEST['url'], '', 100);
+ $img_str = $img->imageString();
+ }
+ }
+
+
+ header("Content-type: image/jpeg");
+ header("Expires: " . gmdate("D, d M Y H:i:s", time() + (3600*24)) . " GMT");
+ header("Cache-Control: max-age=" . (3600*24));
+
+ echo $img_str;
+
+ killme();
+}
+
+/**
+ * @param $url string
+ * @return boolean
+ */
+function privacy_image_cache_is_local_image($url) {
+ if ($url[0] == '/') return true;
+ $baseurl = get_app()->get_baseurl();
+ return (substr($url, 0, strlen($baseurl)) == $baseurl);
+}
+
+/**
+ * @param array $matches
+ * @return string
+ */
+function privacy_image_cache_img_cb($matches) {
+ if (privacy_image_cache_is_local_image($matches[2])) return $matches[2];
+ return $matches[1] . "/privacy_image_cache/?url=" . escape_tags(addslashes($matches[2])) . $matches[3];
+}
+
+/**
+ * @param App $a
+ * @param string $o
+ */
+function privacy_image_cache_bbcode_hook(&$a, &$o) {
+ $o = preg_replace_callback("/(![]()
]*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 .= '
'; + $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'][] = ' . '/addon/smiley_pack/icons/sport/basketball.gif' . ')
';
- $b['texts'][] = ':bowling';
- $b['icons'][] = ' . '/addon/smiley_pack/icons/sport/bowling.gif' . ')
';
+ $b['texts'][] = '~bowling';
+ $b['icons'][] = '';
$b['texts'][] = ':cycling';
$b['icons'][] = ' . '/addon/smiley_pack/icons/sport/cycling.gif' . ')
';
@@ -284,6 +284,9 @@ function smiley_pack_smilies(&$a,&$b) {
$b['texts'][] = ':pillow';
$b['icons'][] = ' . '/addon/smiley_pack/icons/tired/pillow.gif' . ')
';
+ $b['texts'][] = ':yawn';
+ $b['icons'][] = ' . '/addon/smiley_pack/icons/tired/yawn.gif' . ')
';
+
#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
*/
@@ -435,9 +435,9 @@ function statusnet_post_hook(&$a,&$b) {
// shorten all the links in a 200000 character long essay.
if (! $b['title']=='') {
$tmp = $b['title'] . ' : '. $b['body'];
- $tmp = substr($tmp, 0, 4*$max_char);
+// $tmp = substr($tmp, 0, 4*$max_char);
} else {
- $tmp = substr($b['body'], 0, 3*$max_char);
+ $tmp = $b['body']; // substr($b['body'], 0, 3*$max_char);
}
// if [url=bla][img]blub.png[/img][/url] get blub.png
$tmp = preg_replace( '/\[url\=(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)\]\[img\](\\w+.*?)\\[\\/img\]\\[\\/url\]/i', '$2', $tmp);
diff --git a/twitter.tgz b/twitter.tgz
index 52a05cc6..666cf801 100755
Binary files a/twitter.tgz and b/twitter.tgz differ
diff --git a/twitter/README b/twitter/README
index 12bb6664..ff08976c 100755
--- a/twitter/README
+++ b/twitter/README
@@ -21,10 +21,13 @@ Online version of this document: http://ur1.ca/35mml
___ Requirements ___
-To use this plugin you have to register your Friendica instance as an
-_client application_ for Twitter with _read and write_ access, we do not intend
-to use Twitter for login. The registration can be done at twitter.com/apps
-and you need to have a Twitter account to do so.
+To use this plugin you have to register an application for your friendica
+instance on Twitter with
+ * read and write access
+ * don't set a callback URL
+ * we do not intend to use Twitter for login
+The registration can be done at twitter.com/apps and you need a Twitter
+account for doing so.
After you registered the application you get an OAuth consumer key / secret
pair that identifies your app, you will need them for configuration.
diff --git a/twitter/twitter.php b/twitter/twitter.php
index 32b4980f..978cc039 100755
--- a/twitter/twitter.php
+++ b/twitter/twitter.php
@@ -2,7 +2,7 @@
/**
* Name: Twitter Connector
* Description: Relay public postings to a connected Twitter account
- * Version: 1.0.3
+ * Version: 1.0.4
* Author: Tobias Diekershoff
*/
@@ -301,9 +301,9 @@ function twitter_post_hook(&$a,&$b) {
// shorten all the links in a 200000 character long essay.
if (! $b['title']=='') {
$tmp = $b['title'] . ' : '. $b['body'];
- $tmp = substr($tmp, 0, 4*$max_char);
+// $tmp = substr($tmp, 0, 4*$max_char);
} else {
- $tmp = substr($b['body'], 0, 3*$max_char);
+ $tmp = $b['body']; // substr($b['body'], 0, 3*$max_char);
}
// if [url=bla][img]blub.png[/img][/url] get blub.png
$tmp = preg_replace( '/\[url\=(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)\]\[img\](\\w+.*?)\\[\\/img\]\\[\\/url\]/i', '$2', $tmp);
diff --git a/widgets.tgz b/widgets.tgz
index 47d5f588..f3b18578 100755
Binary files a/widgets.tgz and b/widgets.tgz differ
diff --git a/widgets/widget_friendheader.php b/widgets/widget_friendheader.php
new file mode 100644
index 00000000..20a84e25
--- /dev/null
+++ b/widgets/widget_friendheader.php
@@ -0,0 +1,43 @@
+profile = $r[0];
+
+ $o = "";
+ $o .= "";
+ $o .= _abs_url(contact_block());
+ $o .= "profile['nickname']."' target=new>". t('Get added to this list!') ."";
+
+ return $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