Skip to content

fresh start on the UTStats modernization #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
elsheepo wants to merge 3 commits into
base: update-to-mysqli
Choose a base branch
from
Open

fresh start on the UTStats modernization #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
af47c4f
fresh start on the UTStats modernization :sheep:
elsheepo Feb 3, 2019
a73a9cb
test commit
elsheepo Feb 3, 2019
668e2b9
admin login page, HTML formating :sheep:
elsheepo Feb 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
99 changes: 61 additions & 38 deletions html/admin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,60 +1,83 @@
<?php
if (isset($_REQUEST['rememberkey'])) setcookie('uts_adminkey', $_REQUEST['key'], time()+60*60*24*30*365);
if (isset($_COOKIE['uts_adminkey'])) $adminkey = $_REQUEST['uts_adminkey'];
if (isset($_REQUEST['rememberkey'])) {
setcookie('uts_adminkey', $_REQUEST['key'], time() + 60 * 60 * 24 * 30 * 365);
}
if (isset($_COOKIE['uts_adminkey'])) {
$adminkey = $_REQUEST['uts_adminkey'];
}

include ("includes/config.php");
include ("includes/functions.php");
include ("includes/functions_admin.php");
include ("includes/header.php");
require 'includes/config.php';
require 'includes/functions.php';
require 'includes/functions_admin.php';
require 'includes/header.php';

// Get key from web browser
if (isset($_REQUEST['key'])) $adminkey = $_REQUEST['key'];
if (!isset($adminkey)) $adminkey = '';
if (isset($_REQUEST['key'])) {
$adminkey = $_REQUEST['key'];
}

if (!isset($adminkey)) {
$adminkey = '';
}

$action = (!empty($_REQUEST['action'])) ? $_REQUEST['action'] : 'main';

echo'<table class = "box" border="0" cellpadding="1" cellspacing="2" width="720">
<tr>
<td class="heading" align="center" colspan="2">UTStats Administration</td>
</tr>';
echo '
<table class = "box" border="0" cellpadding="1" cellspacing="2" width="100%">
<tr>
<td class="heading text-center" colspan="2">UTStats Administration</td>
</tr>';

IF (empty($import_adminkey)) {
echo'<tr><td class="smheading" align="left" width="150">Error:</td>
<td class="grey" align="left">No key set in config.php</td>
</tr></table>';
include("includes/footer.php");
if (empty($import_adminkey)) {
echo '
<tr>
<td class="smheading" align="left" width="150">Error:</td>
<td class="grey" align="left">No key set in config.php</td>
</tr>
</table>';
include 'includes/footer.php';
return;
}


IF (!empty($adminkey) and $adminkey != $import_adminkey) {
echo'<tr><td class="smheading" align="left" width="150">Error:</td>
<td class="grey" align="left">Keys do not match</td>
</tr>';
if (!empty($adminkey) and $adminkey != $import_adminkey) {
echo '
<tr>
<td class="smheading" align="left" width="150">Error:</td>
<td class="grey" align="left">Keys do not match</td>
</tr>';
$adminkey = '';
}

IF (empty($adminkey)) {
echo'<tr>
<td class="smheading" align="left" width="150">Enter Admin key:</td>
<td class="grey" align="left"><form NAME="adminkey" ACTION="admin.php">
<input TYPE="text" NAME="key" MAXLENGTH="35" SIZE="20" CLASS="searchform">
<input TYPE="submit" VALUE="Submit" CLASS="searchformb">
<input TYPE="checkbox" NAME="rememberkey"> Remember the key
</form></td>
</tr></table>';
include("includes/footer.php");
if (empty($adminkey)) {
echo '
<tr>
<td class="smheading" align="left" width="150">Enter Admin key:</td>
<td class="grey" align="left">
<form NAME="adminkey" ACTION="admin.php">
<input TYPE="text" NAME="key" MAXLENGTH="35" SIZE="20" CLASS="searchform">
<input TYPE="submit" VALUE="Submit" CLASS="searchformb">
<input TYPE="checkbox" NAME="rememberkey"> Remember the key
</form>
</td>
</tr>
</table>';
include 'includes/footer.php';
return;
}


echo'</table>
<br>';

$action = str_replace(array('.', '/', '<', ':'), array(), $action);
$fn = "pages/admin/$action.php";
if (!file_exists($fn) or !is_file($fn)) die('bla');
require($fn);

include('includes/footer.php');
if (!file_exists($fn) or !is_file($fn)) {
die('bla');
}

require $fn;

echo '</table>
<br>';

require 'includes/footer.php';

?>
71 changes: 28 additions & 43 deletions html/assets/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,11 @@
font-style: normal;
}

html {
min-height: 100%;
position: relative;
}

body {
background-color: #1e1e1e;
background-repeat: no-repeat;
Expand All @@ -57,7 +62,7 @@ body {
font-family: Montserrat, Helvetica, Verdana, Arial, sans-serif;
font-weight: 200;
padding: 0;
margin: 0;
margin-bottom: 0px 0px 60px 0px;
}

a {
Expand Down Expand Up @@ -96,55 +101,36 @@ input[type="submit"]:hover {
cursor: pointer;
}

.navbar {
background: rgba(0, 0, 0, 0.7);
height: 56px;
line-height: 56px;
position: relative;
text-align: right;
.logo {
height: 4%;
margin-right: 10px;
}
.navbar ul {
list-style: none;
margin: 0 auto;
padding: 0;
max-width: 900px;
main.row {
margin-left: 0;
margin-right: 0;
}
.navbar li {
display: inline-block;
.main-content {
margin-top: 20px;
}
.navbar a {
font-size: 17px;

.phantom {
display: block;
text-decoration: none;
color: white;
padding: 0 18px;
-webkit-transition: background-color 0.4s;
-moz-transition: background-color 0.4s;
-o-transition: background-color 0.4s;
-ms-transition: background-color 0.4s;
transition: background-color 0.4s;
}
.navbar a:hover {
background-color: #2069a1;
opacity: 1;
}
.navbar .logo {
float: left;
}
.navbar .logo a {
height: 100%;
}
.navbar .logo img {
height: 36px;
margin-top: 10px;
padding: 20px 0px;
margin-top: 50px;
height: 100px;
width: 100%;
bottom: 0;
}

.footer {
background: #2069a1;
font-size: 10pt;
color: #ffffff;
padding: 20px;
margin-top: 50px;
text-align: center;
color: white;
padding: 20px 0px;
position: absolute;
width: 100%;
height: 100%px;
bottom: 0;
}
.footer a {
color: #efc100;
Expand Down Expand Up @@ -403,7 +389,6 @@ input[type="button"].btn-block {
}
.recentheader {
margin-left: 3px;
width: 896px;
height: 310px;
}
.matchtop {
Expand Down
39 changes: 33 additions & 6 deletions html/includes/footer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,44 @@
<div class="footer">

</div>
<div class="col"></div>
</div>
</div>

<div class="phantom"></div>
<footer class="footer">
<div class ="container">
<a href="./?p=totals">Totals</a>
<a href="./?p=maps">Maps</a>
<a href="./?p=servers">Servers</a>
<a href="./import.php">Import</a>
<a href="./admin.php">Admin</a>
<a href="./?p=credits">Credits</a>
<a href="./?p=help">Help</a>
<br>
<br>
<br />
<br />
<a href="https://github.com/sn3p/utstats" target="_blank">UTStats Beta 4.4.1</a>
&copy; <?php echo date("Y"); ?> azazel, AnthraX toa and sn3p
</div>
&copy; <?php echo date("Y"); ?> azazel, AnthraX, toa, <a href="https://github.com/elsheepo" rel="noopener noreferrer" target="_blank" style="margin-left:0">elsheepo</a> and sn3p
</div>
</footer>

<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js" integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49" crossorigin="anonymous"></script>
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/js/bootstrap.min.js" integrity="sha384-ChfqqxuZUCnJSK3+MXmPNIyE6ZbWh2IMqE241rYiqJxyMiZ6OW/JmZQ5stwEULTy" crossorigin="anonymous"></script>
<!-- <script type="text/javascript" src="assets/lib/jquery-1.11.1.min.js"></script> -->
<script type="text/javascript">
<!--
var ol_fgclass="dark"; var ol_bgclass="darkbox"; var ol_textfontclass="dark"; var ol_captionfontclass="hlheading";
-->
</script>
<script type="text/javascript" src="assets/lib/overlib_mini.js"><!-- overLIB (c) Erik Bosrup --></script>
<script type="text/javascript" src="assets/lib/highcharts/adapters/standalone-framework.js"></script>
<script type="text/javascript" src="assets/lib/highcharts/highcharts.js"></script>
<script type="text/javascript" src="assets/lib/highcharts/highcharts-more.js"></script>
<script type="text/javascript" src="assets/lib/highcharts/highcharts-functions.js"></script>
<script type="text/javascript" src="assets/lib/highcharts/themes/utstats.js"></script>
<script type="text/javascript" src="assets/lib/tooltipster/jquery.tooltipster.min.js"></script>
<script type="text/javascript" src="assets/main.js"></script>
</body>
</html>

<?php ob_end_flush(); ?>
<?php ob_end_flush(); ?>
Loading