|
|
@@ -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 {
|
