xinyin025/TravianZ
1
0
Fork 0
mirror of https://github.com/Shadowss/TravianZ.git synced 2026-07-14 08:36:09 +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>