X-Git-Url: https://git.ucc.asn.au/?p=matches%2FMCTX3420.git;a=blobdiff_plain;f=testing%2FMCTXWeb%2Fpublic_html%2Fusers%2Fadmin_upload_users.php;h=05ba0c735617fe1f28312ac9d9d4299f4b81e718;hp=60b4c27236896efa8b1d658ee4e43614dc418641;hb=811c6d37280da482e4e571ef5f1b9a754f324286;hpb=05a891c4621195664d6fcc4ec4a2d492c78e9443

diff --git a/testing/MCTXWeb/public_html/users/admin_upload_users.php b/testing/MCTXWeb/public_html/users/admin_upload_users.php
index 60b4c27..05ba0c7 100644
--- a/testing/MCTXWeb/public_html/users/admin_upload_users.php
+++ b/testing/MCTXWeb/public_html/users/admin_upload_users.php
@@ -28,20 +28,20 @@ if (!empty($_POST))
   }
   else if ($_POST['action'] === "Upload") // Upload users in the text area
   {
-
-    if ($_POST['upload_mode'] === "purge")
-    {
-      $to_delete = fetchAllUsersWithoutPerm("Administrator");
-      if (count($to_delete) > 0)
-      {
-        if ($deletion_count = deleteUsers($to_delete)) {
-          $successes[] = lang("ACCOUNT_DELETIONS_SUCCESSFUL", array($deletion_count));
-        }
-        else {
-          $errors[] = lang("SQL_ERROR");
-        }
-      }
-    }
+
+    if ($_POST['upload_mode'] === "purge")
+    {
+      $to_delete = fetchAllUsersWithoutPerm("Administrator");
+      if (count($to_delete) > 0)
+      {
+        if ($deletion_count = deleteUsers($to_delete)) {
+          $successes[] = lang("ACCOUNT_DELETIONS_SUCCESSFUL", array($deletion_count));
+        }
+        else {
+          $errors[] = lang("SQL_ERROR");
+        }
+      }
+    }
   
     $text_area = $_POST['userUpload'];
 
@@ -53,26 +53,29 @@ if (!empty($_POST))
       if (empty($row) or $row[0] === '#')
         continue;
 
-      $fields = preg_split("/,/",  $row);
-      if(count($fields) < 3)
-      {
-        $errors[] = "Warning: Ignoring row not in correct format: ".htmlspecialchars($row);
-        continue;
-      }
+      $fields = preg_split("/,/",  $row);
+      if(count($fields) < 3)
+      {
+        $errors[] = "Warning: Ignoring row not in correct format: ".htmlspecialchars($row);
+        continue;
+      }
       
       $username = trim($fields[0]);
       $displayname = trim($fields[1]);
-      $email = trim($fields[2]);
-      $title = trim($fields[3]);
-      
-      if(!isValidEmail($email))
-      {
-        $errors[] = "Enter a valid email for row: ".htmlspecialchars($row);
-        continue;
-      }
+      $email = trim($fields[2]);
+      $title = trim($fields[3]);
+      
+      if(!isValidEmail($email))
+      {
+        $errors[] = "Enter a valid email for row: ".htmlspecialchars($row);
+        continue;
+      }
       
       // generate the temporary password
-      $password = generatePassword();
+      //$password = generatePassword();
+
+      // hey, adrian suggested it
+      $password = "mctx".date("MY");
 
       //Construct a user object
       $user = new User($username,$displayname,$password,$email);
@@ -91,52 +94,54 @@ if (!empty($_POST))
         
         if($user->mail_failure) $localerrors[] = lang("MAIL_ERROR");
         if($user->sql_failure)  $localerrors[] = lang("SQL_ERROR");
-        
-        if(strlen($title) >= 50)
-        {
-          $localerrors[] = "Warning: User".$username." added but failed to set title: ".lang("ACCOUNT_TITLE_CHAR_LIMIT",array(1,50));
-        }
-        else if (count($localerrors) == 0 && strlen($title) > 0)
-        {
-          $user_id = fetchUserId($username); //So stupid, when you create a user, it doesn't return the user id
-          if (!updateTitle($user_id, $title))
-          {
-            $localerrors[] = "Warning: User ".$username." added but failed to set title: ". lang("SQL_ERROR");
-          }
+        
+        if(strlen($title) >= 50)
+        {
+          $localerrors[] = "Warning: User".$username." added but failed to set title: ".lang("ACCOUNT_TITLE_CHAR_LIMIT",array(1,50));
+        }
+        else if (count($localerrors) == 0 && strlen($title) > 0)
+        {
+          $user_id = fetchUserId($username); //So stupid, when you create a user, it doesn't return the user id
+          if (!updateTitle($user_id, $title))
+          {
+            $localerrors[] = "Warning: User ".$username." added but failed to set title: ". lang("SQL_ERROR");
+          }
         }
       }
 
       if(count($localerrors) == 0)
-      {
+      {
         $users[] = [$username, $password]; //Push user onto array
     		//$successes[] = ($user->success);
-      }
-      else
-      {
-        $errors = array_merge($errors, $localerrors);
+      }
+      else
+      {
+        $errors = array_merge($errors, $localerrors);
       }
 
     }
- 
-    if(count($users) > 0)
-    {
-      $successes[] = (count($users)." users created.");
-      $successes[] = ("The list of usernames and passwords follow. You must save this!");
-      foreach($users as $user)
-      {
-        $successes[] = $user[0].",".$user[1];
-      }
+ 
+    if(count($users) > 0)
+    {
+      $successes[] = (count($users)." users created.");
+      $successes[] = "The temporary password is: "."mctx".date("MY");
+      $successes[] = "Please change this as soon as possible.";
+//      $successes[] = ("The list of usernames and passwords follow. You must save this!");
+//      foreach($users as $user)
+//      {
+//        $successes[] = $user[0].",".$user[1];
+//      }
     }
   }
 
 
-}
-
-require_once("models/header.php");
-startPage();
-
-echo notificationBlock($errors,$successes);
-
+}
+
+require_once("models/header.php");
+startPage();
+
+echo notificationBlock($errors,$successes);
+
 echo '<div class="widget"><div class="title">Upload users</div>';
 
 if ($show_form)
@@ -164,9 +169,9 @@ if ($show_form)
   <textarea name=\"userUpload\" rows=\"50\" cols=\"100\" style=\"width: 100%\">".$text_area."</textarea> </p>
 
   </form>";
-}
-
-echo '</div>';
+}
+
+echo '</div>';
 finishPage();
   
 ?>