Moved group create API into its own action

Merge branch '0.9.x' into refactor-api

* 0.9.x:
  Implemented create group api
  fix FBConnect so it doesn't muffle EndPrimaryNav
  don't write session if it's unchanged
  Fixed facebook connect primary nav to hide search option when site is private and user is not logged in
  Fixed facebook connect primary nav to obey sms/twitter/openid settings
  Fixed facebook connect login nav to obey openid settings
  Fixed facebook connect nav to obey sms/twitter disabled
  Fixed twitter defaulting to disabled
  Revert "Open tags should have closing tags"
  Don't show search suggestions for private sites
  Fixed E_NOTICE when returnto isn't set
  Fixed E_NOTICE when the "lite" parameter isn't included in the request
  Fixed E_NOTICE - GroupList expects an owner object in the constructor, not an array of search terms
  Returning false seems to fix IE from reclaiming window focus. I think
  Aligning notice attach label from right instead of left
  Fixed IE background image alignment for attach, favour and disfavour
  Fixed nudge and direct message background image alignment
  Using 'CSS sprites' for common icons for the identica theme. Default
  Open tags should have closing tags

Conflicts:
	actions/twitapigroups.php
	actions/twitapistatuses.php

5 files changed, 19 insertions, 10 deletions

diff --git a/lib/api.php b/lib/api.php
index 0801d2823..db2d24fbd 100644
--- a/lib/api.php
+++ b/lib/api.php
@@ -894,7 +894,7 @@ class ApiAction extends Action
         $this->endDocument('json');
     }
 
-    function show_single_xml_group($group)
+    function showSingleXmlGroup($group)
     {
         $this->initDocument('xml');
         $twitter_group = $this->twitterGroupArray($group);
diff --git a/lib/default.php b/lib/default.php
index f9670cb7f..329b041e9 100644
--- a/lib/default.php
+++ b/lib/default.php
@@ -140,16 +140,15 @@ $default =
         array('enabled' => true),
         'sms' =>
         array('enabled' => true),
-        'twitter' =>
-        array('enabled' => true),
         'twitterbridge' =>
         array('enabled' => false),
         'integration' =>
         array('source' => 'StatusNet', # source attribute for Twitter
               'taguri' => $_server.',2009'), # base for tag URIs
 	'twitter' =>
-	array('consumer_key'    => null,
-	      'consumer_secret' => null),
+	array('enabled'       => true,
+	    'consumer_key'    => null,
+	    'consumer_secret' => null),
         'memcached' =>
         array('enabled' => false,
               'server' => 'localhost',
diff --git a/lib/router.php b/lib/router.php
index 11f913f6e..b9a45d867 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -569,9 +569,13 @@ class Router
                          'format' => '(xml|json)'));
 
         $m->connect('api/statusnet/groups/membership/:id.:format',
-                     array('action' => 'ApiGroupMembership',
+                    array('action' => 'ApiGroupMembership',
                            'id' => '[a-zA-Z0-9]+',
                            'format' => '(xml|json)'));
+                           
+        $m->connect('api/statusnet/groups/create.:format',
+                    array('action' => 'ApiGroupCreate',
+                          'format' => '(xml|json)'));
         // Tags
         $m->connect('api/statusnet/tags/timeline/:tag.:format',
                     array('action' => 'ApiTimelineTag',
diff --git a/lib/searchaction.php b/lib/searchaction.php
index 0d9f85a8f..130b28ff5 100644
--- a/lib/searchaction.php
+++ b/lib/searchaction.php
@@ -135,16 +135,21 @@ class SearchAction extends Action
     }
 
     function searchSuggestions($q) {
-        $qe = urlencode($q);
-        $message = sprintf(_(<<<E_O_T
+        $message = _(<<<E_O_T
 * Make sure all words are spelled correctly.
 * Try different keywords.
 * Try more general keywords.
 * Try fewer keywords.
 
+E_O_T
+);
+        if (!common_config('site', 'private')) {
+            $qe = urlencode($q);
+            $message .= sprintf(_(<<<E_O_T
+
 You can also try your search on other engines:
 
-* [Twingly](http://www.twingly.com/search?q=%s&content=microblog&site=identi.ca)
+* [Twingly](http://www.twingly.com/search?q=%s&content=microblog&site=%%%%site.server%%%%)
 * [Tweet scan](http://www.tweetscan.com/indexi.php?s=%s)
 * [Google](http://www.google.com/search?q=site%%3A%%%%site.server%%%%+%s)
 * [Yahoo](http://search.yahoo.com/search?p=site%%3A%%%%site.server%%%%+%s)
@@ -152,6 +157,7 @@ You can also try your search on other engines:
 
 E_O_T
 ), $qe, $qe, $qe, $qe, $qe);
+        }
         $this->elementStart('dl', array('id' => 'help_search', 'class' => 'help'));
         $this->element('dt', null, _('Search help'));
         $this->elementStart('dd', 'instructions');
diff --git a/lib/util.php b/lib/util.php
index d249b154f..be10647fc 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -998,7 +998,7 @@ function common_set_returnto($url)
 function common_get_returnto()
 {
     common_ensure_session();
-    return $_SESSION['returnto'];
+    return (array_key_exists('returnto', $_SESSION)) ? $_SESSION['returnto'] : null;
 }
 
 function common_timestamp()