From 861c0365a118fd7ab5361cc4d18fce99bcb528d8 Mon Sep 17 00:00:00 2001
From: Wruczek <wruczekk@gmail.com>
Date: Wed, 29 Jun 2016 02:49:18 +0200
Subject: [PATCH] Extended support for legacy versions of Apache

- Newest version of Apache is no longer required but recommended
- Support for mod_rewrite is no longer required but recommended
- Support for htaccess is no longer required, but recommended
---
 config/config.template.php | 5 +++++
 include/footer.php         | 6 ++++--
 include/header.php         | 6 +++---
 include/modulecheck.php    | 6 +++++-
 js/status.js               | 4 ++--
 5 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/config/config.template.php b/config/config.template.php
index 93e86bd..50a41ce 100644
--- a/config/config.template.php
+++ b/config/config.template.php
@@ -19,6 +19,9 @@ $config["general"]["newsDir"]       = "news";
 $config["general"]["contactEmail"]  = "email@strona.pl";                            // Twój email kontaktowy
 
 
+$config["general"]["enablehta"]     = false; // Właczenie / wyłączenie dodatkowych usprawnień strony w htaccess (zalecane, 
+                                             // wymaga jednak aktualnej wersji Apache oraz włączenia htaccess oraz mod_rewrite)
+
 
 /********* Konfiguracja serwera TeamSpeak *********/
 
@@ -40,6 +43,8 @@ $config["navlinks"] = array(
     array("fa-shopping-cart", "Sklep", "sklep")
 );
 
+
+
 /************* Konfiguracja listy administratorow *************/
 
 // ID grup wyświetlanych na liście administracji
diff --git a/include/footer.php b/include/footer.php
index e5ac030..846cafe 100644
--- a/include/footer.php
+++ b/include/footer.php
@@ -4,10 +4,10 @@
         <!-- Footer -->
         <hr>
         <footer>
-            <p class="pull-left">&copy; twojanazwa 2016</p>
+            <p class="pull-left">&copy; <?php echo $config["general"]["title"]; ?> 2016</p>
             <div class="pull-right">
                 <ul class="list-inline">
-                    <li>Strona &copy; <a href="http://wruczek.top">Wruczek</a> 2016 | <a href="https://github.com/Wruczek/ts-website">ts-website</a> v 1.1.1 | MIT License</li>
+                    <li>Strona &copy; <a href="http://wruczek.top">Wruczek</a> 2016 | <a href="https://github.com/Wruczek/ts-website">ts-website</a> v 1.2.0 | MIT License</li>
                 </ul>
             </div>
         </footer>
@@ -35,6 +35,8 @@
     <?php } ?>
 
     <!-- Custom JS -->
+    <script>var apiurl = "api/status<?php echo $config["general"]["enablehta"] ? "" : ".php" ?>";</script>
+
     <script src="js/script.js"></script>
     <script src="js/status.js"></script>
 </body>
diff --git a/include/header.php b/include/header.php
index 73172a0..ca53fe3 100644
--- a/include/header.php
+++ b/include/header.php
@@ -58,8 +58,8 @@ require_once __DIR__ . "/../include/adminlist.php";
             <!-- Collect the nav links, forms, and other content for toggling -->
             <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
                 <ul class="nav navbar-nav">
-                    <li><a href="viewer"><i class="fa fa-eye" aria-hidden="true"></i> Podgląd serwera</a></li>
-                    <li><a href="bans"><i class="fa fa-ban" aria-hidden="true"></i> Lista banów</a></li>
+                    <li><a href="viewer<?php echo $config["general"]["enablehta"] ? "" : ".php" ?>"><i class="fa fa-eye" aria-hidden="true"></i> Podgląd serwera</a></li>
+                    <li><a href="bans<?php echo $config["general"]["enablehta"] ? "" : ".php" ?>"><i class="fa fa-ban" aria-hidden="true"></i> Lista banów</a></li>
                     <!-- Nie mam na to czasu
                     <li class="dropdown">
                         <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><i class="fa fa-television" aria-hidden="true"></i></i>Ranking <span class="caret"></span></a>
@@ -120,7 +120,7 @@ require_once __DIR__ . "/../include/adminlist.php";
                 <div class="panel panel-default">
                     <div class="panel-heading"><i class="fa fa-eye" aria-hidden="true"></i> Podgląd serwera</div>
                     <div class="panel-body">
-                        <a href="viewer" class="btn btn-primary btn-lg btn-block"><i class="fa fa-eye" aria-hidden="true"></i> Zobacz &raquo;</a>
+                        <a href="viewer<?php echo $config["general"]["enablehta"] ? "" : ".php" ?>" class="btn btn-primary btn-lg btn-block"><i class="fa fa-eye" aria-hidden="true"></i> Zobacz &raquo;</a>
                     </div>
                 </div>
             </div>
diff --git a/include/modulecheck.php b/include/modulecheck.php
index ab6552f..d9aca3b 100644
--- a/include/modulecheck.php
+++ b/include/modulecheck.php
@@ -1,5 +1,6 @@
 <?php
 
+/* Od wersji 1.2.0 sprawny htaccess nie jest już wymagany
 if (!isset($_SERVER['HTACCESS'])) {
     
     $title = 'Plik .htaccess nie jest włączony';
@@ -9,7 +10,9 @@ if (!isset($_SERVER['HTACCESS'])) {
     
     die(showError($title, $text));
 }
+*/
 
+/* Od wersji 1.2.0 mod_rewrite nie jest już wymagany
 if(!in_array('mod_rewrite', apache_get_modules())) {
     
     $title = 'Brak wymaganych rozszerzeń';
@@ -25,6 +28,7 @@ service apache2 reload</pre>
     
     die(showError($title, $text));
 }
+*/
 
 if(!file_exists(__DIR__ . "/../config/config.php")) {
     
@@ -80,7 +84,7 @@ function showError($title, $text) { ?>
             <?php echo $text; ?>
         </div>
         <div class="panel-footer">
-            Strona &copy; <a href="http://wruczek.top">Wruczek</a> 2016 | <a href="https://github.com/Wruczek/ts-website">ts-website</a> v 1.1.1 | MIT License
+            Strona &copy; <a href="http://wruczek.top">Wruczek</a> 2016 | <a href="https://github.com/Wruczek/ts-website">ts-website</a> v 1.2.0 | MIT License
         </div>
     </div>
 
diff --git a/js/status.js b/js/status.js
index 1e58759..8975336 100644
--- a/js/status.js
+++ b/js/status.js
@@ -8,9 +8,9 @@ $(document).ready(function () {
 })
 
 function checkStatus() {
-
+    
     $.ajax({
-        url: "api/status",
+        url: apiurl,
         success: function (json) {
 
             json = json.tsstatus;