trac750 update Facebook status when posting to Identi.ca from Facebook

[quix0rs-gnu-social.git] / actions / passwordsettings.php

diff --git a/actions/passwordsettings.php b/actions/passwordsettings.php
index f96da13bda254c785694002128226e8e9b626b72..bdce6103502e496d0ee07709b878491f2d12859c 100644 (file)
--- a/actions/passwordsettings.php
+++ b/actions/passwordsettings.php
@@ -81,21 +81,35 @@ class PasswordsettingsAction extends AccountSettingsAction
     {
         $user = common_current_user();
         $this->elementStart('form', array('method' => 'POST',
-                                          'id' => 'password',
+                                          'id' => 'form_password',
+                                          'class' => 'form_settings',
                                           'action' =>
-                                          common_local_url('profilesettings')));
-
+                                          common_local_url('passwordsettings')));
+        $this->elementStart('fieldset');
+        $this->element('legend', null, _('Password change'));
         $this->hidden('token', common_session_token());
 
+
+        $this->elementStart('ul', 'form_data');
         // Users who logged in with OpenID won't have a pwd
         if ($user->password) {
+            $this->elementStart('li');
             $this->password('oldpassword', _('Old password'));
+            $this->elementEnd('li');
         }
+        $this->elementStart('li');
         $this->password('newpassword', _('New password'),
                         _('6 or more characters'));
+        $this->elementEnd('li');
+        $this->elementStart('li');
         $this->password('confirm', _('Confirm'),
                         _('same as password above'));
+        $this->elementEnd('li');
+        $this->elementEnd('ul');
+
         $this->submit('changepass', _('Change'));
+
+        $this->elementEnd('fieldset');
         $this->elementEnd('form');
     }
 
@@ -127,7 +141,12 @@ class PasswordsettingsAction extends AccountSettingsAction
         $newpassword = $this->arg('newpassword');
         $confirm     = $this->arg('confirm');
 
-        if (0 != strcmp($newpassword, $confirm)) {
+        # Some validation
+
+        if (strlen($newpassword) < 6) {
+            $this->showForm(_('Password must be 6 or more characters.'));
+            return;
+        } else if (0 != strcmp($newpassword, $confirm)) {
             $this->showForm(_('Passwords don\'t match.'));
             return;
         }
@@ -158,4 +177,4 @@ class PasswordsettingsAction extends AccountSettingsAction
 
         $this->showForm(_('Password saved.'), true);
     }
-}
\ No newline at end of file
+}