From 321093886fd708696c28118893443aa598c6b97f Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Sat, 13 Mar 2010 16:48:21 -0500
Subject: Assigned an identifier for the representative user and group profile

---
 lib/userprofile.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/userprofile.php b/lib/userprofile.php
index 2c3b1ea45..ca060842b 100644
--- a/lib/userprofile.php
+++ b/lib/userprofile.php
@@ -71,7 +71,8 @@ class UserProfile extends Widget
     {
         if (Event::handle('StartProfilePageProfileSection', array(&$this->out, $this->profile))) {
 
-            $this->out->elementStart('div', 'entity_profile vcard author');
+            $this->out->elementStart('div', array('id' => 'i',
+                                                  'class' => 'entity_profile vcard author'));
             $this->out->element('h2', null, _('User profile'));
 
             if (Event::handle('StartProfilePageProfileElements', array(&$this->out, $this->profile))) {
-- 
cgit v1.2.3-54-g00ecf


From 53bed00f9028523ba003956ed88f9549ec203e3b Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Sun, 14 Mar 2010 14:11:21 -0400
Subject: Added rel=external to geo location link

---
 lib/noticelist.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/noticelist.php b/lib/noticelist.php
index 811b7e4f1..0d4cd4dd9 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -443,7 +443,8 @@ class NoticeListItem extends Widget
                                 $name);
         } else {
             $xstr = new XMLStringer(false);
-            $xstr->elementStart('a', array('href' => $url));
+            $xstr->elementStart('a', array('href' => $url,
+                                           'rel' => 'external'));
             $xstr->element('abbr', array('class' => 'geo',
                                          'title' => $latlon),
                            $name);
-- 
cgit v1.2.3-54-g00ecf


From 3c5586d4bd2b00a2c3a140830fcc7b3e15898242 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Sun, 14 Mar 2010 15:01:24 -0400
Subject: Using rel=external instead of class=external for jOverlay title link

---
 lib/attachmentlist.php     | 6 ++----
 theme/base/css/display.css | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/attachmentlist.php b/lib/attachmentlist.php
index fe38281af..b503bfb45 100644
--- a/lib/attachmentlist.php
+++ b/lib/attachmentlist.php
@@ -248,9 +248,7 @@ class Attachment extends AttachmentListItem
         $this->out->elementStart('div', array('id' => 'attachment_view',
                                               'class' => 'hentry'));
         $this->out->elementStart('div', 'entry-title');
-        $this->out->elementStart('a', $this->linkAttr());
-        $this->out->element('span', null, $this->linkTitle());
-        $this->out->elementEnd('a');
+        $this->out->element('a', $this->linkAttr(), $this->linkTitle());
         $this->out->elementEnd('div');
 
         $this->out->elementStart('div', 'entry-content');
@@ -296,7 +294,7 @@ class Attachment extends AttachmentListItem
     }
 
     function linkAttr() {
-        return array('class' => 'external', 'href' => $this->attachment->url);
+        return array('rel' => 'external', 'href' => $this->attachment->url);
     }
 
     function linkTitle() {
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 782d3dc71..a2e4cdf2a 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -1326,7 +1326,7 @@ margin-bottom:0;
 padding:11px;
 min-height:auto;
 }
-#jOverlayContent .external span {
+#jOverlayContent .entry-title {
 display:block;
 margin-bottom:11px;
 }
-- 
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 'lib')

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 41c8048efd0d4b8053ee6f72fd277b9f602ded17 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Wed, 24 Mar 2010 14:50:12 +0100
Subject: Moved print inside base stylesheet using media rules. One less HTTP
 GET.

---
 lib/action.php                       |  3 +--
 theme/base/css/display.css           | 32 ++++++++++++++++++++++++++++++++
 theme/biz/css/base.css               | 32 ++++++++++++++++++++++++++++++++
 theme/biz/css/display.css            |  3 ++-
 theme/cloudy/css/display.css         | 30 ++++++++++++++++++++++++++++++
 theme/default/css/display.css        |  4 +++-
 theme/h4ck3r/css/base.css            | 32 ++++++++++++++++++++++++++++++++
 theme/h4ck3r/css/display.css         |  5 ++++-
 theme/identica/css/display.css       |  4 +++-
 theme/pigeonthoughts/css/base.css    | 32 ++++++++++++++++++++++++++++++++
 theme/pigeonthoughts/css/display.css |  4 +++-
 11 files changed, 174 insertions(+), 7 deletions(-)

(limited to 'lib')

diff --git a/lib/action.php b/lib/action.php
index 491d7d481..09113a598 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -198,8 +198,7 @@ class Action extends HTMLOutputter // lawsuit
 
             if (Event::handle('StartShowStatusNetStyles', array($this)) &&
                 Event::handle('StartShowLaconicaStyles', array($this))) {
-                $this->cssLink('css/display.css',null,'screen, projection, tv');
-                $this->cssLink('css/print.css','base','print');
+                $this->cssLink('css/display.css',null, 'screen, projection, tv, print');
                 Event::handle('EndShowStatusNetStyles', array($this));
                 Event::handle('EndShowLaconicaStyles', array($this));
             }
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index d58684efb..36f0533b1 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -7,6 +7,7 @@
  * @link      http://status.net/
  */
 
+@media screen, projection, tv {
 * { margin:0; padding:0; }
 img { display:block; border:0; }
 a abbr { cursor: pointer; border-bottom:0; }
@@ -1688,3 +1689,34 @@ width:auto;
 #bookmarklet #wrap {
 min-width:0;
 }
+
+}/*end of @media screen, projection, tv*/
+
+
+@media print {
+a:after { background-color:#FFFFFF; }
+a:not([href^="#"]):after { content:" <"attr(href)"> "; }
+img { border:none; }
+p { orphans: 2; widows: 1; }
+
+#site_nav_global_primary,
+#site_nav_local_views,
+#form_notice,
+.pagination,
+#site_nav_global_secondary,
+.entity_actions,
+.notice-options,
+#aside_primary,
+.form_subscription_edit .submit {
+display:none;
+}
+.timestamp dt, .timestamp dd,
+.device dt, .device dd {
+display:inline;
+}
+.profiles li,
+.notices li {
+margin-bottom:18px;
+}
+
+}/*end of @media print*/
diff --git a/theme/biz/css/base.css b/theme/biz/css/base.css
index 2c2ab33a0..43b8e4656 100644
--- a/theme/biz/css/base.css
+++ b/theme/biz/css/base.css
@@ -7,6 +7,7 @@
  * @link      http://status.net/
  */
 
+@media screen, projection, tv {
 * { margin:0; padding:0; }
 img { display:block; border:0; }
 a abbr { cursor: pointer; border-bottom:0; }
@@ -1358,3 +1359,34 @@ display:none;
 .guide {
 clear:both;
 }
+
+}/*end of @media screen, projection, tv*/
+
+
+@media print {
+a:after { background-color:#FFFFFF; }
+a:not([href^="#"]):after { content:" <"attr(href)"> "; }
+img { border:none; }
+p { orphans: 2; widows: 1; }
+
+#site_nav_global_primary,
+#site_nav_local_views,
+#form_notice,
+.pagination,
+#site_nav_global_secondary,
+.entity_actions,
+.notice-options,
+#aside_primary,
+.form_subscription_edit .submit {
+display:none;
+}
+.timestamp dt, .timestamp dd,
+.device dt, .device dd {
+display:inline;
+}
+.profiles li,
+.notices li {
+margin-bottom:18px;
+}
+
+}/*end of @media print*/
diff --git a/theme/biz/css/display.css b/theme/biz/css/display.css
index 3e97444f1..cafb152dc 100644
--- a/theme/biz/css/display.css
+++ b/theme/biz/css/display.css
@@ -7,8 +7,9 @@
  * @link      http://status.net/
  */
 
-@import url(base.css);
+@import url(base.css) screen, projection, tv, print;
 
+@media screen, projection, tv {
 html {
 background-color:#144A6E;
 }
diff --git a/theme/cloudy/css/display.css b/theme/cloudy/css/display.css
index 5bc32e6d9..d9e9f3ce2 100644
--- a/theme/cloudy/css/display.css
+++ b/theme/cloudy/css/display.css
@@ -7,6 +7,7 @@
  * @link      http://status.net/
  */
 
+@media screen, projection, tv {
 * { margin:0; padding:0; }
 img { display:block; border:0; }
 a abbr { cursor: pointer; border-bottom:0; }
@@ -2099,4 +2100,33 @@ border-left-color:#FFFFFF;
 #footer {
 background-color:#FFFFFF;
 }
+}/*end of @media screen, projection, tv*/
 
+
+@media print {
+a:after { background-color:#FFFFFF; }
+a:not([href^="#"]):after { content:" <"attr(href)"> "; }
+img { border:none; }
+p { orphans: 2; widows: 1; }
+
+#site_nav_global_primary,
+#site_nav_local_views,
+#form_notice,
+.pagination,
+#site_nav_global_secondary,
+.entity_actions,
+.notice-options,
+#aside_primary,
+.form_subscription_edit .submit {
+display:none;
+}
+.timestamp dt, .timestamp dd,
+.device dt, .device dd {
+display:inline;
+}
+.profiles li,
+.notices li {
+margin-bottom:18px;
+}
+
+}/*end of @media print*/
diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index d7f15cc46..7ccd234cd 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -7,8 +7,9 @@
  * @link      http://status.net/
  */
 
-@import url(../../base/css/display.css);
+@import url(../../base/css/display.css) screen, projection, tv, print;
 
+@media screen, projection, tv {
 body,
 a:active {
 background-color:#CEE1E9;
@@ -516,3 +517,4 @@ background-position:90% 47%;
 background-position:10% 47%;
 }
 
+}/*end of @media screen, projection, tv*/
diff --git a/theme/h4ck3r/css/base.css b/theme/h4ck3r/css/base.css
index 18ea742a5..0302653fd 100644
--- a/theme/h4ck3r/css/base.css
+++ b/theme/h4ck3r/css/base.css
@@ -7,6 +7,7 @@
  * @link      http://status.net/
  */
 
+@media screen, projection, tv {
 * { margin:0; padding:0; }
 img { display:block; border:0; }
 a abbr { cursor: pointer; border-bottom:0; }
@@ -1137,3 +1138,34 @@ display:none;
 .guide {
 clear:both;
 }
+
+}/*end of @media screen, projection, tv*/
+
+
+@media print {
+a:after { background-color:#FFFFFF; }
+a:not([href^="#"]):after { content:" <"attr(href)"> "; }
+img { border:none; }
+p { orphans: 2; widows: 1; }
+
+#site_nav_global_primary,
+#site_nav_local_views,
+#form_notice,
+.pagination,
+#site_nav_global_secondary,
+.entity_actions,
+.notice-options,
+#aside_primary,
+.form_subscription_edit .submit {
+display:none;
+}
+.timestamp dt, .timestamp dd,
+.device dt, .device dd {
+display:inline;
+}
+.profiles li,
+.notices li {
+margin-bottom:18px;
+}
+
+}/*end of @media print*/
diff --git a/theme/h4ck3r/css/display.css b/theme/h4ck3r/css/display.css
index 58b3f242a..7112765ab 100644
--- a/theme/h4ck3r/css/display.css
+++ b/theme/h4ck3r/css/display.css
@@ -7,8 +7,9 @@
  * @link      http://status.net/
  */
 
-@import url(base.css);
+@import url(base.css) screen, projection, tv, print;
 
+@media screen, projection, tv {
 html,
 body,
 a:active {
@@ -234,3 +235,5 @@ background-position:10% 45%;
 background-image:url(../../base/images/icons/twotone/green/arrow-right.gif);
 background-position:90% 45%;
 }
+
+}/*end of @media screen, projection, tv*/
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index d9f39e780..3972657a7 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -7,8 +7,9 @@
  * @link      http://status.net/
  */
 
-@import url(../../base/css/display.css);
+@import url(../../base/css/display.css) screen, projection, tv, print;
 
+@media screen, projection, tv {
 body,
 a:active {
 background-color:#F0F2F5;
@@ -515,3 +516,4 @@ background-position:90% 47%;
 background-position:10% 47%;
 }
 
+}/*end of @media screen, projection, tv*/
diff --git a/theme/pigeonthoughts/css/base.css b/theme/pigeonthoughts/css/base.css
index 2814260bd..bd12e6eaa 100644
--- a/theme/pigeonthoughts/css/base.css
+++ b/theme/pigeonthoughts/css/base.css
@@ -7,6 +7,7 @@
  * @link      http://status.net/
  */
 
+@media screen, projection, tv {
 * { margin:0; padding:0; }
 img { display:block; border:0; }
 a abbr { cursor: pointer; border-bottom:0; }
@@ -1383,3 +1384,34 @@ display:none;
 .guide {
 clear:both;
 }
+
+}/*end of @media screen, projection, tv*/
+
+
+@media print {
+a:after { background-color:#FFFFFF; }
+a:not([href^="#"]):after { content:" <"attr(href)"> "; }
+img { border:none; }
+p { orphans: 2; widows: 1; }
+
+#site_nav_global_primary,
+#site_nav_local_views,
+#form_notice,
+.pagination,
+#site_nav_global_secondary,
+.entity_actions,
+.notice-options,
+#aside_primary,
+.form_subscription_edit .submit {
+display:none;
+}
+.timestamp dt, .timestamp dd,
+.device dt, .device dd {
+display:inline;
+}
+.profiles li,
+.notices li {
+margin-bottom:18px;
+}
+
+}/*end of @media print*/
diff --git a/theme/pigeonthoughts/css/display.css b/theme/pigeonthoughts/css/display.css
index dfeb01b48..de5164ea8 100644
--- a/theme/pigeonthoughts/css/display.css
+++ b/theme/pigeonthoughts/css/display.css
@@ -7,8 +7,9 @@
  * @link      http://status.net/
  */
 
-@import url(base.css);
+@import url(base.css) screen, projection, tv, print;
 
+@media screen, projection, tv {
 html {
 background:url(../images/illustrations/illu_pigeons-01.png) no-repeat 0 100%;
 }
@@ -496,3 +497,4 @@ background-position:90% 47%;
 background-position:10% 47%;
 }
 
+}/*end of @media screen, projection, tv*/
-- 
cgit v1.2.3-54-g00ecf


From 2b3a2e6b6d0e50a8723fd970bc8d23eb1378d2ea Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Wed, 24 Mar 2010 20:50:07 +0100
Subject: Updated tag list output in subscriptions list. Matches userprofile.

---
 lib/subscriptionlist.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'lib')

diff --git a/lib/subscriptionlist.php b/lib/subscriptionlist.php
index e1207774f..fc8f33f2e 100644
--- a/lib/subscriptionlist.php
+++ b/lib/subscriptionlist.php
@@ -113,12 +113,13 @@ class SubscriptionListItem extends ProfileListItem
             $this->out->elementStart('ul', 'tags xoxo');
             foreach ($tags as $tag) {
                 $this->out->elementStart('li');
-                $this->out->element('span', 'mark_hash', '#');
-                $this->out->element('a', array('rel' => 'tag',
-                                               'href' => common_local_url($this->action->trimmed('action'),
-                                                                          array('nickname' => $this->owner->nickname,
-                                                                                'tag' => $tag))),
-                                    $tag);
+                // Avoid space by using raw output.
+                $pt = '<span class="mark_hash">#</span><a rel="tag" href="' .
+                  common_local_url($this->action->trimmed('action'),
+                                   array('nickname' => $this->owner->nickname,
+                                   'tag' => $tag)) .
+                  '">' . $tag . '</a>';
+                $this->out->raw($pt);
                 $this->out->elementEnd('li');
             }
             $this->out->elementEnd('ul');
-- 
cgit v1.2.3-54-g00ecf


From 5e79ef58e458d8df9eb6315d3b96e1338652df51 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Wed, 24 Mar 2010 20:58:13 +0100
Subject: Using hCard label instead of location. Matches userprofile.

---
 lib/profilelist.php        | 2 +-
 theme/base/css/display.css | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/profilelist.php b/lib/profilelist.php
index d970e605a..3e5513895 100644
--- a/lib/profilelist.php
+++ b/lib/profilelist.php
@@ -213,7 +213,7 @@ class ProfileListItem extends Widget
     {
         if (!empty($this->profile->location)) {
             $this->out->text(' ');
-            $this->out->elementStart('span', 'location');
+            $this->out->elementStart('span', 'label');
             $this->out->raw($this->highlight($this->profile->location));
             $this->out->elementEnd('span');
         }
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 36f0533b1..b0ab02bce 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -926,7 +926,7 @@ display:inline;
 }
 
 .profile .entity_profile .fn,
-.profile .entity_profile .location {
+.profile .entity_profile .label {
 margin-left:11px;
 margin-bottom:4px;
 width:auto;
-- 
cgit v1.2.3-54-g00ecf


From 46655eb3ca06666a747eacbef9de4bbc00cfd6b8 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 25 Mar 2010 17:25:26 -0400
Subject: version number and codename

---
 lib/common.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lib')

diff --git a/lib/common.php b/lib/common.php
index 334a88ffd..50cf5c99c 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -22,10 +22,10 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 //exit with 200 response, if this is checking fancy from the installer
 if (isset($_REQUEST['p']) && $_REQUEST['p'] == 'check-fancy') {  exit; }
 
-define('STATUSNET_VERSION', '0.9.0');
+define('STATUSNET_VERSION', '0.9.1rc1');
 define('LACONICA_VERSION', STATUSNET_VERSION); // compatibility
 
-define('STATUSNET_CODENAME', 'Stand');
+define('STATUSNET_CODENAME', 'Everybody Hurts');
 
 define('AVATAR_PROFILE_SIZE', 96);
 define('AVATAR_STREAM_SIZE', 48);
-- 
cgit v1.2.3-54-g00ecf


From e174a7211df1e15e1c79415a2722651a3b885be7 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 25 Mar 2010 14:31:22 -0700
Subject: Restore lost addition of inline HTML attachment display.

---
 lib/attachmentlist.php | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'lib')

diff --git a/lib/attachmentlist.php b/lib/attachmentlist.php
index c6261dea5..43f836e15 100644
--- a/lib/attachmentlist.php
+++ b/lib/attachmentlist.php
@@ -330,6 +330,15 @@ class Attachment extends AttachmentListItem
                     $this->out->element('param', array('name' => 'autoStart', 'value' => 1));
                     $this->out->elementEnd('object');
                     break;
+
+                case 'text/html':
+                    if ($this->attachment->filename) {
+                        // Locally-uploaded HTML. Scrub and display inline.
+                        $this->showHtmlFile($this->attachment);
+                        break;
+                    }
+                    // Fall through to default.
+
                 default:
                     $this->showFallback();
                 }
-- 
cgit v1.2.3-54-g00ecf


From 60009227f724e67b0205ae9eb77306107f2e4681 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Fri, 26 Mar 2010 18:51:01 +0000
Subject: Return an http auth error, when a client sends in an invalid auth
 user, even when http auth is not required.

---
 lib/apiauth.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/apiauth.php b/lib/apiauth.php
index 17f803a1c..e78de618e 100644
--- a/lib/apiauth.php
+++ b/lib/apiauth.php
@@ -267,7 +267,7 @@ class ApiAuthAction extends ApiAction
 
             $this->access = self::READ_WRITE;
 
-            if (empty($this->auth_user) && $required) {
+            if (empty($this->auth_user) && ($required || isset($_SERVER['PHP_AUTH_USER']))) {
 
                 // basic authentication failed
 
-- 
cgit v1.2.3-54-g00ecf


From 29566c5d4b17eb42d3f69bb6b8e74259ee4218fb Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sat, 27 Mar 2010 22:44:10 -0400
Subject: move check for bad IDs from activityobject to activity and make
 simpler

---
 lib/activity.php       | 11 +++++++++++
 lib/activityobject.php | 25 +++++++------------------
 2 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'lib')

diff --git a/lib/activity.php b/lib/activity.php
index f9192c6b8..5d6230c6d 100644
--- a/lib/activity.php
+++ b/lib/activity.php
@@ -179,6 +179,17 @@ class Activity
 
             $this->actor = new ActivityObject($actorEl);
 
+            // Cliqset has bad actor IDs (just nickname of user). We
+            // work around it by getting the author data and using its
+            // id instead
+
+            if (!preg_match('/^\w+:/', $this->actor->id)) {
+                $authorEl = ActivityUtils::child($entry, 'author');
+                if (!empty($authorEl)) {
+                    $authorObj = new ActivityObject($authorEl);
+                    $this->actor->id = $authorObj->id;
+                }
+            }
         } else if (!empty($feed) &&
                    $subjectEl = $this->_child($feed, self::SUBJECT)) {
 
diff --git a/lib/activityobject.php b/lib/activityobject.php
index 34d1b9170..677a48197 100644
--- a/lib/activityobject.php
+++ b/lib/activityobject.php
@@ -177,10 +177,7 @@ class ActivityObject
         $this->type  = self::PERSON; // XXX: is this fair?
         $this->title = $this->_childContent($element, self::NAME);
 
-        $id = $this->_childContent($element, self::URI);
-        if (ActivityUtils::validateUri($id)) {
-            $this->id = $id;
-        }
+        $this->id = $this->_childContent($element, self::URI);
 
         if (empty($this->id)) {
             $email = $this->_childContent($element, self::EMAIL);
@@ -193,15 +190,6 @@ class ActivityObject
 
     private function _fromAtomEntry($element)
     {
-        if ($element->localName == 'actor') {
-            // Old-fashioned <activity:actor>...
-            // First pull anything from <author>, then we'll add on top.
-            $author = ActivityUtils::child($element->parentNode, 'author');
-            if ($author) {
-                $this->_fromAuthor($author);
-            }
-        }
-
         $this->type = $this->_childContent($element, Activity::OBJECTTYPE,
                                            Activity::SPEC);
 
@@ -209,11 +197,6 @@ class ActivityObject
             $this->type = ActivityObject::NOTE;
         }
 
-        $id = $this->_childContent($element, self::ID);
-        if (ActivityUtils::validateUri($id)) {
-            $this->id = $id;
-        }
-
         $this->summary = ActivityUtils::childHtmlContent($element, self::SUMMARY);
         $this->content = ActivityUtils::getContent($element);
 
@@ -226,6 +209,12 @@ class ActivityObject
         $this->source  = $this->_getSource($element);
 
         $this->link = ActivityUtils::getPermalink($element);
+
+        $this->id = $this->_childContent($element, self::ID);
+
+        if (empty($this->id) && !empty($this->link)) { // fallback if there's no ID
+            $this->id = $this->link;
+        }
     }
 
     // @fixme rationalize with Activity::_fromRssItem()
-- 
cgit v1.2.3-54-g00ecf


From ddc71b6637573831ee9e9799e4e48ca2e90d5203 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sun, 28 Mar 2010 11:39:56 -0400
Subject: update README and version number

---
 README         | 89 ++++++++++++++++++++++------------------------------------
 lib/common.php |  2 +-
 2 files changed, 34 insertions(+), 57 deletions(-)

(limited to 'lib')

diff --git a/README b/README
index c5adda177..c687cb240 100644
--- a/README
+++ b/README
@@ -2,8 +2,8 @@
 README
 ------
 
-StatusNet 0.9.0 ("Stand")
-4 Mar 2010
+StatusNet 0.9.1 ("Everybody Hurts")
+28 Mar 2010
 
 This is the README file for StatusNet, the Open Source microblogging
 platform. It includes installation instructions, descriptions of
@@ -77,57 +77,34 @@ for additional terms.
 New this version
 ================
 
-This is a major feature release since version 0.8.3, released Feb 1
-2010. It is the final release version of 0.9.0, replacing any beta
-versions.
+This is a minor bug and feature release since version 0.9.0 released 4
+March 2010.
+
+Because of fixes to OStatus bugs, it is highly recommended that all
+public sites upgrade to the new version immediately.
 
 Notable changes this version:
 
-- Support for the new distributed status update standard OStatus
-  <http://ostatus.org>, based on PubSubHubbub, Salmon, Webfinger,
-  and Activity Streams.
-- Support for location using the Geolocation API. Notices are (optionally) 
-  marked with lat-long information with geo microformats, and can be shown
-  on a map.
-- No fixed content size. Notice size is configurable, from 1 to
-  unlimited number of characters. Default is still 140!
-- An authorization framework, allowing different levels of users.
-- A Web-based administration panel.
-- A moderation system that lets site moderators sandbox, silence,
-  or delete uncooperative users.
-- A flag system that lets users flag profiles for moderator review.
-- Support for OAuth <http://oauth.net> authentication in the Twitter
-  API.
-- User roles system that lets the owner of the site to assign
-  administrator and moderator roles to other users.
-- A pluggable authentication system.
-- An authentication plugin for LDAP servers.
-- Many features that were core in 0.8.x are now plugins, such
-  as OpenID, Twitter integration, Facebook integration
-- A much-improved offline processing system
-- In-browser "realtime" updates using a number of realtime
-  servers (Meteor, Orbited, Cometd)
-- A plugin to provide an interface optimized for mobile browsers
-- Support for Facebook Connect
-- Support for logging in with a Twitter account
-- Vastly improved translation with additional languages and
-  translation in plugins
-- Support for all-SSL instances
-- Core support for "repeats" (like Twitter's "retweets")
-- Pluggable caching system, with plugins for Memcached,
-  APC, XCache, and a disk-based cache
-- Plugin to support RSSCloud
-- A framework for adding advertisements to a public site,
-  and plugins for Google AdSense and OpenX server
-- Plugins to throttle excessive subscriptions and registrations.
-- A plugin to blacklist particular URLs or nicknames.
-
-There are also literally thousands of bugs fixed and minor features
-added. A full changelog is available at http://status.net/wiki/StatusNet_0.9.0.
-
-Under the covers, the software has a vastly improved plugin and
-extension mechanism that makes writing powerful and flexible additions
-to the core functionality much easier.
+- Twitter bridge truncates and links back to original for long
+  notices.
+- Changed "Home" link in main menu to "Personal".
+- A new memcached plugin (using pecl/memcached versus pecl/memcache)
+- Opt-in subscription to update@status.net
+- Script to run commands on behalf of a user.
+- Better Web UI for long notices.
+- A plugin to open external links in their own window or tab
+- Fixes to Salmon protocol for compatibility with other systems.
+- Updates to latest ActivityStreams definition.
+- Twitpic-compatible API for image upload.
+- Background deletion of user accounts.
+- Better support for HTTP basic authentication with CGI/FastCGI
+- Better discovery on OStatus
+- Support for PuSH-enabled RSS 2.0 feeds
+- OpenID-only mode
+- OpenID blacklist/whitelist
+- OStatus unit tests
+
+A full changelog is available at http://status.net/wiki/StatusNet_0.9.1.
 
 Prerequisites
 =============
@@ -239,9 +216,9 @@ especially if you've previously installed PHP/MySQL packages.
 1. Unpack the tarball you downloaded on your Web server. Usually a
    command like this will work:
 
-       tar zxf statusnet-0.9.0.tar.gz
+       tar zxf statusnet-0.9.1.tar.gz
 
-   ...which will make a statusnet-0.9.0 subdirectory in your current
+   ...which will make a statusnet-0.9.1 subdirectory in your current
    directory. (If you don't have shell access on your Web server, you
    may have to unpack the tarball on your local computer and FTP the
    files to the server.)
@@ -249,7 +226,7 @@ especially if you've previously installed PHP/MySQL packages.
 2. Move the tarball to a directory of your choosing in your Web root
    directory. Usually something like this will work:
 
-       mv statusnet-0.9.0 /var/www/statusnet
+       mv statusnet-0.9.1 /var/www/statusnet
 
    This will make your StatusNet instance available in the statusnet path of
    your server, like "http://example.net/statusnet". "microblog" or
@@ -664,7 +641,7 @@ with this situation.
 If you've been using StatusNet 0.7, 0.6, 0.5 or lower, or if you've
 been tracking the "git" version of the software, you will probably
 want to upgrade and keep your existing data. There is no automated
-upgrade procedure in StatusNet 0.9.0. Try these step-by-step
+upgrade procedure in StatusNet 0.9.1. Try these step-by-step
 instructions; read to the end first before trying them.
 
 0. Download StatusNet and set up all the prerequisites as if you were
@@ -685,7 +662,7 @@ instructions; read to the end first before trying them.
 5. Once all writing processes to your site are turned off, make a
    final backup of the Web directory and database.
 6. Move your StatusNet directory to a backup spot, like "statusnet.bak".
-7. Unpack your StatusNet 0.9.0 tarball and move it to "statusnet" or
+7. Unpack your StatusNet 0.9.1 tarball and move it to "statusnet" or
    wherever your code used to be.
 8. Copy the config.php file and avatar directory from your old
    directory to your new directory.
@@ -1522,7 +1499,7 @@ repository (see below), and you get a compilation error ("unexpected
 T_STRING") in the browser, check to see that you don't have any
 conflicts in your code.
 
-If you upgraded to StatusNet 0.9.0 without reading the "Notice
+If you upgraded to StatusNet 0.9.1 without reading the "Notice
 inboxes" section above, and all your users' 'Personal' tabs are empty,
 read the "Notice inboxes" section above.
 
diff --git a/lib/common.php b/lib/common.php
index 50cf5c99c..8d2e6b420 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -22,7 +22,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
 //exit with 200 response, if this is checking fancy from the installer
 if (isset($_REQUEST['p']) && $_REQUEST['p'] == 'check-fancy') {  exit; }
 
-define('STATUSNET_VERSION', '0.9.1rc1');
+define('STATUSNET_VERSION', '0.9.1');
 define('LACONICA_VERSION', STATUSNET_VERSION); // compatibility
 
 define('STATUSNET_CODENAME', 'Everybody Hurts');
-- 
cgit v1.2.3-54-g00ecf