diff --git a/addon/oembed/oembed.php b/addon/oembed/oembed.php index 82183f3cc..4bbd75387 100644 --- a/addon/oembed/oembed.php +++ b/addon/oembed/oembed.php @@ -10,13 +10,11 @@ function oembed_install() { register_hook('jot_tool', 'addon/oembed/oembed.php', 'oembed_hook_jot_tool'); register_hook('page_header', 'addon/oembed/oembed.php', 'oembed_hook_page_header'); - register_hook('bbcode', 'addon/oembed/oembed.php', 'oembed_hook_bbcode'); } function oembed_uninstall() { unregister_hook('jot_tool', 'addon/oembed/oembed.php', 'oembed_hook_jot_tool'); unregister_hook('page_header', 'addon/oembed/oembed.php', 'oembed_hook_page_header'); - unregister_hook('bbcode', 'addon/oembed/oembed.php', 'oembed_hook_bbcode'); } function oembed_hook_page_header($a, &$b){ @@ -53,49 +51,7 @@ function oembed_hook_jot_tool($a, &$b) { '; } -function oembed_replacecb($matches){ - $embedurl=$matches[1]; - $ourl = "http://oohembed.com/oohembed/?url=".urlencode($embedurl); - $txt = fetch_url($ourl); - $j = json_decode($txt); - $ret=""; - switch ($j->type) { - case "video": { - if (isset($j->thumbnail_url)) { - $tw = (isset($j->thumbnail_width)) ? $j->thumbnail_width:200; - $th = (isset($j->thumbnail_height)) ? $j->thumbnail_height:180; - $ret = ""; - $ret.= ""; - $ret.= ""; - } else { - $ret=$j->html; - } - $ret.="
"; - }; break; - case "photo": { - $ret = ""; - $ret.="
"; - }; break; - case "link": { - //$ret = "".$j->title.""; - }; break; - case "rich": { - // not so safe.. - $ret = "
".$j->html."
"; - }; break; - } - - $embedlink = (isset($j->title))?$j->title:$embedurl; - $ret .= "$embedlink"; - if (isset($j->author_name)) $ret.=" by ".$j->author_name; - if (isset($j->provider_name)) $ret.=" on ".$j->provider_name; - $ret.=""; - return $ret; -} -function oembed_hook_bbcode($a, &$text){ - $text = preg_replace_callback("/\[embed\](.+?)\[\/embed\]/is", oembed_replacecb ,$text); -} ?> \ No newline at end of file diff --git a/boot.php b/boot.php index 6cbb4f07c..ac010c19d 100644 --- a/boot.php +++ b/boot.php @@ -2,7 +2,7 @@ set_time_limit(0); -define ( 'BUILD_ID', 1033 ); +define ( 'BUILD_ID', 1034 ); define ( 'FRIENDIKA_VERSION', '2.10.0902' ); define ( 'DFRN_PROTOCOL_VERSION', '2.0' ); diff --git a/database.sql b/database.sql index 54950f0fd..817fd0922 100644 --- a/database.sql +++ b/database.sql @@ -471,4 +471,8 @@ CREATE TABLE IF NOT EXISTS `event` ( `deny_gid` MEDIUMTEXT NOT NULL ) ENGINE = MYISAM DEFAULT CHARSET=utf8; - +CREATE TABLE IF NOT EXISTS 'cache' ( + `k` CHAR( 255 ) NOT NULL PRIMARY KEY , + `v` TEXT NOT NULL, + `updated` DATETIME NOT NULL +) ENGINE = MYISAM DEFAULT CHARSET=utf8; diff --git a/htconfig.php b/htconfig.php index 13c065e69..5f5c76cbd 100644 --- a/htconfig.php +++ b/htconfig.php @@ -72,4 +72,7 @@ $a->config['system']['rino_encrypt'] = true; $a->config['system']['addon'] = 'js_upload'; - \ No newline at end of file +// Disable oembed embedding +// This disable the conversion of [embed]$url[/embed] tag in html +// $a->config['system']['no_oembed'] = true; + diff --git a/include/acl_selectors.php b/include/acl_selectors.php index 554782a82..269dc3e34 100644 --- a/include/acl_selectors.php +++ b/include/acl_selectors.php @@ -17,8 +17,9 @@ function group_select($selname,$selclass,$preselected = false,$size = 4) { $selected = " selected=\"selected\" "; else $selected = ''; + $trimmed = substr($rr['name'],0,12); - $o .= "\r\n"; + $o .= "\r\n"; } } @@ -66,7 +67,9 @@ function contact_select($selname, $selclass, $preselected = false, $size = 4, $p else $selected = ''; - $o .= "\r\n"; + $trimmed = substr($rr['name'],0,22); + + $o .= "\r\n"; } } diff --git a/include/bbcode.php b/include/bbcode.php index 8382cc804..eb0806dc5 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -1,5 +1,5 @@ ', $Text); + // oembed tag + $Text = oembed_bbcode2html($Text); + call_hooks('bbcode',$Text); return $Text; diff --git a/include/items.php b/include/items.php index a5991d663..f204745bb 100644 --- a/include/items.php +++ b/include/items.php @@ -1,6 +1,7 @@ ]+>.+?' . 'http://www.youtube.com/((?:v|cp)/[A-Za-z0-9\-_=]+).+?#s', '[youtube]$1[/youtube]', $res['body']); + $res['body'] = oembed_html2bbcode($res['body']); + $config = HTMLPurifier_Config::createDefault(); $config->set('Cache.DefinitionImpl', null); diff --git a/include/notifier.php b/include/notifier.php index 59e29d7d1..8442349cf 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -159,11 +159,12 @@ function notifier_run($argv, $argc){ $r = q("SELECT * FROM `contact` WHERE `id` IN ( $conversant_str ) AND `blocked` = 0 AND `pending` = 0"); - if( ! count($r)){ - return; - } +// if( ! count($r)){ +// return; +// } - $contacts = $r; + if(count($r)) + $contacts = $r; } $feed_template = load_view_file('view/atom_feed.tpl'); @@ -255,90 +256,90 @@ function notifier_run($argv, $argc){ $recip_str = implode(', ', $recipients); - $r = q("SELECT * FROM `contact` WHERE `id` IN ( %s ) AND `blocked` = 0 ", + $r = q("SELECT * FROM `contact` WHERE `id` IN ( %s ) AND `blocked` = 0 AND `pending` = 0 ", dbesc($recip_str) ); - if(! count($r)){ - return; - } + // delivery loop require_once('include/salmon.php'); - foreach($r as $contact) { - if($contact['self']) - continue; + if(count($r)) { + foreach($r as $contact) { + if($contact['self']) + continue; - $deliver_status = 0; + $deliver_status = 0; - switch($contact['network']) { - case 'dfrn': - logger('notifier: dfrndelivery: ' . $contact['name']); - $deliver_status = dfrn_deliver($owner,$contact,$atom); - - logger('notifier: dfrn_delivery returns ' . $deliver_status); - - if($deliver_status == (-1)) { - logger('notifier: delivery failed: queuing message'); - // queue message for redelivery - q("INSERT INTO `queue` ( `cid`, `created`, `last`, `content`) - VALUES ( %d, '%s', '%s', '%s') ", - intval($contact['id']), - dbesc(datetime_convert()), - dbesc(datetime_convert()), - dbesc($atom) - ); - } - break; - case 'stat': - if($followup && $contact['notify']) { - logger('notifier: slapdelivery: ' . $contact['name']); - $deliver_status = slapper($owner,$contact['notify'],$slap); + switch($contact['network']) { + case 'dfrn': + logger('notifier: dfrndelivery: ' . $contact['name']); + $deliver_status = dfrn_deliver($owner,$contact,$atom); + logger('notifier: dfrn_delivery returns ' . $deliver_status); + if($deliver_status == (-1)) { + logger('notifier: delivery failed: queuing message'); // queue message for redelivery q("INSERT INTO `queue` ( `cid`, `created`, `last`, `content`) VALUES ( %d, '%s', '%s', '%s') ", intval($contact['id']), dbesc(datetime_convert()), dbesc(datetime_convert()), - dbesc($slap) + dbesc($atom) ); + } + break; + case 'stat': + if($followup && $contact['notify']) { + logger('notifier: slapdelivery: ' . $contact['name']); + $deliver_status = slapper($owner,$contact['notify'],$slap); + + if($deliver_status == (-1)) { + // queue message for redelivery + q("INSERT INTO `queue` ( `cid`, `created`, `last`, `content`) + VALUES ( %d, '%s', '%s', '%s') ", + intval($contact['id']), + dbesc(datetime_convert()), + dbesc(datetime_convert()), + dbesc($slap) + ); + + } + } + else { + // only send salmon if public - e.g. if it's ok to notify + // a public hub, it's ok to send a salmon - } - else { - - // only send salmon if public - e.g. if it's ok to notify - // a public hub, it's ok to send a salmon - - if(count($slaps) && $notify_hub) { - logger('notifier: slapdelivery: ' . $contact['name']); - foreach($slaps as $slappy) { - if($contact['notify']) { - $deliver_status = slapper($owner,$contact['notify'],$slappy); - if($deliver_status == (-1)) { - // queue message for redelivery - q("INSERT INTO `queue` ( `cid`, `created`, `last`, `content`) - VALUES ( %d, '%s', '%s', '%s') ", - intval($contact['id']), - dbesc(datetime_convert()), - dbesc(datetime_convert()), - dbesc($slappy) - ); + if(count($slaps) && $notify_hub) { + logger('notifier: slapdelivery: ' . $contact['name']); + foreach($slaps as $slappy) { + if($contact['notify']) { + $deliver_status = slapper($owner,$contact['notify'],$slappy); + if($deliver_status == (-1)) { + // queue message for redelivery + q("INSERT INTO `queue` ( `cid`, `created`, `last`, `content`) + VALUES ( %d, '%s', '%s', '%s') ", + intval($contact['id']), + dbesc(datetime_convert()), + dbesc(datetime_convert()), + dbesc($slappy) + ); + } } } } } - } - break; - case 'mail': - case 'dspr': - case 'feed': - default: - break; + break; + case 'mail': + case 'dspr': + case 'feed': + default: + break; + } } } @@ -370,6 +371,55 @@ function notifier_run($argv, $argc){ } } + if($notify_hub) { + + /** + * + * If you have less than 150 dfrn friends and it's a public message, + * we'll just go ahead and push them out securely with dfrn/rino. + * If you've got more than that, you'll have to rely on PuSH delivery. + * + */ + + $max_allowed = ((get_config('system','maxpubdeliver') === false) ? 150 : intval(get_config('system','maxdeliver'))); + + /** + * + * Only get the bare essentials and go back for the full record. + * If you've got a lot of friends and we grab all the details at once it could exhaust memory. + * + */ + + $r = q("SELECT `id`, `name` FROM `contact` + WHERE `network` = 'dfrn' AND `uid` = %d AND `blocked` = 0 AND `pending` = 0 + AND `rel` != %d ", + intval($owner['uid']), + intval(REL_FAN) + ); + + if((count($r)) && (($max_allowed == 0) || (count($r) < $max_allowed))) { + + foreach($r as $rr) { + + /* Don't deliver to folks who have already been delivered to */ + + if(! in_array($rr['id'], $conversants)) { + $n = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1", + intval($rr['id']) + ); + + if(count($n)) { + + logger('notifier: dfrnpubdelivery: ' . $n[0]['name']); + $deliver_status = dfrn_deliver($owner,$n[0],$atom); + } + } + else + logger('notifier: dfrnpubdelivery: ignoring ' . $rr['name']); + } + } + } + return; } diff --git a/include/oembed.php b/include/oembed.php new file mode 100644 index 000000000..37923a877 --- /dev/null +++ b/include/oembed.php @@ -0,0 +1,97 @@ +"; + switch ($j->type) { + case "video": { + if (isset($j->thumbnail_url)) { + $tw = (isset($j->thumbnail_width)) ? $j->thumbnail_width:200; + $th = (isset($j->thumbnail_height)) ? $j->thumbnail_height:180; + $ret = ""; + $ret.= ""; + $ret.= ""; + } else { + $ret=$j->html; + } + $ret.="
"; + }; break; + case "photo": { + $ret = ""; + $ret.="
"; + }; break; + case "link": { + //$ret = "".$j->title.""; + }; break; + case "rich": { + // not so safe.. + $ret = "
".$j->html."
"; + }; break; + } + + $embedlink = (isset($j->title))?$j->title:$embedurl; + $ret .= "$embedlink"; + if (isset($j->author_name)) $ret.=" by ".$j->author_name; + if (isset($j->provider_name)) $ret.=" on ".$j->provider_name; + $ret.=""; + return $ret; +} + +function oembed_bbcode2html($text){ + $stopoembed = get_config("system","no_oembed"); + if ($stopoembed == true){ + return preg_replace("/\[embed\](.+?)\[\/embed\]/is", "". t('Embedding disabled') ." : $1" ,$text); + } + return preg_replace_callback("/\[embed\](.+?)\[\/embed\]/is", 'oembed_replacecb' ,$text); +} + + +function oe_build_xpath($attr, $value){ + // http://westhoffswelt.de/blog/0036_xpath_to_select_html_by_class.html + return "contains( normalize-space( @$attr ), ' $value ' ) or substring( normalize-space( @$attr ), 1, string-length( '$value' ) + 1 ) = '$value ' or substring( normalize-space( @$attr ), string-length( @$attr ) - string-length( '$value' ) ) = ' $value' or @$attr = '$value'"; +} + +function oe_get_inner_html( $node ) { + $innerHTML= ''; + $children = $node->childNodes; + foreach ($children as $child) { + $innerHTML .= $child->ownerDocument->saveXML( $child ); + } + return $innerHTML; +} + +/** + * Find .... + * and replace it with [embed]url[/embed] + */ +function oembed_html2bbcode($text) { + $dom = DOMDocument::loadHTML($text); + $xpath = new DOMXPath($dom); + $attr = "oembed"; + + $xattr = oe_build_xpath("class","oembed"); + $entries = $xpath->query("//span[$xattr]"); + + $xattr = oe_build_xpath("rel","oembed"); + foreach($entries as $e) { + $href = $xpath->evaluate("a[$xattr]/@href", $e)->item(0)->nodeValue; + if(!is_null($href)) $e->parentNode->replaceChild(new DOMText("[embed]".$href."[embed]"), $e); + } + return oe_get_inner_html( $dom->getElementsByTagName("body")->item(0) ); +} + +?> \ No newline at end of file diff --git a/include/poller.php b/include/poller.php index 4567a5cfc..2ba285b7b 100644 --- a/include/poller.php +++ b/include/poller.php @@ -30,6 +30,10 @@ function poller_run($argv, $argc){ $php_path = ((x($a->config,'php_path') && strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php'); //proc_close(proc_open("\"$php_path\" \"include/queue.php\" &", array(), $foo)); proc_run($php_path,"include/queue.php"); + + // clear old cache + q("DELETE FROM `cache` WHERE `updated`<'%s'", + dbesc(datetime_convert('UTC','UTC',"now - 30 days"))); $hub_update = false; diff --git a/mod/item.php b/mod/item.php index cc1886c17..7125ae1f4 100644 --- a/mod/item.php +++ b/mod/item.php @@ -422,12 +422,39 @@ function item_post(&$a) { logger('mod_item: notifier invoked: ' . "\"$php_path\" \"include/notifier.php\" \"$notify_type\" \"$post_id\" &"); - proc_run($php_path, "include/notifier.php", $notify_type, "$post_id"); + proc_run($php_path, "include/notifier.php", $notify_type, "$post_id"); $datarray['id'] = $post_id; call_hooks('post_local_end', $datarray); - + + if(strlen($emailcc) && $profile_uid == local_user()) { + $erecips = explode(',', $emailcc); + if(count($erecips)) { + foreach($erecips as $recip) { + $addr = trim($recip); + if(! strlen($addr)) + continue; + $disclaimer = '
' . t('This message was sent to you by ') . $a->user['username'] + . t(', a member of the Friendika social network.') . '
'; + $disclaimer .= t('You may visit them online at') . ' ' + . $a->get_baseurl() . '/profile/' . $a->user['nickname'] . '
'; + $disclaimer .= t('Please contact the sender by replying to this post if you do not wish to receive these messages.') . '
'; + + $subject = '[Friendika]' . ' ' . $a->user['username'] . ' ' . t('posted an update.'); + $headers = 'From: ' . $a->user['username'] . ' <' . $a->user['email'] . '>' . "\n"; + $headers .= 'MIME-Version: 1.0' . "\n"; + $headers .= 'Content-Type: text/html; charset=UTF-8' . "\n"; + $headers .= 'Content-Transfer-Encoding: 8bit' . "\n\n"; + $link = '' . $a->user['username'] . '

'; + $html = prepare_body($datarray); + $message = '' . $link . $html . $disclaimer . ''; + @mail($addr, $subject, $message, $headers); + } + } + } + + goaway($a->get_baseurl() . "/" . $_POST['return'] ); return; // NOTREACHED diff --git a/mod/network.php b/mod/network.php index 50d7134c1..80edca1d0 100644 --- a/mod/network.php +++ b/mod/network.php @@ -87,6 +87,8 @@ function network_content(&$a, $update = 0) { '$baseurl' => $a->get_baseurl(), '$defloc' => $a->user['default-location'], '$visitor' => 'block', + '$emailcc' => t('CC: email addresses'), + '$emtitle' => t('Example: bob@example.com, mary@example.com'), '$lockstate' => $lockstate, '$acl' => populate_acl((($group) ? $group_acl : $a->user), $celeb), '$bang' => (($group) ? '!' : ''), diff --git a/mod/profile.php b/mod/profile.php index c84b493c5..91c1ba6d8 100644 --- a/mod/profile.php +++ b/mod/profile.php @@ -144,6 +144,8 @@ function profile_content(&$a, $update = 0) { '$return_path' => $a->cmd, '$visitor' => (($is_owner || $commvisitor) ? 'block' : 'none'), '$lockstate' => $lockstate, + '$emailcc' => t('CC: email addresses'), + '$emtitle' => t('Example: bob@example.com, mary@example.com'), '$bang' => '', '$acl' => (($is_owner) ? populate_acl($a->user, $celeb) : ''), '$profile_uid' => $a->profile['profile_uid'], diff --git a/tinymce/jscripts/tiny_mce/themes/advanced/langs/en.js b/tinymce/jscripts/tiny_mce/themes/advanced/langs/en.js index 69694b1f9..502b00817 100644 --- a/tinymce/jscripts/tiny_mce/themes/advanced/langs/en.js +++ b/tinymce/jscripts/tiny_mce/themes/advanced/langs/en.js @@ -36,7 +36,7 @@ link_desc:"Insert/edit link", unlink_desc:"Unlink", image_desc:"Insert/edit image", cleanup_desc:"Cleanup messy code", -code_desc:"Edit HTML Source", +code_desc:"Edit BBcode Source", sub_desc:"Subscript", sup_desc:"Superscript", hr_desc:"Insert horizontal ruler", diff --git a/tinymce/jscripts/tiny_mce/themes/advanced/langs/en_dlg.js b/tinymce/jscripts/tiny_mce/themes/advanced/langs/en_dlg.js index 9d124d7db..ea5a6dae2 100644 --- a/tinymce/jscripts/tiny_mce/themes/advanced/langs/en_dlg.js +++ b/tinymce/jscripts/tiny_mce/themes/advanced/langs/en_dlg.js @@ -10,7 +10,7 @@ about_version:"Version", about_loaded:"Loaded plugins", anchor_title:"Insert/edit anchor", anchor_name:"Anchor name", -code_title:"HTML Source Editor", +code_title:"BBcode Source Editor", code_wordwrap:"Word wrap", colorpicker_title:"Select a color", colorpicker_picker_tab:"Picker", diff --git a/update.php b/update.php index 0bd58d6d4..f7bf9da1e 100644 --- a/update.php +++ b/update.php @@ -320,3 +320,11 @@ function update_1031() { function update_1032() { q("ALTER TABLE `profile` ADD `pdesc` CHAR( 255 ) NOT NULL AFTER `name` "); } + +function update_1033() { + q("CREATE TABLE IF NOT EXISTS `cache` ( + `k` CHAR( 255 ) NOT NULL PRIMARY KEY , + `v` TEXT NOT NULL, + `updated` DATETIME NOT NULL + ) ENGINE = MYISAM DEFAULT CHARSET=utf8;"); +} diff --git a/view/de/jot.tpl b/view/de/jot.tpl index f42f37156..d86d8f847 100644 --- a/view/de/jot.tpl +++ b/view/de/jot.tpl @@ -40,8 +40,12 @@
-
Berechtigungseinstellungen$bang
+
Berechtigungseinstellungen$bang
+ diff --git a/view/en/jot-header.tpl b/view/en/jot-header.tpl index b687f65a6..d0c956a02 100644 --- a/view/en/jot-header.tpl +++ b/view/en/jot-header.tpl @@ -2,17 +2,20 @@ diff --git a/view/en/jot.tpl b/view/en/jot.tpl index de88fb84f..d2a1014e7 100644 --- a/view/en/jot.tpl +++ b/view/en/jot.tpl @@ -40,8 +40,12 @@
-
Permission Settings$bang
+
Permission Settings$bang
+ diff --git a/view/fr/jot.tpl b/view/fr/jot.tpl index 9a5c58153..7c49d771d 100644 --- a/view/fr/jot.tpl +++ b/view/fr/jot.tpl @@ -41,8 +41,13 @@
-
Permission Settings$bang
+
Permission Settings$bang
+ + diff --git a/view/it/jot.tpl b/view/it/jot.tpl index b0c90ddf5..7153c341c 100644 --- a/view/it/jot.tpl +++ b/view/it/jot.tpl @@ -40,8 +40,13 @@
-
Impostazione permessi$bang
+
Impostazione permessi$bang
+ + diff --git a/view/theme/purplezero/border.jpg b/view/theme/purplezero/border.jpg new file mode 100644 index 000000000..66c7a6fcc Binary files /dev/null and b/view/theme/purplezero/border.jpg differ diff --git a/view/theme/purplezero/head.jpg b/view/theme/purplezero/head.jpg new file mode 100644 index 000000000..1acd2ddb8 Binary files /dev/null and b/view/theme/purplezero/head.jpg differ diff --git a/view/theme/purplezero/shiny.png b/view/theme/purplezero/shiny.png new file mode 100644 index 000000000..d3f71ee1d Binary files /dev/null and b/view/theme/purplezero/shiny.png differ diff --git a/view/theme/purplezero/style.css b/view/theme/purplezero/style.css new file mode 100644 index 000000000..16c9dc650 --- /dev/null +++ b/view/theme/purplezero/style.css @@ -0,0 +1,27 @@ +@import url('../duepuntozero/style.css'); + +a, a:visited { color: #7433af; text-decoration: none; } +a:hover {text-decoration: underline; } + + +body { background-image: url(head.jpg); } +aside( background-image: url(border.jpg); } +section { background-image: url(border.jpg); } +#profile-tabs-wrapper { background-image: url(head.jpg); } +div.wall-item-content-wrapper.shiny { background-image: url('shiny.png'); } + + +.nav-commlink, .nav-login-link { + background-color: #aed3b2; + +} + +.fakelink, .fakelink:visited { + color: #7433af; +} + +.wall-item-name-link { + color: #7433af; +} + +