Merge branch '0.8.x' into queuemanager

9 files changed, 34 insertions, 17 deletions

diff --git a/EVENTS.txt b/EVENTS.txt
index 8e917f11d..2c43469d4 100644
--- a/EVENTS.txt
+++ b/EVENTS.txt
@@ -1,5 +1,4 @@
-InitializePlugin: a chance to initialize a plugin in a complete
-		  environment
+InitializePlugin: a chance to initialize a plugin in a complete environment
 
 CleanupPlugin: a chance to cleanup a plugin at the end of a program
 
@@ -117,3 +116,9 @@ EndLogout: After logging out
 
 ArgsInitialized: After the argument array has been initialized
 - $args: associative array of arguments, can be modified
+
+StartAddressData: Allows the site owner to provide additional information about themselves for contact (e.g., tagline, email, location)
+- $action: the current action
+
+EndAddressData: At the end of <address>
+- $action: the current action
diff --git a/actions/conversation.php b/actions/conversation.php
index cd6f26329..468409189 100644
--- a/actions/conversation.php
+++ b/actions/conversation.php
@@ -107,7 +107,7 @@ class ConversationAction extends Action
 
     function showContent()
     {
-        $notices = Notice::conversationStream($this->id, 0, null);
+        $notices = Notice::conversationStream($this->id, null);
 
         $ct = new ConversationTree($notices, $this);
 
diff --git a/actions/subscriptions.php b/actions/subscriptions.php
index 4124abea4..42bdae10f 100644
--- a/actions/subscriptions.php
+++ b/actions/subscriptions.php
@@ -159,7 +159,10 @@ class SubscriptionsListItem extends SubscriptionListItem
         $this->showBio();
         $this->showTags();
         // Relevant portion!
-        $this->showOwnerControls();
+        $cur = common_current_user();
+        if (!empty($cur) && $cur->id == $this->owner->id) {
+            $this->showOwnerControls();
+        }
         $this->endProfile();
     }
 
diff --git a/config.php.sample b/config.php.sample
index a23b41b31..4f8f715be 100644
--- a/config.php.sample
+++ b/config.php.sample
@@ -36,6 +36,9 @@ $config['site']['path'] = 'laconica';
 // If you want logging sent to a file instead of syslog
 // $config['site']['logfile'] = '/tmp/laconica.log';
 
+// Change the syslog facility that Laconica logs to
+// $config['syslog']['facility'] = LOG_LOCAL7;
+
 // Enables extra log information, for example full details of PEAR DB errors
 // $config['site']['logdebug'] = true;
 
diff --git a/js/util.js b/js/util.js
index 638104c1c..9bb7c9128 100644
--- a/js/util.js
+++ b/js/util.js
@@ -49,8 +49,9 @@ $(document).ready(function(){
 		// run once in case there's something in there
 		counter();
 
-		// set the focus
-		$("#notice_data-text").focus();
+        if($('body')[0].id != 'conversation') {
+            $("#notice_data-text").focus();
+        }
 	}
 
 	// XXX: refactor this code
diff --git a/lib/action.php b/lib/action.php
index 3bfa6ba15..c89fe180a 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -383,15 +383,18 @@ class Action extends HTMLOutputter // lawsuit
     {
         $this->elementStart('address', array('id' => 'site_contact',
                                              'class' => 'vcard'));
-        $this->elementStart('a', array('class' => 'url home bookmark',
-                                       'href' => common_local_url('public')));
-        if (common_config('site', 'logo') || file_exists(theme_file('logo.png'))) {
-            $this->element('img', array('class' => 'logo photo',
-                                        'src' => (common_config('site', 'logo')) ? common_config('site', 'logo') : theme_path('logo.png'),
-                                        'alt' => common_config('site', 'name')));
+        if (Event::handle('StartAddressData', array($this))) {
+            $this->elementStart('a', array('class' => 'url home bookmark',
+                                           'href' => common_local_url('public')));
+            if (common_config('site', 'logo') || file_exists(theme_file('logo.png'))) {
+                $this->element('img', array('class' => 'logo photo',
+                                            'src' => (common_config('site', 'logo')) ? common_config('site', 'logo') : theme_path('logo.png'),
+                                            'alt' => common_config('site', 'name')));
+            }
+            $this->element('span', array('class' => 'fn org'), common_config('site', 'name'));
+            $this->elementEnd('a');
+            Event::handle('EndAddressData', array($this));
         }
-        $this->element('span', array('class' => 'fn org'), common_config('site', 'name'));
-        $this->elementEnd('a');
         $this->elementEnd('address');
     }
 
diff --git a/lib/common.php b/lib/common.php
index 5d451463b..14be747bc 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -124,7 +124,8 @@ $config =
               'dupelimit' => 60), # default for same person saying the same thing
         'syslog' =>
         array('appname' => 'laconica', # for syslog
-              'priority' => 'debug'), # XXX: currently ignored
+              'priority' => 'debug', # XXX: currently ignored
+              'facility' => LOG_USER),
         'queue' =>
         array('enabled' => false,
               'subsystem' => 'db', # default to database, or 'stomp'
diff --git a/lib/rssaction.php b/lib/rssaction.php
index 6f6c9a8cb..0c8188e88 100644
--- a/lib/rssaction.php
+++ b/lib/rssaction.php
@@ -214,7 +214,7 @@ class Rss10Action extends Action
         $this->element('cc:licence', array('rdf:resource' => common_config('license', 'url')));
         if ($notice->reply_to) {
             $replyurl = common_local_url('shownotice', array('notice' => $notice->reply_to));
-            $this->element('sioc:reply_to', array('rdf:resource' => $replyurl));
+            $this->element('sioc:reply_of', array('rdf:resource' => $replyurl));
         }
         $this->elementEnd('item');
         $this->creators[$creator_uri] = $profile;
diff --git a/lib/util.php b/lib/util.php
index 86a0316ea..a40cd3d54 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -978,7 +978,8 @@ function common_ensure_syslog()
 {
     static $initialized = false;
     if (!$initialized) {
-        openlog(common_config('syslog', 'appname'), 0, LOG_USER);
+        openlog(common_config('syslog', 'appname'), 0,
+            common_config('syslog', 'facility'));
         $initialized = true;
     }
 }