Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

2 files changed, 17 insertions, 0 deletions

diff --git a/README b/README
index 51a8e91cc..3e712af8c 100644
--- a/README
+++ b/README
@@ -1407,6 +1407,21 @@ contentlimit: max length of the plain-text content of a message.
               Default is null, meaning to use the site-wide text limit.
               0 means no limit.
 
+logincommand
+------------
+
+Configuration options for the login command.
+
+disabled: whether to enable this command. If enabled, users who send
+	  the text 'login' to the site through any channel will
+	  receive a link to login to the site automatically in return.
+	  Possibly useful for users who primarily use an XMPP or SMS
+	  interface and can't be bothered to remember their site
+	  password. Note that the security implications of this are
+	  pretty serious and have not been thoroughly tested. You
+	  should enable it only after you've convinced yourself that
+	  it is safe. Default is 'false'.
+
 Plugins
 =======
 
diff --git a/lib/default.php b/lib/default.php
index ebb6f8d01..42d4623b1 100644
--- a/lib/default.php
+++ b/lib/default.php
@@ -229,4 +229,6 @@ $default =
         array('namespace' => 1), // 1 = geonames, 2 = Yahoo Where on Earth
         'omb' =>
         array('timeout' => 5), // HTTP request timeout in seconds when contacting remote hosts for OMB updates
+        'logincommand' =>
+        array('disabled' => true),
         );