diff --git a/Admin/Templates/addUsers.tpl b/Admin/Templates/addUsers.tpl
index 9aac83bd..408a9f64 100644
--- a/Admin/Templates/addUsers.tpl
+++ b/Admin/Templates/addUsers.tpl
@@ -75,6 +75,25 @@
$amount = ($_GET['am']);
$skipped = ($_GET['sk']);
$beginnersProtection = ($_GET['bp']);
+ switch ($_GET['tr'])
+ {
+ case '0':
+ $tribe = RANDOM;
+ break;
+ case '1':
+ $tribe = ROMANS;
+ break;
+ case '2':
+ $tribe = TEUTONS;
+ break;
+ case '3':
+ $tribe = GAULS;
+ break;
+ default:
+ // Should never reach here
+ $tribe = 'Unknown';
+ }
+
echo '
'
. $amount .
@@ -87,23 +106,28 @@
// Say if Beginners Protection was set for any Users created
if ($amount > 0)
{
+ // Plural or Singular for User(s)
+ // TODO: Add options for these to lang files
+ if ($amount > 1)
+ {
+ $usersMessage = 'these Users';
+ }
+ else
+ {
+ $usersMessage = 'this User';
+ }
$begMessage = 'Beginners Protection was ';
if (!$beginnersProtection)
{
$begMessage .= 'NOT ';
}
- $begMessage .= 'set for ';
- if ($amount > 1)
- {
- $begMessage .= 'these Users';
- }
- else
- {
- $begMessage .= 'this User';
- }
-
- $begMessage .= '
';
+ $begMessage .= 'set for ' . $usersMessage . '
';
echo $begMessage;
+
+ // Say Tribes chosen
+ $tribeMessage = 'Tribe for ' . $usersMessage . ' was ';
+ $tribeMessage .= $tribe . '
';
+ echo $tribeMessage;
}
if ($skipped > 0)
{
@@ -124,12 +148,18 @@
}
?>
- Base Name
-
- How Many
-
- Beginners Protection
-
-
+Base Name
+
+How Many
+
+Beginners Protection
+
+Tribe:
+
+
+
+
+
+
diff --git a/GameEngine/Admin/Mods/addUsers.php b/GameEngine/Admin/Mods/addUsers.php
index 3b2be182..aa50db13 100644
--- a/GameEngine/Admin/Mods/addUsers.php
+++ b/GameEngine/Admin/Mods/addUsers.php
@@ -18,6 +18,7 @@ $id = $_POST['id'];
$baseName = $_POST['users_base_name'];
$amount = (int) $_POST['users_amount'];
$beginnersProtection = $_POST['users_protection'];
+$postTribe = $_POST['tribe'];
// Some basic error checking
if (strlen($baseName) < 4)
@@ -54,7 +55,16 @@ else
//$password = $baseName . $i . 'PASS';
$email = $baseName . $i . '@example.com';
- $tribe = rand(1, 3);
+ if ($postTribe == 0)
+ {
+ // Random Tribe
+ $tribe = rand(1, 3);
+ }
+ else
+ {
+ // No error checking here but should be set to 1-3 from form
+ $tribe = $postTribe;
+ }
// Create in a random quad
$kid = rand(1,4);
// Dont need to activate, not 100% sure we need to initialise $act
@@ -120,6 +130,6 @@ else
}
}
}
- header("Location: ../../../Admin/admin.php?p=addUsers&g=OK&bn=$baseName&am=$created&sk=$skipped&bp=$beginnersProtection");
+ header("Location: ../../../Admin/admin.php?p=addUsers&g=OK&bn=$baseName&am=$created&sk=$skipped&bp=$beginnersProtection&tr=$postTribe");
}
?>