diff --git a/classes/constellation.php b/classes/constellation.php index 162a473..d244e16 100644 --- a/classes/constellation.php +++ b/classes/constellation.php @@ -121,9 +121,9 @@ class Constellation $timestamp = time(); } - $c = ($future)?">=":"<="; + $operator = ($future)?">=":"<="; $limit++; - $sql = $mysqli->prepare("SELECT *, status.id as status_id FROM status INNER JOIN users ON user_id=users.id WHERE `time` $c ? AND `end_time` $c ? OR (`time`<=? AND `end_time` $c ? ) ORDER BY `time` DESC LIMIT ? OFFSET ?"); + $sql = $mysqli->prepare("SELECT *, status.id as status_id FROM status INNER JOIN users ON user_id=users.id WHERE `time` $operator ? AND `end_time` $operator ? OR (`time`<=? AND `end_time` $operator ? ) ORDER BY `time` DESC LIMIT ? OFFSET ?"); $sql->bind_param("iiiiii",$timestamp, $timestamp, $timestamp, $timestamp, $limit, $offset); $sql->execute(); $query = $sql->get_result(); diff --git a/classes/token.php b/classes/token.php index b2eebee..1771367 100644 --- a/classes/token.php +++ b/classes/token.php @@ -69,6 +69,6 @@ class Token $stmt = $mysqli->prepare("DELETE FROM tokens WHERE token = ? OR expirebind_param("sd", $token,$time); $stmt->execute(); - $query = $stmt->get_result(); + $stmt->get_result(); } } \ No newline at end of file diff --git a/classes/user.php b/classes/user.php index 11b1d86..e4d69d6 100644 --- a/classes/user.php +++ b/classes/user.php @@ -549,7 +549,7 @@ class User $stmt = $mysqli->prepare("UPDATE users SET email = ? WHERE id=?"); $stmt->bind_param("sd", $email, $id); $stmt->execute(); - $query = $stmt->get_result(); + $stmt->get_result(); Token::delete($token); header("Location: ".WEB_URL."/admin/"); } diff --git a/css/main.css b/css/main.css index de990ad..141be2c 100644 --- a/css/main.css +++ b/css/main.css @@ -341,8 +341,8 @@ body a h1{ } @media (max-width: 991px) { - #footerwrap .col-md-8, #footerwrap .col-md-4 { - text-align: center !important; + body #footerwrap .col-md-8, #footerwrap .col-md-4 { + text-align: center; } } diff --git a/js/admin.js b/js/admin.js index 658f789..4d57113 100644 --- a/js/admin.js +++ b/js/admin.js @@ -11,7 +11,7 @@ var icons = ["fa fa-times", "fa fa-exclamation", "fa fa-info", "fa fa-check"]; $("body").on("change","#new-incident select", function(){ - var val = $(this).val(); + var val = parseInt($(this).val()); //this should make exploitation harder $("#new-incident .panel.new .panel-heading i").get(0).className = icons[val]; $("#new-incident .panel.new").get(0).className = classes[val] + " new"; @@ -22,9 +22,9 @@ $("body").on("submit","#new-incident",function(){ var time = Date.parse($('#time_input').val()); var end_time = Date.parse($('#end_time').val()); - var type = $("#type").val(); + var type = $("#type").val() || 0; - if (type == 2 &&(isNaN(time) || isNaN(end_time))) + if (type === 2 &&(isNaN(time) || isNaN(end_time))) { if (isNaN(end_time)) { @@ -39,7 +39,7 @@ } return false; } - else if (type == 2 && time >= end_time) + else if (type === 2 && time >= end_time) { $.growl.error({ message: "End time is either the same or earlier than start time!" }); $('#time').addClass("error"); @@ -47,7 +47,7 @@ return false; } - if($('#status-container :checkbox:checked').length == 0) + if($('#status-container :checkbox:checked').length === 0) { $.growl.error({ message: "Please check at least one service!" }); $('#status-container').addClass("error");