From eed0facc87781e25e59337f1371489742a945764 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <shiny@cpan.org>
Date: Thu, 27 May 2010 03:00:58 +0000
Subject: [PATCH 01/29] added user_location_prefs to upgrade script

---
 db/08to09_pg.sql | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/db/08to09_pg.sql b/db/08to09_pg.sql
index b7a0eb8e8c..cc1edc5ec0 100644
--- a/db/08to09_pg.sql
+++ b/db/08to09_pg.sql
@@ -101,3 +101,13 @@ alter table queue_item rename to queue_item_old;
 alter table queue_item_new rename to queue_item;
 
 
+create table user_location_prefs (
+    user_id integer not null /*comment 'user who has the preference'*/ references "user" (id),
+    share_location int default 1 /* comment 'Whether to share location data'*/,
+    created timestamp not null /*comment 'date this record was created'*/,
+    modified timestamp /* comment 'date this record was modified'*/,
+
+    primary key (user_id)
+);
+ 
+

From af4fd327429fcc01769b33ece458a77a37b2463f Mon Sep 17 00:00:00 2001
From: Brenda Wallace <shiny@cpan.org>
Date: Thu, 27 May 2010 03:06:42 +0000
Subject: [PATCH 02/29] added the inbox table to postgres upgrade script

---
 db/08to09_pg.sql | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/db/08to09_pg.sql b/db/08to09_pg.sql
index cc1edc5ec0..c2fabf63ba 100644
--- a/db/08to09_pg.sql
+++ b/db/08to09_pg.sql
@@ -110,4 +110,12 @@ create table user_location_prefs (
     primary key (user_id)
 );
  
+create table inbox (
+
+    user_id integer not null /* comment 'user receiving the notice' */ references "user" (id),
+    notice_ids bytea /* comment 'packed list of notice ids' */,
+
+    primary key (user_id)
+
+);
 

From ac6486f12e3a51fc0b7b1433de881934d8029299 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 12 Aug 2010 21:19:12 -0700
Subject: [PATCH 03/29] Plugin file and data file for notice title

---
 plugins/NoticeTitle/NoticeTitlePlugin.php | 111 +++++++++++++++++++++
 plugins/NoticeTitle/Notice_title.php      | 116 ++++++++++++++++++++++
 2 files changed, 227 insertions(+)
 create mode 100644 plugins/NoticeTitle/NoticeTitlePlugin.php
 create mode 100644 plugins/NoticeTitle/Notice_title.php

diff --git a/plugins/NoticeTitle/NoticeTitlePlugin.php b/plugins/NoticeTitle/NoticeTitlePlugin.php
new file mode 100644
index 0000000000..9dfb4b21c2
--- /dev/null
+++ b/plugins/NoticeTitle/NoticeTitlePlugin.php
@@ -0,0 +1,111 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2010, StatusNet, Inc.
+ *
+ * A plugin to add titles to notices
+ *
+ * PHP version 5
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  NoticeTitle
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2010 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    // This check helps protect against security problems;
+    // your code file can't be executed directly from the web.
+    exit(1);
+}
+
+define('NOTICE_TITLE_PLUGIN_VERSION', '0.1');
+
+/**
+ * NoticeTitle plugin to add an optional title to notices.
+ *
+ * Stores notice titles in a secondary table, notice_title.
+ *
+ * @category  NoticeTitle
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2010 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+class NoticeTitlePlugin extends Plugin
+{
+    /**
+     * Database schema setup
+     *
+     * Add the notice_title helper table
+     *
+     * @see Schema
+     * @see ColumnDef
+     *
+     * @return boolean hook value; true means continue processing, false means stop.
+     */
+
+    function onCheckSchema()
+    {
+        $schema = Schema::get();
+
+        // For storing titles for notices
+
+        $schema->ensureTable('notice_title',
+                             array(new ColumnDef('notice_id', 'integer', null, true, 'PRI'),
+                                   new ColumnDef('title', 'varchar', 255, false)));
+
+        return true;
+    }
+
+    /**
+     * Load related modules when needed
+     *
+     * @param string $cls Name of the class to be loaded
+     *
+     * @return boolean hook value; true means continue processing, false means stop.
+     */
+
+    function onAutoload($cls)
+    {
+        $dir = dirname(__FILE__);
+
+        switch ($cls)
+        {
+        case 'Notice_title':
+            include_once $dir . '/'.$cls.'.php';
+            return false;
+        default:
+            return true;
+        }
+    }
+
+    function onPluginVersion(&$versions)
+    {
+        $versions[] = array('name' => 'NoticeTitle',
+                            'version' => NOTICE_TITLE_PLUGIN_VERSION,
+                            'author' => 'Evan Prodromou',
+                            'homepage' => 'http://status.net/wiki/Plugin:NoticeTitle',
+                            'rawdescription' =>
+                            _m('Adds optional titles to notices'));
+        return true;
+    }
+}
+
diff --git a/plugins/NoticeTitle/Notice_title.php b/plugins/NoticeTitle/Notice_title.php
new file mode 100644
index 0000000000..ed71f13567
--- /dev/null
+++ b/plugins/NoticeTitle/Notice_title.php
@@ -0,0 +1,116 @@
+<?php
+/**
+ * Data class for notice titles
+ *
+ * PHP version 5
+ *
+ * @category Data
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://status.net/
+ *
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2010, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.     See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+require_once INSTALLDIR . '/classes/Memcached_DataObject.php';
+
+/**
+ * Data class for notice titles
+ *
+ * @category Action
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://status.net/
+ *
+ * @see      DB_DataObject
+ */
+
+class Notice_title extends Memcached_DataObject
+{
+    public $__table = 'notice_title'; // table name
+    public $notice_id;                         // int(4)  primary_key not_null
+    public $title;                             // varchar(255)
+
+    /**
+     * Get an instance by key
+     *
+     * This is a utility method to get a single instance with a given key value.
+     *
+     * @param string $k Key to use to lookup (usually 'user_id' for this class)
+     * @param mixed  $v Value to lookup
+     *
+     * @return Notice_title object found, or null for no hits
+     *
+     */
+
+    function staticGet($k, $v=null)
+    {
+        return Memcached_DataObject::staticGet('Notice_title', $k, $v);
+    }
+
+    /**
+     * return table definition for DB_DataObject
+     *
+     * DB_DataObject needs to know something about the table to manipulate
+     * instances. This method provides all the DB_DataObject needs to know.
+     *
+     * @return array array of column definitions
+     */
+
+    function table()
+    {
+        return array('notice_id' => DB_DATAOBJECT_INT + DB_DATAOBJECT_NOTNULL,
+                     'title' => DB_DATAOBJECT_STR);
+    }
+
+    /**
+     * return key definitions for DB_DataObject
+     *
+     * @return array list of key field names
+     */
+
+    function keys()
+    {
+        return array_keys($this->keyTypes());
+    }
+
+    /**
+     * return key definitions for Memcached_DataObject
+     */
+
+    function keyTypes()
+    {
+        return array('notice_id' => 'K');
+    }
+
+    /**
+     * Magic formula for non-autoincrementing integer primary keys
+     *
+     * @return array magic three-false array that stops auto-incrementing.
+     */
+
+    function sequenceKey()
+    {
+        return array(false, false, false);
+    }
+}

From 79b5f1cea5ffadf18d3680ddeb1f8bd4d974b059 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Thu, 12 Aug 2010 22:11:26 -0700
Subject: [PATCH 04/29] add title element to notice form

---
 plugins/NoticeTitle/NoticeTitlePlugin.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/plugins/NoticeTitle/NoticeTitlePlugin.php b/plugins/NoticeTitle/NoticeTitlePlugin.php
index 9dfb4b21c2..524faef3a2 100644
--- a/plugins/NoticeTitle/NoticeTitlePlugin.php
+++ b/plugins/NoticeTitle/NoticeTitlePlugin.php
@@ -107,5 +107,18 @@ class NoticeTitlePlugin extends Plugin
                             _m('Adds optional titles to notices'));
         return true;
     }
+
+    function onStartShowNoticeFormData($form)
+    {
+        $form->out->element('input', array('type' => 'text',
+                                           'id' => 'notice_title',
+                                           'name' => 'notice_title',
+                                           'size' => 40,
+                                           'value' => _m('Title'),
+                                           'style' => 'color: 333333',
+                                           'onFocus' => 'this.value = ""; this.style = \'color: black\';'));
+        return true;
+    }
+
 }
 

From 7dd46222a86a54be9d268a36291b795087fbd5c8 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Fri, 13 Aug 2010 11:21:07 -0700
Subject: [PATCH 05/29] add StartNoticeSaveWeb and EndNoticeSaveWeb to hook
 web-based UI for notices

---
 EVENTS.txt            | 11 +++++++++++
 actions/newnotice.php | 14 +++++++++++---
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/EVENTS.txt b/EVENTS.txt
index 7784e7d42e..f34fcc3da0 100644
--- a/EVENTS.txt
+++ b/EVENTS.txt
@@ -1045,3 +1045,14 @@ StartActivityEnd: before the closing </entry> in a notice activity entry (last c
 EndActivityEnd: after the closing </entry> in a notice activity entry
 - &$notice: notice being output
 - &$xs: XMLStringer for output
+
+StartNoticeSaveWeb: before saving a notice through the Web interface
+- $action: action being executed (instance of NewNoticeAction)
+- &$authorId: integer ID of the author
+- &$text: text of the notice
+- &$options: additional options (location, replies, etc.)
+
+EndNoticeSaveWeb: after saving a notice through the Web interface
+- $action: action being executed (instance of NewNoticeAction)
+- $notice: notice that was saved
+
diff --git a/actions/newnotice.php b/actions/newnotice.php
index 748d104ff9..ca6355cbff 100644
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -203,10 +203,18 @@ class NewnoticeAction extends Action
             $options = array_merge($options, $locOptions);
         }
 
-        $notice = Notice::saveNew($user->id, $content_shortened, 'web', $options);
+        $author_id = $user->id;
+        $text      = $content_shortened;
 
-        if (isset($upload)) {
-            $upload->attachToNotice($notice);
+        if (Event::handle('StartNoticeSaveWeb', array($this, &$author_id, &$text, &$options))) {
+
+            $notice = Notice::saveNew($user->id, $content_shortened, 'web', $options);
+
+            if (isset($upload)) {
+                $upload->attachToNotice($notice);
+            }
+
+            Event::handle('EndNoticeSaveWeb', array($this, $notice));
         }
 
         if ($this->boolean('ajax')) {

From e2128b201952131ab78344b089b72a0b74521c86 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Fri, 13 Aug 2010 11:29:18 -0700
Subject: [PATCH 06/29] save the notice title when the notice is saved

---
 plugins/NoticeTitle/NoticeTitlePlugin.php | 33 ++++++++++++++++++++++-
 plugins/NoticeTitle/Notice_title.php      |  2 ++
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/plugins/NoticeTitle/NoticeTitlePlugin.php b/plugins/NoticeTitle/NoticeTitlePlugin.php
index 524faef3a2..86a74a4da5 100644
--- a/plugins/NoticeTitle/NoticeTitlePlugin.php
+++ b/plugins/NoticeTitle/NoticeTitlePlugin.php
@@ -70,7 +70,7 @@ class NoticeTitlePlugin extends Plugin
 
         $schema->ensureTable('notice_title',
                              array(new ColumnDef('notice_id', 'integer', null, true, 'PRI'),
-                                   new ColumnDef('title', 'varchar', 255, false)));
+                                   new ColumnDef('title', 'varchar', Notice_title::MAXCHARS, false)));
 
         return true;
     }
@@ -114,11 +114,42 @@ class NoticeTitlePlugin extends Plugin
                                            'id' => 'notice_title',
                                            'name' => 'notice_title',
                                            'size' => 40,
+                                           'maxlength' => Notice_title::MAXCHARS,
                                            'value' => _m('Title'),
                                            'style' => 'color: 333333',
                                            'onFocus' => 'this.value = ""; this.style = \'color: black\';'));
         return true;
     }
 
+    function onStartNoticeSaveWeb($action, &$authorId, &$text, &$options)
+    {
+        $title = $action->trimmed('notice_title');
+        if (!empty($title)) {
+            if (mb_strlen($title) > Notice_title::MAXCHARS) {
+                throw new Exception(sprintf(_m("Notice title too long (max %d chars)", Notice_title::MAXCHARS)));
+            }
+        }
+        return true;
+    }
+
+    function onEndNoticeSaveWeb($action, $notice)
+    {
+        if (!empty($notice)) {
+
+            $title = $action->trimmed('notice_title');
+
+            if (!empty($title)) {
+
+                $nt = new Notice_title();
+
+                $nt->notice_id = $notice->id;
+                $nt->title     = $title;
+
+                $nt->insert();
+            }
+        }
+
+        return true;
+    }
 }
 
diff --git a/plugins/NoticeTitle/Notice_title.php b/plugins/NoticeTitle/Notice_title.php
index ed71f13567..44d56b4968 100644
--- a/plugins/NoticeTitle/Notice_title.php
+++ b/plugins/NoticeTitle/Notice_title.php
@@ -47,6 +47,8 @@ require_once INSTALLDIR . '/classes/Memcached_DataObject.php';
 
 class Notice_title extends Memcached_DataObject
 {
+    const MAXCHARS = 255;
+
     public $__table = 'notice_title'; // table name
     public $notice_id;                         // int(4)  primary_key not_null
     public $title;                             // varchar(255)

From 67ff9ea49011fd8cc1c102c6fb236c47cd034342 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Fri, 13 Aug 2010 11:35:16 -0700
Subject: [PATCH 07/29] helper static method to get title text based on a
 notice

---
 plugins/NoticeTitle/Notice_title.php | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/plugins/NoticeTitle/Notice_title.php b/plugins/NoticeTitle/Notice_title.php
index 44d56b4968..c2d1a83ca4 100644
--- a/plugins/NoticeTitle/Notice_title.php
+++ b/plugins/NoticeTitle/Notice_title.php
@@ -115,4 +115,22 @@ class Notice_title extends Memcached_DataObject
     {
         return array(false, false, false);
     }
+
+    /**
+     * Get a notice title based on the notice
+     *
+     * @param Notice $notice Notice to fetch a title for
+     *
+     * @return string title of the notice, or null if none
+     */
+
+    static function fromNotice(Notice $notice)
+    {
+        $nt = Notice_title::staticGet('notice_id', $notice->id);
+        if (empty($nt)) {
+            return null;
+        } else {
+            return $nt->title;
+        }
+    }
 }

From 91c914fa3b988c2e5b38b0cdff3fd2d596a6a0ce Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Fri, 13 Aug 2010 11:35:36 -0700
Subject: [PATCH 08/29] show notice title for notices in a notice list

---
 plugins/NoticeTitle/NoticeTitlePlugin.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/plugins/NoticeTitle/NoticeTitlePlugin.php b/plugins/NoticeTitle/NoticeTitlePlugin.php
index 86a74a4da5..e8377f5b0b 100644
--- a/plugins/NoticeTitle/NoticeTitlePlugin.php
+++ b/plugins/NoticeTitle/NoticeTitlePlugin.php
@@ -151,5 +151,16 @@ class NoticeTitlePlugin extends Plugin
 
         return true;
     }
+
+    function onStartShowNoticeItem($nli)
+    {
+        $title = Notice_title::fromNotice($nli->notice);
+
+        if (!empty($title)) {
+            $nli->out->element('h4', array('class' => 'notice_title'), $title);
+        }
+
+        return true;
+    }
 }
 

From ed8d8eb5eeedf3caf7f38b5e03519dada24abee1 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Fri, 13 Aug 2010 11:44:26 -0700
Subject: [PATCH 09/29] hooks to allow changing RSS content

---
 EVENTS.txt        |   8 ++++
 lib/apiaction.php | 101 ++++++++++++++++++++++++----------------------
 2 files changed, 61 insertions(+), 48 deletions(-)

diff --git a/EVENTS.txt b/EVENTS.txt
index f34fcc3da0..bc3e0ea90f 100644
--- a/EVENTS.txt
+++ b/EVENTS.txt
@@ -1056,3 +1056,11 @@ EndNoticeSaveWeb: after saving a notice through the Web interface
 - $action: action being executed (instance of NewNoticeAction)
 - $notice: notice that was saved
 
+StartRssEntryArray: at the start of copying a notice to an array
+- $notice: the notice being copied
+- &$entry: the entry (empty at beginning)
+
+EndRssEntryArray: at the end of copying a notice to an array
+- $notice: the notice being copied
+- &$entry: the entry, with all the fields filled up
+
diff --git a/lib/apiaction.php b/lib/apiaction.php
index 479a86ad80..cc98b9b6ec 100644
--- a/lib/apiaction.php
+++ b/lib/apiaction.php
@@ -462,66 +462,71 @@ class ApiAction extends Action
 
     function twitterRssEntryArray($notice)
     {
-        $profile = $notice->getProfile();
-
         $entry = array();
 
-        // We trim() to avoid extraneous whitespace in the output
+        if (Event::handle('StartRssEntryArray', array($notice, &$entry))) {
 
-        $entry['content'] = common_xml_safe_str(trim($notice->rendered));
-        $entry['title'] = $profile->nickname . ': ' . common_xml_safe_str(trim($notice->content));
-        $entry['link'] = common_local_url('shownotice', array('notice' => $notice->id));
-        $entry['published'] = common_date_iso8601($notice->created);
+            $profile = $notice->getProfile();
 
-        $taguribase = TagURI::base();
-        $entry['id'] = "tag:$taguribase:$entry[link]";
+            // We trim() to avoid extraneous whitespace in the output
 
-        $entry['updated'] = $entry['published'];
-        $entry['author'] = $profile->getBestName();
+            $entry['content'] = common_xml_safe_str(trim($notice->rendered));
+            $entry['title'] = $profile->nickname . ': ' . common_xml_safe_str(trim($notice->content));
+            $entry['link'] = common_local_url('shownotice', array('notice' => $notice->id));
+            $entry['published'] = common_date_iso8601($notice->created);
 
-        // Enclosures
-        $attachments = $notice->attachments();
-        $enclosures = array();
+            $taguribase = TagURI::base();
+            $entry['id'] = "tag:$taguribase:$entry[link]";
 
-        foreach ($attachments as $attachment) {
-            $enclosure_o=$attachment->getEnclosure();
-            if ($enclosure_o) {
-                 $enclosure = array();
-                 $enclosure['url'] = $enclosure_o->url;
-                 $enclosure['mimetype'] = $enclosure_o->mimetype;
-                 $enclosure['size'] = $enclosure_o->size;
-                 $enclosures[] = $enclosure;
+            $entry['updated'] = $entry['published'];
+            $entry['author'] = $profile->getBestName();
+
+            // Enclosures
+            $attachments = $notice->attachments();
+            $enclosures = array();
+
+            foreach ($attachments as $attachment) {
+                $enclosure_o=$attachment->getEnclosure();
+                if ($enclosure_o) {
+                    $enclosure = array();
+                    $enclosure['url'] = $enclosure_o->url;
+                    $enclosure['mimetype'] = $enclosure_o->mimetype;
+                    $enclosure['size'] = $enclosure_o->size;
+                    $enclosures[] = $enclosure;
+                }
             }
-        }
 
-        if (!empty($enclosures)) {
-            $entry['enclosures'] = $enclosures;
-        }
-
-        // Tags/Categories
-        $tag = new Notice_tag();
-        $tag->notice_id = $notice->id;
-        if ($tag->find()) {
-            $entry['tags']=array();
-            while ($tag->fetch()) {
-                $entry['tags'][]=$tag->tag;
+            if (!empty($enclosures)) {
+                $entry['enclosures'] = $enclosures;
             }
-        }
-        $tag->free();
 
-        // RSS Item specific
-        $entry['description'] = $entry['content'];
-        $entry['pubDate'] = common_date_rfc2822($notice->created);
-        $entry['guid'] = $entry['link'];
+            // Tags/Categories
+            $tag = new Notice_tag();
+            $tag->notice_id = $notice->id;
+            if ($tag->find()) {
+                $entry['tags']=array();
+                while ($tag->fetch()) {
+                    $entry['tags'][]=$tag->tag;
+                }
+            }
+            $tag->free();
 
-        if (isset($notice->lat) && isset($notice->lon)) {
-            // This is the format that GeoJSON expects stuff to be in.
-            // showGeoRSS() below uses it for XML output, so we reuse it
-            $entry['geo'] = array('type' => 'Point',
-                                  'coordinates' => array((float) $notice->lat,
-                                                         (float) $notice->lon));
-        } else {
-            $entry['geo'] = null;
+            // RSS Item specific
+            $entry['description'] = $entry['content'];
+            $entry['pubDate'] = common_date_rfc2822($notice->created);
+            $entry['guid'] = $entry['link'];
+
+            if (isset($notice->lat) && isset($notice->lon)) {
+                // This is the format that GeoJSON expects stuff to be in.
+                // showGeoRSS() below uses it for XML output, so we reuse it
+                $entry['geo'] = array('type' => 'Point',
+                                      'coordinates' => array((float) $notice->lat,
+                                                             (float) $notice->lon));
+            } else {
+                $entry['geo'] = null;
+            }
+
+            Event::handle('EndRssEntryArray', array($notice, &$entry));
         }
 
         return $entry;

From 96705b4ec5d9fc658a6add47777912bc1362f406 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Fri, 13 Aug 2010 11:50:33 -0700
Subject: [PATCH 10/29] set notice titles in RSS and Atom output

---
 plugins/NoticeTitle/NoticeTitlePlugin.php | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/plugins/NoticeTitle/NoticeTitlePlugin.php b/plugins/NoticeTitle/NoticeTitlePlugin.php
index e8377f5b0b..c708a9fa0c 100644
--- a/plugins/NoticeTitle/NoticeTitlePlugin.php
+++ b/plugins/NoticeTitle/NoticeTitlePlugin.php
@@ -162,5 +162,27 @@ class NoticeTitlePlugin extends Plugin
 
         return true;
     }
+
+    function onEndRssEntryArray($notice, &$entry)
+    {
+        $title = Notice_title::fromNotice($notice);
+
+        if (!empty($title)) {
+            $entry['title'] = $title;
+        }
+
+        return true;
+    }
+
+    function onStartActivityTitle(&$notice, &$xs, &$output)
+    {
+        $title = Notice_title::fromNotice($notice);
+
+        if (!empty($title)) {
+            $output = $title;
+        }
+
+        return true;
+    }
 }
 

From eff0b8e1aaf6c6c6d71b89aa068430c2077a12b0 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Fri, 13 Aug 2010 12:01:29 -0700
Subject: [PATCH 11/29] make notice title phpcs-clean

---
 plugins/NoticeTitle/NoticeTitlePlugin.php | 88 ++++++++++++++++++++---
 1 file changed, 80 insertions(+), 8 deletions(-)

diff --git a/plugins/NoticeTitle/NoticeTitlePlugin.php b/plugins/NoticeTitle/NoticeTitlePlugin.php
index c708a9fa0c..115e1c14cf 100644
--- a/plugins/NoticeTitle/NoticeTitlePlugin.php
+++ b/plugins/NoticeTitle/NoticeTitlePlugin.php
@@ -69,8 +69,15 @@ class NoticeTitlePlugin extends Plugin
         // For storing titles for notices
 
         $schema->ensureTable('notice_title',
-                             array(new ColumnDef('notice_id', 'integer', null, true, 'PRI'),
-                                   new ColumnDef('title', 'varchar', Notice_title::MAXCHARS, false)));
+                             array(new ColumnDef('notice_id',
+                                                 'integer',
+                                                 null,
+                                                 true,
+                                                 'PRI'),
+                                   new ColumnDef('title',
+                                                 'varchar',
+                                                 Notice_title::MAXCHARS,
+                                                 false)));
 
         return true;
     }
@@ -97,41 +104,79 @@ class NoticeTitlePlugin extends Plugin
         }
     }
 
+    /**
+     * Provide plugin version information.
+     *
+     * This data is used when showing the version page.
+     *
+     * @param array &$versions array of version data arrays; see EVENTS.txt
+     *
+     * @return boolean hook value
+     */
+
     function onPluginVersion(&$versions)
     {
+        $url = 'http://status.net/wiki/Plugin:NoticeTitle';
+
         $versions[] = array('name' => 'NoticeTitle',
                             'version' => NOTICE_TITLE_PLUGIN_VERSION,
                             'author' => 'Evan Prodromou',
-                            'homepage' => 'http://status.net/wiki/Plugin:NoticeTitle',
+                            'homepage' => $url,
                             'rawdescription' =>
                             _m('Adds optional titles to notices'));
         return true;
     }
 
+    /**
+     * Show title entry when showing notice form
+     *
+     * @param Form $form Form being shown
+     *
+     * @return boolean hook value
+     */
+
     function onStartShowNoticeFormData($form)
     {
         $form->out->element('input', array('type' => 'text',
                                            'id' => 'notice_title',
                                            'name' => 'notice_title',
                                            'size' => 40,
-                                           'maxlength' => Notice_title::MAXCHARS,
-                                           'value' => _m('Title'),
-                                           'style' => 'color: 333333',
-                                           'onFocus' => 'this.value = ""; this.style = \'color: black\';'));
+                                           'maxlength' => Notice_title::MAXCHARS));
         return true;
     }
 
+    /**
+     * Validate notice title before saving
+     *
+     * @param Action  $action    NewNoticeAction being executed
+     * @param integer &$authorId Author ID
+     * @param string  &$text     Text of the notice
+     * @param array   &$options  Options array
+     *
+     * @return boolean hook value
+     */
+
     function onStartNoticeSaveWeb($action, &$authorId, &$text, &$options)
     {
         $title = $action->trimmed('notice_title');
         if (!empty($title)) {
             if (mb_strlen($title) > Notice_title::MAXCHARS) {
-                throw new Exception(sprintf(_m("Notice title too long (max %d chars)", Notice_title::MAXCHARS)));
+                throw new Exception(sprintf(_m("Notice title too long (max %d)",
+                                               Notice_title::MAXCHARS)));
             }
         }
         return true;
     }
 
+    /**
+     * Save notice title after notice is saved
+     *
+     * @param Action $action NewNoticeAction being executed
+     * @param Notice $notice Notice that was saved
+     *
+     * @return boolean hook value
+     */
+
     function onEndNoticeSaveWeb($action, $notice)
     {
         if (!empty($notice)) {
@@ -152,6 +197,14 @@ class NoticeTitlePlugin extends Plugin
         return true;
     }
 
+    /**
+     * Show the notice title in lists
+     *
+     * @param NoticeListItem $nli NoticeListItem being shown
+     *
+     * @return boolean hook value
+     */
+
     function onStartShowNoticeItem($nli)
     {
         $title = Notice_title::fromNotice($nli->notice);
@@ -163,6 +216,15 @@ class NoticeTitlePlugin extends Plugin
         return true;
     }
 
+    /**
+     * Show the notice title in RSS output
+     *
+     * @param Notice $notice Notice being shown
+     * @param array  &$entry array of values used for RSS output
+     *
+     * @return boolean hook value
+     */
+
     function onEndRssEntryArray($notice, &$entry)
     {
         $title = Notice_title::fromNotice($notice);
@@ -174,6 +236,16 @@ class NoticeTitlePlugin extends Plugin
         return true;
     }
 
+    /**
+     * Show the notice title in Atom output
+     *
+     * @param Notice      &$notice Notice being shown
+     * @param XMLStringer &$xs     output context
+     * @param string      &$output string to be output as title
+     *
+     * @return boolean hook value
+     */
+
     function onStartActivityTitle(&$notice, &$xs, &$output)
     {
         $title = Notice_title::fromNotice($notice);

From e6da476c1650fbb9e4cca5f2d9a418b3186d5d06 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Fri, 13 Aug 2010 12:04:30 -0700
Subject: [PATCH 12/29] make notice title phpcs-clean

---
 plugins/NoticeTitle/Notice_title.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/NoticeTitle/Notice_title.php b/plugins/NoticeTitle/Notice_title.php
index c2d1a83ca4..b3b4fcc571 100644
--- a/plugins/NoticeTitle/Notice_title.php
+++ b/plugins/NoticeTitle/Notice_title.php
@@ -98,6 +98,8 @@ class Notice_title extends Memcached_DataObject
 
     /**
      * return key definitions for Memcached_DataObject
+     *
+     * @return array list mapping field names to key types
      */
 
     function keyTypes()

From 9b7536351b1efa5bf222fad1fb92b6dc9e33156f Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Fri, 13 Aug 2010 12:22:58 -0700
Subject: [PATCH 13/29] hide the Whats Up Nickname if notice title enabled

---
 lib/noticeform.php                        | 3 ++-
 plugins/NoticeTitle/NoticeTitlePlugin.php | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/noticeform.php b/lib/noticeform.php
index 84c20a5b3f..5140663569 100644
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -169,7 +169,8 @@ class NoticeForm extends Form
     function formData()
     {
         if (Event::handle('StartShowNoticeFormData', array($this))) {
-            $this->out->element('label', array('for' => 'notice_data-text'),
+            $this->out->element('label', array('for' => 'notice_data-text',
+                                               'id' => 'notice_data-text-label'),
                                 sprintf(_('What\'s up, %s?'), $this->user->nickname));
             // XXX: vary by defined max size
             $this->out->element('textarea', array('id' => 'notice_data-text',
diff --git a/plugins/NoticeTitle/NoticeTitlePlugin.php b/plugins/NoticeTitle/NoticeTitlePlugin.php
index 115e1c14cf..18ffed4be2 100644
--- a/plugins/NoticeTitle/NoticeTitlePlugin.php
+++ b/plugins/NoticeTitle/NoticeTitlePlugin.php
@@ -137,6 +137,7 @@ class NoticeTitlePlugin extends Plugin
 
     function onStartShowNoticeFormData($form)
     {
+        $form->out->element('style', null, 'label#notice_data-text-label { display: none }');
         $form->out->element('input', array('type' => 'text',
                                            'id' => 'notice_title',
                                            'name' => 'notice_title',

From f7b2bb09e66d3985ce6f524e6841e5f6a473afdc Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 13 Aug 2010 10:51:00 -0700
Subject: [PATCH 14/29] Suppress whinging during HTML parsing in profile page
 discovery for things that turn out to be XML feeds with funny namespaces.

---
 plugins/OStatus/lib/discoveryhints.php | 5 +++--
 plugins/OStatus/lib/feeddiscovery.php  | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/plugins/OStatus/lib/discoveryhints.php b/plugins/OStatus/lib/discoveryhints.php
index 34c9be2777..fa2ead7320 100644
--- a/plugins/OStatus/lib/discoveryhints.php
+++ b/plugins/OStatus/lib/discoveryhints.php
@@ -114,9 +114,10 @@ class DiscoveryHints {
 
     static function _hcard($body, $url)
     {
-        // DOMDocument::loadHTML may throw warnings on unrecognized elements.
+        // DOMDocument::loadHTML may throw warnings on unrecognized elements,
+        // and notices on unrecognized namespaces.
 
-        $old = error_reporting(error_reporting() & ~E_WARNING);
+        $old = error_reporting(error_reporting() & ~(E_WARNING | E_NOTICE));
 
         $doc = new DOMDocument();
         $doc->loadHTML($body);
diff --git a/plugins/OStatus/lib/feeddiscovery.php b/plugins/OStatus/lib/feeddiscovery.php
index a55399d7c8..8a166a0be5 100644
--- a/plugins/OStatus/lib/feeddiscovery.php
+++ b/plugins/OStatus/lib/feeddiscovery.php
@@ -196,8 +196,9 @@ class FeedDiscovery
      */
     function discoverFromHTML($url, $body)
     {
-        // DOMDocument::loadHTML may throw warnings on unrecognized elements.
-        $old = error_reporting(error_reporting() & ~E_WARNING);
+        // DOMDocument::loadHTML may throw warnings on unrecognized elements,
+        // and notices on unrecognized namespaces.
+        $old = error_reporting(error_reporting() & ~(E_WARNING | E_NOTICE));
         $dom = new DOMDocument();
         $ok = $dom->loadHTML($body);
         error_reporting($old);

From 60c36c1868f6bed18b2ac71ffb37f09ef1cbc472 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 13 Aug 2010 11:02:21 -0700
Subject: [PATCH 15/29] SubMirror: check feel-url discovery if profile-url
 discovery failed; should help when giving direct feeds to subscribe to

---
 plugins/SubMirror/actions/basemirror.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/plugins/SubMirror/actions/basemirror.php b/plugins/SubMirror/actions/basemirror.php
index 5be0699f09..be6942efa7 100644
--- a/plugins/SubMirror/actions/basemirror.php
+++ b/plugins/SubMirror/actions/basemirror.php
@@ -92,7 +92,13 @@ abstract class BaseMirrorAction extends Action
      */
     protected function profileForFeed($url)
     {
-        $oprofile = Ostatus_profile::ensureProfileURL($url);
+        try {
+            // Maybe we got a web page?
+            $oprofile = Ostatus_profile::ensureProfileURL($url);
+        } catch (Exception $e) {
+            // Direct feed URL?
+            $oprofile = Ostatus_profile::ensureFeedURL($url);
+        }
         if ($oprofile->isGroup()) {
             $this->clientError(_m("Can't mirror a StatusNet group at this time."));
         }

From 16f75b95c695d4730bed8bdf6b609caa47721e3a Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 13 Aug 2010 11:41:44 -0700
Subject: [PATCH 16/29] Fixes for RSS subscriptions: accept posts with no
 ActivityStreams object-type set; be more liberal about accepting posts from
 feeds where the author info doesn't match (we'll post under the feed's
 profile and just not try to update the profile info).

---
 plugins/OStatus/classes/Ostatus_profile.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/plugins/OStatus/classes/Ostatus_profile.php b/plugins/OStatus/classes/Ostatus_profile.php
index 8f8eb773f8..e76683a1c2 100644
--- a/plugins/OStatus/classes/Ostatus_profile.php
+++ b/plugins/OStatus/classes/Ostatus_profile.php
@@ -456,8 +456,10 @@ class Ostatus_profile extends Memcached_DataObject
         case ActivityObject::NOTE:
         case ActivityObject::STATUS:
         case ActivityObject::COMMENT:
+        case null: // Unspecified type is assumed to be a blog post; as we get from RSS.
             break;
         default:
+            common_log(LOG_INFO, "Aborting processing for unrecognized activity type " . $activity->objects[0]->type);
             throw new ClientException("Can't handle that kind of post.");
         }
 
@@ -496,8 +498,11 @@ class Ostatus_profile extends Memcached_DataObject
             } else if ($actor->id) {
                 // We have an ActivityStreams actor with an explicit ID that doesn't match the feed owner.
                 // This isn't what we expect from mainline OStatus person feeds!
-                // Group feeds go down another path, with different validation.
-                throw new Exception("Got an actor '{$actor->title}' ({$actor->id}) on single-user feed for {$this->uri}");
+                // Group feeds go down another path, with different validation...
+                // Most likely this is a plain ol' blog feed of some kind which
+                // doesn't match our expectations. We'll take the entry, but ignore
+                // the <author> info.
+                common_log(LOG_WARNING, "Got an actor '{$actor->title}' ({$actor->id}) on single-user feed for {$this->uri}");
             } else {
                 // Plain <author> without ActivityStreams actor info.
                 // We'll just ignore this info for now and save the update under the feed's identity.

From 614b12ea5188098b8260b3d2c58a59d327543562 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Fri, 13 Aug 2010 23:53:05 +0000
Subject: [PATCH 17/29] A plugin to add Disqus commenting to notice pages

---
 plugins/DisqusPlugin.php | 168 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 168 insertions(+)
 create mode 100644 plugins/DisqusPlugin.php

diff --git a/plugins/DisqusPlugin.php b/plugins/DisqusPlugin.php
new file mode 100644
index 0000000000..dfc1aa8b07
--- /dev/null
+++ b/plugins/DisqusPlugin.php
@@ -0,0 +1,168 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Plugin to add Disqus commenting to notice pages
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Plugin
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2010 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+/**
+ *
+ * This plugin adds Disqus commenting to your notices. Enabling this
+ * plugin will make each notice page display the Disqus widget, and
+ * notice lists will display the number of commments each notice has.
+ *
+ * To use this plugin, you need to first register your site with Disqus
+ * and get a Discus 'shortname' for it.
+ *
+ *    http://disqus.com
+ *
+ * To enable the plugin, put the following in you config.php:
+ *
+ * addPlugin(
+ *   'Disqus', array(
+ *       'shortname' => 'YOURSHORTNAME',
+ *      'div_style' => 'width:675px; padding-top:10px; position:relative; float:left;'
+ *   )
+ * );
+ *
+ * NOTE: the 'div_style' in an optional parameter that passes in some
+ * inline CSS when creating the Disqus widget. It's a shortcut to make
+ * the widget look OK with the the default StatusNet theme. If you leave
+ * it out you'll have to edit your theme CSS files to make the widget
+ * look good.
+ *
+ * @category Plugin
+ * @package  StatusNet
+ * @author   Zach Copley <zach@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ *
+ * @see      Event
+ */
+
+class DisqusPlugin extends Plugin
+{
+    function onEndShowContentBlock($action)
+    {
+        if (get_class($action) == 'ShownoticeAction') {
+
+            $attrs = array();
+            $attrs['id'] = 'disqus_thread';
+
+            if ($this->div_style) {
+                $attrs['style'] = $this->div_style;
+            }
+
+            $action->element('div', $attrs, null);
+
+            $script = <<<ENDOFSCRIPT
+var disqus_identifier = %d;
+  (function() {
+   var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+   dsq.src = 'http://%s.disqus.com/embed.js';
+   (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+  })();
+ENDOFSCRIPT;
+
+            $action->inlineScript(sprintf($script, $action->notice->id, $this->shortname));
+
+            $attrs = array();
+
+            $attrs['id'] = 'disqus_thread_footer';
+
+            if ($this->div_style) {
+                $attrs['style'] = $this->div_style;
+            }
+
+            $action->elementStart('div', $attrs);
+            $action->elementStart('noscript');
+
+            $action->raw('Please enable JavaScript to view the ');
+            $noscriptUrl = 'http://disqus.com/?ref_noscript=' . $this->shortname;
+            $action->element('a', array('href' => $noscriptUrl), 'comments powered by Disqus.');
+            $action->elementEnd('noscript');
+
+            $action->elementStart('a', array('href' => 'http://disqus.com', 'class' => 'dsq-brlink'));
+            $action->raw('blog comments powered by ');
+            $action->element('span', array('class' => 'logo-disqus'), 'Disqus');
+            $action->elementEnd('a');
+            $action->elementEnd('div');
+        }
+    }
+
+    function onEndShowScripts($action)
+    {
+        // fugly
+        $script = <<<ENDOFSCRIPT
+var disqus_shortname = '%s';
+(function () {
+  var s = document.createElement('script'); s.async = true;
+  s.src = 'http://disqus.com/forums/%s/count.js';
+  (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+}());
+ENDOFSCRIPT;
+        $action->inlineScript(sprintf($script, $this->shortname, $this->shortname));
+
+        return true;
+    }
+
+    function onStartShowNoticeItem($noticeListItem)
+    {
+        if (empty($noticeListItem->notice->is_local)) {
+            return true;
+        }
+
+        $noticeListItem->showNotice();
+        $noticeListItem->showNoticeInfo();
+
+        $noticeUrl = $noticeListItem->notice->bestUrl();
+        $noticeUrl .= '#disqus_thread';
+
+        $noticeListItem->out->element(
+            'a', array('href' => $noticeUrl, 'class' => 'disqus_count', 'Comments')
+        );
+
+        $noticeListItem->showNoticeOptions();
+        Event::handle('EndShowNoticeItem', array($noticeListItem));
+
+        return false;
+    }
+
+    function onPluginVersion(&$versions)
+    {
+        $versions[] = array('name' => 'Disqus',
+                            'version' => STATUSNET_VERSION,
+                            'author' => 'Zach Copley',
+                            'homepage' => 'http://status.net/wiki/Plugin:Disqus',
+                            'rawdescription' =>
+                            _m('Use <a href="http://disqus.com/">Disqus</a>'.
+                               ' to add commenting to notice pages.'));
+        return true;
+    }
+}

From fa4b360ba0e360fdb738a3857830ef68fff7ed69 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@status.net>
Date: Sat, 14 Aug 2010 00:07:12 +0000
Subject: [PATCH 18/29] - Remove extraneous style stuff from Echo plugin - that
 stuff should be handled via CSS in the theme. - Updated installation
 instructions on Echo and Disqus plugins

---
 plugins/DisqusPlugin.php |  7 +++--
 plugins/EchoPlugin.php   | 68 +++++++++-------------------------------
 2 files changed, 20 insertions(+), 55 deletions(-)

diff --git a/plugins/DisqusPlugin.php b/plugins/DisqusPlugin.php
index dfc1aa8b07..dc56f320c3 100644
--- a/plugins/DisqusPlugin.php
+++ b/plugins/DisqusPlugin.php
@@ -53,9 +53,12 @@ if (!defined('STATUSNET')) {
  *
  * NOTE: the 'div_style' in an optional parameter that passes in some
  * inline CSS when creating the Disqus widget. It's a shortcut to make
- * the widget look OK with the the default StatusNet theme. If you leave
+ * the widget look OK with the default StatusNet theme. If you leave
  * it out you'll have to edit your theme CSS files to make the widget
- * look good.
+ * look good.  You can also control the way the widget looks by
+ * adding style rules to your theme.
+ *
+ * See: http://help.disqus.com/entries/100878-css-customization
  *
  * @category Plugin
  * @package  StatusNet
diff --git a/plugins/EchoPlugin.php b/plugins/EchoPlugin.php
index 2ebfbceb33..7b51866ebd 100644
--- a/plugins/EchoPlugin.php
+++ b/plugins/EchoPlugin.php
@@ -36,54 +36,26 @@ if (!defined('STATUSNET')) {
  *
  * This plugin adds an Echo commenting widget to each notice page on
  * your site.  To get it to work, first you'll have to sign up for Echo
- * (a commercial service) and register your site's URL.
+ * (a for-pay service) and register your site's URL.
  *
  *     http://aboutecho.com/
  *
  * Once you've done that it's pretty straight forward to turn the
- * plugin on, just add:
+ * plugin on; just add this to your config.php:
  *
- *     addPlugin('Echo');
+ *     addPlugin(
+ *        'Echo',
+ *        array('div_style' => 'width:675px; padding-top:10px; position:relative; float:left;')
+ *     );
  *
- * to your config.php. The defaults should work OK with the default
- * theme, but there are a lot of options to customize the look and
- * feel of the comment widget. You can control both the CSS for the
- * div that contains the widget, as well as the CSS for the widget
- * itself via config parameters that can be passed into the plugin.
- * See below for a more complex example:
+ * NOTE: the 'div_style' in an optional parameter that passes in some
+ * inline CSS when creating the Echo widget. It's a shortcut to make
+ * the widget look OK with the default StatusNet theme. If you leave
+ * it out you'll have to edit your theme CSS files to make the widget
+ * look good. You can also control the way the widget looks by
+ * adding style rules to your theme.
  *
- * // Custom stylesheet for Echo commenting widget
- * // See: http://wiki.js-kit.com/Skinning-Guide#UsingCSSnbsptocustomizefontsandcolors
- * $stylesheet = <<<ENDOFCSS
- * .js-CommentsArea { width: 400px; }
- * .jsk-HeaderWrapper { display: none; }
- * .jsk-ItemUserAvatar { display: none; }
- * .jsk-ItemBody { margin-left: -48px; }
- * .js-kit-avatars-wrapper { display: none; }
- * .js-kit-nonLoggedUserInfo { margin-left: -75px; }
- * .js-singleViaLinkWrapper { display: none; }
- * .js-CommentsSkin-echo div.jsk-ThreadWrapper { padding: 0px; }
- * .js-singleCommentAdminStar { display: none !important; }
- * .js-singleCommentName { margin-right: 1em; }
- * .js-kit-miniProfile { background-color:#FFFFFF; }
- * .jskit-MenuContainer { background-color:#FFFFFF; }
- * .jskit-MenuItemMO { background-color: #EDEDED; }
- * .jsk-CommentFormButton { display: none; }
- * .js-singleCommentReplyable { display: none; }
- * .jsk-CommentFormSurface { display: none; }
- * .js-kit-tab-follow { display: none; }
- * ENDOFCSS;
- *
- * addPlugin(
- *   'Echo',
- *    array
- *    (
- *        // div_css is the css for the div containing the comment widget
- *        'div_css' => 'width:675px; padding-top:10px; position:relative; float:left;',
- *        // stylesheet is the CSS for the comment widget itself
- *        'stylesheet' => $stylesheet
- *    )
- * );
+ * See: http://wiki.js-kit.com/Skinning-Guide#UsingCSSnbsptocustomizefontsandcolors
  *
  * @category Plugin
  * @package  StatusNet
@@ -122,24 +94,14 @@ class EchoPlugin extends Plugin
             // NOTE: there are some other attributes that could be useful
             // http://wiki.js-kit.com/Echo-Behavior
 
-            if (empty($this->div_css)) {
-                // This CSS seems to work OK with the default theme
-                $attrs['style'] = 'width:675px; padding-top:10px; position:relative; float:left;';
-            } else {
-                $attrs['style'] = $this->css;
+            if (!empty($this->div_style)) {
+                $attrs['style'] = $this->div_style;
             }
 
             $action->element('div', $attrs, null);
         }
     }
 
-    function onEndShowStyles($action)
-    {
-        if (get_class($action) == 'ShownoticeAction' && !empty($this->stylesheet)) {
-            $action->style($this->stylesheet);
-        }
-    }
-
     function onPluginVersion(&$versions)
     {
         $versions[] = array('name' => 'Echo',

From 6d89aa09317719dd4f682f75a10e8e9b50132b5c Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sat, 14 Aug 2010 11:54:20 -0700
Subject: [PATCH 19/29] on deleting a notice

---
 EVENTS.txt         |  2 ++
 classes/Notice.php | 19 +++++++++++--------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/EVENTS.txt b/EVENTS.txt
index bc3e0ea90f..1a3b2594a2 100644
--- a/EVENTS.txt
+++ b/EVENTS.txt
@@ -1064,3 +1064,5 @@ EndRssEntryArray: at the end of copying a notice to an array
 - $notice: the notice being copied
 - &$entry: the entry, with all the fields filled up
 
+NoticeDeleteRelated: at the beginning of deleting related fields to a notice
+- $notice: notice being deleted
diff --git a/classes/Notice.php b/classes/Notice.php
index 0eeebfadf3..686dfc031e 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -121,16 +121,19 @@ class Notice extends Memcached_DataObject
             $deleted->insert();
         }
 
-        // Clear related records
+        if (Event::handle('NoticeDeleteRelated', array($this))) {
 
-        $this->clearReplies();
-        $this->clearRepeats();
-        $this->clearFaves();
-        $this->clearTags();
-        $this->clearGroupInboxes();
+            // Clear related records
 
-        // NOTE: we don't clear inboxes
-        // NOTE: we don't clear queue items
+            $this->clearReplies();
+            $this->clearRepeats();
+            $this->clearFaves();
+            $this->clearTags();
+            $this->clearGroupInboxes();
+
+            // NOTE: we don't clear inboxes
+            // NOTE: we don't clear queue items
+        }
 
         $result = parent::delete();
 

From 401cf36de3bcce681f95344cc479f0594014b028 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sat, 14 Aug 2010 11:58:54 -0700
Subject: [PATCH 20/29] handle deletion of notice

---
 plugins/NoticeTitle/NoticeTitlePlugin.php | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/plugins/NoticeTitle/NoticeTitlePlugin.php b/plugins/NoticeTitle/NoticeTitlePlugin.php
index 18ffed4be2..f7fb1e4d00 100644
--- a/plugins/NoticeTitle/NoticeTitlePlugin.php
+++ b/plugins/NoticeTitle/NoticeTitlePlugin.php
@@ -137,7 +137,9 @@ class NoticeTitlePlugin extends Plugin
 
     function onStartShowNoticeFormData($form)
     {
-        $form->out->element('style', null, 'label#notice_data-text-label { display: none }');
+        $form->out->element('style',
+                            null,
+                            'label#notice_data-text-label { display: none }');
         $form->out->element('input', array('type' => 'text',
                                            'id' => 'notice_title',
                                            'name' => 'notice_title',
@@ -257,5 +259,24 @@ class NoticeTitlePlugin extends Plugin
 
         return true;
     }
+
+    /**
+     * Remove title when the notice is deleted
+     *
+     * @param Notice $notice Notice being deleted
+     *
+     * @return boolean hook value
+     */
+
+    function onNoticeDeleteRelated($notice)
+    {
+        $nt = Notice_title::staticGet('notice_id', $notice->id);
+
+        if (!empty($nt)) {
+            $nt->delete();
+        }
+
+        return true;
+    }
 }
 

From c1cab9bfb83496d941f9a4da918d1e9221f3a08a Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Sat, 14 Aug 2010 18:02:08 -0700
Subject: [PATCH 21/29] Notice title constructor doesn't check class of Notice

---
 plugins/NoticeTitle/Notice_title.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/NoticeTitle/Notice_title.php b/plugins/NoticeTitle/Notice_title.php
index b3b4fcc571..b66ea9901b 100644
--- a/plugins/NoticeTitle/Notice_title.php
+++ b/plugins/NoticeTitle/Notice_title.php
@@ -126,7 +126,7 @@ class Notice_title extends Memcached_DataObject
      * @return string title of the notice, or null if none
      */
 
-    static function fromNotice(Notice $notice)
+    static function fromNotice($notice)
     {
         $nt = Notice_title::staticGet('notice_id', $notice->id);
         if (empty($nt)) {

From e687862ca126ef6483fe874303bce730f78feb5c Mon Sep 17 00:00:00 2001
From: Brenda Wallace <shiny@cpan.org>
Date: Mon, 16 Aug 2010 13:26:27 +1200
Subject: [PATCH 22/29] fixed a %d that should be a %s in an error message

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

diff --git a/lib/installer.php b/lib/installer.php
index ff2bed1403..2eff2d85ac 100644
--- a/lib/installer.php
+++ b/lib/installer.php
@@ -319,7 +319,7 @@ abstract class Installer
             $this->updateStatus(sprintf("Adding %s data to database...", $name));
             $res = $this->runDbScript($scr.'.sql', $conn, 'pgsql');
             if ($res === false) {
-                $this->updateStatus(sprintf("Can't run %d script.", $name), true);
+                $this->updateStatus(sprintf("Can't run %s script.", $name), true);
                 return false;
             }
         }

From 9c97e33d35b4d98933cd0a574ecd704032d69b90 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <shiny@cpan.org>
Date: Mon, 16 Aug 2010 14:47:18 +1200
Subject: [PATCH 23/29] removed the notice.location column from postgres def --
 snuck in on a git commit by Patrick G

---
 db/statusnet_pg.sql | 1 -
 1 file changed, 1 deletion(-)

diff --git a/db/statusnet_pg.sql b/db/statusnet_pg.sql
index 2db98550c9..fe0758de89 100644
--- a/db/statusnet_pg.sql
+++ b/db/statusnet_pg.sql
@@ -136,7 +136,6 @@ create table notice (
     is_local integer default 0 /* comment 'notice was generated by a user' */,
     source varchar(32) /* comment 'source of comment, like "web", "im", or "clientname"' */,
     conversation integer /*id of root notice in this conversation' */ references notice (id),
-    location varchar(255) /* comment 'physical location' */,
     lat decimal(10,7) /* comment 'latitude'*/ ,
     lon decimal(10,7) /* comment 'longitude'*/ ,
     location_id integer /* comment 'location id if possible'*/ ,

From 54b93aede615271dd22983172ffabcd9dbd18bf6 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Fri, 13 Aug 2010 13:07:25 -0700
Subject: [PATCH 24/29] typo mixing up  and  in salmonaction

---
 plugins/OStatus/lib/salmonaction.php | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/plugins/OStatus/lib/salmonaction.php b/plugins/OStatus/lib/salmonaction.php
index fa9dc3b1da..9d6c6b269a 100644
--- a/plugins/OStatus/lib/salmonaction.php
+++ b/plugins/OStatus/lib/salmonaction.php
@@ -47,7 +47,6 @@ class SalmonAction extends Action
 
         $xml = file_get_contents('php://input');
 
-
         // Check the signature
         $salmon = new Salmon;
         if (!$salmon->verifyMagicEnv($xml)) {
@@ -58,7 +57,6 @@ class SalmonAction extends Action
             $env = $magic_env->parse($xml);
             $xml = $magic_env->unfold($env);
         }
-        
 
         $dom = DOMDocument::loadXML($xml);
         if ($dom->documentElement->namespaceURI != Activity::ATOM ||
@@ -67,7 +65,7 @@ class SalmonAction extends Action
             $this->clientError(_m('Salmon post must be an Atom entry.'));
         }
 
-        $this->act = new Activity($dom->documentElement);
+        $this->activity = new Activity($dom->documentElement);
         return true;
     }
 
@@ -79,9 +77,9 @@ class SalmonAction extends Action
     {
         StatusNet::setApi(true); // Send smaller error pages
 
-        common_log(LOG_DEBUG, "Got a " . $this->act->verb);
+        common_log(LOG_DEBUG, "Got a " . $this->activity->verb);
         if (Event::handle('StartHandleSalmon', array($this->activity))) {
-            switch ($this->act->verb)
+            switch ($this->activity->verb)
             {
             case ActivityVerb::POST:
                 $this->handlePost();
@@ -164,12 +162,12 @@ class SalmonAction extends Action
      */
     function handleUpdateProfile()
     {
-        $oprofile = Ostatus_profile::getActorProfile($this->act);
+        $oprofile = Ostatus_profile::getActorProfile($this->activity);
         if ($oprofile) {
             common_log(LOG_INFO, "Got a profile-update ping from $oprofile->uri");
-            $oprofile->updateFromActivityObject($this->act->actor);
+            $oprofile->updateFromActivityObject($this->activity->actor);
         } else {
-            common_log(LOG_INFO, "Ignoring profile-update ping from unknown " . $this->act->actor->id);
+            common_log(LOG_INFO, "Ignoring profile-update ping from unknown " . $this->activity->actor->id);
         }
     }
 
@@ -178,10 +176,10 @@ class SalmonAction extends Action
      */
     function ensureProfile()
     {
-        $actor = $this->act->actor;
+        $actor = $this->activity->actor;
         if (empty($actor->id)) {
             common_log(LOG_ERR, "broken actor: " . var_export($actor, true));
-            common_log(LOG_ERR, "activity with no actor: " . var_export($this->act, true));
+            common_log(LOG_ERR, "activity with no actor: " . var_export($this->activity, true));
             throw new Exception("Received a salmon slap from unidentified actor.");
         }
 
@@ -191,6 +189,6 @@ class SalmonAction extends Action
     function saveNotice()
     {
         $oprofile = $this->ensureProfile();
-        return $oprofile->processPost($this->act, 'salmon');
+        return $oprofile->processPost($this->activity, 'salmon');
     }
 }

From 5110275a38f68a52114a5f51d661ace730a9428b Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Fri, 13 Aug 2010 14:18:54 -0700
Subject: [PATCH 25/29] fix use of activity rather than act in salmonaction
 subclasses, too

---
 plugins/OStatus/actions/groupsalmon.php |  4 ++--
 plugins/OStatus/actions/usersalmon.php  | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/plugins/OStatus/actions/groupsalmon.php b/plugins/OStatus/actions/groupsalmon.php
index d60725a71b..5094dccf0f 100644
--- a/plugins/OStatus/actions/groupsalmon.php
+++ b/plugins/OStatus/actions/groupsalmon.php
@@ -61,7 +61,7 @@ class GroupsalmonAction extends SalmonAction
     function handlePost()
     {
         // @fixme process all objects?
-        switch ($this->act->objects[0]->type) {
+        switch ($this->activity->objects[0]->type) {
         case ActivityObject::ARTICLE:
         case ActivityObject::BLOGENTRY:
         case ActivityObject::NOTE:
@@ -74,7 +74,7 @@ class GroupsalmonAction extends SalmonAction
 
         // Notice must be to the attention of this group
 
-        $context = $this->act->context;
+        $context = $this->activity->context;
 
         if (empty($context->attention)) {
             throw new ClientException("Not to the attention of anyone.");
diff --git a/plugins/OStatus/actions/usersalmon.php b/plugins/OStatus/actions/usersalmon.php
index 6c360c49f9..641e131abc 100644
--- a/plugins/OStatus/actions/usersalmon.php
+++ b/plugins/OStatus/actions/usersalmon.php
@@ -55,10 +55,10 @@ class UsersalmonAction extends SalmonAction
      */
     function handlePost()
     {
-        common_log(LOG_INFO, "Received post of '{$this->act->objects[0]->id}' from '{$this->act->actor->id}'");
+        common_log(LOG_INFO, "Received post of '{$this->activity->objects[0]->id}' from '{$this->activity->actor->id}'");
 
         // @fixme: process all activity objects?
-        switch ($this->act->objects[0]->type) {
+        switch ($this->activity->objects[0]->type) {
         case ActivityObject::ARTICLE:
         case ActivityObject::BLOGENTRY:
         case ActivityObject::NOTE:
@@ -72,7 +72,7 @@ class UsersalmonAction extends SalmonAction
         // Notice must either be a) in reply to a notice by this user
         // or b) to the attention of this user
 
-        $context = $this->act->context;
+        $context = $this->activity->context;
 
         if (!empty($context->replyToID)) {
             $notice = Notice::staticGet('uri', $context->replyToID);
@@ -92,7 +92,7 @@ class UsersalmonAction extends SalmonAction
             throw new ClientException("Not to anyone in reply to anything!");
         }
 
-        $existing = Notice::staticGet('uri', $this->act->objects[0]->id);
+        $existing = Notice::staticGet('uri', $this->activity->objects[0]->id);
 
         if (!empty($existing)) {
             common_log(LOG_ERR, "Not saving notice '{$existing->uri}'; already exists.");
@@ -143,7 +143,7 @@ class UsersalmonAction extends SalmonAction
 
     function handleFavorite()
     {
-        $notice = $this->getNotice($this->act->objects[0]);
+        $notice = $this->getNotice($this->activity->objects[0]);
         $profile = $this->ensureProfile()->localProfile();
 
         $old = Fave::pkeyGet(array('user_id' => $profile->id,
@@ -164,7 +164,7 @@ class UsersalmonAction extends SalmonAction
      */
     function handleUnfavorite()
     {
-        $notice = $this->getNotice($this->act->objects[0]);
+        $notice = $this->getNotice($this->activity->objects[0]);
         $profile = $this->ensureProfile()->localProfile();
 
         $fave = Fave::pkeyGet(array('user_id' => $profile->id,

From fa778148876cad5d7ecc15866bf880d32d2f9da0 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <shiny@cpan.org>
Date: Mon, 16 Aug 2010 14:47:18 +1200
Subject: [PATCH 26/29] removed the notice.location column from postgres def --
 snuck in on a git commit by Patrick G

---
 db/statusnet_pg.sql | 1 -
 1 file changed, 1 deletion(-)

diff --git a/db/statusnet_pg.sql b/db/statusnet_pg.sql
index 2db98550c9..fe0758de89 100644
--- a/db/statusnet_pg.sql
+++ b/db/statusnet_pg.sql
@@ -136,7 +136,6 @@ create table notice (
     is_local integer default 0 /* comment 'notice was generated by a user' */,
     source varchar(32) /* comment 'source of comment, like "web", "im", or "clientname"' */,
     conversation integer /*id of root notice in this conversation' */ references notice (id),
-    location varchar(255) /* comment 'physical location' */,
     lat decimal(10,7) /* comment 'latitude'*/ ,
     lon decimal(10,7) /* comment 'longitude'*/ ,
     location_id integer /* comment 'location id if possible'*/ ,

From 7f9ab683b259fc93d507eb705c84af0cfd2fae5b Mon Sep 17 00:00:00 2001
From: Brenda Wallace <shiny@cpan.org>
Date: Mon, 16 Aug 2010 13:26:27 +1200
Subject: [PATCH 27/29] fixed a %d that should be a %s in an error message

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

diff --git a/lib/installer.php b/lib/installer.php
index ff2bed1403..2eff2d85ac 100644
--- a/lib/installer.php
+++ b/lib/installer.php
@@ -319,7 +319,7 @@ abstract class Installer
             $this->updateStatus(sprintf("Adding %s data to database...", $name));
             $res = $this->runDbScript($scr.'.sql', $conn, 'pgsql');
             if ($res === false) {
-                $this->updateStatus(sprintf("Can't run %d script.", $name), true);
+                $this->updateStatus(sprintf("Can't run %s script.", $name), true);
                 return false;
             }
         }

From b2a5e0d09b6ef93c265fe4542725de4a7472b103 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 16 Aug 2010 10:09:33 -0700
Subject: [PATCH 28/29] StatusNet 0.9.4 "Orange Crush"

---
 README         | 7 ++-----
 lib/common.php | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/README b/README
index 93b63c2acf..e5cb2c933d 100644
--- a/README
+++ b/README
@@ -2,8 +2,8 @@
 README
 ------
 
-StatusNet 0.9.4beta2
-11 August 2010
+StatusNet 0.9.4 "Orange Crush"
+16 August 2010
 
 This is the README file for StatusNet, the Open Source microblogging
 platform. It includes installation instructions, descriptions of
@@ -88,9 +88,6 @@ For best compatibility with client software and site federation, and a lot of
 bug fixes, it is highly recommended that all public sites upgrade to the new
 version.
 
-Changes from 0.9.4beta1:
-- fix for daemon config switching on multi-site setup
-
 Notable changes this version:
 
 - OpenID and OAuth libraries patched for potential timing attack
diff --git a/lib/common.php b/lib/common.php
index 897d08b77d..097f19268d 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.4beta2');
+define('STATUSNET_VERSION', '0.9.4');
 define('LACONICA_VERSION', STATUSNET_VERSION); // compatibility
 
 define('STATUSNET_CODENAME', 'Orange Crush');

From 466e3f7f7026227347db4ebdcf821789a3f6e563 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Mon, 16 Aug 2010 12:03:30 -0700
Subject: [PATCH 29/29] Link fixes for footer in fr, pt-br (also saved changed
 at TranslateWiki.net)

---
 locale/fr/LC_MESSAGES/statusnet.po    | 2 +-
 locale/pt_BR/LC_MESSAGES/statusnet.po | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po
index 4f7b3f0e70..aa4850e0ad 100644
--- a/locale/fr/LC_MESSAGES/statusnet.po
+++ b/locale/fr/LC_MESSAGES/statusnet.po
@@ -5367,7 +5367,7 @@ msgid ""
 "org/licensing/licenses/agpl-3.0.html)."
 msgstr ""
 "Il utilise le logiciel de micro-blogging [StatusNet](http://status.net/), "
-"version %s, disponible sous la licence [GNU Affero General Public License] "
+"version %s, disponible sous la licence [GNU Affero General Public License]"
 "(http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po
index 53468a0649..fd7e860e26 100644
--- a/locale/pt_BR/LC_MESSAGES/statusnet.po
+++ b/locale/pt_BR/LC_MESSAGES/statusnet.po
@@ -5343,7 +5343,7 @@ msgid ""
 "org/licensing/licenses/agpl-3.0.html)."
 msgstr ""
 "Ele funciona sobre o software de microblog [StatusNet](http://status.net/), "
-"versão %s, disponível sob a [GNU Affero General Public License] (http://www."
+"versão %s, disponível sob a [GNU Affero General Public License](http://www."
 "fsf.org/licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.