allow configurable length for user group description

diff --git a/actions/editgroup.php b/actions/editgroup.php
index 6aa6f8b11f20d82d59b46a57bf8129d81e9b327e..aeeea2b63ce73e3f0aebb675e9f53c0e374079d1 100644 (file)
--- a/actions/editgroup.php
+++ b/actions/editgroup.php
@@ -196,8 +196,8 @@ class EditgroupAction extends GroupDesignAction
         } else if (!is_null($fullname) && mb_strlen($fullname) > 255) {
             $this->showForm(_('Full name is too long (max 255 chars).'));
             return;
-        } else if (!is_null($description) && mb_strlen($description) > 140) {
-            $this->showForm(_('description is too long (max 140 chars).'));
+        } else if (User_group::descriptionTooLong($description)) {
+            $this->showForm(sprintf(_('description is too long (max %d chars).'), User_group::maxDescription()));
             return;
         } else if (!is_null($location) && mb_strlen($location) > 255) {
             $this->showForm(_('Location is too long (max 255 chars).'));

diff --git a/actions/newgroup.php b/actions/newgroup.php
index 0289e77c2511a7aebd096a4d78e66d54ac72dbe3..71647d83481adcd3a4a529224f10fd0026cac97d 100644 (file)
--- a/actions/newgroup.php
+++ b/actions/newgroup.php
@@ -146,8 +146,8 @@ class NewgroupAction extends Action
         } else if (!is_null($fullname) && mb_strlen($fullname) > 255) {
             $this->showForm(_('Full name is too long (max 255 chars).'));
             return;
-        } else if (!is_null($description) && mb_strlen($description) > 140) {
-            $this->showForm(_('description is too long (max 140 chars).'));
+        } else if (User_group::descriptionTooLong($description)) {
+            $this->showForm(sprintf(_('description is too long (max %d chars).'), User_group::maxDescription()));
             return;
         } else if (!is_null($location) && mb_strlen($location) > 255) {
             $this->showForm(_('Location is too long (max 255 chars).'));

diff --git a/classes/User_group.php b/classes/User_group.php
index 7b0daad94ca501991a2e156a2fa34d92385cc3cf..38e0058c136b49b67d76b3217c6dd5c26e774da6 100644 (file)
--- a/classes/User_group.php
+++ b/classes/User_group.php
@@ -297,4 +297,19 @@ class User_group extends Memcached_DataObject
 
         return $ids;
     }
+
+    static function maxDescription()
+    {
+        $desclimit = common_config('group', 'desclimit');
+        if (empty($desclimit)) {
+            $desclimit = common_config('site', 'textlimit');
+        }
+        return $desclimit;
+    }
+
+    static function descriptionTooLong($desc)
+    {
+        $desclimit = self::maxDescription();
+        return (!empty($desclimit) && !empty($desc) && (mb_strlen($desc) > $desclimit));
+    }
 }