Merge branch '0.9-release'

* 0.9-release: (874 commits)
  Removed call to NewDirectMessage() until IE return is fixed i.e.,
  Don't show flag user button your own profile
  Fixed HXR response for flag user
  Using the right form class name
  Using common_redirect
  Left a form_data class of a <ul> in the user admin panel
  Added validation to fields in user admin panel
  Added a user admin panel
  Added mobile logos for default and identica themes
  Changed gif to png
  Changed this to action. THANKS zach!
  Doing content negotiation only once
  Add execute bit to pingqueuehandler
  Localisation updates for !StatusNet from !translatewiki.net
  Use the browser's geolocation API to set the location on the notice form
  Add geometa library, and include it.
  Add location form elements to the noticeform, and save their values on submission
  Use the $user object nickname, as login name doesnt have to == nickname anymore with plugins such as ldap/etc
  Revert "Re added NICKNAME_FMT constant to router.php."
  Moved most path and server settings to a new paths admin panel
  ...

Conflicts:
	js/util.js
	locale/it_IT/LC_MESSAGES/statusnet.mo
	locale/mk_MK/LC_MESSAGES/statusnet.mo
	locale/mk_MK/LC_MESSAGES/statusnet.po
	locale/pt_BR/LC_MESSAGES/statusnet.mo
	locale/vi_VN/LC_MESSAGES/statusnet.mo
	plugins/InfiniteScroll/infinitescroll.js
	plugins/Realtime/realtimeupdate.js

1 files changed, 152 insertions, 0 deletions

diff --git a/extlib/HTTP/Request2/Adapter.php b/extlib/HTTP/Request2/Adapter.php
new file mode 100644
index 000000000..39b092b34
--- /dev/null
+++ b/extlib/HTTP/Request2/Adapter.php
@@ -0,0 +1,152 @@
+<?php

+/**

+ * Base class for HTTP_Request2 adapters

+ *

+ * PHP version 5

+ *

+ * LICENSE:

+ *

+ * Copyright (c) 2008, 2009, Alexey Borzov <avb@php.net>

+ * All rights reserved.

+ *

+ * Redistribution and use in source and binary forms, with or without

+ * modification, are permitted provided that the following conditions

+ * are met:

+ *

+ *    * Redistributions of source code must retain the above copyright

+ *      notice, this list of conditions and the following disclaimer.

+ *    * Redistributions in binary form must reproduce the above copyright

+ *      notice, this list of conditions and the following disclaimer in the

+ *      documentation and/or other materials provided with the distribution.

+ *    * The names of the authors may not be used to endorse or promote products

+ *      derived from this software without specific prior written permission.

+ *

+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS

+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,

+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR

+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,

+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,

+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR

+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY

+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+ *

+ * @category   HTTP

+ * @package    HTTP_Request2

+ * @author     Alexey Borzov <avb@php.net>

+ * @license    http://opensource.org/licenses/bsd-license.php New BSD License

+ * @version    CVS: $Id: Adapter.php 274684 2009-01-26 23:07:27Z avb $

+ * @link       http://pear.php.net/package/HTTP_Request2

+ */

+

+/**

+ * Class representing a HTTP response

+ */

+require_once 'HTTP/Request2/Response.php';

+

+/**

+ * Base class for HTTP_Request2 adapters

+ *

+ * HTTP_Request2 class itself only defines methods for aggregating the request

+ * data, all actual work of sending the request to the remote server and 

+ * receiving its response is performed by adapters.

+ *

+ * @category   HTTP

+ * @package    HTTP_Request2

+ * @author     Alexey Borzov <avb@php.net>

+ * @version    Release: 0.4.1

+ */

+abstract class HTTP_Request2_Adapter

+{

+   /**

+    * A list of methods that MUST NOT have a request body, per RFC 2616

+    * @var  array

+    */

+    protected static $bodyDisallowed = array('TRACE');

+

+   /**

+    * Methods having defined semantics for request body

+    *

+    * Content-Length header (indicating that the body follows, section 4.3 of

+    * RFC 2616) will be sent for these methods even if no body was added

+    *

+    * @var  array

+    * @link http://pear.php.net/bugs/bug.php?id=12900

+    * @link http://pear.php.net/bugs/bug.php?id=14740

+    */

+    protected static $bodyRequired = array('POST', 'PUT');

+

+   /**

+    * Request being sent

+    * @var  HTTP_Request2

+    */

+    protected $request;

+

+   /**

+    * Request body

+    * @var  string|resource|HTTP_Request2_MultipartBody

+    * @see  HTTP_Request2::getBody()

+    */

+    protected $requestBody;

+

+   /**

+    * Length of the request body

+    * @var  integer

+    */

+    protected $contentLength;

+

+   /**

+    * Sends request to the remote server and returns its response

+    *

+    * @param    HTTP_Request2

+    * @return   HTTP_Request2_Response

+    * @throws   HTTP_Request2_Exception

+    */

+    abstract public function sendRequest(HTTP_Request2 $request);

+

+   /**

+    * Calculates length of the request body, adds proper headers

+    *

+    * @param    array   associative array of request headers, this method will 

+    *                   add proper 'Content-Length' and 'Content-Type' headers 

+    *                   to this array (or remove them if not needed)

+    */

+    protected function calculateRequestLength(&$headers)

+    {

+        $this->requestBody = $this->request->getBody();

+

+        if (is_string($this->requestBody)) {

+            $this->contentLength = strlen($this->requestBody);

+        } elseif (is_resource($this->requestBody)) {

+            $stat = fstat($this->requestBody);

+            $this->contentLength = $stat['size'];

+            rewind($this->requestBody);

+        } else {

+            $this->contentLength = $this->requestBody->getLength();

+            $headers['content-type'] = 'multipart/form-data; boundary=' .

+                                       $this->requestBody->getBoundary();

+            $this->requestBody->rewind();

+        }

+

+        if (in_array($this->request->getMethod(), self::$bodyDisallowed) ||

+            0 == $this->contentLength

+        ) {

+            unset($headers['content-type']);

+            // No body: send a Content-Length header nonetheless (request #12900),

+            // but do that only for methods that require a body (bug #14740)

+            if (in_array($this->request->getMethod(), self::$bodyRequired)) {

+                $headers['content-length'] = 0;

+            } else {

+                unset($headers['content-length']);

+            }

+        } else {

+            if (empty($headers['content-type'])) {

+                $headers['content-type'] = 'application/x-www-form-urlencoded';

+            }

+            $headers['content-length'] = $this->contentLength;

+        }

+    }

+}

+?>