From 82b12a29d41ecc058f07e286e360ee3764f79935 Mon Sep 17 00:00:00 2001 From: KFCSpike Date: Mon, 27 Jan 2014 13:30:45 +0000 Subject: [PATCH 1/5] Add checkbox for Beginner's Protection when creating Users in Admin Panel --- Admin/Templates/addUsers.tpl | 31 +++++++++++++++++++++++++++--- GameEngine/Admin/Mods/addUsers.php | 20 +++++++++++++++---- 2 files changed, 44 insertions(+), 7 deletions(-) diff --git a/Admin/Templates/addUsers.tpl b/Admin/Templates/addUsers.tpl index 9ec415bf..b68eba97 100644 --- a/Admin/Templates/addUsers.tpl +++ b/Admin/Templates/addUsers.tpl @@ -74,6 +74,7 @@ $baseName = ($_GET['bn']); $amount = ($_GET['am']); $skipped = ($_GET['sk']); + $beginnersProtection = ($_GET['bp']); echo '

' . $amount . @@ -82,6 +83,28 @@ ' . $baseName . '
'; + + // Say if Beginners Protection was set for any Users created + if ($amount > 0) + { + $begMessage = 'Beginners Protection was '; + if (!$beginnersProtection) + { + $begMessage .= 'NOT '; + } + $begMessage .= 'set for '; + if ($amount > 1) + { + $begMessage .= 'these Users'; + } + else + { + $begMessage .= 'this User'; + } + + $begMessage .= '
'; + echo $begMessage; + } if ($skipped > 0) { echo '' @@ -90,7 +113,7 @@ Users not created as the user name already exists
'; } - echo 'Now would be a good time to ' + echo '
Now would be a good time to ' . 'Return to the server' . ' this will update rankings etc but will take a while!
' . ' Make sure max_execution_time is set to a high enough value in php.ini

' @@ -101,9 +124,11 @@ } ?>
- Base Name   + Base Name  

- How Many    + How Many    +

+ Beginners Protection   

diff --git a/GameEngine/Admin/Mods/addUsers.php b/GameEngine/Admin/Mods/addUsers.php index bb94697b..3b2be182 100644 --- a/GameEngine/Admin/Mods/addUsers.php +++ b/GameEngine/Admin/Mods/addUsers.php @@ -17,6 +17,7 @@ mysql_select_db(SQL_DB); $id = $_POST['id']; $baseName = $_POST['users_base_name']; $amount = (int) $_POST['users_amount']; +$beginnersProtection = $_POST['users_protection']; // Some basic error checking if (strlen($baseName) < 4) @@ -74,8 +75,6 @@ else /* * @TODO * - * Make beginners protection optional for Users created - * * Allow option to create (random) bigger villages, * upgrade fields, granary, warehouse, wall etc * @@ -85,11 +84,24 @@ else * where required */ - // Show beginners protection in User Profile - see TODOs + // Show the dove in User Profile - will show this even if + // beginners protection is not checked // Need a $database function for this // (assuming we don't already have one as creating Natars also updates this way) $q = "UPDATE " . TB_PREFIX . "users SET desc2 = '[#0]' WHERE id = $uid"; mysql_query($q) or die(mysql_error()); + + if (!$beginnersProtection) + { + // No beginners protection so set it to current time + // TODO create a $database function for this + // also used in editProtection.php so assuming no function + // already exists + $protection = time(); + mysql_query("UPDATE ".TB_PREFIX."users SET + protect = '".$protection."' + WHERE id = $uid") or die(mysql_error()); + } $database->updateUserField($uid,"act","",1); $wid = $database->generateBase($kid,0); @@ -108,6 +120,6 @@ else } } } - header("Location: ../../../Admin/admin.php?p=addUsers&g=OK&bn=$baseName&am=$created&sk=$skipped"); + header("Location: ../../../Admin/admin.php?p=addUsers&g=OK&bn=$baseName&am=$created&sk=$skipped&bp=$beginnersProtection"); } ?> From 955d44aae42e003f6cecf8d630ac8cc06ccfaea3 Mon Sep 17 00:00:00 2001 From: KFCSpike Date: Mon, 27 Jan 2014 14:49:22 +0000 Subject: [PATCH 2/5] Tweaks to font stuff --- Admin/Templates/addUsers.tpl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Admin/Templates/addUsers.tpl b/Admin/Templates/addUsers.tpl index b68eba97..9aac83bd 100644 --- a/Admin/Templates/addUsers.tpl +++ b/Admin/Templates/addUsers.tpl @@ -90,7 +90,7 @@ $begMessage = 'Beginners Protection was '; if (!$beginnersProtection) { - $begMessage .= 'NOT '; + $begMessage .= 'NOT '; } $begMessage .= 'set for '; if ($amount > 1) @@ -126,9 +126,9 @@
Base Name  

- How Many    + How Many   

- Beginners Protection    + Beginners Protection   

From 5f2036b71942dd4d11c35f530f04b8fc8e4ebc7d Mon Sep 17 00:00:00 2001 From: KFCSpike Date: Mon, 27 Jan 2014 19:00:28 +0000 Subject: [PATCH 3/5] Include LANG file in admin.php --- Admin/admin.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Admin/admin.php b/Admin/admin.php index 659cae81..97411210 100644 --- a/Admin/admin.php +++ b/Admin/admin.php @@ -15,6 +15,8 @@ include("../GameEngine/Database.php"); include("../GameEngine/Admin/database.php"); include("../GameEngine/config.php"); include("../GameEngine/Data/buidata.php"); +// Should we including Session.php here instead? +include_once ("../GameEngine/Lang/" . LANG . ".php"); class timeFormatGenerator { From ffd063362f30f23892973ec9217f8c86eb0c237a Mon Sep 17 00:00:00 2001 From: KFCSpike Date: Mon, 27 Jan 2014 19:01:26 +0000 Subject: [PATCH 4/5] Added TODO --- Admin/admin.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Admin/admin.php b/Admin/admin.php index 97411210..7157084d 100644 --- a/Admin/admin.php +++ b/Admin/admin.php @@ -15,7 +15,7 @@ include("../GameEngine/Database.php"); include("../GameEngine/Admin/database.php"); include("../GameEngine/config.php"); include("../GameEngine/Data/buidata.php"); -// Should we including Session.php here instead? +// TODO: Should we including Session.php here instead? include_once ("../GameEngine/Lang/" . LANG . ".php"); class timeFormatGenerator From 5c1babcee9fccab1d7e7791778fc9425fa2eea1d Mon Sep 17 00:00:00 2001 From: KFCSpike Date: Mon, 27 Jan 2014 20:02:08 +0000 Subject: [PATCH 5/5] Choose Tribe when creating Users in Admin panel --- Admin/Templates/addUsers.tpl | 66 ++++++++++++++++++++++-------- GameEngine/Admin/Mods/addUsers.php | 14 ++++++- 2 files changed, 60 insertions(+), 20 deletions(-) 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"); } ?>