From 505bbfbc255833a98f5673b8a0b79f88e8e9b68d Mon Sep 17 00:00:00 2001
From: lera2od <119118688+lera2od@users.noreply.github.com>
Date: Thu, 11 May 2023 23:08:06 +0300
Subject: [PATCH] 2.0 update

---
 .gitignore                        |  8 +++----
 src/leravel/admin/views/stats.php |  3 ++-
 src/leravel/commonErrors.json     |  5 ++++
 src/leravel/error.php             | 39 ++++++++++++++++++++++---------
 src/leravel/index.php             |  1 +
 src/leravel/leravel.json          |  5 +---
 src/leravel/leravelVar.php        |  4 ++--
 7 files changed, 43 insertions(+), 22 deletions(-)

diff --git a/.gitignore b/.gitignore
index a4f6026..d9256f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
-src/app/settings.json
-README.md
+src/leravel/leravel.json
+src/leravel/admin/statRenders/lastUpdated.json
+src/leravel/admin/statRenders/mostVisitedPages.json
+src/leravel/admin/statRenders/weeklyVisits.json
 src/app/stats.json
-src/leravel/admin/statRenders
-.gitignore
\ No newline at end of file
diff --git a/src/leravel/admin/views/stats.php b/src/leravel/admin/views/stats.php
index cb0eea7..987bdf9 100644
--- a/src/leravel/admin/views/stats.php
+++ b/src/leravel/admin/views/stats.php
@@ -10,6 +10,7 @@
 if ($render == "true") {
     $weeklyVisits = array();
 
+
     foreach ($stats as $stat) {
         $date = $stat["date"];
         $visits = 0;
@@ -60,7 +61,7 @@
         if (in_array($ip, array_column($visitors, "ip"))) {
             continue;
         }
-        if ($ip == "127.0.0.1") {
+        if ($ip == "127.0.0.1" || $ip == "::1") {
             continue;
         }
         $country = json_decode(file_get_contents("http://ip-api.com/json/" . $ip), true)["country"];
diff --git a/src/leravel/commonErrors.json b/src/leravel/commonErrors.json
index 1f3748b..4ec685f 100644
--- a/src/leravel/commonErrors.json
+++ b/src/leravel/commonErrors.json
@@ -13,5 +13,10 @@
         "error" : "parse_ini_file(",
         "file" : "\\admin\\admin.php",
         "solution" : "<b>account.ini</b> moved into <b>/app/adminAccount.ini</b><br>For more info : <a href='https://github.com/lera2od/leravel/releases/tag/1.3'>leravel v1.3 changelog</a>"
+    },
+    {
+        "error" : "Uncaught mysqli_sql_exception",
+        "file" : "leravelVar.php",
+        "solution" : "The default MySQLI connection having trouble connecting to the MySQL server<br>Check if your MySQL server is on. Or disable the database entirely from settings.json"
     }
 ]
\ No newline at end of file
diff --git a/src/leravel/error.php b/src/leravel/error.php
index 1be7a71..d90cc2b 100644
--- a/src/leravel/error.php
+++ b/src/leravel/error.php
@@ -16,7 +16,23 @@ function customError($errno, $errstr, $errfile, $errline)
     }
     
 
-    echo "<style>h1,h2{margin:0}.centerbox,.row,fieldset{display:flex}table{border-collapse:collapse;background-color:red}table,td,th{border:1px solid #000;padding:5px}body{background-image:linear-gradient(40deg,#744d4d,#fff);font-size:1.2rem;line-height:1.5;color:#000;background-position:center;background-repeat:no-repeat;background-size:cover;min-height:100vh;font-family:Roboto,sans-serif}h1{font-size:2rem;font-weight:400;padding:0}h2,legend{font-size:1.2rem;font-weight:400;padding:0}.container{width:100%;max-width:1200px;margin:0 auto;padding:0 1rem}.row{flex-wrap:wrap;margin:0 -1rem}.col{flex:1 1 100%;padding:0 1rem}.center{text-align:center}.centerbox{justify-content:center;align-items:center;flex-direction:column}.btn{display:inline-block;padding:.5rem 1rem;border-radius:.25rem;background-color:#333;color:#fff;text-decoration:none;transition:.2s ease-in-out;display:flex;align-items:center}.btn:hover{background-color:#444}.btn img{width:2.5rem}.logo{width:100%;max-width:300px}::-webkit-scrollbar{width:.4rem}::-webkit-scrollbar-track{background:#f1f1f1}::-webkit-scrollbar-thumb{background:#888;border-radius:5px}fieldset{border:1px solid #000;border-radius:5px;padding:20px;justify-content:center;align-items:center;flex-direction:column}legend{margin:0 10px}</style>";
+    echo "<style>h1,h2{margin:0}.centerbox,.row,fieldset{display:flex}table{border-collapse:collapse;background-color:red}table,td,th{border:1px solid #000;padding:5px}body{background-image:linear-gradient(40deg,#744d4d,#fff);font-size:1.2rem;line-height:1.5;color:#000;background-position:center;background-repeat:no-repeat;background-size:cover;min-height:100vh;font-family:Roboto,sans-serif}h1{font-size:2rem;font-weight:400;padding:0}h2,legend{font-size:1.2rem;font-weight:400;padding:0}.container{width:100%;max-width:1200px;margin:0 auto;padding:0 1rem}.row{flex-wrap:wrap;margin:0 -1rem}.col{flex:1 1 100%;padding:0 1rem}.center{text-align:center}.centerbox{justify-content:center;align-items:center;flex-direction:column}.btn{display:inline-block;padding:.5rem 1rem;border-radius:.25rem;background-color:#333;color:#fff;text-decoration:none;transition:.2s ease-in-out;display:flex;align-items:center}.btn:hover{background-color:#444}.btn img{width:2.5rem}.logo{width:100%;max-width:300px}::-webkit-scrollbar{width:.4rem}::-webkit-scrollbar-track{background:#f1f1f1}::-webkit-scrollbar-thumb{background:#888;border-radius:5px}fieldset{border:1px solid #000;border-radius:5px;padding:20px;justify-content:center;align-items:center;flex-direction:column}legend{margin:0 10px}
+    .solution {
+        background-color: #33e361;
+        padding: 10px;
+        border-radius: 10px;
+        box-shadow: 0px 0px 15px 4px black;
+        font-family: monospace;
+    }
+    .solution table {
+        background-color: #fffdfd5e;
+        color: black;
+    }
+    .solution h2 {
+        font-size: 26px;
+        color: #000000c7;
+    }
+    </style>";
     echo '<div class="container">';
     echo "<div class='centerbox'>";
     echo "<h1 style='color: red;'>ERROR</h1>";
@@ -26,15 +42,6 @@ function customError($errno, $errstr, $errfile, $errline)
     echo "<div class='centerbox'>";
     $extra = "";
     if (strpos($errfile, "leravel") !== false) {
-        if($solution != null) {
-            echo "<br>";
-            echo "<h2>There is a solution for this error</h2>";
-            echo "<table>";
-            echo "<tr><td>Solution</td><td>" . $solution . "</td></tr>";
-            echo "</table>";
-            echo "<br>";
-            $extra = "If the solution didn't help.";
-        }
         echo "<table>";
         echo "<tr><td>Error Type</td><td>Leravel Error</td></tr>";
         echo "<tr><td>Error</td><td>" . $errno . "</td></tr>";
@@ -43,9 +50,19 @@ function customError($errno, $errstr, $errfile, $errline)
         echo "<tr><td>Line</td><td>" . $errline . "</td></tr>";
         echo "</table>";
         echo "<br>";
+        if($solution != null) {
+            echo "<br>";
+            echo "<div class='solution'>";
+            echo "<h2>There is a solution for this error</h2>";
+            echo "<table>";
+            echo "<tr><td>Solution</td><td>" . $solution . "</td></tr>";
+            echo "</table>";
+            echo "</div>";
+            echo "<br>";
+        }
         echo "<fieldset>";
         echo "<legend>Report The Error</legend>";
-        echo '<a href="https://github.com/lera2od/leravel" class="btn" style="width: fit-content"><img src="https://img.icons8.com/fluency/256/github.png">'. $extra . 'Report the error using Github</a>';
+        echo '<a href="https://github.com/lera2od/leravel" class="btn" style="width: fit-content"><img src="https://img.icons8.com/fluency/256/github.png"> Report the error using Github</a>';
         echo "</fieldset>";
     } else {
         echo "<table>";
diff --git a/src/leravel/index.php b/src/leravel/index.php
index ba14c81..e15690f 100644
--- a/src/leravel/index.php
+++ b/src/leravel/index.php
@@ -1,5 +1,6 @@
 <?php
 session_start();
+error_reporting(0);
 
 $files = glob(__DIR__ . "/*.php");
 foreach ($files as $file) {
diff --git a/src/leravel/leravel.json b/src/leravel/leravel.json
index 240a1e5..b9f92c0 100644
--- a/src/leravel/leravel.json
+++ b/src/leravel/leravel.json
@@ -1,6 +1,3 @@
 {
-    "version": "1.6",
-    "statWeek": 20,
-    "lastUpdateCheck": 1683738433,
-    "latestVersion": "1.5"
+    "version": "2.0"
 }
\ No newline at end of file
diff --git a/src/leravel/leravelVar.php b/src/leravel/leravelVar.php
index f1056fd..ec22cf3 100644
--- a/src/leravel/leravelVar.php
+++ b/src/leravel/leravelVar.php
@@ -20,7 +20,7 @@
 if ($Leravel["settings"]["database"]["enabled"] == "true" || $Leravel["settings"]["database"]["enabled"] == "1") {
     $Leravel["conn"] = new Mysqli($Leravel["settings"]["database"]["host"], $Leravel["settings"]["database"]["username"], $Leravel["settings"]["database"]["password"], $Leravel["settings"]["database"]["database"]);
 
-    if ($Leravel["conn"]->connect_error) {
-        die("Connection failed: " . $Leravel["conn"]->connect_error);
+    if ( $Leravel["conn"]->connect_errno ) {
+        die('Connect Error: ' . $db->connect_errno);
     }
 }
\ No newline at end of file