Updates

- Remove namespaces for PHP 5.2 support - Rename "includes" to "inc" - Add database error handling and error pages
2025-05-23 08:29:06 +00:00 · 2016-01-09 21:24:18 +02:00 · 2016-01-09 21:24:18 +02:00 · 5660317403
commit 5660317403
parent 57777295bb
28 changed files with 114 additions and 65 deletions
--- a/bans.php
+++ b/bans.php
@ -1,9 +1,6 @@
 <?php
-namespace litebans;
+require_once './inc/page.php';

-use PDO;
-
-require_once './includes/page.php';
 $page = new Page("bans");
 $page->print_title();

--- a/check.php
+++ b/check.php
@ -1,9 +1,5 @@
 <?php
-namespace litebans;
-
-use PDOException;
-
-require_once './includes/page.php';
+require_once './inc/page.php';

 class Check {
    public function run($name, $from) {
@ -64,7 +60,7 @@ class Check {
            }
            */
        } catch (PDOException $ex) {
-            die($ex->getMessage());
+            Settings::handle_database_error($page->settings, $ex);
        }
    }

--- a/error/access-denied.php
+++ b/error/access-denied.php
@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta name="description" content="">
+    <title>litebans-php - Database Error</title>
+    <link href="../inc/css/bootstrap.min.css" rel="stylesheet">
+</head>
+<body>
+<div class="container">
+    <div class="jumbotron">
+        <h2>Database Error</h2><br>
+
+        <div class="text-warning">
+            The web interface was unable to connect to the database using the configuration provided.
+            <br>
+            Database error: Access denied
+        </div>
+        <br>
+        <a href="../" class="btn btn-default">Try Again</a>
+    </div>
+</div>
+</body>
+</html>
--- a/error/tables-not-found.php
+++ b/error/tables-not-found.php
@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <meta name="description" content="">
+    <title>litebans-php - Database Error</title>
+    <link href="../inc/css/bootstrap.min.css" rel="stylesheet">
+</head>
+<body>
+<div class="container">
+    <div class="jumbotron">
+        <h2>Database Error</h2><br>
+        <div class="text-warning">
+            The web interface has connected to the database, but could not find any tables generated by LiteBans.
+            <br>
+            This means that the plugin has not successfully connected to this database before with the same configuration.
+            <br><br>
+            Solutions:
+            <br>
+            - Check the startup logs to see if there are any errors.
+            <br>
+            - Ensure that the plugin is using the MySQL driver (not SQLite) to connect to the database.
+            <br>
+            - Ensure that the table prefix is the same in config.yml and settings.php.
+            <br>
+        </div>
+        <br>
+        <a href="../" class="btn btn-default">Try Again</a>
+    </div>
+</div>
+</body>
+</html>
--- a/history.php
+++ b/history.php
@ -1,11 +1,5 @@
 <?php
-namespace litebans;
-
-use PDO;
-use PDOException;
-use PDORow;
-
-require_once './includes/page.php';
+require_once './inc/page.php';
 require_once './info.php';

 class History {
@ -125,7 +119,7 @@ try {
        $total += $count;
    }

-    usort($all, array("litebans\\History", "cmp_row_date"));
+    usort($all, array("History", "cmp_row_date"));

    if (!empty($all)) {
        $page->table_begin();
@ -211,5 +205,5 @@ try {

    $page->print_footer();
 } catch (PDOException $ex) {
-    die($ex->getMessage());
+    Settings::handle_database_error($page->settings, $ex);
 }
--- a/includes/css/bootstrap.css
+++ b/includes/css/bootstrap.css
--- a/includes/css/bootstrap.min.css
+++ b/includes/css/bootstrap.min.css
--- a/includes/css/custom.css
+++ b/includes/css/custom.css
--- a/includes/fonts/glyphicons-halflings-regular.eot
+++ b/includes/fonts/glyphicons-halflings-regular.eot
--- a/includes/fonts/glyphicons-halflings-regular.svg
+++ b/includes/fonts/glyphicons-halflings-regular.svg
--- a/includes/fonts/glyphicons-halflings-regular.ttf
+++ b/includes/fonts/glyphicons-halflings-regular.ttf
--- a/includes/fonts/glyphicons-halflings-regular.woff
+++ b/includes/fonts/glyphicons-halflings-regular.woff
--- a/inc/footer.php
+++ b/inc/footer.php
@ -0,0 +1,3 @@
+<script src="inc/js/jquery.min.js"></script>
+<script src="inc/js/bootstrap.min.js"></script>
+<?php echo "</html>"; ?>
--- a/includes/header.php
+++ b/includes/header.php
@ -1,8 +1,4 @@
 <?php
-namespace litebans;
-
-use PDO;
-use PDOException;

 class Header {
 /**
@ -30,7 +26,7 @@ function __construct($page) {
                'kicks.php'    => $row['c_kicks'],
            );
        } catch (PDOException $ex) {
-            die($ex->getMessage());
+            Settings::handle_database_error($page->settings, $ex);
        }
    }
 }
@ -62,10 +58,10 @@ $settings = $this->page->settings;
    <meta name="viewport" content="width=device-width, initial-scale=1">
    <meta name="description" content="">
    <meta name="author" content="LiteBans">
-    <link rel="shortcut icon" href="includes/img/minecraft.ico">
+    <link rel="shortcut icon" href="inc/img/minecraft.ico">
    <!-- CSS -->
-    <link href="includes/css/bootstrap.min.css" rel="stylesheet">
-    <link href="includes/css/custom.css" rel="stylesheet">
+    <link href="inc/css/bootstrap.min.css" rel="stylesheet">
+    <link href="inc/css/custom.css" rel="stylesheet">
    <script type="text/javascript">
        function withjQuery(f) {
            if (window.jQuery) f();
@ -110,5 +106,4 @@ $settings = $this->page->settings;
 <?php
 }
 }
-
 ?>
--- a/includes/img/console.png
+++ b/includes/img/console.png
--- a/includes/img/minecraft.ico
+++ b/includes/img/minecraft.ico
--- a/includes/js/bootstrap.js
+++ b/includes/js/bootstrap.js
--- a/includes/js/bootstrap.min.js
+++ b/includes/js/bootstrap.min.js
--- a/includes/js/jquery.js
+++ b/includes/js/jquery.js
--- a/includes/js/jquery.min.js
+++ b/includes/js/jquery.min.js
--- a/includes/page.php
+++ b/includes/page.php
@ -1,8 +1,4 @@
 <?php
-namespace litebans;
-
-use PDO;
-use PDOException;

 class Page {
    public function __construct($name, $header = true) {
@ -12,9 +8,9 @@ class Page {

        $this->time = microtime(true);
        if ($header) {
-            require_once './includes/header.php';
+            require_once './inc/header.php';
        }
-        require_once './includes/settings.php';
+        require_once './inc/settings.php';
        $settings = new Settings();
        $this->conn = $settings->conn;
        $this->settings = $settings;
@ -129,7 +125,7 @@ class Page {

            return $st;
        } catch (PDOException $ex) {
-            die($ex->getMessage());
+            Settings::handle_database_error($this->settings, $ex);
        }
    }

@ -381,7 +377,7 @@ class Page {
        $time = microtime(true) - $this->time;
        echo "<!-- Page generated in $time seconds. -->";

-        include_once './includes/footer.php';
+        include_once './inc/footer.php';
    }

    function table_begin() {
--- a/includes/settings.php
+++ b/includes/settings.php
@ -1,12 +1,11 @@
 <?php
-namespace litebans;
-
-use PDO;
-use PDOException;

 final class Settings {
    public static $TRUE = "1", $FALSE = "0";

+    /**
+     * @param bool|true $connect
+     */
    public function __construct($connect = true) {
        // Server name, shown on the main page and on the header
        $this->name = 'LiteBans';
@ -44,7 +43,7 @@ final class Settings {
            "CONSOLE", "Console",
        );
        $this->console_name = "Console";
-        $this->console_image = "includes/img/console.png";
+        $this->console_image = "inc/img/console.png";

        // Avatar images for all players will be fetched from this URL.
        // Examples:
@ -69,6 +68,8 @@ final class Settings {
        // Enable PHP error reporting.
        $error_reporting = true;

+        // Enable error pages.
+        $this->error_pages = true;

        /*** End of configuration ***/

@ -108,11 +109,38 @@ final class Settings {
                $this->conn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
                $this->conn->setAttribute(PDO::ATTR_EMULATE_PREPARES, false);
            } catch (PDOException $e) {
-                die('Connection failed: ' . $e->getMessage());
+                Settings::handle_database_error($this, $e);
            }
            if ($driver === 'pgsql') {
                $this->conn->query("SET NAMES 'UTF8';");
            }
        }
    }
+
+
+    /**
+     * @param $settings Settings
+     * @param $e Exception
+     */
+    static function handle_database_error($settings, $e) {
+        $message = $e->getMessage();
+        if ($settings->error_pages) {
+            if (strstr($message, "Access denied for user")) {
+                $settings->redirect("error/access-denied.php");
+            }
+            if (strstr($message, "Base table or view not found:")) {
+                $settings->redirect("error/tables-not-found.php");
+            }
+        }
+        die('Database error: ' . $message);
+    }
+
+
+    function redirect($url) {
+        echo "<a href=\"$url\">Redirecting...</a>";
+
+        echo "<script type=\"text/javascript\">document.location=\"$url\";</script>";
+
+        die;
+    }
 }
--- a/includes/footer.php
+++ b/includes/footer.php
@ -1,3 +0,0 @@
-<script src="includes/js/jquery.min.js"></script>
-<script src="includes/js/bootstrap.min.js"></script>
-<?php echo "</html>"; ?>
--- a/index.php
+++ b/index.php
@ -1,10 +1,8 @@
 <?php
-namespace litebans;
+require_once './inc/page.php';

-require_once './includes/page.php';
 $page = new Page("index");
 $page->print_title();
-
 ?>
 <div class="container">
    <div class="jumbotron">
--- a/info.php
+++ b/info.php
@ -1,9 +1,5 @@
 <?php
-namespace litebans;
-
-use PDO;
-
-require_once './includes/page.php';
+require_once './inc/page.php';

 abstract class Info {
    /**
--- a/kicks.php
+++ b/kicks.php
@ -1,9 +1,6 @@
 <?php
-namespace litebans;
+require_once './inc/page.php';

-use PDO;
-
-require_once './includes/page.php';
 $page = new Page("kicks");
 $page->print_title();

--- a/mutes.php
+++ b/mutes.php
@ -1,9 +1,6 @@
 <?php
-namespace litebans;
+require_once './inc/page.php';

-use PDO;
-
-require_once './includes/page.php';
 $page = new Page("mutes");
 $page->print_title();

--- a/warnings.php
+++ b/warnings.php
@ -1,9 +1,6 @@
 <?php
-namespace litebans;
+require_once './inc/page.php';

-use PDO;
-
-require_once './includes/page.php';
 $page = new Page("warnings");
 $page->print_title();