Merge branch '0.9.x' into 1.0.x

Conflicts:
	classes/statusnet.ini
	db/statusnet.sql
	lib/jabber.php
	lib/xmppmanager.php

diff --cc EVENTS.txt
Simple merge

diff --cc classes/User.php
Simple merge

diff --cc classes/statusnet.ini
Simple merge

diff --cc db/statusnet.sql
index d6f0f54a2d690c5fa6ec9ff84bbceebde883c877,3f95948e1ed5ede5d9cde05511f78fb49f657021..d1cd67075091c3f83083991f4481ec8383bc0a5e
--- 1/db/statusnet.sql
--- 2/db/statusnet.sql
+++ b/db/statusnet.sql
@@@ -650,3 -645,14 +655,13 @@@ create table conversation 
      created datetime not null comment 'date this record was created',
      modified timestamp comment 'date this record was modified'
  ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
 -
+ 
+ create table local_group (
+ 
+    group_id integer primary key comment 'group represented' references user_group (id),
+    nickname varchar(64) unique key comment 'group represented',
+ 
+    created datetime not null comment 'date this record was created',
+    modified timestamp comment 'date this record was modified'
+ 
+ ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;

diff --cc lib/statusnet.php
index 3f9a48e6aba99aab322460cc74ed5feeff2c20b2,ef3adebf94fdf4bbc9223bc6a2d9435bf79e6411..afb8f5af02f4ad830d496c633dbfd61ef7a17caf
--- 1/lib/statusnet.php
--- 2/lib/statusnet.php
+++ b/lib/statusnet.php
@@@ -339,9 -339,14 +339,13 @@@ class StatusNe
          }
  
          // Backwards compatibility
 -
          if (array_key_exists('memcached', $config)) {
              if ($config['memcached']['enabled']) {
-                 addPlugin('Memcache', array('servers' => $config['memcached']['server']));
+                 if(class_exists('Memcached')) {
+                     addPlugin('Memcached', array('servers' => $config['memcached']['server']));
+                 } else {
+                     addPlugin('Memcache', array('servers' => $config['memcached']['server']));
+                 }
              }
  
              if (!empty($config['memcached']['base'])) {

diff --cc lib/util.php
Simple merge

diff --cc plugins/Xmpp/Fake_XMPP.php
index a0f329ca08709d5e39e46bb3b69a0a45f17108ee,0000000000000000000000000000000000000000..0f7cfd3b4de292482ea0c82fdb7da70a6807c100
mode 100644,000000..100644
--- 1/plugins/Xmpp/Fake_XMPP.php
--- /dev/null
+++ b/plugins/Xmpp/Fake_XMPP.php
@@@ -1,104 -1,0 +1,114 @@@
-               parent::__construct($host, $port, $user, $password, $resource, $server, $printlog, $loglevel);
-               // Normally the fulljid isn't filled out until resource binding time;
-               // we need to save it here since we're not talking to a real server.
-               $this->fulljid = "{$this->basejid}/{$this->resource}";
 +<?php
 +/**
 + * StatusNet, the distributed open-source microblogging tool
 + *
 + * Instead of sending XMPP messages, retrieve the raw XML that would be sent
 + *
 + * 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  Network
 + * @package   StatusNet
 + * @author    Brion Vibber <brion@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') && !defined('LACONICA')) {
 +    exit(1);
 +}
 +
 +class Fake_XMPP extends XMPPHP_XMPP
 +{
 +    public $would_be_sent = null;
 +
 +      /**
 +       * Constructor
 +       *
 +       * @param string  $host
 +       * @param integer $port
 +       * @param string  $user
 +       * @param string  $password
 +       * @param string  $resource
 +       * @param string  $server
 +       * @param boolean $printlog
 +       * @param string  $loglevel
 +       */
 +      public function __construct($host, $port, $user, $password, $resource, $server = null, $printlog = false, $loglevel = null)
 +      {
++        parent::__construct($host, $port, $user, $password, $resource, $server, $printlog, $loglevel);
++
++        // We use $host to connect, but $server to build JIDs if specified.
++        // This seems to fix an upstream bug where $host was used to build
++        // $this->basejid, never seen since it isn't actually used in the base
++        // classes.
++        if (!$server) {
++            $server = $this->host;
++        }
++        $this->basejid = $this->user . '@' . $server;
++
++        // Normally the fulljid is filled out by the server at resource binding
++        // time, but we need to do it since we're not talking to a real server.
++        $this->fulljid = "{$this->basejid}/{$this->resource}";
 +    }
 +
 +    /**
 +     * Send a formatted message to the outgoing queue for later forwarding
 +     * to a real XMPP connection.
 +     *
 +     * @param string $msg
 +     */
 +    public function send($msg, $timeout=NULL)
 +    {
 +        $this->would_be_sent = $msg;
 +    }
 +
 +    //@{
 +    /**
 +     * Stream i/o functions disabled; only do output
 +     */
 +    public function connect($timeout = 30, $persistent = false, $sendinit = true)
 +    {
 +        throw new Exception("Can't connect to server from fake XMPP.");
 +    }
 +
 +    public function disconnect()
 +    {
 +        throw new Exception("Can't connect to server from fake XMPP.");
 +    }
 +
 +    public function process()
 +    {
 +        throw new Exception("Can't read stream from fake XMPP.");
 +    }
 +
 +    public function processUntil($event, $timeout=-1)
 +    {
 +        throw new Exception("Can't read stream from fake XMPP.");
 +    }
 +
 +    public function read()
 +    {
 +        throw new Exception("Can't read stream from fake XMPP.");
 +    }
 +
 +    public function readyToProcess()
 +    {
 +        throw new Exception("Can't read stream from fake XMPP.");
 +    }
 +    //@}
 +}
 +