General fixes

+Better indentation, why doesn't anyone use arrays :(
This commit is contained in:
iopietro
2018-06-11 16:03:54 +02:00
parent 365e56addf
commit 048b0d9589
+119 -95
View File
@@ -1,19 +1,20 @@
<?php <?php
//TODO: Reduce this file by a lot, by using arrays
$MyGold = mysqli_query($database->dblink, "SELECT * FROM " . TB_PREFIX . "users WHERE `id`='" . $session->uid . "'") or die(mysqli_error($database->dblink)); $MyGold = mysqli_query($database->dblink, "SELECT * FROM " . TB_PREFIX . "users WHERE `id`='" . $session->uid . "'") or die(mysqli_error($database->dblink));
$golds = mysqli_fetch_array($MyGold); $golds = mysqli_fetch_array($MyGold);
include ("Templates/Plus/pmenu.tpl"); include ("Templates/Plus/pmenu.tpl");
$MyGold = mysqli_query($database->dblink, "SELECT * FROM " . TB_PREFIX . "users WHERE `id`='" . $session->uid . "'") or die(mysqli_error($database->dblink)); $MyGold = mysqli_query($database->dblink, "SELECT * FROM " . TB_PREFIX . "users WHERE `id`='" . $session->uid . "'") or die(mysqli_error($database->dblink));
$golds = mysqli_fetch_array($MyGold); $golds = mysqli_fetch_array($MyGold);
$today = date("mdHi"); $today = date("mdHi");
if (mysqli_num_rows($MyGold)) { if (mysqli_num_rows($MyGold)) {
if($session->gold == 0) echo "<p>You currently don't own gold.</p>"; if ($session->gold == 0)
else echo "<p>You currently have <b> $session->gold </b> gold</p>"; echo "<p>You currently don't own gold.</p>";
else
echo "<p>You currently have <b> $session->gold </b> gold</p>";
} }
?> ?>
@@ -34,10 +35,11 @@ if(mysqli_num_rows($MyGold)){
<tbody> <tbody>
<tr> <tr>
<td class="man"><a href="#" onClick="return Popup(0,6);"><img class="help" src="img/x.gif" alt="" title="" /></a></td> <td class="man"><a href="#" onClick="return Popup(0,6);"><img
<td class="desc"> class="help" src="img/x.gif" alt="" title="" /></a></td>
<b><font color="#71D000">P</font><font color="#FF6F0F">l</font><font color="#71D000">u</font><font color="#FF6F0F">s</font></b> Account<br /> <td class="desc"><b><font color="#71D000">P</font><font
<span class="run"> color="#FF6F0F">l</font><font color="#71D000">u</font><font
color="#FF6F0F">s</font></b> Account<br /> <span class="run">
<?php <?php
$datetimep = $golds['plus']; $datetimep = $golds['plus'];
$datetime1 = $golds['b1']; $datetime1 = $golds['b1'];
@@ -50,7 +52,6 @@ $datetimedp = $golds['dp'];
// Retrieve the current date/time // Retrieve the current date/time
$date2 = strtotime("NOW"); $date2 = strtotime("NOW");
if ($datetimep == 0) echo "get PLUS<br>"; if ($datetimep == 0) echo "get PLUS<br>";
else else
{ {
@@ -71,15 +72,18 @@ $holdmr=intval($holdtotmin-(($holdhr*60)+($holdtotday*1440)));
echo "<b> " . ($holdmr) . "</b> mins</font>"; echo "<b> " . ($holdmr) . "</b> mins</font>";
} }
?> ?>
</span> </span></td>
</td> <td class="dur"><?php
<td class="dur"><?php if(PLUS_TIME >= 86400){
if (PLUS_TIME >= 86400) {
echo '' . (PLUS_TIME / 86400) . ' Days'; echo '' . (PLUS_TIME / 86400) . ' Days';
} else if (PLUS_TIME < 86400) { } else if (PLUS_TIME < 86400) {
echo '' . (PLUS_TIME / 3600) . ' Hours'; echo '' . (PLUS_TIME / 3600) . ' Hours';
} ?> }
?>
</td> </td>
<td class="cost"><img src="img/x.gif" class="gold" alt="Gold" title="Gold" alt="Gold" title="Gold" />10</td> <td class="cost"><img src="img/x.gif" class="gold" alt="Gold"
title="Gold" alt="Gold" title="Gold" />10</td>
<td class="act"> <td class="act">
<?php <?php
@@ -90,17 +94,17 @@ if (mysqli_num_rows($MyGold)) {
if ($golds['gold'] > 9 && $datetimep < $date2) { if ($golds['gold'] > 9 && $datetimep < $date2) {
echo ' echo '
<a href="plus.php?id=8"><span>Activate'; <a href="plus.php?id=8"><span>Activate';
}elseif } elseif ($golds['gold'] > 9 && $datetimep > $date2) {
($golds['gold'] > 9 && $datetimep > $date2) {
echo ' echo '
<a href="plus.php?id=8"><span>Extend'; <a href="plus.php?id=8"><span>Extend';
} else { } else {
echo '<a href="plus.php?s=1"><span class="none">too little gold';} echo '<a href="plus.php?s=1"><span class="none">too little gold';
}
} }
} }
?> ?>
</span></a></td> </span></a>
</td>
</tr> </tr>
<tr> <tr>
@@ -108,10 +112,11 @@ if (mysqli_num_rows($MyGold)) {
</tr> </tr>
<tr> <tr>
<td class="man"><a href="#" onClick="return Popup(1,6);"><img class="help" src="img/x.gif" alt="" title="" /></a></td> <td class="man"><a href="#" onClick="return Popup(1,6);"><img
<td class="desc"> class="help" src="img/x.gif" alt="" title="" /></a></td>
+<b>25</b>% <img class="r1" src="img/x.gif" alt="Lumber" title="Lumber" /> Production: Lumber<br /> <td class="desc">+<b>25</b>% <img class="r1" src="img/x.gif"
<span class="run"> alt="Lumber" title="Lumber" /> Production: Lumber<br /> <span
class="run">
<?php <?php
$tl_b1 = $golds['b1']; $tl_b1 = $golds['b1'];
@@ -132,18 +137,21 @@ $holdmr1=intval($holdtotmin1-(($holdhr1*60)+($holdtotday1*1440)));
echo "<font color='#B3B3B3' size='1'>Remaining <b> " . $holdtotday1 . "</b> days "; echo "<font color='#B3B3B3' size='1'>Remaining <b> " . $holdtotday1 . "</b> days ";
echo "<b> " . ($holdhr1) . "</b> hours "; echo "<b> " . ($holdhr1) . "</b> hours ";
echo "<b> " . ($holdmr1) . "</b> mins</font> "; echo "<b> " . ($holdmr1) . "</b> mins</font> ";
} }
?> ?>
&nbsp; </span> &nbsp; </span>
</td> </td>
<td class="dur"><?php if(PLUS_PRODUCTION >= 86400){ <td class="dur"><?php
if (PLUS_PRODUCTION >= 86400) {
echo '' . (PLUS_PRODUCTION / 86400) . ' Days'; echo '' . (PLUS_PRODUCTION / 86400) . ' Days';
} else if (PLUS_PRODUCTION < 86400) { } else if (PLUS_PRODUCTION < 86400) {
echo '' . (PLUS_PRODUCTION / 3600) . ' Hours'; echo '' . (PLUS_PRODUCTION / 3600) . ' Hours';
} ?></td> }
<td class="cost"><img src="img/x.gif" class="gold" alt="Gold" title="Gold" />5</td> ?></td>
<td class="cost"><img src="img/x.gif" class="gold" alt="Gold"
title="Gold" />5</td>
<td class="act"><span class="none"> <td class="act"><span class="none">
<?php <?php
@@ -151,21 +159,21 @@ if ($session->access != BANNED){
if (mysqli_num_rows($MyGold)) { if (mysqli_num_rows($MyGold)) {
if ($golds['gold'] > 4 && $tl_b1 < $date2) { if ($golds['gold'] > 4 && $tl_b1 < $date2) {
echo '<a href="plus.php?id=9"><span>Activate'; echo '<a href="plus.php?id=9"><span>Activate';
}elseif } elseif ($golds['gold'] > 4 && $datetime1 > $date2) {
($golds['gold'] > 4 && $datetime1 > $date2) {
echo ' <a href="plus.php?id=9"><span>Extend'; echo ' <a href="plus.php?id=9"><span>Extend';
} else { } else {
echo '<a href="plus.php?s=1"><span class="none">too little gold';} echo '<a href="plus.php?s=1"><span class="none">too little gold';
}
} }
} else { } else {
if (mysqli_num_rows($MyGold)) { if (mysqli_num_rows($MyGold)) {
if ($golds['gold'] > 4 && $tl_b1 < $date2) { if ($golds['gold'] > 4 && $tl_b1 < $date2) {
echo '<a href="banned.php"><span>Activate'; echo '<a href="banned.php"><span>Activate';
}elseif } elseif ($golds['gold'] > 4 && $datetime1 > $date2) {
($golds['gold'] > 4 && $datetime1 > $date2) {
echo ' <a href="banned.php"><span>Extend'; echo ' <a href="banned.php"><span>Extend';
} else { } else {
echo '<a href="banned.php"><span class="none">too little gold';} echo '<a href="banned.php"><span class="none">too little gold';
}
} }
} }
?> ?>
@@ -173,11 +181,11 @@ if (mysqli_num_rows($MyGold)) {
</tr> </tr>
<tr> <tr>
<td class="man"><a href="#" onClick="return Popup(2,6);"><img class="help" src="img/x.gif" alt="" title="" /></a></td> <td class="man"><a href="#" onClick="return Popup(2,6);"><img
class="help" src="img/x.gif" alt="" title="" /></a></td>
<td class="desc"> <td class="desc">+<b>25</b>% <img class="r2" src="img/x.gif"
+<b>25</b>% <img class="r2" src="img/x.gif" alt="Clay" title="Clay" /> Production: Clay<br /> alt="Clay" title="Clay" /> Production: Clay<br /> <span class="run">
<span class="run">
<?php <?php
$tl_b2 = $golds['b2']; $tl_b2 = $golds['b2'];
@@ -198,17 +206,20 @@ $holdmr2=intval($holdtotmin2-(($holdhr2*60)+($holdtotday2*1440)));
echo "<font color='#B3B3B3' size='1'>Remaining: <b> " . $holdtotday2 . "</b> days "; echo "<font color='#B3B3B3' size='1'>Remaining: <b> " . $holdtotday2 . "</b> days ";
echo "<b> " . ($holdhr2) . "</b> hours "; echo "<b> " . ($holdhr2) . "</b> hours ";
echo "<b> " . ($holdmr2) . "</b> mins<font>"; echo "<b> " . ($holdmr2) . "</b> mins<font>";
} }
?> ?>
&nbsp; </span> &nbsp; </span>
</td> </td>
<td class="dur"><?php if(PLUS_PRODUCTION >= 86400){ <td class="dur"><?php
if (PLUS_PRODUCTION >= 86400) {
echo '' . (PLUS_PRODUCTION / 86400) . ' Days'; echo '' . (PLUS_PRODUCTION / 86400) . ' Days';
} else if (PLUS_PRODUCTION < 86400) { } else if (PLUS_PRODUCTION < 86400) {
echo '' . (PLUS_PRODUCTION / 3600) . ' Hours'; echo '' . (PLUS_PRODUCTION / 3600) . ' Hours';
} ?></td> }
<td class="cost"><img src="img/x.gif" class="gold" alt="Gold" title="Gold" />5</td> ?></td>
<td class="cost"><img src="img/x.gif" class="gold" alt="Gold"
title="Gold" />5</td>
<td class="act"><span class="none"> <td class="act"><span class="none">
@@ -217,32 +228,34 @@ if ($session->access != BANNED){
if (mysqli_num_rows($MyGold)) { if (mysqli_num_rows($MyGold)) {
if ($golds['gold'] > 4 && $tl_b2 < $date2) { if ($golds['gold'] > 4 && $tl_b2 < $date2) {
echo '<a href="plus.php?id=10"><span>Activate'; echo '<a href="plus.php?id=10"><span>Activate';
}elseif } elseif ($golds['gold'] > 4 && $tl_b2 > $date2) {
($golds['gold'] > 4 && $tl_b2 > $date2) {
echo ' <a href="plus.php?id=10"><span>Extend'; echo ' <a href="plus.php?id=10"><span>Extend';
} else { } else {
echo '<a href="plus.php?s=1"><span class="none">too little gold</span></a></td>';} echo '<a href="plus.php?s=1"><span class="none">too little gold</span></a></td>';
}
} }
} else { } else {
if (mysqli_num_rows($MyGold)) { if (mysqli_num_rows($MyGold)) {
if ($golds['gold'] > 4 && $tl_b2 < $date2) { if ($golds['gold'] > 4 && $tl_b2 < $date2) {
echo '<a href="banned.php"><span>Activate'; echo '<a href="banned.php"><span>Activate';
}elseif } elseif ($golds['gold'] > 4 && $tl_b2 > $date2) {
($golds['gold'] > 4 && $tl_b2 > $date2) {
echo ' <a href="banned.php"><span>Extend'; echo ' <a href="banned.php"><span>Extend';
} else { } else {
echo '<a href="banned.php"><span class="none">too little gold</span></a></td>';} echo '<a href="banned.php"><span class="none">too little gold</span></a></td>';
}
} }
} }
?> ?>
</tr> </tr>
<tr> <tr>
<td class="man"><a href="#" onClick="return Popup(3,6);"><img class="help" src="img/x.gif" alt="" title="" /></a></td> <td class="man"><a href="#" onClick="return Popup(3,6);"><img
<td class="desc"> class="help" src="img/x.gif" alt="" title="" /></a></td>
+<b>25</b>% <img class="r3" src="img/x.gif" alt="Iron" title="Iron" /> Production: Iron<br /> <td class="desc">+<b>25</b>% <img class="r3" src="img/x.gif"
<span class="run"> alt="Iron" title="Iron" /> Production: Iron<br /> <span class="run">
<?php <?php
$tl_b3 = $golds['b3']; $tl_b3 = $golds['b3'];
@@ -263,17 +276,20 @@ $holdmr3=intval($holdtotmin3-(($holdhr3*60)+($holdtotday3*1440)));
echo "<font color='#B3B3B3' size='1'>Remaining: <b> " . $holdtotday3 . "</b> days "; echo "<font color='#B3B3B3' size='1'>Remaining: <b> " . $holdtotday3 . "</b> days ";
echo "<b> " . ($holdhr3) . "</b> hours "; echo "<b> " . ($holdhr3) . "</b> hours ";
echo "<b> " . ($holdmr3) . "</b> mins</font>"; echo "<b> " . ($holdmr3) . "</b> mins</font>";
} }
?> ?>
&nbsp; </span> &nbsp; </span>
</td> </td>
<td class="dur"><?php if(PLUS_PRODUCTION >= 86400){ <td class="dur"><?php
if (PLUS_PRODUCTION >= 86400) {
echo '' . (PLUS_PRODUCTION / 86400) . ' Days'; echo '' . (PLUS_PRODUCTION / 86400) . ' Days';
} else if (PLUS_PRODUCTION < 86400) { } else if (PLUS_PRODUCTION < 86400) {
echo '' . (PLUS_PRODUCTION / 3600) . ' Hours'; echo '' . (PLUS_PRODUCTION / 3600) . ' Hours';
} ?></td> }
<td class="cost"><img src="img/x.gif" class="gold" alt="Gold" title="Gold" />5</td> ?></td>
<td class="cost"><img src="img/x.gif" class="gold" alt="Gold"
title="Gold" />5</td>
<td class="act"><span class="none"> <td class="act"><span class="none">
<?php <?php
@@ -281,21 +297,21 @@ if ($session->access != BANNED){
if (mysqli_num_rows($MyGold)) { if (mysqli_num_rows($MyGold)) {
if ($golds['gold'] > 4 && $tl_b3 < $date2) { if ($golds['gold'] > 4 && $tl_b3 < $date2) {
echo '<a href="plus.php?id=11"><span>Activate'; echo '<a href="plus.php?id=11"><span>Activate';
}elseif } elseif ($golds['gold'] > 4 && $tl_b3 > $date2) {
($golds['gold'] > 4 && $tl_b3 > $date2) {
echo ' <a href="plus.php?id=11"><span>Extend'; echo ' <a href="plus.php?id=11"><span>Extend';
} else { } else {
echo '<a href="plus.php?s=1"><span class="none">too little gold';} echo '<a href="plus.php?s=1"><span class="none">too little gold';
}
} }
} else { } else {
if (mysqli_num_rows($MyGold)) { if (mysqli_num_rows($MyGold)) {
if ($golds['gold'] > 4 && $tl_b3 < $date2) { if ($golds['gold'] > 4 && $tl_b3 < $date2) {
echo '<a href="banned.php"><span>Activate'; echo '<a href="banned.php"><span>Activate';
}elseif } elseif ($golds['gold'] > 4 && $tl_b3 > $date2) {
($golds['gold'] > 4 && $tl_b3 > $date2) {
echo ' <a href="banned.php"><span>Extend'; echo ' <a href="banned.php"><span>Extend';
} else { } else {
echo '<a href="banned.php"><span class="none">too little gold';} echo '<a href="banned.php"><span class="none">too little gold';
}
} }
} }
?> ?>
@@ -304,10 +320,10 @@ if (mysqli_num_rows($MyGold)) {
<tr> <tr>
<td class="man"><a href="#" onClick="return Popup(4,6);"><img class="help" src="img/x.gif" alt="" title="" /></a></td> <td class="man"><a href="#" onClick="return Popup(4,6);"><img
<td class="desc"> class="help" src="img/x.gif" alt="" title="" /></a></td>
+<b>25</b>% <img class="r4" src="img/x.gif" alt="Crop" title="Crop" /> Production: Crop<br /> <td class="desc">+<b>25</b>% <img class="r4" src="img/x.gif"
<span class="run"> alt="Crop" title="Crop" /> Production: Crop<br /> <span class="run">
<?php <?php
$tl_b4 = $golds['b4']; $tl_b4 = $golds['b4'];
@@ -330,34 +346,39 @@ echo "<b> ".($holdhr4). "</b> hours ";
echo "<b> " . ($holdmr4) . "</b> mins</font>"; echo "<b> " . ($holdmr4) . "</b> mins</font>";
} }
?> ?>
&nbsp; </span> </td> &nbsp; </span>
<td class="dur"><?php if(PLUS_PRODUCTION >= 86400){ </td>
<td class="dur"><?php
if (PLUS_PRODUCTION >= 86400) {
echo '' . (PLUS_PRODUCTION / 86400) . ' Days'; echo '' . (PLUS_PRODUCTION / 86400) . ' Days';
} else if (PLUS_PRODUCTION < 86400) { } else if (PLUS_PRODUCTION < 86400) {
echo '' . (PLUS_PRODUCTION / 3600) . ' Hours'; echo '' . (PLUS_PRODUCTION / 3600) . ' Hours';
} ?></td> }
<td class="cost"><img src="img/x.gif" class="gold" alt="Gold" title="Gold" />5</td> ?></td>
<td class="cost"><img src="img/x.gif" class="gold" alt="Gold"
title="Gold" />5</td>
<td><span class="none"> <td><span class="none">
<?php <?php
if ($session->access != BANNED) { if ($session->access != BANNED) {
if (mysqli_num_rows($MyGold)) { if (mysqli_num_rows($MyGold)) {
if ($golds['gold'] > 4 && $tl_b4 < $date2) { if ($golds['gold'] > 4 && $tl_b4 < $date2) {
echo '<a href="plus.php?id=12"><span>Activate'; echo '<a href="plus.php?id=12"><span>Activate';
}elseif } elseif ($golds['gold'] > 4 && $tl_b4 > $date2) {
($golds['gold'] > 4 && $tl_b4 > $date2) {
echo ' <a href="plus.php?id=12"><span>Extend'; echo ' <a href="plus.php?id=12"><span>Extend';
} else { } else {
echo '<a href="plus.php?s=1"><span class="none">too little gold';} echo '<a href="plus.php?s=1"><span class="none">too little gold';
}
} }
} else { } else {
if (mysqli_num_rows($MyGold)) { if (mysqli_num_rows($MyGold)) {
if ($golds['gold'] > 4 && $tl_b4 < $date2) { if ($golds['gold'] > 4 && $tl_b4 < $date2) {
echo '<a href="banned.php"><span>Activate'; echo '<a href="banned.php"><span>Activate';
}elseif } elseif ($golds['gold'] > 4 && $tl_b4 > $date2) {
($golds['gold'] > 4 && $tl_b4 > $date2) {
echo ' <a href="banned.php"><span>Extend'; echo ' <a href="banned.php"><span>Extend';
} else { } else {
echo '<a href="banned.php"><span class="none">too little gold';} echo '<a href="banned.php"><span class="none">too little gold';
}
} }
} }
?> ?>
@@ -369,10 +390,13 @@ if (mysqli_num_rows($MyGold)) {
</tr> </tr>
<tr> <tr>
<td class="man"><a href="#" onClick="return Popup(7,6);"><img class="help" src="img/x.gif" alt="" title="" /></a></td> <td class="man"><a href="#" onClick="return Popup(7,6);"><img
<td class="desc">Complete construction orders and researches in this village now (does not work for Palace and Residence).</td> class="help" src="img/x.gif" alt="" title="" /></a></td>
<td class="desc">Complete construction orders and researches in this
village now (does not work for Palace and Residence).</td>
<td class="dur">now</td> <td class="dur">now</td>
<td class="cost"><img src="img/x.gif" class="gold" alt="Gold" title="Gold" />2</td> <td class="cost"><img src="img/x.gif" class="gold" alt="Gold"
title="Gold" />2</td>
<td class="act"><span class="none"> <td class="act"><span class="none">
<?php <?php
@@ -400,10 +424,12 @@ if (mysqli_num_rows($MyGold)) {
</tr> </tr>
<tr> <tr>
<td class="man"><a href="#" onClick="return Popup(8,6);"><img class="help" src="img/x.gif" alt="" title="" /></a></td> <td class="man"><a href="#" onClick="return Popup(8,6);"><img
class="help" src="img/x.gif" alt="" title="" /></a></td>
<td class="desc">1:1 Trade with the NPC merchant</td> <td class="desc">1:1 Trade with the NPC merchant</td>
<td class="dur">now</td> <td class="dur">now</td>
<td class="cost"><img src="img/x.gif" class="gold" alt="Gold" title="Gold" />3</td> <td class="cost"><img src="img/x.gif" class="gold" alt="Gold"
title="Gold" />3</td>
<td class="act"><span class="none"> <td class="act"><span class="none">
@@ -426,8 +452,7 @@ if (mysqli_num_rows($MyGold)) {
} }
} }
?> ?>
</span></a> </span></a></td>
</td>
</tr> </tr>
</tbody> </tbody>
@@ -449,15 +474,12 @@ if (mysqli_num_rows($MyGold)) {
<tbody> <tbody>
<tr> <tr>
<td class="man"><a href="#" onClick="return Popup(9,6);"><img class="help" src="img/x.gif" alt="" title="" /></a></td> <td class="man"><a href="#" onClick="return Popup(9,6);"><img
<td class="desc"> class="help" src="img/x.gif" alt="" title="" /></a></td>
<b>Gold Club</b></br> <td class="desc"><b>Gold Club</b></br> <span class="run"> </span></td>
<span class="run"> <td class="dur">Whole game round</td>
</span> <td class="cost"><img src="img/x.gif" class="gold" alt="Gold"
</td> title="Gold" alt="Gold" title="Gold" />100</td>
<td class="dur">Whole game round
</td>
<td class="cost"><img src="img/x.gif" class="gold" alt="Gold" title="Gold" alt="Gold" title="Gold" />100</td>
<td class="act"> <td class="act">
<?php <?php
@@ -472,12 +494,14 @@ if (mysqli_num_rows($MyGold)) {
} else { } else {
echo ' echo '
<a href="plus.php?s=1"><span class="none">too little gold'; <a href="plus.php?s=1"><span class="none">too little gold';
}
}} else { } else {
echo '<a href="plus.php?id=3"><span class="none">On';} echo '<a href="plus.php?id=3"><span class="none">On';
}
} }
?> ?>
</span></a></td> </span></a>
</td>
</tr> </tr>
</tbody> </tbody>
</table> </table>