fix: work on very basic PHP remediation

This commit is contained in:
Emmanuel BENOîT 2024-12-31 00:25:05 +01:00
parent b18b795ab3
commit 6ee9078e0c
Signed by: Emmanuel BENOîT
SSH key fingerprint: SHA256:l7PFUUF5TCDsvYeQC9OnTNz08dFY7Fvf4Hv3neIqYpg
117 changed files with 216 additions and 208 deletions

View file

@ -1,10 +1,10 @@
<title>Legacy Worlds<?= is_null($this->title) ? "" : " - {$this->title}" ?></title>
<? if (! is_null($this->cssRes) ) : ?>
<?php if (! is_null($this->cssRes) ) : ?>
<link rel='stylesheet' type='text/css' href='<?= makeLink('css', 'main', 'css') ?>?id=<?= $this->cssRes ?>' />
<? endif; ?>
<? if (! is_null($this->jsRes) ) : ?>
<?php endif; ?>
<?php if (! is_null($this->jsRes) ) : ?>
<script type='text/javascript' charset='utf-8' src='<?= makeLink('js', 'main', 'js') ?>?id=<?= $this->jsRes ?>'></script>
<? endif; ?>
<?php endif; ?>
<meta name=description content="Massively multiplayer strategy game based on planet conquest, research, spying, diplomacy, war, alliances. Features both permanent and 'speed' games." />
<meta name=keywords content="massively multiplayer, free, strategy game, wargame, multiplayer games, multiplayer game, strategy games, planet conquest, planets, colonisation, colonization, galaxy, galactic, universe, persistent, permanent, warships, fleets, fighter, massively multiplayer game, cruiser, battle cruiser, star, starship, ground armies, strategy game, planet, nebula, nebulae, players, alliances, online multiplayer game, diplomacy, spy, trade, spying, trading, web, browser, based, multiplayer, strategy" />
</head>
@ -17,5 +17,5 @@
engine v<?= config::$main['v_engine'] ?> -
revision <?= config::$main['v_rev'] ?>
</div>
<div id="players"><? include("players.en.inc"); ?></div>
<div id="lbox"><? include("lbox.en.inc"); ?></div>
<div id="players"><?php include("players.en.inc"); ?></div>
<div id="lbox"><?php include("lbox.en.inc"); ?></div>

View file

@ -1,20 +1,20 @@
<? if ($_SESSION['authok']) : ?>
<?php if ($_SESSION['authok']) : ?>
Welcome, <b><?= utf8entities($_SESSION['login']) ?></b><br/>
<? if ($__vacation) : ?>
<?php if ($__vacation) : ?>
Vacation mode activated
<? endif; ?>
<?php endif; ?>
<br/>
<a title="Preferences" href="<?= makeLink('settings', 'main') ?>">Preferences</a><br/>
<a title="Log out" href="<?= makeLink('logout', 'main') ?>">Log out</a>
<? else : ?>
<? if (input::$path == "main" && input::$page == "logout") : ?>
<?php else : ?>
<?php if (input::$path == "main" && input::$page == "logout") : ?>
<form method="post" action="<?= makeLink('index', 'main') ?>?userlogin=1"><div>
<? else : ?>
<?php else : ?>
<form method="post" action="?userlogin=1"><div>
<? endif; ?>
<?php endif; ?>
Username: <input type="text" name="login" value='' size="15" maxlength="15" class='input' /><br/>
Password: <input type="password" name="password" value='' size="15" maxlength="65" class='input' /><br/>
<a title="Recover password" href="<?= makeLink('lostpass', 'main') ?>">Forgot your password?</a>
<input type="submit" value='Log in' class='input' />
</div></form>
<? endif; ?>
<?php endif; ?>

View file

@ -1,4 +1,4 @@
<?
<?php
include("menu.en.inc");
$this->title = "About Legacy Worlds";
$this->addStylesheet('text');
@ -39,4 +39,4 @@ $this->startContents();
<a href="http://www.gpmanagerpro.com">GP Manager Pro</a> is DeepClone's latest project, a game
in which you play as the manager of a Grand Prix team.
</p>
<? $this->endContents(); ?>
<?php $this->endContents(); ?>

View file

@ -1,4 +1,4 @@
<?
<?php
include("menu.en.inc");
$this->title = "My account";
$this->addScript("account");
@ -73,9 +73,9 @@ function displayRegistered($a) {
?>
<div id='tabs'>
<a href="#acc-games" id="tab-games">Games</a>
<? if (is_null($__quit)) : ?>
<?php if (is_null($__quit)) : ?>
<a href="#acc-vacation" id="tab-vacation">Vacation</a>
<? endif; ?>
<?php endif; ?>
<a href="#acc-quit" id="tab-quit">Quit LegacyWorlds</a>
</div>
<div id="acc-games" class="acctab">
@ -89,7 +89,7 @@ $onVacation = ($vac['status'] == 'VAC');
if (count($args['play'])) {
echo "<p>You are currently playing the following games:</p>\n";
displayRegistered($args['play']);
if (count($args['other'])) {
if (isset($args['other']) && count($args['other'])) {
if ($onVacation) {
echo "<p>Other games are available, but you must exit vacation mode to see them.</p>\n";
} elseif (!$_SESSION['show_unregistered']) {
@ -133,7 +133,7 @@ if ($args['leech']) {
?>
</div>
<?
<?php
if (is_null($args['quit'])) {
?>

View file

@ -1,4 +1,4 @@
<?
<?php
$this->title = "Please contribute";
$this->addStylesheet('annoy');
$this->addScript('annoy');

View file

@ -1,4 +1,4 @@
<?
<?php
include('menu.en.inc');
$this->title = 'Beta 6 planets';
$this->addStylesheet('b6pp');
@ -30,7 +30,7 @@ $this->startContents();
<h2>Beta 6 planet pictures</h2>
<p><a href="?c=">Rate a picture</a> - <a href="?c=t">Top ratings</a> - You rated <?=$args['rated']?> out of <?=$args['total']?> pictures.</p>
<p>&nbsp;</p>
<? if ($args['page'] == 'nu'): ?>
<?php if ($args['page'] == 'nu'): ?>
<h3>There are no more pictures for you to rate</h3>
<p>
It would seem that you have rated all of the currently available pictures.
@ -38,7 +38,7 @@ $this->startContents();
<p>
Please come back later!
</p>
<? elseif ($args['page'] == 'vp') : ?>
<?php elseif ($args['page'] == 'vp') : ?>
<table style="margin: 0px auto; border-width:0px; width: 90%">
<tr>
<td style="vertical-align: middle; border-width:0px; text-align:center">
@ -53,7 +53,7 @@ $this->startContents();
<p>Environment: <?= $envType[$args['pic']['p_type']] ?></p>
<p>Type: <?= $pType[$args['pic']['p_type']][0] ?></p>
<p>Description: <?= $pType[$args['pic']['p_type']][1] ?></p>
<? if (is_null($args['cr'])) : ?>
<?php if (is_null($args['cr'])) : ?>
<p>&nbsp;</p>
<h3>Rate this picture</h3>
<div>
@ -66,7 +66,7 @@ $this->startContents();
for ($i = 1; $i <= 5; $i ++) {
?>
<input type="radio" name="r" value="<?=$i?>" onclick="this.form.submit();" />&nbsp;<?=$i?> &nbsp;
<?
<?php
}
?> &nbsp;(best)
</p></div>
@ -74,12 +74,12 @@ for ($i = 1; $i <= 5; $i ++) {
</div>
<p>&nbsp;</p>
<p>Each planet you rate grants you 120 <a href='<?=makeLink('contrib', 'main')?>'>contribution credits</a>.</p>
<? else: ?>
<?php else: ?>
<h3>Ratings</h3>
<p>Your rating: <?= $args['cr'] ?> / 5</p>
<p>Average rating: <?= $args['ar'] ?></p>
<p>Total votes: <?= $args['nv'] ?></p>
<? endif; ?>
<?php endif; ?>
</td>
</tr>
<tr>
@ -88,7 +88,7 @@ for ($i = 1; $i <= 5; $i ++) {
</td>
</tr>
</table>
<? elseif ($args['page'] == 'tt') : ?>
<?php elseif ($args['page'] == 'tt') : ?>
<h3 style="margin: 5px 0px; text-align: center">Top 50 planet pictures</h3>
<table style="margin: 0px auto; border-style: none">
<?php
@ -105,12 +105,12 @@ foreach ($args['pics'] as $pic) {
<?= sprintf("%.2f", $pic['rating']) ?> / 5.00
</td>
</tr>
<?
<?php
}
?>
</table>
<? elseif ($args['page'] == 'nt') : ?>
<?php elseif ($args['page'] == 'nt') : ?>
<h3>No planets have been rated at the moment</h3>
<p>... which kind of explains why this page is blank.</p>
<? endif; ?>
<? $this->endContents(); ?>
<?php endif; ?>
<?php $this->endContents(); ?>

View file

@ -1,4 +1,4 @@
<?
<?php
include("menu.en.inc");
$this->title = "Cancel account deletion";
$this->addStylesheet("account");
@ -17,4 +17,4 @@ $this->startContents();
<input type="submit" name="cancel" value="No, get on with it" class="input" />
</div></form>
</div>
<? $this->endContents(); ?>
<?php $this->endContents(); ?>

View file

@ -1,4 +1,4 @@
<?
<?php
include("menu.en.inc");
$this->title = "Account confirmation";
$this->startContents();
@ -17,4 +17,4 @@ $this->startContents();
<input type='submit' value='Validate my account' class="input" />
</p>
</div></form>
<? $this->endContents(); ?>
<?php $this->endContents(); ?>

View file

@ -1,4 +1,4 @@
<?
<?php
include('menu.en.inc');
$this->title = 'Contributions';
$this->addStylesheet('text');
@ -30,4 +30,4 @@ $this->startContents();
Note: if the resources you used are higher than the estimate of your contributions, you will start getting an
annoying message every time you log on to LegacyWorlds.
</p>
<? $this->endContents(); ?>
<?php $this->endContents(); ?>

View file

@ -102,7 +102,7 @@ if ($__err3) {
</div>
</div>
</div>
<?
<?php
$ePlanet = array(
"Valid characters: letters, numbers, spaces, and _@.+'/",
"The planet name is too long.",
@ -132,4 +132,4 @@ if ($__err4) {
<div class="formline"><input type='submit' name='create' value='Create account' class="input" /></div>
</div>
</div></form>
<? $this->endContents(); ?>
<?php $this->endContents(); ?>

View file

@ -1,4 +1,4 @@
<?
<?php
include("menu.en.inc");
$this->title = "Account creation";
$this->addStylesheet('text');

View file

@ -1,4 +1,4 @@
<?
<?php
include("menu.en.inc");
$this->title = "Credits";
$this->addStylesheet("credits");
@ -37,4 +37,4 @@ $this->startContents();
<div class="misc">Thanks to everyone who contributed to the game with various ideas or by reporting bugs...</div>
<div class="misc">Many bottles of beer were harmed during the making of this game.</div>
<? $this->endContents(); ?>
<?php $this->endContents(); ?>

View file

@ -1,4 +1,4 @@
<?
<?php
include("menu.en.inc");
$this->title = "Disclaimer";
$this->addStylesheet('text');
@ -28,4 +28,4 @@ $this->startContents();
the <a href="<?=makeLink('manual')?>?p=general_rules">manual</a>.
</p>
<?=$args?"<p>&nbsp;</p><p><a href='?'>Continue to account creation</a></p>":""?>
<? $this->endContents(); ?>
<?php $this->endContents(); ?>

View file

@ -1,5 +1,5 @@
<? $this->addStylesheet('home'); ?>
<? include('menu.en.inc'); ?>
<?php $this->addStylesheet('home'); ?>
<?php include('menu.en.inc'); ?>
<div id="gamedesc">
Legacy Worlds is a free, massively multiplayer, browser-based strategy game.<br/>
You don't need any plugins to play it, nor do you need to download anything.<br/>

View file

@ -1,4 +1,4 @@
<?
<?php
include("menu.en.inc");
$this->addStylesheet('text');
$this->title = "Logged out";
@ -17,4 +17,4 @@ $this->startContents();
<p>
See you soon!
</p>
<? $this->endContents(); ?>
<?php $this->endContents(); ?>

View file

@ -1,4 +1,4 @@
<?
<?php
include("menu.en.inc");
$this->title = "Password recovery";
$this->startContents();
@ -40,7 +40,7 @@ if ($args === false || is_array($args) && $args['error'] < 2) {
</tr>
</table>
</div></form>
<?
<?php
} elseif ($args === true) {
?>
<h1>Your password has been changed!</h1>
@ -111,4 +111,4 @@ if ($args === false || is_array($args) && $args['error'] < 2) {
}
?>
<? $this->endContents(); ?>
<?php $this->endContents(); ?>

View file

@ -1,4 +1,4 @@
<?
<?php
$game = config::getDefaultGame();
$man = $game->getLib('main/manual');
@ -37,7 +37,7 @@ ob_start();
<span id="msb-title">Contents</span>
</div>
<div id="msb-links">
<?
<?php
function dumpManualStructure(&$sections, $depth) {
$br = false;
@ -62,7 +62,7 @@ function dumpManualStructure(&$sections, $depth) {
?>
</div>
<?
<?php
$sbContents = ob_get_contents();
ob_end_clean();

View file

@ -66,13 +66,13 @@ function drawTitle(&$section, $depth) {
$tMargin = ($pgLink == "") ? "5px $mDepth 15px 0px" : "5px $mDepth 5px 0px";
?>
<? if ($depth == 2) : ?>
<?php if ($depth == 2) : ?>
<a class="toplnk" href='#ac-<?= handler::$h->page['name'] ?>'>Top</a>
<? endif; ?>
<?php endif; ?>
<h<?= $depth ?> id='ac-<?= $section['name'] ?>'><?= $section['title'] ?></h<?= $depth ?>>
<? if ($pgLink != "") : ?>
<?php if ($pgLink != "") : ?>
<?= $pgLink ?>-&gt; Main article</a>
<? endif;
<?php endif;
}
@ -85,12 +85,12 @@ function drawSections (&$list, $depth = 2) {
}
*/
?>
<? if ($depth == 2) : ?>
<?php if ($depth == 2) : ?>
<div class="mtopsec">
<? else : ?>
<?php else : ?>
<div class="msec">
<? endif; ?>
<? drawTitle($list[$k], $depth);
<?php endif; ?>
<?php drawTitle($list[$k], $depth);
if (trim($list[$k]['contents']) != '') {
echo "<div class='mancontents'>" . displayLinks($list[$k]['contents']) . "</div>";
}
@ -99,7 +99,7 @@ function drawSections (&$list, $depth = 2) {
}
?>
</div>
<?
<?php
}
}
@ -114,7 +114,7 @@ if (is_null(handler::$h->page)) {
?>
<div id="manpage">
<h1 id="ac-<?=handler::$h->page['name']?>"><?=handler::$h->page['title']?></h1>
<? if (count(handler::$h->page['subsections'])) : ?>
<?php if (count(handler::$h->page['subsections'])) : ?>
<div id='clist'>
<div id='chead'>
<b>Page contents</b>
@ -122,14 +122,14 @@ if (is_null(handler::$h->page)) {
</div>
<div id='pcontents'>
<ul>
<? drawContents(handler::$h->page['subsections']); ?>
<?php drawContents(handler::$h->page['subsections']); ?>
</ul>
</div>
</div>
<? drawSections(handler::$h->page['subsections']); ?>
<? endif; ?>
<?php drawSections(handler::$h->page['subsections']); ?>
<?php endif; ?>
</div>
<?
<?php
}
$this->endContents();
?>

View file

@ -1,10 +1,10 @@
<? if ($_SESSION['authok']) : ?>
<?php if ($_SESSION['authok']) : ?>
<a class="mbutton" id="b0" href="<?= makeLink('index', 'main') ?>" title="Manage your account">My account</a>
<a class="mbutton" id="b1" href="<?= makeLink('contrib', 'main') ?>" title="Contributions">Contributions</a>
<? else : ?>
<?php else : ?>
<a class="mbutton" id="b0" href="<?= makeLink('create', 'main') ?>" title="Register">Create an account</a>
<a class="mbutton" id="b1" href="<?= makeLink('about', 'main') ?>" title="About">About this game</a>
<? endif; ?>
<?php endif; ?>
<a class="mbutton" id="b2" href="<?= makeLink('screenshots', 'main') ?>" title="Screenshots">Screenshots</a>
<a class="mbutton" id="b3" href="<?= makeLink('manual', 'main') ?>" title="Manual">Manual</a>
<a class="mbutton" id="b4" href="<?= makeLink('rankings', 'main') ?>" title="Rankings">Rankings</a>

View file

@ -1,4 +1,4 @@
<?
<?php
include("menu.en.inc");
$this->title = "Page not found";
$this->addStylesheet('text');
@ -11,4 +11,4 @@ $this->startContents();
<p>
Sorry :-\
</p>
<? $this->endContents(); ?>
<?php $this->endContents(); ?>

View file

@ -1,4 +1,4 @@
<?
<?php
include("menu.en.inc");
$this->title = "Registration required";
$this->addStylesheet('text');
@ -11,4 +11,4 @@ $this->startContents();
<p>
Before you can access the game, you have to <a href='<?=makeLink('play', 'main')?>?g=<?=$args['id']?>'>register</a>.
</p>
<? $this->endContents(); ?>
<?php $this->endContents(); ?>

View file

@ -1,4 +1,4 @@
<?
<?php
include("menu.en.inc");
$this->title = "Registration";
$this->startContents();
@ -117,4 +117,4 @@ if (is_null($args['registered'])) {
}
?>
<? $this->endContents(); ?>
<?php $this->endContents(); ?>

View file

@ -1,4 +1,4 @@
<?
<?php
include("menu.en.inc");
$this->addStylesheet("account");
$this->title = "Close account";
@ -57,4 +57,4 @@ if ($args['ePass']) {
</p>
</div></form>
</div>
<? $this->endContents(); ?>
<?php $this->endContents(); ?>

View file

@ -1,4 +1,4 @@
<?
<?php
include("menu.en.inc");
$this->addStylesheet('rankings');
$this->title = "Rankings";
@ -6,7 +6,7 @@ $this->startContents();
?>
<form action="?" method="get">
<div style="text-align:center; margin: 0px 0px 10px 0px">
<select class="input" name="g" onchange="this.form.submit();"><?
<select class="input" name="g" onchange="this.form.submit();"><?php
foreach ($args['games'] as $v => $t) {
echo " <option value='$v'";
@ -15,7 +15,7 @@ foreach ($args['games'] as $v => $t) {
echo ">" . utf8entities($t) . "&nbsp;&nbsp;&nbsp;</option>\n";
}
?></select> / <select class="input" name="t" onchange="this.form.submit();"><?
?></select> / <select class="input" name="t" onchange="this.form.submit();"><?php
foreach ($args['types'] as $t => $d) {
echo " <option value='$t'";
@ -37,7 +37,7 @@ foreach ($args['types'] as $t => $d) {
<th style="text-align:left">Name</th>
<th style="text-align:center;width: 20%">Points</th>
</tr>
<?
<?php
foreach ($args['rankings'] as $data)
echo " <tr>\n <td style='text-align:center;'><b>#"
. $data['ranking'] . "</b></td>\n <td>" . utf8entities($data['id'])
@ -45,4 +45,4 @@ foreach ($args['rankings'] as $data)
. number_format($data['points']) . "</td>\n </tr>\n";
?>
</table>
<? $this->endContents(); ?>
<?php $this->endContents(); ?>

View file

@ -1,4 +1,4 @@
<?
<?php
include("menu.en.inc");
$this->addStylesheet('text');
$this->title = "Account re-activation";
@ -28,4 +28,4 @@ $this->startContents();
user name and password in the email.
</p>
</div></form>
<? $this->endContents(); ?>
<?php $this->endContents(); ?>

View file

@ -23,7 +23,7 @@ if (is_null($__category)) {
<?= count($data['pics']) ?> pictures
</div>
</div>
<?
<?php
$y += 75;
}
} elseif (is_null($__picture)) {
@ -33,7 +33,7 @@ if (is_null($__category)) {
<div class="catname">Screenshots - <?= utf8entities($category['title']) ?></div>
<div class="catpics"><a href="<?= makeLink('screenshots', 'main') ?>">Back</a></div>
</div>
<?
<?php
$y = 70;
$x = 0;
foreach ($category['pics'] as $id => $title) {
@ -42,7 +42,7 @@ if (is_null($__category)) {
<div class="thumbpic"><a href="<?= makeLink('screenshots', 'main') ?>?c=<?= $__category ?>&amp;s=<?= $id ?>"><img src="<?= config::$main['staticurl'] ?>/main/screens/<?= $__category ?>-<?= $id ?>-s.jpg" alt="<?= utf8entities($title) ?>" /></a></div>
<div class="thumbname"><a href="<?= makeLink('screenshots', 'main') ?>?c=<?= $__category ?>&amp;s=<?= $id ?>"><?= utf8entities($title) ?></a></div>
</div>
<?
<?php
$x = ($x + 1) % 3;
if ($x == 0) {
$y += 120;
@ -59,7 +59,7 @@ if (is_null($__category)) {
<div class="showpic">
<a href="<?= config::$main['staticurl'] ?>/main/screens/<?= $__category ?>-<?= $__picture ?>.jpg"><img src="<?= config::$main['staticurl'] ?>/main/screens/<?= $__category ?>-<?= $__picture ?>-m.jpg" alt="<?= utf8entities($title) ?>" /></a>
</div>
<?
<?php
}
$this->endContents();

View file

@ -1,4 +1,4 @@
<?
<?php
include("menu.en.inc");
$this->title = "Preferences";
$this->startContents();
@ -133,4 +133,4 @@ if (!is_null($args['err2']))
<tr><td colspan='4' style="text-align:center"><input type='submit' value='Update my preferences' class="input" /></td></tr>
</table>
</div></form>
<? $this->endContents(); ?>
<?php $this->endContents(); ?>

View file

@ -1,4 +1,4 @@
<?
<?php
$this->addStylesheet("sidebox");
$this->addScript("sidebox");
?>
@ -13,7 +13,7 @@ $this->addScript("sidebox");
<li class="slcol" id="slright">
<span>Menu</span>
<div>
<? include("menu.en.inc"); ?>
<?php include("menu.en.inc"); ?>
</div>
</li>
</ul>

View file

@ -1,4 +1,4 @@
<?
<?php
include("menu.en.inc");
$this->title = "Cancel vacation mode";
$this->addStylesheet("account");
@ -19,4 +19,4 @@ $this->startContents();
<input type="submit" name="cancel" value="No, continue with the countdown" class="input" />
</div></form>
</div>
<? $this->endContents(); ?>
<?php $this->endContents(); ?>

View file

@ -1,4 +1,4 @@
<?
<?php
include("menu.en.inc");
$this->title = "Leave vacation mode";
$this->addStylesheet("account");
@ -20,4 +20,4 @@ $this->startContents();
<input type="submit" name="cancel" value="No, stay in vacation mode" class="input" />
</div></form>
</div>
<? $this->endContents(); ?>
<?php $this->endContents(); ?>

View file

@ -1,4 +1,4 @@
<?
<?php
include("menu.en.inc");
$this->title = "Enter vacation mode";
$this->addStylesheet("account");
@ -25,4 +25,4 @@ $this->startContents();
<input type="submit" name="cancel" value="No, don't activate vacation mode" class="input" />
</div></form>
</div>
<? $this->endContents(); ?>
<?php $this->endContents(); ?>