Merge branch '0.7.x' of git://gitorious.org/laconica/dev into 0.7.x

Conflicts:
	plugins/PiwikAnalyticsPlugin.php

README

@@ -2,7 +2,7 @@
 README
 ------
 
-Laconica 0.7.2 ("Talk about the Passion")
+Laconica 0.7.2.1 ("Talk about the Passion")
 11 March 2009
 
 This is the README file for Laconica, the Open Source microblogging
@@ -257,9 +257,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 laconica-0.7.1.tar.gz
+   	   tar zxf laconica-0.7.2.1.tar.gz
 
-   ...which will make a laconica-0.7.1 subdirectory in your current
+   ...which will make a laconica-0.7.2.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.)
@@ -267,7 +267,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 laconica-0.7.1 /var/www/mublog
+   	   mv laconica-0.7.2.1 /var/www/mublog
 
    This will make your Laconica instance available in the mublog path of
    your server, like "http://example.net/mublog". "microblog" or
@@ -757,7 +757,7 @@ Upgrading
 If you've been using Laconica 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 Laconica 0.7.1. Try these step-by-step instructions; read
+procedure in Laconica 0.7.2.1. Try these step-by-step instructions; read
 to the end first before trying them.
 
 0. Download Laconica and set up all the prerequisites as if you were
@@ -1181,7 +1181,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 Laconica 0.7.1 without reading the "Notice inboxes"
+If you upgraded to Laconica 0.7.2.1 without reading the "Notice inboxes"
 section above, and all your users' 'Personal' tabs are empty, read the
 "Notice inboxes" section above.
 

lib/common.php

@@ -19,7 +19,7 @@
 
 if (!defined('LACONICA')) { exit(1); }
 
-define('LACONICA_VERSION', '0.7.2');
+define('LACONICA_VERSION', '0.7.2.1');
 
 define('AVATAR_PROFILE_SIZE', 96);
 define('AVATAR_STREAM_SIZE', 48);

lib/router.php

@@ -156,7 +156,7 @@ class Router
                     array('notice' => '[0-9]+'));
 
         $m->connect('message/new', array('action' => 'newmessage'));
-        $m->connect('message/new?to=:to', array('action' => 'newmessage'), array('to' => '[A-Za-z0-9_-]'));
+        $m->connect('message/new?to=:to', array('action' => 'newmessage'), array('to' => '[A-Za-z0-9_-]+'));
         $m->connect('message/:message',
                     array('action' => 'showmessage'),
                     array('message' => '[0-9]+'));

plugins/PiwikAnalyticsPlugin.php

@@ -22,6 +22,7 @@
  * @category  Plugin
  * @package   Laconica
  * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Tobias Diekershoff <tobias.diekershoff@gmx.net>
  * @copyright 2008 Control Yourself, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://laconi.ca/
@@ -34,15 +35,16 @@ if (!defined('LACONICA')) {
 /**
  * Plugin to use Piwik Analytics (based on the Google Analytics plugin by Evan)
  *
- * This plugin will spoot out the correct JavaScript spell to invoke Piwik Analytics on a page.
+ * This plugin will spoot out the correct JavaScript spell to invoke
+ * Piwik Analytics on a page.
  *
  * To use this plugin please add the following three lines to your config.php
-#Add Piwik Analytics
-require_once('plugins/PiwikAnalyticsPlugin.php');
-$pa = new PiwikAnalyticsPlugin("example.com/piwik/","id");
  *
- * exchange example.com/piwik/ with the url (without http:// or https:// !) to your
- *          piwik installation and make sure you don't forget the final /
+ *     require_once('plugins/PiwikAnalyticsPlugin.php');
+ *     $pa = new PiwikAnalyticsPlugin("example.com/piwik/","id");
+ *
+ * exchange example.com/piwik/ with the url to your piwik installation and
+ * make sure you don't forget the final /
  * exchange id with the ID your laconica installation has in your Piwik analytics
  *
  * @category Plugin
@@ -56,11 +58,18 @@ $pa = new PiwikAnalyticsPlugin("example.com/piwik/","id");
 
 class PiwikAnalyticsPlugin extends Plugin
 {
-    // the base of your Piwik installation
+    /** the base of your Piwik installation */
     var $piwikroot = null;
-    // the Piwik Id of your laconica installation
+    /** the Piwik Id of your laconica installation */
     var $piwikId   = null;
 
+    /**
+     * constructor
+     *
+     * @param string $root Piwik root URL
+     * @param string $id   Piwik ID of this app
+     */
+
     function __construct($root=null, $id=null)
     {
         $this->piwikroot = $root;
@@ -68,6 +77,14 @@ class PiwikAnalyticsPlugin extends Plugin
         parent::__construct();
     }
 
+    /**
+     * Called when all scripts have been shown
+     *
+     * @param Action $action Current action
+     *
+     * @return boolean ignored
+     */
+
     function onEndShowScripts($action)
     {
         $js1 = 'var pkBaseURL = (("https:" == document.location.protocol) ? "https://'.
@@ -82,5 +99,6 @@ class PiwikAnalyticsPlugin extends Plugin
         $action->elementStart('script', array('type' => 'text/javascript'));
         $action->raw($js2);
         $action->elementEnd('script');
+        return true;
     }
 }