From f4339ddb7d5ab6ae7a2ab78562990da1fcc2a8bd Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Tue, 16 Mar 2010 20:53:49 +0100
Subject: Added extra condition to focusing on notice form on page load. If the
 window location contains a fragument identifier, it will skip focus and do
 what the UA does natively.

---
 js/util.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'js/util.js')

diff --git a/js/util.js b/js/util.js
index 3efda0d7b..2e0f6e57b 100644
--- a/js/util.js
+++ b/js/util.js
@@ -86,7 +86,7 @@ var SN = { // StatusNet
                 $('#'+form_id+' #'+SN.C.S.NoticeTextCount).text(jQuery.data(form[0], 'ElementData').MaxLength);
             }
 
-            if ($('body')[0].id != 'conversation') {
+            if ($('body')[0].id != 'conversation' && window.location.hash.length === 0) {
                 $('#'+form_id+' textarea').focus();
             }
         },
-- 
cgit v1.2.3-54-g00ecf


From 7fc8b6af4ae9a784b797d4f7aef49c820bb10bdf Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Tue, 16 Mar 2010 21:02:56 +0100
Subject: Removed unnecessary form_id. Using jQuery .find() instead of
 constructing the selector.

---
 js/util.js | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

(limited to 'js/util.js')

diff --git a/js/util.js b/js/util.js
index 2e0f6e57b..f82ca992c 100644
--- a/js/util.js
+++ b/js/util.js
@@ -61,10 +61,8 @@ var SN = { // StatusNet
 
     U: { // Utils
         FormNoticeEnhancements: function(form) {
-            form_id = form.attr('id');
-
             if (jQuery.data(form[0], 'ElementData') === undefined) {
-                MaxLength = $('#'+form_id+' #'+SN.C.S.NoticeTextCount).text();
+                MaxLength = form.find('#'+SN.C.S.NoticeTextCount).text();
                 if (typeof(MaxLength) == 'undefined') {
                      MaxLength = SN.C.I.MaxLength;
                 }
@@ -72,7 +70,7 @@ var SN = { // StatusNet
 
                 SN.U.Counter(form);
 
-                NDT = $('#'+form_id+' #'+SN.C.S.NoticeDataText);
+                NDT = form.find('#'+SN.C.S.NoticeDataText);
 
                 NDT.bind('keyup', function(e) {
                     SN.U.Counter(form);
@@ -83,11 +81,11 @@ var SN = { // StatusNet
                 });
             }
             else {
-                $('#'+form_id+' #'+SN.C.S.NoticeTextCount).text(jQuery.data(form[0], 'ElementData').MaxLength);
+                form.find('#'+SN.C.S.NoticeTextCount).text(jQuery.data(form[0], 'ElementData').MaxLength);
             }
 
             if ($('body')[0].id != 'conversation' && window.location.hash.length === 0) {
-                $('#'+form_id+' textarea').focus();
+                form.find('textarea').focus();
             }
         },
 
@@ -105,7 +103,6 @@ var SN = { // StatusNet
 
         Counter: function(form) {
             SN.C.I.FormNoticeCurrent = form;
-            form_id = form.attr('id');
 
             var MaxLength = jQuery.data(form[0], 'ElementData').MaxLength;
 
@@ -113,8 +110,8 @@ var SN = { // StatusNet
                 return;
             }
 
-            var remaining = MaxLength - $('#'+form_id+' #'+SN.C.S.NoticeDataText).val().length;
-            var counter = $('#'+form_id+' #'+SN.C.S.NoticeTextCount);
+            var remaining = MaxLength - form.find('#'+SN.C.S.NoticeDataText).val().length;
+            var counter = form.find('#'+SN.C.S.NoticeTextCount);
 
             if (remaining.toString() != counter.text()) {
                 if (!SN.C.I.CounterBlackout || remaining === 0) {
@@ -174,7 +171,6 @@ var SN = { // StatusNet
 
         FormNoticeXHR: function(form) {
             SN.C.I.NoticeDataGeo = {};
-            form_id = form.attr('id');
             form.append('<input type="hidden" name="ajax" value="1"/>');
             form.ajaxForm({
                 dataType: 'xml',
-- 
cgit v1.2.3-54-g00ecf


From c11064a5398db824f2623c5763b3fdfdf8ae3c39 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 25 Mar 2010 14:15:54 -0700
Subject: Updated 'more' anchor for attachments to do an XHR GET

Conflicts:

	lib/attachmentlist.php
	plugins/OStatus/classes/Ostatus_profile.php

Merge tried to delete things that it seems it shouldn't, very confusing order. Hope rest of the cherry-picking isn't a problem.
---
 js/util.js                                  | 110 +++++++++++++++-------------
 lib/attachmentlist.php                      |  53 ++++++++++++++
 plugins/OStatus/classes/Ostatus_profile.php |  18 ++++-
 theme/base/css/display.css                  |   9 ++-
 theme/default/css/display.css               |   3 +-
 theme/identica/css/display.css              |   3 +-
 6 files changed, 141 insertions(+), 55 deletions(-)

(limited to 'js/util.js')

diff --git a/js/util.js b/js/util.js
index f82ca992c..79fd40deb 100644
--- a/js/util.js
+++ b/js/util.js
@@ -399,58 +399,70 @@ var SN = { // StatusNet
                 return;
             }
 
-            $.fn.jOverlay.options = {
-                method : 'GET',
-                data : '',
-                url : '',
-                color : '#000',
-                opacity : '0.6',
-                zIndex : 9999,
-                center : false,
-                imgLoading : $('address .url')[0].href+'theme/base/images/illustrations/illu_progress_loading-01.gif',
-                bgClickToClose : true,
-                success : function() {
-                    $('#jOverlayContent').append('<button class="close">&#215;</button>');
-                    $('#jOverlayContent button').click($.closeOverlay);
-                },
-                timeout : 0,
-                autoHide : true,
-                css : {'max-width':'542px', 'top':'5%', 'left':'32.5%'}
-            };
-
-            notice.find('a.attachment').click(function() {
-                var attachId = ($(this).attr('id').substring('attachment'.length + 1));
-                if (attachId) {
-                    $().jOverlay({url: $('address .url')[0].href+'attachment/' + attachId + '/ajax'});
-                    return false;
-                }
-            });
+            var attachment_more = notice.find('.attachment.more');
+            if (attachment_more.length > 0) {
+                attachment_more.click(function() {
+                    $.get($(this).attr('href')+'/ajax', null, function(data) {
+                        notice.find('.entry-title .entry-content').html($(data).find('#attachment_view .entry-content').html());
+                    });
 
-            if ($('#shownotice').length == 0) {
-                var t;
-                notice.find('a.thumbnail').hover(
-                    function() {
-                        var anchor = $(this);
-                        $('a.thumbnail').children('img').hide();
-                        anchor.closest(".entry-title").addClass('ov');
-
-                        if (anchor.children('img').length === 0) {
-                            t = setTimeout(function() {
-                                $.get($('address .url')[0].href+'attachment/' + (anchor.attr('id').substring('attachment'.length + 1)) + '/thumbnail', null, function(data) {
-                                    anchor.append(data);
-                                });
-                            }, 500);
-                        }
-                        else {
-                            anchor.children('img').show();
-                        }
+                    return false;
+                });
+            }
+            else {
+                $.fn.jOverlay.options = {
+                    method : 'GET',
+                    data : '',
+                    url : '',
+                    color : '#000',
+                    opacity : '0.6',
+                    zIndex : 9999,
+                    center : false,
+                    imgLoading : $('address .url')[0].href+'theme/base/images/illustrations/illu_progress_loading-01.gif',
+                    bgClickToClose : true,
+                    success : function() {
+                        $('#jOverlayContent').append('<button class="close">&#215;</button>');
+                        $('#jOverlayContent button').click($.closeOverlay);
                     },
-                    function() {
-                        clearTimeout(t);
-                        $('a.thumbnail').children('img').hide();
-                        $(this).closest('.entry-title').removeClass('ov');
+                    timeout : 0,
+                    autoHide : true,
+                    css : {'max-width':'542px', 'top':'5%', 'left':'32.5%'}
+                };
+
+                notice.find('a.attachment').click(function() {
+                    var attachId = ($(this).attr('id').substring('attachment'.length + 1));
+                    if (attachId) {
+                        $().jOverlay({url: $('address .url')[0].href+'attachment/' + attachId + '/ajax'});
+                        return false;
                     }
-                );
+                });
+
+                if ($('#shownotice').length == 0) {
+                    var t;
+                    notice.find('a.thumbnail').hover(
+                        function() {
+                            var anchor = $(this);
+                            $('a.thumbnail').children('img').hide();
+                            anchor.closest(".entry-title").addClass('ov');
+
+                            if (anchor.children('img').length === 0) {
+                                t = setTimeout(function() {
+                                    $.get($('address .url')[0].href+'attachment/' + (anchor.attr('id').substring('attachment'.length + 1)) + '/thumbnail', null, function(data) {
+                                        anchor.append(data);
+                                    });
+                                }, 500);
+                            }
+                            else {
+                                anchor.children('img').show();
+                            }
+                        },
+                        function() {
+                            clearTimeout(t);
+                            $('a.thumbnail').children('img').hide();
+                            $(this).closest('.entry-title').removeClass('ov');
+                        }
+                    );
+                }
             }
         },
 
diff --git a/lib/attachmentlist.php b/lib/attachmentlist.php
index b503bfb45..c6261dea5 100644
--- a/lib/attachmentlist.php
+++ b/lib/attachmentlist.php
@@ -359,6 +359,59 @@ class Attachment extends AttachmentListItem
         }
     }
 
+    protected function showHtmlFile(File $attachment)
+    {
+        $body = $this->scrubHtmlFile($attachment);
+        if ($body) {
+            $this->out->raw($body);
+        }
+    }
+
+    /**
+     * @return mixed false on failure, HTML fragment string on success
+     */
+    protected function scrubHtmlFile(File $attachment)
+    {
+        $path = File::path($attachment->filename);
+        if (!file_exists($path) || !is_readable($path)) {
+            common_log(LOG_ERR, "Missing local HTML attachment $path");
+            return false;
+        }
+        $raw = file_get_contents($path);
+
+        // Normalize...
+        $dom = new DOMDocument();
+        if(!$dom->loadHTML($raw)) {
+            common_log(LOG_ERR, "Bad HTML in local HTML attachment $path");
+            return false;
+        }
+
+        // Remove <script>s or htmlawed will dump their contents into output!
+        // Note: removing child nodes while iterating seems to mess things up,
+        // hence the double loop.
+        $scripts = array();
+        foreach ($dom->getElementsByTagName('script') as $script) {
+            $scripts[] = $script;
+        }
+        foreach ($scripts as $script) {
+            common_log(LOG_DEBUG, $script->textContent);
+            $script->parentNode->removeChild($script);
+        }
+
+        // Trim out everything outside the body...
+        $body = $dom->saveHTML();
+        $body = preg_replace('/^.*<body[^>]*>/is', '', $body);
+        $body = preg_replace('/<\/body[^>]*>.*$/is', '', $body);
+
+        require_once INSTALLDIR.'/extlib/htmLawed/htmLawed.php';
+        $config = array('safe' => 1,
+                        'deny_attribute' => 'id,style,on*',
+                        'comment' => 1); // remove comments
+        $scrubbed = htmLawed($body, $config);
+
+        return $scrubbed;
+    }
+
     function showFallback()
     {
         // If we don't know how to display an attachment inline, we probably
diff --git a/plugins/OStatus/classes/Ostatus_profile.php b/plugins/OStatus/classes/Ostatus_profile.php
index c7e3b0509..51a426dc4 100644
--- a/plugins/OStatus/classes/Ostatus_profile.php
+++ b/plugins/OStatus/classes/Ostatus_profile.php
@@ -555,9 +555,21 @@ class Ostatus_profile extends Memcached_DataObject
                 $shortSummary = substr($shortSummary,
                                        0,
                                        Notice::maxContent() - (mb_strlen($url) + 2));
-                $shortSummary .= '… ' . $url;
-                $content = $shortSummary;
-                $rendered = common_render_text($content);
+                $shortSummary .= '…';
+                $content = $shortSummary . ' ' . $url;
+
+                // We mark up the attachment link specially for the HTML output
+                // so we can fold-out the full version inline.
+                $attachUrl = common_local_url('attachment',
+                                              array('attachment' => $attachment->id));
+                $rendered = common_render_text($shortSummary) .
+                            ' ' .
+                            '<a href="' .
+                            htmlspecialchars($attachUrl) .
+                            '" class="attachment more">' .
+                            // TRANS: expansion link for too-long remote messages
+                            htmlspecialchars(_m('more')) .
+                            '</a>';
             }
         }
 
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index a2e4cdf2a..9044021f5 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -1284,9 +1284,16 @@ height:16px;
 position:relative;
 padding-left:16px;
 }
-#attachments .attachment {
+#attachments .attachment,
+.notice .attachment.more {
 padding-left:0;
 }
+.notice .attachment.more:before {
+content:'( ';
+}
+.notice .attachment.more:after {
+content:' )';
+}
 .notice .attachment img {
 position:absolute;
 top:18px;
diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index d92a53965..c08a03061 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -410,7 +410,8 @@ background-position: 0 -1714px;
 .notice .attachment {
 background-position:0 -394px;
 }
-#attachments .attachment {
+#attachments .attachment,
+.notice .attachment.more {
 background:none;
 }
 .notice-options .notice_reply {
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 59cb3c38a..62a9e25d8 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -409,7 +409,8 @@ background-position: 0 -1714px;
 .notice .attachment {
 background-position:0 -394px;
 }
-#attachments .attachment {
+#attachments .attachment,
+.notice .attachment.more {
 background:none;
 }
 .notice-options .notice_reply {
-- 
cgit v1.2.3-54-g00ecf


From 72cf8e712d7d34920fc2002a54d5ebaeef514b9f Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Thu, 18 Mar 2010 23:00:38 +0100
Subject: Added processing indicator for more anchor

---
 js/util.js                     | 1 +
 theme/default/css/display.css  | 2 +-
 theme/identica/css/display.css | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'js/util.js')

diff --git a/js/util.js b/js/util.js
index 79fd40deb..60eeb418f 100644
--- a/js/util.js
+++ b/js/util.js
@@ -402,6 +402,7 @@ var SN = { // StatusNet
             var attachment_more = notice.find('.attachment.more');
             if (attachment_more.length > 0) {
                 attachment_more.click(function() {
+                    $(this).addClass(SN.C.S.Processing);
                     $.get($(this).attr('href')+'/ajax', null, function(data) {
                         notice.find('.entry-title .entry-content').html($(data).find('#attachment_view .entry-content').html());
                     });
diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index a283930e5..d89607ebe 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -213,7 +213,7 @@ background-color:transparent;
 }
 
 #wrap form.processing input.submit,
-.entity_actions a.processing,
+#content a.processing,
 .dialogbox.processing .submit_dialogbox {
 background:#FFFFFF url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
 }
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 69d265a6b..1af853c49 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -214,7 +214,7 @@ background-color:transparent;
 }
 
 #wrap form.processing input.submit,
-.entity_actions a.processing,
+#content a.processing,
 .dialogbox.processing .submit_dialogbox {
 background:#FFFFFF url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
 }
-- 
cgit v1.2.3-54-g00ecf