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

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

Browse Source 
Conflicts:
	Admin/Templates/config.tpl
	Admin/Templates/editServerSet.tpl
This commit is contained in:
Shadow
2014-03-10 08:39:06 +02:00
parent c848e87fb7 743a19326c
commit 15c6bb2fea
18 changed files with 73 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Admin/Templates/config.tpl
+7 -1
View File
@@ -155,12 +155,18 @@ if($_SESSION['access'] < 9) die(ACCESS_DENIED_ADMIN);
</tr>
<tr>
<td>Error Reporting</td>
<<<<<<< HEAD
<td><b>
<?php
echo (ERROR_REPORT=="error_reporting (0);")? "No": (ERROR_REPORT=="error_reporting (E_ALL);")? "Yes (E_ALL)":"Yes (E_ALL ^ E_NOTICE)";
?>
</b></td>
</tr>
=======
<td><b><?php echo (ERROR_REPORT=="error_reporting (0);")? "No": "Yes";?></b></td>
</tr>
>>>>>>> 743a19326cddff179e325da92167a5362a94a6a2
</table>
<table id="member">
@@ -350,4 +356,4 @@ function define_array( $array, $keys = NULL )
}
}
//define_array($array);
?>
?>
Admin/Templates/editAdminInfo.tpl
+1 -9
View File
@@ -41,14 +41,6 @@ if($_SESSION['access'] < 9) die(ACCESS_DENIED_ADMIN);
</select>
</td>
</tr>
<tr>
<td>Error Reporting</td>
<td><select name="error">
<option value="error_reporting (E_ALL ^ E_NOTICE);" selected="selected">Yes</option>
<option value="error_reporting (0);">No</option>
</select>
</td>
</tr>
</tbody>
</table>
<br />
@@ -57,4 +49,4 @@ if($_SESSION['access'] < 9) die(ACCESS_DENIED_ADMIN);
<td align="right"><input type="image" border="0" src="../img/admin/b/ok1.gif"></td>
</tr>
</table>
</form>
</form>
Admin/Templates/editExtraSet.tpl
+2 -9
View File
@@ -37,14 +37,7 @@ if($_SESSION['access'] < 9) die(ACCESS_DENIED_ADMIN);
<td>Max Number of Mails</td>
<td>30</td>
</tr>
<tr>
<td>Error Reporting</td>
<td><select name="error">
<option value="error_reporting (E_ALL ^ E_NOTICE);" selected="selected">Yes</option>
<option value="error_reporting (0);">No</option>
</select>
</td>
</tr>
</tbody>
</table>
<br />
@@ -53,4 +46,4 @@ if($_SESSION['access'] < 9) die(ACCESS_DENIED_ADMIN);
<td align="right"><input type="image" border="0" src="../img/admin/b/ok1.gif"></td>
</tr>
</table>
</form>
</form>
Admin/Templates/editLogSet.tpl
+2 -8
View File
@@ -97,13 +97,7 @@ if($_SESSION['access'] < 9) die(ACCESS_DENIED_ADMIN);
</td>
</tr>
<tr>
<td>Error Reporting</td>
<td><select name="error">
<option value="error_reporting (E_ALL ^ E_NOTICE);" selected="selected">Yes</option>
<option value="error_reporting (0);">No</option>
</select>
</td>
</tr>
</tbody>
</table>
<br />
@@ -112,4 +106,4 @@ if($_SESSION['access'] < 9) die(ACCESS_DENIED_ADMIN);
<td align="right"><input type="image" border="0" src="../img/admin/b/ok1.gif"></td>
</tr>
</table>
</form>
</form>
Admin/Templates/editNewsboxSet.tpl
+2 -8
View File
@@ -52,13 +52,7 @@ if($_SESSION['access'] < 9) die(ACCESS_DENIED_ADMIN);
</td>
</tr>
<tr>
<td>Error Reporting</td>
<td><select name="error">
<option value="error_reporting (E_ALL ^ E_NOTICE);" selected="selected">Yes</option>
<option value="error_reporting (0);">No</option>
</select>
</td>
</tr>
</tbody>
</table>
<br />
@@ -67,4 +61,4 @@ if($_SESSION['access'] < 9) die(ACCESS_DENIED_ADMIN);
<td align="right"><input type="image" border="0" src="../img/admin/b/ok1.gif"></td>
</tr>
</table>
</form>
</form>
Admin/Templates/editServerSet.tpl
+6
View File
@@ -289,8 +289,14 @@ function refresh(tz) {
<tr>
<td>Error Reporting</td>
<td><select name="error">
<<<<<<< HEAD
<option value="error_reporting (E_ALL ^ E_NOTICE);" <?php if(ERROR_REPORTING=="error_reporting (E_ALL ^ E_NOTICE);") echo "selected";?>>Yes</option>
<option value="error_reporting (0);" <?php if(ERROR_REPORTING=="error_reporting (0);") echo "selected";?>>No</option>
=======
<option value="error_reporting (E_ALL ^ E_NOTICE);" <?php if(ERROR_REPORT=="error_reporting (E_ALL ^ E_NOTICE);") echo "selected";?>>Yes</option>
<option value="error_reporting (0);" <?php if(ERROR_REPORT=="error_reporting (0);") echo "selected";?>>No</option>
>>>>>>> 743a19326cddff179e325da92167a5362a94a6a2
</select>
</td>
</tr>
GameEngine/Admin/Mods/constant_format.tpl
+2 -1
View File
@@ -16,6 +16,7 @@
//////////////////////////////////
// (E_ALL ^ E_NOTICE) = enabled
// (0) = disabled
define("ERROR_REPORT","%ERRORREPORT%");
%ERROR%
//////////////////////////////////
@@ -295,4 +296,4 @@ $requse = 0;
## ##
#################################################################################
?>
?>
GameEngine/Admin/Mods/editAdminInfo.php
+4 -3
View File
@@ -17,7 +17,7 @@ $id = $_POST['id'];
$myFile = "../../config.php";
$fh = fopen($myFile, 'w') or die("<br/><br/><br/>Can't open file: GameEngine\config.php");
$ERRORREPORT=ERROR_REPORT;
$T4=(T4_COMING==false)? "false":"true";
$GP_ENABLE=(GP_ENABLE==false)? "false":"true";
$QUEST=(QUEST==false)? "false":"true";
@@ -41,7 +41,8 @@ $fh = fopen($myFile, 'w') or die("<br/><br/><br/>Can't open file: GameEngine\con
$LIMIT_MAILBOX=(LIMIT_MAILBOX==false)? "false":"true";
$text = file_get_contents("constant_format.tpl");
$text = preg_replace("'%ERROR%'", $_POST['error'], $text);
$text = preg_replace("'%ERRORREPORT%'", $ERRORREPORT, $text);
$text = preg_replace("'%ERROR%'", $ERRORREPORT, $text);
$text = preg_replace("'%SERVERNAME%'", SERVER_NAME, $text);
$text = preg_replace("'%STIMEZONE%'", TIMEZONE, $text);
$text = preg_replace("'%STARTTIME%'", COMMENCE, $text);
@@ -111,4 +112,4 @@ $database->query("Insert into ".TB_PREFIX."admin_log values (0,".$id.",'Changed
header("Location: ../../../Admin/admin.php?p=config");
?>
?>
GameEngine/Admin/Mods/editExtraSet.php
+4 -3
View File
@@ -17,7 +17,7 @@ $id = $_POST['id'];
$myFile = "../../config.php";
$fh = fopen($myFile, 'w') or die("<br/><br/><br/>Can't open file: GameEngine\config.php");
$ERRORREPORT=ERROR_REPORT;
$T4=(T4_COMING==false)? "false":"true";
$GP_ENABLE=(GP_ENABLE==false)? "false":"true";
$QUEST=(QUEST==false)? "false":"true";
@@ -41,7 +41,8 @@ $fh = fopen($myFile, 'w') or die("<br/><br/><br/>Can't open file: GameEngine\con
$INCLUDE_ADMIN=(INCLUDE_ADMIN==false)? "false":"true";
$text = file_get_contents("constant_format.tpl");
$text = preg_replace("'%ERROR%'", $_POST['error'], $text);
$text = preg_replace("'%ERRORREPORT%'", $ERRORREPORT, $text);
$text = preg_replace("'%ERROR%'", $ERRORREPORT, $text);
$text = preg_replace("'%SERVERNAME%'", SERVER_NAME, $text);
$text = preg_replace("'%STIMEZONE%'", TIMEZONE, $text);
$text = preg_replace("'%STARTTIME%'", COMMENCE, $text);
@@ -111,4 +112,4 @@ $database->query("Insert into ".TB_PREFIX."admin_log values (0,".$id.",'Changed
header("Location: ../../../Admin/admin.php?p=config");
?>
?>
GameEngine/Admin/Mods/editLogSet.php
+4 -3
View File
@@ -17,7 +17,7 @@ $id = $_POST['id'];
$myFile = "../../config.php";
$fh = fopen($myFile, 'w') or die("<br/><br/><br/>Can't open file: GameEngine\config.php");
$ERRORREPORT=ERROR_REPORT;
$T4=(T4_COMING==false)? "false":"true";
$GP_ENABLE=(GP_ENABLE==false)? "false":"true";
$QUEST=(QUEST==false)? "false":"true";
@@ -34,7 +34,8 @@ $fh = fopen($myFile, 'w') or die("<br/><br/><br/>Can't open file: GameEngine\con
$INCLUDE_ADMIN=(INCLUDE_ADMIN==false)? "false":"true";
$text = file_get_contents("constant_format.tpl");
$text = preg_replace("'%ERROR%'", $_POST['error'], $text);
$text = preg_replace("'%ERRORREPORT%'", $ERRORREPORT, $text);
$text = preg_replace("'%ERROR%'", $ERRORREPORT, $text);
$text = preg_replace("'%SERVERNAME%'", SERVER_NAME, $text);
$text = preg_replace("'%STIMEZONE%'", TIMEZONE, $text);
$text = preg_replace("'%STARTTIME%'", COMMENCE, $text);
@@ -106,4 +107,4 @@ $database->query("Insert into ".TB_PREFIX."admin_log values (0,".$id.",'Changed
header("Location: ../../../Admin/admin.php?p=config");
?>
?>
GameEngine/Admin/Mods/editNewsboxSet.php
+4 -3
View File
@@ -17,7 +17,7 @@ $id = $_POST['id'];
$myFile = "../../config.php";
$fh = fopen($myFile, 'w') or die("<br/><br/><br/>Can't open file: GameEngine\config.php");
$ERRORREPORT=ERROR_REPORT;
$T4=(T4_COMING==false)? "false":"true";
$GP_ENABLE=(GP_ENABLE==false)? "false":"true";
$QUEST=(QUEST==false)? "false":"true";
@@ -41,7 +41,8 @@ $fh = fopen($myFile, 'w') or die("<br/><br/><br/>Can't open file: GameEngine\con
$INCLUDE_ADMIN=(INCLUDE_ADMIN==false)? "false":"true";
$text = file_get_contents("constant_format.tpl");
$text = preg_replace("'%ERROR%'", $_POST['error'], $text);
$text = preg_replace("'%ERRORREPORT%'", $ERRORREPORT, $text);
$text = preg_replace("'%ERROR%'", $ERRORREPORT, $text);
$text = preg_replace("'%SERVERNAME%'", SERVER_NAME, $text);
$text = preg_replace("'%STIMEZONE%'", TIMEZONE, $text);
$text = preg_replace("'%STARTTIME%'", COMMENCE, $text);
@@ -113,4 +114,4 @@ $database->query("Insert into ".TB_PREFIX."admin_log values (0,".$id.",'Changed
header("Location: ../../../Admin/admin.php?p=config");
?>
?>
GameEngine/Admin/Mods/editServerSet.php
+1 -1
View File
@@ -105,4 +105,4 @@ $database->query("Insert into ".TB_PREFIX."admin_log values (0,".$id.",'Changed
header("Location: ../../../Admin/admin.php?p=config");
?>
?>
GameEngine/Database.php
+2 -2
View File
@@ -9,7 +9,7 @@
## ##
#################################################################################
include("config.php");
include_once("config.php");
switch(DB_TYPE) {
case 1:
@@ -24,4 +24,4 @@ switch(DB_TYPE) {
}
## Security
include("Protection.php");
?>
?>
GameEngine/Session.php
+22 -21
View File
@@ -17,30 +17,31 @@ mb_internal_encoding("UTF-8"); // Add for utf8 varriables.
## ##
#################################################################################
if(!file_exists('GameEngine/config.php') && !file_exists('../../GameEngine/config.php') && !file_exists('../../config.php')) {
if(file_exists('GameEngine/config.php') || file_exists('../../GameEngine/config.php') || file_exists('../../config.php') || file_exists('../GameEngine/config.php')) {
}else{
header("Location: install/");
}
$script_name = ($_SERVER['REQUEST_URI'] == 'karte.php') ? 'karte' : $_SERVER['REQUEST_URI'];
include ("Battle.php");
include ("Data/buidata.php");
include ("Data/cp.php");
include ("Data/cel.php");
include ("Data/resdata.php");
include ("Data/unitdata.php");
include ("Data/hero_full.php");
include ("config.php");
include ("Database.php");
include ("Mailer.php");
include ("Form.php");
include ("Generator.php");
include ("Multisort.php");
include ("Ranking.php");
include ("Lang/" . LANG . ".php");
include ("Logging.php");
include ("Message.php");
include ("Alliance.php");
include ("Profile.php");
include_once ("Battle.php");
include_once ("Data/buidata.php");
include_once ("Data/cp.php");
include_once ("Data/cel.php");
include_once ("Data/resdata.php");
include_once ("Data/unitdata.php");
include_once ("Data/hero_full.php");
include_once ("config.php");
include_once ("Database.php");
include_once ("Mailer.php");
include_once ("Form.php");
include_once ("Generator.php");
include_once ("Multisort.php");
include_once ("Ranking.php");
include_once ("Lang/" . LANG . ".php");
include_once ("Logging.php");
include_once ("Message.php");
include_once ("Alliance.php");
include_once ("Profile.php");
class Session {
@@ -60,7 +61,7 @@ class Session {
function Session() {
$this->time = time();
session_start();
if (!isset($_SESSION)) session_start();
$this->logged_in = $this->checkLogin();
Templates/Ajax/mapscroll.tpl
+4 -2
View File
@@ -1,6 +1,7 @@
<?php
session_start();
include('GameEngine/config.php');
include_once ("GameEngine/Lang/" . LANG . ".php");
mysql_connect(SQL_SERVER, SQL_USER, SQL_PASS) or die(mysql_error());
mysql_select_db(SQL_DB) or die(mysql_error());
include("GameEngine/Generator.php");
@@ -109,10 +110,11 @@ $neutral = (($neutralarray[0]['alli1']>0 and $neutralarray[0]['alli2']>0 and $do
$image = ($donnees['map_occupied'] == 1 && $donnees['map_fieldtype'] > 0)?(($donnees['ville_user'] == $_SESSION['id_user'])? ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b30': 'b20' :'b10' : 'b00') : (($targetalliance != 0)? ($friend==1? ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b31': 'b21' :'b11' : 'b01') : ($war==1? ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b32': 'b22' :'b12' : 'b02') : ($neutral==1? ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b35': 'b25' :'b15' : 'b05') : ($targetalliance == $_SESSION['alliance_user']? ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b33': 'b23' :'b13' : 'b03') : ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b34': 'b24' :'b14' : 'b04'))))) : ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b34': 'b24' :'b14' : 'b04'))) : $donnees['map_image'];
if($donnees['ville_user']==3 && $donnees['ville_name']=='WW Buildingplan'){
if($donnees['ville_user']==3 && $donnees['ville_name']==PLANVILLAGE){
$image = "o99";
}
//Javascript map info
$regcount=0;
if($yrow!=7){
$map_js .= "[".$donnees['map_x'].",".$donnees['map_y'].",".$donnees['map_fieldtype'].",". ((!empty($donnees['map_oasis'])) ? $donnees['map_oasis'] : 0) .",\"d=".$donnees['map_id']."&c=".$generator->getMapCheck($donnees['map_id'])."\",\"".$image."\"";
if($donnees['map_occupied']){
@@ -144,4 +146,4 @@ $image = "o99";
else {$map_js .= "]";}
++$i;
}
echo '[['.$map_js.']';
echo '[['.$map_js.']';
Templates/Ajax/mapscroll2.tpl
+4 -2
View File
@@ -1,6 +1,7 @@
<?php
session_start();
include('GameEngine/config.php');
include_once ("GameEngine/Lang/" . LANG . ".php");
mysql_connect(SQL_SERVER, SQL_USER, SQL_PASS) or die(mysql_error());
mysql_select_db(SQL_DB) or die(mysql_error());
include("GameEngine/Generator.php");
@@ -126,10 +127,11 @@ $neutral = (($neutralarray[0]['alli1']>0 and $neutralarray[0]['alli2']>0 and $do
$image = ($donnees['map_occupied'] == 1 && $donnees['map_fieldtype'] > 0)?(($donnees['ville_user'] == $_SESSION['id_user'])? ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b30': 'b20' :'b10' : 'b00') : (($targetalliance != 0)? ($friend==1? ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b31': 'b21' :'b11' : 'b01') : ($war==1? ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b32': 'b22' :'b12' : 'b02') : ($neutral==1? ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b35': 'b25' :'b15' : 'b05') : ($targetalliance == $_SESSION['alliance_user']? ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b33': 'b23' :'b13' : 'b03') : ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b34': 'b24' :'b14' : 'b04'))))) : ($donnees['ville_pop']>=100? $donnees['ville_pop']>= 250?$donnees['ville_pop']>=500? 'b34': 'b24' :'b14' : 'b04'))) : $donnees['map_image'];
if($donnees['ville_user']==3 && $donnees['ville_name']=='WW Buildingplan'){
if($donnees['ville_user']==3 && $donnees['ville_name']==PLANVILLAGE){
$image = "o99";
}
//Javascript map info
$regcount=0;
if($yrow!=13){
$map_js .= "[".$donnees['map_x'].",".$donnees['map_y'].",".$donnees['map_fieldtype'].",". ((!empty($donnees['map_oasis'])) ? $donnees['map_oasis'] : 0) .",\"d=".$donnees['map_id']."&c=".$generator->getMapCheck($donnees['map_id'])."\",\"".$image."\"";
if($donnees['map_occupied']){
@@ -161,4 +163,4 @@ $image = "o99";
else {$map_js .= "]";}
++$i;
}
echo '[['.$map_js.']';
echo '[['.$map_js.']';
install/data/constant_format.tpl
+1
View File
@@ -16,6 +16,7 @@
//////////////////////////////////
// (E_ALL ^ E_NOTICE) = enabled
// (0) = disabled
define("ERROR_REPORT","%ERRORREPORT%");
%ERROR%
//////////////////////////////////
install/process.php
+1
View File
@@ -90,6 +90,7 @@ class Process {
$text = preg_replace("'%BOX2%'", $_POST['box2'], $text);
$text = preg_replace("'%BOX3%'", $_POST['box3'], $text);
$text = preg_replace("'%VILLAGE_EXPAND%'", $_POST['village_expand'], $text);
$text = preg_replace("'%ERRORREPORT%'", $_POST['error'], $text);
$text = preg_replace("'%ERROR%'", $_POST['error'], $text);
$text = preg_replace("'%GP_LOCATE%'", $_POST['gp_locate'], $text);
$text = preg_replace("'%PLUS_TIME%'", $_POST['plus_time'], $text);