xinyin025/TravianZ
1
0
Fork 0
mirror of https://github.com/Shadowss/TravianZ.git synced 2026-08-26 13:17:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

catching up (#2)

Browse Source 
* fix: all languages added to installer

* fix: all languages added to installer and Admin

* fix: max crop/resources reset to level 1 value temporarily

This happened when level 1 granary / warehouse was built because of
a missing + sign in a formula.

#374

* chore: some more badges and thanks to JetBrains :)

* chore: one more badge :P

* chore: cleanup

* fix: Multihunter should have access to villages info

* fix: troops duplicate for certain tribes via raid lists
This commit is contained in:
Martin Ambrus
2017-11-30 20:12:59 +01:00
committed by GitHub
parent 64b0429325
commit 6fb38ebca1
8 changed files with 24 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Admin/Templates/troopUpgrades.tpl
+1 -1
View File
@@ -1,5 +1,5 @@
<?php <?php
if($_SESSION['access'] < 9) die("Access Denied: You are not Admin!"); if($_SESSION['access'] < MULTIHUNTER) die("Access Denied: You are not Admin!");
?> ?>
<table id="member"> <table id="member">
<thead> <thead>
Admin/Templates/troops.tpl
+1 -1
View File
@@ -108,7 +108,7 @@
else if($units['u49'] > 0){$u49 = '<font color="black">'.$units['u49'].'';} else if($units['u49'] > 0){$u49 = '<font color="black">'.$units['u49'].'';}
if($units['u50'] == 0){$u50 = '<font color="gray">'.$units['u50'].'';} if($units['u50'] == 0){$u50 = '<font color="gray">'.$units['u50'].'';}
else if($units['u50'] > 0){$u50 = '<font color="black">'.$units['u50'].'';} else if($units['u50'] > 0){$u50 = '<font color="black">'.$units['u50'].'';}
if($_SESSION['access'] == ADMIN) if($_SESSION['access'] >= MULTIHUNTER)
{ {
if($user['tribe'] == 1) if($user['tribe'] == 1)
{ {
Admin/Templates/village.tpl
+1 -1
View File
@@ -10,7 +10,7 @@
## Copyright: TravianZ (c) 2010-2014. All rights reserved. ## ## Copyright: TravianZ (c) 2010-2014. All rights reserved. ##
## Improved: aggenkeech ## ## Improved: aggenkeech ##
################################################################################# #################################################################################
if($_SESSION['access'] < 9) die("Access Denied: You are not Admin!"); if($_SESSION['access'] < 8) die("Access Denied: You are not Admin!");
error_reporting(0); error_reporting(0);
$id = $_GET['did']; $id = $_GET['did'];
if(isset($id)) if(isset($id))
README.md
+13 -3
View File
@@ -1,7 +1,13 @@
[![Code Triagers Badge](https://www.codetriage.com/shadowss/travianz/badges/users.svg)](https://www.codetriage.com/shadowss/travianz) [![Code Triagers Badge](https://www.codetriage.com/shadowss/travianz/badges/users.svg)](https://www.codetriage.com/shadowss/travianz)
[![Join the chat at https://gitter.im/TravianZ-V8/Lobby](https://badges.gitter.im/TravianZ-V8/Lobby.svg)](https://gitter.im/TravianZ-V8/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
[![Gratipay User](https://img.shields.io/gratipay/user/martinambrus.svg?style=plastic)](https://gratipay.com/~martinambrus/)
[![Maintenance](https://img.shields.io/maintenance/yes/2017.svg)]() [![Maintenance](https://img.shields.io/maintenance/yes/2017.svg)]()
[![GitHub Release](https://img.shields.io/github/release/Shadowss/TravianZ/all.svg)]()
[![Github All Downloads](https://img.shields.io/github/downloads/Shadowss/TravianZ/total.svg)]()
[![GitHub contributors](https://img.shields.io/github/contributors/Shadowss/TravianZ.svg)]()
[![license](https://img.shields.io/github/license/Shadowss/TravianZ.svg)]()
[![GitHub last commit](https://img.shields.io/github/last-commit/Shadowss/TravianZ.svg)]()
[![Proudly Coded in PHPStorm](https://img.shields.io/badge/coded%20in-PHPStorm-BD5CF3.svg)](https://www.jetbrains.com/buy/opensource/?product=phpstorm)
[![Join the chat at https://gitter.im/TravianZ-V8/Lobby](https://badges.gitter.im/TravianZ-V8/Lobby.svg)](https://gitter.im/TravianZ-V8/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
[![Donate to this project on LiberaPay](https://liberapay.com/assets/widgets/donate.svg)](https://liberapay.com/martinambrus/donate)
TravianZ Version **v.8.3.3 BETA b3** TravianZ Version **v.8.3.3 BETA b3**
====== ======
@@ -48,4 +54,8 @@ runnign this game :)
Also, our thanks go to all both, the original and occasional developers, especially [yi12345](https://github.com/yi12345/), Also, our thanks go to all both, the original and occasional developers, especially [yi12345](https://github.com/yi12345/),
[advocaite](https://github.com/advocaite/), [brainiacX](https://github.com/brainiacX/), [ronix](https://github.com/ronix/), [advocaite](https://github.com/advocaite/), [brainiacX](https://github.com/brainiacX/), [ronix](https://github.com/ronix/),
[MisterX](https://github.com/MisterX/), [Elio](https://github.com/Elio/) and many others who were part of this [MisterX](https://github.com/MisterX/), [Elio](https://github.com/Elio/) and many others who were part of this
project's history. project's history.
Last but not least, our thanks go to [JetBrains](https://www.jetbrains.com/) for lending us a one-year full-featured
[open-source PHPStorm](https://www.jetbrains.com/buy/opensource/?product=phpstorm) (and other products) license!
Thanks guys, you're awesome :)
Templates/a2b/startRaid.tpl
+8 -2
View File
@@ -128,8 +128,14 @@
$modes = []; $modes = [];
for ( $u = 1; $u <= 10; $u ++ ) { for ( $u = 1; $u <= 10; $u ++ ) {
$units[] = $uname2 . ($u < 10 ? $u : 0); if ($tribe == 1) {
$amounts[] = $data[ 'u' . ($u < 10 ? $u : 0) ]; $unitKey = $uname2 . $u;
} else {
$unitKey = $uname2 . ($u < 10 ? $u : 0);
}
$units[] = $uname2 . $unitKey;
$amounts[] = $data[ 'u' . $unitKey ];
$modes[] = 0; $modes[] = 0;
} }
cache/.htaccess
Vendored
-4
View File
@@ -1,4 +0,0 @@
<Files ~ "\.cache$">
Order allow,deny
Deny from all
</Files>
payment/.htaccess
-11
View File
@@ -1,11 +0,0 @@
<Files "*.php">
Order deny,allow
Deny from all
Allow from service.micropayment.de
Allow from proxy.micropayment.de
Allow from access.micropayment.de
ErrorDocument 403 http://travian.shadowss.ro/403.php
ErrorDocument 404 http://travian.shadowss.ro/404.php
ErrorDocument 500 http://travian.shadowss.ro/500.php
Options -Indexes
</Files>
payment/c2p.php
-117
View File
@@ -1,117 +0,0 @@
<?php
session_start();
$amount = $_GET['amount'];
$title = $_GET['title'];
$auth = $_GET['auth'];
$country = $_GET['country'];
$currency = $_GET['currency'];
$free = $_GET['free'];
$function = $_GET['function'];
if(isset($_GET['amount'])) {
$id1 = $_GET['amount'];
} else {
$id1 = "";
}
if ($id1 == "") {
echo"<br>Somethings wrong";
}
if ($id1 == 199) {
$_SESSION['amount'] = $amount;
$trenner = "\n";
$status = 'ok';
$url = "http://" . $_SERVER['HOMEPAGE'] . "/a2b2.php"; // change to your own
$target = '_blank';
$forward = 0;
$response = 'status=' . $status;
$response.= $trenner;
$response.= 'url=' . $url;
$response.= $trenner;
$response.= 'target=' . $target;
$response.= $trenner;
$response.= 'forward=' . $forward;
echo $response;
}
if ($id1 == 499) {
$_SESSION['amount'] = $amount;
$trenner = "\n";
$status = 'ok';
$url = "http://" . $_SERVER['HOMEPAGE'] . "/a2b2.php"; // change to your own
$target = '_blank';
$forward = 1;
$response = 'status=' . $status;
$response.= $trenner;
$response.= 'url=' . $url;
$response.= $trenner;
$response.= 'target=' . $target;
$response.= $trenner;
$response.= 'forward=' . $forward;
echo $response;
}
if ($id1 == 999) {
$_SESSION['amount'] = $amount;
$trenner = "\n";
$status = 'ok';
$url = "http://" . $_SERVER['HOMEPAGE'] . "/a2b2.php"; // change to your own
$target = '_blank';
$forward = 1;
$response = 'status=' . $status;
$response.= $trenner;
$response.= 'url=' . $url;
$response.= $trenner;
$response.= 'target=' . $target;
$response.= $trenner;
$response.= 'forward=' . $forward;
echo $response;
}
if ($id1 == 1999) {
$_SESSION['amount'] = $amount;
$trenner = "\n";
$status = 'ok';
$url = "http://" . $_SERVER['HOMEPAGE'] . "/a2b2.php"; // change to your own
$target = '_blank';
$forward = 1;
$response = 'status=' . $status;
$response.= $trenner;
$response.= 'url=' . $url;
$response.= $trenner;
$response.= 'target=' . $target;
$response.= $trenner;
$response.= 'forward=' . $forward;
echo $response;
}
if ($id1 == 4999) {
$_SESSION['amount'] = $amount;
$trenner = "\n";
$status = 'ok';
$url = "http://" . $_SERVER['HOMEPAGE'] . "/a2b2.php"; // change to your own
$target = '_blank';
$forward = 1;
$response = 'status=' . $status;
$response.= $trenner;
$response.= 'url=' . $url;
$response.= $trenner;
$response.= 'target=' . $target;
$response.= $trenner;
$response.= 'forward=' . $forward;
echo $response;
}
?>