Merge branch '0.8.x' into queuemanager

diff --git a/EVENTS.txt b/EVENTS.txt
index 8e917f11de864605b5e561caf1b797f33a3d0e96..2c43469d4642c3e8a9edc5f1bd5f6da2fd33831c 100644 (file)
--- 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 cd6f263294270466328f28f283675f38c2432016..468409189bdd09f2f210ae764140b563ed615cb6 100644 (file)
--- 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 4124abea4d2e77e82dbde71c296f0cbff526a02c..42bdae10f78c160846de3f97d364bddfa88f390a 100644 (file)
--- 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 a23b41b3192cec813849f0608828ad94fd28b7af..4f8f715bebf7f877628253a3813bb387225b2ce6 100644 (file)
--- 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 638104c1c58045842c653292fb8a0784b4384972..9bb7c91288ff6577b445b1b9a7e1512e14ac7d58 100644 (file)
--- 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 3bfa6ba15bd78d4b0818d457ded8635effe9e0c8..c89fe180ab43679acbd30b35c9b40699be77dfc5 100644 (file)
--- 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 5d451463b9ed9f4e794f67bc980becf80ea60fb8..14be747bc7a65db1ac31f44bbfc2c9899c71ad51 100644 (file)
--- 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 6f6c9a8cb08e76461b1438556de367850c39e20d..0c8188e88021a8aca153d0eefb09ecf2b5805861 100644 (file)
--- 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 86a0316ea6c8a5def9d74652b1a5b34fd803fb13..a40cd3d54bf2558aa5485c8431deaec62bbbd329 100644 (file)
--- 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;
     }
 }