Added validation to fields in user admin panel

2 files changed, 26 insertions, 3 deletions

diff --git a/actions/useradminpanel.php b/actions/useradminpanel.php
index 968f2a247..e65769212 100644
--- a/actions/useradminpanel.php
+++ b/actions/useradminpanel.php
@@ -143,6 +143,31 @@ class UseradminpanelAction extends AdminPanelAction
 
     function validate(&$values)
     {
+        // Validate biolimit
+
+        if (!Validate::number($values['profile']['biolimit'])) {
+            $this->clientError(_("Invalid bio limit. Must be numeric."));
+        }
+
+        // Validate welcome text
+
+        if (mb_strlen($values['newuser']['welcome']) > 255) {
+            $this->clientError(_("Invalid welcome text. Max length is 255 characters."));
+        }
+
+        // Validate default subscription
+
+        if (!empty($values['newuser']['default'])) {
+            $defuser = User::staticGet('nickname', trim($values['newuser']['default']));
+            if (empty($defuser)) {
+                $this->clientError(
+                    sprintf(
+                        _('Invalid default subscripton: \'%1$s\' is not user.'),
+                        $values['newuser']['default']
+                    )
+                );
+            }
+        }
     }
 }
 
@@ -208,7 +233,7 @@ class UserAdminPanelForm extends AdminForm
 
         $this->li();
         $this->input('welcome', _('New user welcome'),
-                     _('Welcome text for new users.'),
+                     _('Welcome text for new users (Max 255 chars).'),
                      'newuser');
         $this->unli();
 
diff --git a/lib/router.php b/lib/router.php
index d5101826f..b22185126 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -593,8 +593,6 @@ class Router
             $m->connect('admin/user', array('action' => 'useradminpanel'));
             $m->connect('admin/paths', array('action' => 'pathsadminpanel'));
 
-
-
             $m->connect('getfile/:filename',
                         array('action' => 'getfile'),
                         array('filename' => '[A-Za-z0-9._-]+'));