better connection error structure in general

3 files changed, 5 insertions, 30 deletions

diff --git a/admin/error.php b/admin/error.php
deleted file mode 100644
index 3e2b549..0000000
--- a/admin/error.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-header('Location:../error.php');
-// Redirect to correct error file
diff --git a/error.php b/error.php
deleted file mode 100644
index 1e62b83..0000000
--- a/error.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-$req_noredirect = true;
-require_once('req.php');
-require_once('header.php');
-
-echo "<h2>Error:</h2><br />";
-echo "<ul>";
-$err = 0;
-if (!$mysqli) {
-    $err++;
-    echo "<li>Could not connect to database. Please contact the administrator.";
-}
-if ($insecure == TRUE && $_SESSION['role'] == 'adm') {
-    $err++;
-    echo "<li>You are seeing the following message because you are an administrator. Your MySQL database is potentially unsafe. P
-          lease make sure Polr's database receives an UTF8 encoding. </li>";
-}
-if ($err<1) {
-    echo "<li>No errors to report.</li>";
-}
-  
-echo "</ul>";
-
-require_once('footer.php');
diff --git a/req.php b/req.php
index bd972a2..c79e8bc 100644
--- a/req.php
+++ b/req.php
@@ -5,9 +5,11 @@ $debug = 0; // Set to 1 in order to enable debug mode (shows sensitive database
 $footer = "&copy; Copyright 2014 $wsn. Powered by <a href='http://github.com/cydrobolt/polr'>Polr</a> ver $version build $reldate";
 $hidefooter = true; // Let's hide this for now
 //connect to mysql with $mysqli variable
-$mysqli = new mysqli($host, $user, $passwd, $db) or $wp = 1; //If cannot connect, then set var $wp to 1
-if (!$mysqli && $req_noredirect = true) {
-	header('Location:error.php');
+$mysqli = new mysqli($host, $user, $passwd, $db) ;
+if ($mysqli->connect_errno) {
+    echo "Database error. If you are a member of the general public, contact an administrator to solve this issue.
+    If you are the administrator of this website, please make sure your database is turned on and that credentials are correct.";
+    die();
 }
 // Attempt to set Charset as UTF8 to avoid real_escape_string vulnerabilities
 if (!$mysqli->set_charset("utf8")) {