Crypted password, other fixes.

icculus · Jun 30, 2004 · 42d48f9 · 42d48f9
1 parent 44a1ba2
commit 42d48f9
Showing 1 changed file with 26 additions and 3 deletions.
diff --git a/vendor/index.php b/vendor/index.php
@@ -72,8 +72,10 @@ function op_renderpapertrail()
 } // op_renderpapertrail
 
 
-function update_vendor_login($loginname, $pw)
+function update_vendor_login($loginname, $pw, $allowreplace)
 {
+    if (!welcome_here()) return;
+
     $action = 'Added';
     $users = file("./.htpasswd");
 
@@ -83,6 +85,27 @@ function update_vendor_login($loginname, $pw)
         return;
     } // if
 
+    $cmd = escapeshellcmd("htpasswd -b -n $loginname $pw");
+    $cryptedpw = system($cmd);
+    if ($cryptedpw == false)
+    {
+        write_error("Can't crypt password");
+        return;
+    } // if
+
+    if (!$allowreplace)
+    {
+        foreach ($users as $u)
+        {
+            $chop = str_replace(strchr($u, ':'), "", $u);
+            if ($chop == $loginname)
+            {
+                write_error("Username already exists.");
+                return;
+            } // if
+        } // foreach
+    } // if
+
     if (!copy('./.htpasswd', '.htpasswd_knowngood'))
     {
         write_error("couldn't archive old vendor list.");
@@ -127,7 +150,7 @@ function op_confirmpw()
         return;
     } // if
 
-    update_vendor_login($_SERVER['REMOTE_USER'], $pw1);
+    update_vendor_login($_SERVER['REMOTE_USER'], $pw1, true);
 } // op_confirmpw
 
 
@@ -167,7 +190,7 @@ function op_confirmaddvendor()
         return;
     } // if
 
-    update_vendor_login($loginname, $pw1);
+    update_vendor_login($loginname, $pw1, false);
 } // op_confirmaddvendor