xinyin025/TravianZ
1
0
Fork 0
mirror of https://github.com/Shadowss/TravianZ.git synced 2026-07-25 14:06:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Shadowss/TravianZ

Browse Source 
Conflicts:
	Admin/admin.php
This commit is contained in:
Shadow
2014-01-31 08:20:42 +02:00
parent 15182ecb3d c9cc7c1f0a
commit 31faf6f924
20 changed files with 724 additions and 177 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
+9
View File
@@ -11,10 +11,19 @@
#################################################################################
session_start();
<<<<<<< HEAD
include_once("../GameEngine/Database.php");
include_once("../GameEngine/Admin/database.php");
include_once("../GameEngine/Data/buidata.php");
include_once ("../GameEngine/Lang/" . LANG . ".php");
=======
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");
>>>>>>> c9cc7c1f0a714bc65502dce1fd28edb31c59e092
class timeFormatGenerator
{