Changeset 774

Timestamp:

01/10/10 21:34:00 (8 months ago)

Author:

DmitryChemerik

Message:

Пофиксен тикет #413, добавлено введение пароля пользователя при добавлении пользователя в веб интерфейсе

Files:

• trunk/php/src/usersbuttom_1_useradd.php (modified) (5 diffs)

trunk/php/src/usersbuttom_1_useradd.php

@@ -114 +114 @@
   if(isset($_GET["newusernick"])) $newusernick=$_GET["newusernick"];
   if(isset($_GET["userdomain"])) $userdomain=$_GET["userdomain"];
+  if(isset($_GET["passwd"])) $passwd=$_GET["passwd"];
 
   if(($SAMSConf->AUTH=="ntlm"||$SAMSConf->AUTH=="adld")&&$SAMSConf->NTLMDOMAIN=="Y"&&strlen($newusernick)>0)
@@ -146 +147 @@
   $usergroup=trim($usergroup);
 
+  if(strlen($passwd) > 0)
+        $pass=crypt($passwd, substr($passwd,0,2));
+  else
+        $pass="";
+
+/*
   if($SAMSConf->AUTH=="ncsa"||$SAMSConf->AUTH=="ip")
     {
@@ -157 +164 @@
         $pass=crypt("none", substr("none",0,2));
     }
-
+*/
   if($enabled=="on")
      $enabled=1;
@@ -273 +280 @@
        print("> \n");
 
-       if($SAMSConf->AUTH=="ncsa"||$SAMSConf->AUTH=="ip")
-         {
-           if($SAMSConf->AUTH=="ncsa")
-              print("<TR><TD><B>$userstray_NewUserForm_5:\n");
-           if($SAMSConf->AUTH=="ip")
-              print("<TR><TD><B>$userstray_NewUserForm_6:\n");
-           print("<TD><INPUT TYPE=\"PASSWORD\" NAME=\"passwd\" SIZE=20 >\n");
-         }
-       //if($SAMSConf->AUTH=="ip")
-       //  {
-           print("<TR><TD><B>$userstray_NewUserForm_7: \n");
-           print("<TD><INPUT TYPE=\"TEXT\" NAME=\"userip\" SIZE=15> \n");
-       //  }
+       print("<TR><TD><B>$userbuttom_1_prop_UpdateUserForm_3:\n");
+       print("<TD><INPUT TYPE=\"PASSWORD\" NAME=\"passwd\" SIZE=20 >\n");
+
+       print("<TR><TD><B>$userstray_NewUserForm_7: \n");
+       print("<TD><INPUT TYPE=\"TEXT\" NAME=\"userip\" SIZE=15> \n");
+
        print("<TR>\n");
        print("<TD>\n");
@@ -293 +293 @@
        print("<TR>\n");
        print("<TD>\n");
+       print("<B>$userstray_NewUserForm_9: \n");
+       print("<TD>\n");
+       print("<INPUT TYPE=\"TEXT\" NAME=\"usersoname\" SIZE=30> \n");
+       print("<TR>\n");
+       print("<TD>\n");
        print("<B>$userstray_NewUserForm_10: \n");
        print("<TD>\n");
        print("<INPUT TYPE=\"TEXT\" NAME=\"userfamily\" SIZE=30> \n");
-       print("<TR>\n");
-       print("<TD>\n");
-       print("<B>$userstray_NewUserForm_9: \n");
-       print("<TD>\n");
-       print("<INPUT TYPE=\"TEXT\" NAME=\"usersoname\" SIZE=30> \n");
        print("<TR>\n");
        print("<TD>\n");