xinyin025/TravianZ
1
0
Fork 0
mirror of https://github.com/Shadowss/TravianZ.git synced 2026-07-02 18:44:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #83 from Fannybaws/UpdateCreateUsers

Browse Source 
Update create users
This commit is contained in:
Shadow
2014-01-29 06:43:25 -08:00
parent 94f9e374ae 5c1babcee9
commit c9cc7c1f0a
3 changed files with 90 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Admin/Templates/addUsers.tpl
+61 -6
View File
@@ -74,6 +74,26 @@
$baseName = ($_GET['bn']);
$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 '<br /><br />
<font color="Blue"><b>'
. $amount .
@@ -82,6 +102,33 @@
<font color="Blue"><b>'
. $baseName .
'</b></font><br>';
// 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 .= '<font color="red"><b>NOT</b></font> ';
}
$begMessage .= 'set for ' . $usersMessage . '<br>';
echo $begMessage;
// Say Tribes chosen
$tribeMessage = 'Tribe for ' . $usersMessage . ' was ';
$tribeMessage .= $tribe . '<br>';
echo $tribeMessage;
}
if ($skipped > 0)
{
echo '<font color="Red"><b>'
@@ -90,7 +137,7 @@
Users not created as the user name already exists
</b></font><br>';
}
echo 'Now would be a good time to '
echo '<br>Now would be a good time to '
. '<a href="' . SERVER . 'dorf1.php">Return to the server</a>'
. ' this will update rankings etc but <b>will</b> take a while!<br>'
. ' Make sure <b>max_execution_time</b> is set to a high enough value in php.ini<br><br>'
@@ -101,10 +148,18 @@
}
?>
<br>
<font color ="<?php echo $baseNameFontColor ?>">Base Name &nbsp;</font><input name="users_base_name" id="users_name" value="<?php echo $baseName ?>" maxlength="20">
<br><br>
<font color ="<?php echo $amountFontColor ?>">How Many &nbsp;&nbsp;<font><input name="users_amount" id="users_amount" value="<?php echo $amount ?>" maxlength="4">
<br><br>
<input type="submit" value="Create Users">
</center>
<font color ="<?php echo $baseNameFontColor ?>">Base Name &nbsp;</font><input type ="text" name="users_base_name" id="users_name" value="<?php echo $baseName ?>" maxlength="20">
<br><br>
<font color ="<?php echo $amountFontColor ?>">How Many &nbsp;&nbsp;</font><input type ="text" name="users_amount" id="users_amount" value="<?php echo $amount ?>" maxlength="4">
<br><br>
Beginners Protection &nbsp;&nbsp;<input type ="checkbox" name="users_protection" id="users_protection" checked>
<br><br>
Tribe:<br>
<label><input type="radio" name="tribe" value="0" checked> &nbsp;<?php echo RANDOM; ?></label><br>
<label><input type="radio" name="tribe" value="1"> &nbsp;<?php echo ROMANS; ?></label><br>
<label><input type="radio" name="tribe" value="2"> &nbsp;<?php echo TEUTONS; ?></label><br>
<label><input type="radio" name="tribe" value="3"> &nbsp;<?php echo GAULS; ?></label><br>
<br><br>
<input type="submit" value="Create Users">
</form>
Admin/admin.php
+2
View File
@@ -15,6 +15,8 @@ include("../GameEngine/Database.php");
include("../GameEngine/Admin/database.php");
include("../GameEngine/config.php");
include("../GameEngine/Data/buidata.php");
// TODO: Should we including Session.php here instead?
include_once ("../GameEngine/Lang/" . LANG . ".php");
class timeFormatGenerator
{
GameEngine/Admin/Mods/addUsers.php
+27 -5
View File
@@ -17,6 +17,8 @@ mysql_select_db(SQL_DB);
$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)
@@ -53,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
@@ -74,8 +85,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 +94,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 +130,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&tr=$postTribe");
}
?>