From 6d308f6ffe3f894c60fafaea3ceaef86d30dfe1d Mon Sep 17 00:00:00 2001
From: Jeffery To <jeffery.to@gmail.com>
Date: Sun, 14 Jun 2009 16:17:22 +0800
Subject: Adds $config['invite']['enabled'] to enable/disable invites.

The invite function may not applicable for private and/or closed installs. This adds a configuration option to enable/disable invites (defaulting to enabled), hides the "Invite" nav item when necessary, and adds a check to actions/invite.php.

Note that I haven't tried the Facebook application so I didn't add any checks to actions/facebookinvite.php.
---
 README | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'README')

diff --git a/README b/README
index 2099f94d6..679fa8ee3 100644
--- a/README
+++ b/README
@@ -1067,6 +1067,13 @@ debug: if turned on, this will make the XMPP library blurt out all of
 public: an array of JIDs to send _all_ notices to. This is useful for
 	participating in third-party search and archiving services.
 
+invite
+------
+
+For configuring invites.
+
+enabled: Whether to allow users to send invites. Default true.
+
 tag
 ---
 
-- 
cgit v1.2.3-54-g00ecf


From b416df93128e6ffc42ad62233f92ab617f809de1 Mon Sep 17 00:00:00 2001
From: Jeff Mitchell <mitchell@kde.org>
Date: Thu, 11 Jun 2009 13:07:41 +0000
Subject: Add site-wide option to change the length at which URLs are
 auto-shortened

---
 README               | 3 +++
 lib/Shorturl_api.php | 2 +-
 lib/common.php       | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'README')

diff --git a/README b/README
index e02fa02d3..0f1b5a43b 100644
--- a/README
+++ b/README
@@ -906,6 +906,9 @@ sslserver: use an alternate server name for SSL URLs, like
            parameters correctly so that both the SSL server and the
            "normal" server can access the session cookie and
            preferably other cookies as well.
+shorturllength: Length of URL at which URLs in a message exceeding 140
+                characters will be sent to the user's chosen
+                shortening service.
 
 db
 --
diff --git a/lib/Shorturl_api.php b/lib/Shorturl_api.php
index 29f4eb3a6..22d5b4cb5 100644
--- a/lib/Shorturl_api.php
+++ b/lib/Shorturl_api.php
@@ -40,7 +40,7 @@ class ShortUrlApi
     }
 
     private function is_long($url) {
-        return strlen($url) >= $this->long_limit;
+        return strlen($url) >= common_config('site', 'shorturllength');
     }
 
     protected function http_post($data) {
diff --git a/lib/common.php b/lib/common.php
index e10f24b3b..5d451463b 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -120,6 +120,7 @@ $config =
               'private' => false,
               'ssl' => 'never',
               'sslserver' => null,
+              'shorturllength' => 30,
               'dupelimit' => 60), # default for same person saying the same thing
         'syslog' =>
         array('appname' => 'laconica', # for syslog
-- 
cgit v1.2.3-54-g00ecf