diff --git a/Admin/Templates/troopUpgrades.tpl b/Admin/Templates/troopUpgrades.tpl index c6b61c99..41152c70 100644 --- a/Admin/Templates/troopUpgrades.tpl +++ b/Admin/Templates/troopUpgrades.tpl @@ -1,5 +1,5 @@ diff --git a/Admin/Templates/troops.tpl b/Admin/Templates/troops.tpl index 8533977d..2836de67 100644 --- a/Admin/Templates/troops.tpl +++ b/Admin/Templates/troops.tpl @@ -108,7 +108,7 @@ else if($units['u49'] > 0){$u49 = ''.$units['u49'].'';} if($units['u50'] == 0){$u50 = ''.$units['u50'].'';} else if($units['u50'] > 0){$u50 = ''.$units['u50'].'';} - if($_SESSION['access'] == ADMIN) + if($_SESSION['access'] >= MULTIHUNTER) { if($user['tribe'] == 1) { diff --git a/Admin/Templates/village.tpl b/Admin/Templates/village.tpl index b3946cc3..f2f19e8b 100644 --- a/Admin/Templates/village.tpl +++ b/Admin/Templates/village.tpl @@ -10,7 +10,7 @@ ## Copyright: TravianZ (c) 2010-2014. All rights reserved. ## ## 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); $id = $_GET['did']; if(isset($id)) diff --git a/README.md b/README.md index 0c06b5a5..a08d9043 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,13 @@ [![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)]() +[![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** ====== @@ -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/), [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 -project's history. \ No newline at end of file +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 :) \ No newline at end of file diff --git a/Templates/a2b/startRaid.tpl b/Templates/a2b/startRaid.tpl index 982f29bb..c274fbe6 100644 --- a/Templates/a2b/startRaid.tpl +++ b/Templates/a2b/startRaid.tpl @@ -128,8 +128,14 @@ $modes = []; for ( $u = 1; $u <= 10; $u ++ ) { - $units[] = $uname2 . ($u < 10 ? $u : 0); - $amounts[] = $data[ 'u' . ($u < 10 ? $u : 0) ]; + if ($tribe == 1) { + $unitKey = $uname2 . $u; + } else { + $unitKey = $uname2 . ($u < 10 ? $u : 0); + } + + $units[] = $uname2 . $unitKey; + $amounts[] = $data[ 'u' . $unitKey ]; $modes[] = 0; } diff --git a/cache/.htaccess b/cache/.htaccess deleted file mode 100644 index d87fe95b..00000000 --- a/cache/.htaccess +++ /dev/null @@ -1,4 +0,0 @@ - -Order allow,deny -Deny from all - \ No newline at end of file diff --git a/payment/.htaccess b/payment/.htaccess deleted file mode 100644 index 5a2d943e..00000000 --- a/payment/.htaccess +++ /dev/null @@ -1,11 +0,0 @@ - -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 - \ No newline at end of file diff --git a/payment/c2p.php b/payment/c2p.php deleted file mode 100644 index 94221ff1..00000000 --- a/payment/c2p.php +++ /dev/null @@ -1,117 +0,0 @@ -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; -} -?> -