less code, better output, slower

Author: simonLeary42

resources/lib/UnityUser.php

@@ -244,22 +244,6 @@ public function addSSHKey(string $key, UnityUser $operator, bool $send_mail = tr
         return true;
     }
 
-    /**
-     * @return int number of keys added -- a key might not be added because it was already there
-     * @throws NoKeyLoadedException if any key is invalid
-     */
-    public function addSSHKeys(array $keys, UnityUser $operator, bool $send_mail = true): int
-    {
-        foreach ($keys as $key) {
-            PublicKeyLoader::load($key); // throws NoKeyLoadedException
-        }
-        $keysBefore = $this->getSSHKeys();
-        // merge, then remove duplicates, then re-index
-        $keysAfter = array_values(array_unique(array_merge($keysBefore, $keys)));
-        $this->setSSHKeys($keysAfter, $operator, $send_mail);
-        return count($keysAfter) - count($keysBefore);
-    }
-
     public function removeSSHKey(int $index, UnityUser $operator, bool $send_mail = true)
     {
         $keys = $this->getSSHKeys();

webroot/panel/account.php

@@ -41,44 +41,20 @@
                     break;
             }
             $keys = array_map("trim", $keys);
-            try {
-                if (count($keys) == 1) {
-                    $keyWasAdded = $USER->addSSHKey($keys[0], $OPERATOR);
-                    if ($keyWasAdded) {
-                        UnityHTTPD::messageSuccess("SSH Key Added", "");
-                        UnityHTTPD::redirect();
-                    } else {
-                        UnityHTTPD::messageWarning("SSH Key Not Added", "This key already exists");
-                        UnityHTTPD::redirect();
-                    }
+            foreach ($keys as $key) {
+                try {
+                    $keyWasAdded = $USER->addSSHKey($key, $OPERATOR);
+                } catch (NoKeyLoadedException) {
+                    UnityHTTPD::messageError("SSH Key Not Added", "This key is invalid");
+                    UnityHTTPD::redirect();
+                }
+                if ($keyWasAdded) {
+                    UnityHTTPD::messageSuccess("SSH Key Added", "");
+                    UnityHTTPD::redirect();
                 } else {
-                    $numKeysAdded = $USER->addSSHKeys($keys, $OPERATOR);
-                    $numKeysNotAdded = count($keys) - $numKeysAdded;
-                    if ($numKeysAdded == 0) {
-                        UnityHTTPD::messageWarning(
-                            "SSH Keys Not Added",
-                            "These keys already exist"
-                        );
-                        UnityHTTPD::redirect();
-                    } elseif ($numKeysAdded == count($keys)) {
-                        UnityHTTPD::messageSuccess("SSH Keys Added", "");
-                        UnityHTTPD::redirect();
-                    } else {
-                        UnityHTTPD::messageWarning(
-                            "Some SSH Keys Not Added",
-                            // pluralization may be wrong here but I don't care
-                            sprintf(
-                                "%s keys were added. The other %s keys already existed.",
-                                $numKeysAdded,
-                                $numKeysNotAdded
-                            )
-                        );
-                        UnityHTTPD::redirect();
-                    }
+                    UnityHTTPD::messageInfo("SSH Key Not Added", "This key already exists");
+                    UnityHTTPD::redirect();
                 }
-            } catch (NoKeyLoadedException $e) {
-                UnityHTTPD::messageError("Invalid SSH Key", "");
-                UnityHTTPD::redirect();
             }
             break;
         case "delKey":