CLEANUP: cleaned up CSS a bit

[e-DoKo.git] / include / preferences.php

diff --git a/include/preferences.php b/include/preferences.php
index 03821932f282946f4c6f0aee2c03a4a04a645bc7..67e2eecb409e3e7d7e6b1a51f9c5a778a1f7a0de 100644 (file)
--- a/include/preferences.php
+++ b/include/preferences.php
@@ -18,7 +18,7 @@ $changed_cards           = 0;
 $changed_timezone  = 0;
 $changed_autosetup = 0;
 
 $changed_timezone  = 0;
 $changed_autosetup = 0;
 

-display_user_menu();
+display_user_menu($myid);

 
 /* get old infos */
 $PREF = DB_get_PREF($myid);
 
 /* get old infos */
 $PREF = DB_get_PREF($myid);


@@ -103,10 +103,14 @@ if(myisset("password0") &&  $_REQUEST["password0"]!="" )
     if(!( ($password == $oldpasswd) || DB_check_recovery_passwords($oldpasswd,$email) ))
       $changed_password = -1;
 
     if(!( ($password == $oldpasswd) || DB_check_recovery_passwords($oldpasswd,$email) ))
       $changed_password = -1;
 

-    /* check if new passwords are types the same twice */
+    /* check if new password has been typed in correctly */

     if($_REQUEST["password1"] != $_REQUEST["password2"] )
       $changed_password = -2;
 
     if($_REQUEST["password1"] != $_REQUEST["password2"] )
       $changed_password = -2;
 

+    /* check if new password is long enough */
+    if(strlen($_REQUEST["password1"])<4)
+      $changed_password = -3;
+

     if($changed_password==1)
       {
        DB_query("UPDATE User SET password='".md5($_REQUEST["password1"]).
     if($changed_password==1)
       {
        DB_query("UPDATE User SET password='".md5($_REQUEST["password1"]).


@@ -182,6 +186,9 @@ echo "    <tr><td>Password(old):         </td><td>",
   "<input type=\"password\" id=\"password0\" name=\"password0\" size=\"20\" maxlength=\"30\" />";
 switch($changed_password)
   {
   "<input type=\"password\" id=\"password0\" name=\"password0\" size=\"20\" maxlength=\"30\" />";
 switch($changed_password)
   {

+  case '-3':
+    echo "The new passwords is not long enough (you need at least 4 characters).";
+    break;

   case '-2':
     echo "The new passwords don't match.";
     break;
   case '-2':
     echo "The new passwords don't match.";
     break;


@@ -199,7 +206,7 @@ echo "    <tr><td>Password(new):         </td><td>",
 echo "    <tr><td>Password(new, retype): </td><td>",
   "<input type=\"password\" id=\"password2\" name=\"password2\" size=\"20\" maxlength=\"30\" />",
   " </td></tr>\n";
 echo "    <tr><td>Password(new, retype): </td><td>",
   "<input type=\"password\" id=\"password2\" name=\"password2\" size=\"20\" maxlength=\"30\" />",
   " </td></tr>\n";

-echo "    <tr><td><input type=\"submit\" class=\"submitbutton\" name=\"passwd\" value=\"set\" /></td>",
+echo "    <tr><td><input type=\"submit\"  name=\"passwd\" value=\"set\" /></td>",

   "<td></td></tr>\n";
 echo "    </table>\n";
 echo "  </form>\n";
   "<td></td></tr>\n";
 echo "    </table>\n";
 echo "  </form>\n";