Página Principal Explorar Ajuda
Registe-se Iniciar Sessão
Tankernn
/
tankernn-eu
1
0
Fork 0
Ficheiros Problemas 0 Pull Requests 0 Wiki
Ver Fonte

Port to SQLite

Frans Bergman há 5 anos atrás
pai
8e4d2c45b6
commit
0d12ab7b72
11 ficheiros alterados com 27 adições e 30 exclusões
Visão Dividida Mostrar Estatísticas Diff
  1. 3 3
      admin/actions/activate.php
  2. 2 2
      admin/actions/delete.php
  3. 1 1
      admin/actions/getList.php
  4. 2 2
      admin/actions/get_sections.php
  5. 1 1
      admin/actions/new.php
  6. 1 1
      admin/actions/updatePermissions.php
  7. 3 3
      admin/pages/edit.php
  8. 9 9
      app.php
  9. 2 5
      config.php.sample
  10. 1 1
      login/check_login.php
  11. 2 2
      login/reset.php

+ 3 - 3
admin/actions/activate.php
Ver Ficheiro 

@@ -6,7 +6,7 @@
 
 
     $sql = "SELECT * FROM Activations WHERE Activation_key='$key'";
 
     $query = $conn->query($sql);
 
-    if (!($row = $query->fetch_array())) {
 
+    if (!($row = $query->fetchArray())) {
 
       die("No such key in database.");
 
     }
 
 
@@ -14,7 +14,7 @@
 
     $value = $row['Val'];
 
     $user = $row['User'];
 
     if ($type == "Addresses") {
 
-      $values = json_decode($conn->query("SELECT * FROM Users WHERE User='$user'")->fetch_array()['Addresses'], true);
 
+      $values = json_decode($conn->query("SELECT * FROM Users WHERE User='$user'")->fetchArray()['Addresses'], true);
 
       array_push($values, $value);
 
       $value = json_encode($values);
 
     }
 
@@ -26,7 +26,7 @@
 
       $conn->query($sql);
 
       header("Location: ../index.php");
 
     } else {
 
-      echo "Failed to activate $type. Error: " . $conn->error;
 
+      echo "Failed to activate $type. Error: " . $conn->lastErrorMsg();
 
     }
 
   } else { ?>
 
     <!DOCTYPE html>

+ 2 - 2
admin/actions/delete.php
Ver Ficheiro 

@@ -12,9 +12,9 @@ if (isset($_GET['uid']) and isset($_GET['type'])) {
 
 		if ($conn->query($sql)) {
 
 			echo "Successfully deleted $type.";
 
 		} else {
 
-			echo "Error deleting record: " . $conn->error;
 
+			echo "Error deleting record: " . $conn->lastErrorMsg();
 
 		}
 
-		echo $conn->error;
 
+		echo $conn->lastErrorMsg();
 
 } else {
 
 	echo 'Something went wrong! (No type or no UID provided.)';
 
 }

+ 1 - 1
admin/actions/getList.php
Ver Ficheiro 

@@ -18,7 +18,7 @@
 
       $result = $conn->query("SELECT * FROM $type ORDER BY UID");
 
     }
 
 
-    while($row = $result->fetch_array()) {
 
+    while($row = $result->fetchArray()) {
 
       if (isset($row['name'])) {
 
         $name = $row['name'];
 
       } else {

+ 2 - 2
admin/actions/get_sections.php
Ver Ficheiro 

@@ -9,7 +9,7 @@
 
     $query = $conn->query("SELECT UID, name FROM Section");
 
     $sectionlist = array();
 
 
-    while ($row = $query->fetch_array()) {
 
+    while ($row = $query->fetchArray()) {
 
       $sectionlist[$row['UID']] = $row['name'];
 
     }
 
 
@@ -20,7 +20,7 @@
 
     $sectionids = array();
 
 
     foreach ($sectionnames as $sectionname)
 
-      array_push($sectionids, $conn->query("SELECT UID FROM Section WHERE name='$sectionname'")->fetch_array()['UID']);
 
+      array_push($sectionids, $conn->query("SELECT UID FROM Section WHERE name='$sectionname'")->fetchArray()['UID']);
 
 
     echo json_encode($sectionids);
 
   } else {

+ 1 - 1
admin/actions/new.php
Ver Ficheiro 

@@ -12,6 +12,6 @@
 
 	if($conn->query($sql)) {
 
 		echo "Successfully created new $type!";
 
 	} else {
 
-		echo $conn->error;
 
+		echo $conn->lastErrorMsg();
 
 	}
 
 ?>

+ 1 - 1
admin/actions/updatePermissions.php
Ver Ficheiro 

@@ -22,7 +22,7 @@
 
   if ($conn->query("UPDATE Users SET Permissions='$permissionString' WHERE UID='$uid'")) {
 
     echo "Successfully updated permissions.";
 
   } else {
 
-    echo "Error updating database: " . $conn->error;
 
+    echo "Error updating database: " . $conn->lastErrorMsg();
 
   }
 
 
 ?>

+ 3 - 3
admin/pages/edit.php
Ver Ficheiro 

@@ -39,7 +39,7 @@
 
 		if ($conn->query($sql)) {
 
 			echo "<script>display_message('Successfully saved $type.')</script>";
 
 		} else {
 
-			echo "<script>display_message('Something broke: $conn->error', 'danger')</script>";
 
+			echo "<script>display_message('Something broke: " . $conn->lastErrorMsg() . "', 'danger')</script>";
 
 		}
 
 	} else if (isset($_POST['css'])) {
 
 		$file = fopen("../stylesheets/StyleSheet.css", "w");
 
@@ -51,7 +51,7 @@
 
 
 	if ($type !== "CSS") {
 
 		$query = $conn->query("SELECT * FROM $type WHERE UID='$uid'");
 
-		$row = $query->fetch_array();
 
+		$row = $query->fetchArray();
 
 		$name = isset($row['name']) ? $row['name'] : $row['User'];
 
 	}
 
 
@@ -92,7 +92,7 @@
 
 
 			$page_options = "";
 
 			$pagequery = $conn->query("SELECT * FROM Page ORDER BY ListId");
 
-			while ($pagerow = $pagequery->fetch_array()) {
 
+			while ($pagerow = $pagequery->fetchArray()) {
 
 				$page_name = $pagerow['name'];
 
 				$page_selected = "";
 
 				if ($row['value'] == $page_name) {

+ 9 - 9
app.php
Ver Ficheiro 

@@ -16,11 +16,11 @@
 
       //Get page name
 
       $this->pagename = "Start";
 
       if(isset($_GET['p']))
 
-        $this->pagename = htmlspecialchars($conn->escape_string($_GET['p']));
 
+        $this->pagename = htmlspecialchars($conn->escapeString($_GET['p']));
 
 
       //Get page
 
       $query=$conn->query("SELECT * FROM Page WHERE name='$this->pagename'");
 
-      $this->pageRow=$query->fetch_array() or print($silent ? "" : "<i>Couldn't find page: ".$this->pagename."</i>"); /*header("Location: /?p=error")*/
 
+      $this->pageRow=$query->fetchArray() or print($silent ? "" : "<i>Couldn't find page: ".$this->pagename."</i>"); /*header("Location: /?p=error")*/
 
 
       //Import scripts
 
       $this->scripts = "";
 
@@ -52,7 +52,7 @@ EOT;
 
       //Get components
 
       $this->components = array();
 
       $query=$conn->query("SELECT * FROM Component");
 
-      while ($compRow = $query->fetch_array()) {
 
+      while ($compRow = $query->fetchArray()) {
 
         $this->components[$compRow['name']] = strtr($compRow['content'], $this->vars);
 
       }
 
     }
 
@@ -60,7 +60,7 @@ EOT;
 
     function addSection($sectionName) {
 
       global $conn;
 
       $query=$conn->query("SELECT * FROM Section WHERE name='$sectionName' OR UID='$sectionName'");
 
-      $sectionrow=$query->fetch_array();
 
+      $sectionrow=$query->fetchArray();
 
       echo "<section class=".strtolower($sectionrow["name"])." id=". $sectionrow["UID"] ."><div class='container'>";
 
       echo strtr($sectionrow['content'], $this->vars);
 
       echo '</div></section>';
 
@@ -81,7 +81,7 @@ EOT;
 
       $menuquery = $conn->query("SELECT * FROM Menu ORDER BY listId");
 
       $menuString = "";
 
 
-      while($menurow = $menuquery->fetch_array()) {
 
+      while($menurow = $menuquery->fetchArray()) {
 
         $selected = "";
 
         if ($this->pagename == $menurow['value'])
 
           $selected = "active";
 
@@ -142,7 +142,7 @@ EOT;
 
     if ($type === "Email") {
 
       $mail = $value;
 
     } else {
 
-      $mail = $conn->query("SELECT Email FROM Users WHERE User='$user'")->fetch_array()['Email'];
 
+      $mail = $conn->query("SELECT Email FROM Users WHERE User='$user'")->fetchArray()['Email'];
 
     }
 
 
     $key = generateKey(16);
 
@@ -150,7 +150,7 @@ EOT;
 
       mail($mail, Config::$sitename . " $type confirmation", "To activate your new $type, navigate to this address: http://tankernn.eu/admin/actions/activate.php?key=" . $key);
 
       return new Message("Activation E-mail sent to " . $mail, "success");
 
     } else {
 
-      return new Message("Failed to update database. Error: " . $conn->error, "danger");
 
+      return new Message("Failed to update database. Error: " . $conn->lastErrorMsg(), "danger");
 
     }
 
   }
 
 
@@ -162,14 +162,14 @@ EOT;
 
         return false;
 
       }
 
       $query = $conn->query("SELECT * FROM Users WHERE UID='$userid'");
 
-      $row = $query->fetch_array();
 
+      $row = $query->fetchArray();
 
       if ($oldPass === false || password_verify($oldPass, $row['Password'])) {
 
         $pass_hashed = password_hash($newPass, PASSWORD_DEFAULT);
 
         if($conn->query("UPDATE Users SET Password='$pass_hashed' WHERE UID='$userid'")) {
 
           queue_message(new Message("Successfully updated password.", "success"));
 
           return true;
 
         } else {
 
-          queue_message(new Message("SQL error: " . $conn->error, "danger"));
 
+          queue_message(new Message("SQL error: " . $conn->lastErrorMsg(), "danger"));
 
           return false;
 
         }
 
       } else {

+ 2 - 5
config.php.sample
Ver Ficheiro 

@@ -4,11 +4,8 @@
 
 		public static $webmaster = "frans@tankernn.eu";
 
 
 		//Database Settings
 
-		public static $hostname = "localhost";
 
-		public static $dbuser = "USER_HERE";
 
-		public static $dbpass = "PASS_HERE";
 
-		public static $dbname = "DB_NAME_HERE";
 
+		public static $dbpath = "/var/db/tankernn_eu/tankernn_eu.db";
 
 	}
 
 
-	$conn = new mysqli(Config::$hostname, Config::$dbuser, Config::$dbpass, Config::$dbname) or die("Error " . $conn->error);
 
+	$conn = new SQLite3(Config::$dbpath) or die("Error " . $conn->lastErrorMsg());
 
 ?>

+ 1 - 1
login/check_login.php
Ver Ficheiro 

@@ -3,7 +3,7 @@
 
 	if (isset($_POST['user'])) {
 
 		$username = $_POST['user'];
 
 		$query = $conn->query("SELECT * FROM Users WHERE User='$username'") or header("Location: ../?wronglogin");
 
-		$row = $query->fetch_array();
 
+		$row = $query->fetchArray();
 
 		if (password_verify($_POST['pass'], $row['Password'])) {
 
 			if (empty($row['Email'])) { // Unconfirmed E-mail
 
 				$mess = new Message("You have not confirmed your e-mail address yet. Please do so before logging in.", "warning");

+ 2 - 2
login/reset.php
Ver Ficheiro 

@@ -5,7 +5,7 @@
 
     $key = $conn->escape_string($_POST['key']);
 
     $sql = "SELECT userid FROM PasswordReset WHERE `key`='$key'";
 
     if ($query = $conn->query($sql)) {
 
-      $userid = $query->fetch_array()['userid'];
 
+      $userid = $query->fetchArray()['userid'];
 
     } else {
 
       queue_message(new Message("SQL error: " . $conn->error, "danger"));
 
       header('Location: /');
 
@@ -21,7 +21,7 @@
 
     $email = $conn->escape_string($_POST['email']);
 
     $sql = "SELECT UID FROM Users WHERE Email='$email'";
 
     if ($query = $conn->query($sql)) {
 
-      $userid = $query->fetch_array()['UID'];
 
+      $userid = $query->fetchArray()['UID'];
 
     } else {
 
       queue_message(new Message("No account has that e-mail address registered.", "danger"));
 
       header('Location: /');