v15 changes

bhdresh · Jan 26, 2023 · cd68aff · cd68aff
1 parent bdd93d1
commit cd68aff
Show file tree

Hide file tree

Showing 52 changed files with 612 additions and 1,568 deletions.
diff --git a/Console/Decoify/addEdit.php b/Console/Decoify/addEdit.php
diff --git a/Console/Decoify/backupSettings.php b/Console/Decoify/backupSettings.php
@@ -2,20 +2,19 @@
 
 if(!isset($_SESSION)) 
 { 
-		    session_start(); 
+			    session_start(); 
 }
-require_once('includes/common.php');
 
 include "db.php";
-if(!isset($_SESSION['user_name']) && !isAdmin($_SESSION))
+if(!isset($_SESSION['user_name']) && $_SESSION['role'] != 'admin')
 {
-		        header('location:loginView.php');
-					        exit();
+			        header('location:loginView.php');
+									        exit();
 
 }
 
 
-if(isset($_SESSION['user_name']) && isAdmin($_SESSION)) {
+if(isset($_SESSION['user_name']) && $_SESSION['role'] == 'admin') {
 
 ?>
 
@@ -86,10 +85,11 @@
         </div>
         <!-- /.box-body -->
 
-
-                <div class="box box-primary">
+
+
+	<div class="box box-primary">
         <div class="box-header with-border">
-          <h3 class="box-title">Upgrade DejaVu Console</h3>
+          <h3 class="box-title">Upgrade DejaVu</h3>
         </div>
         <!-- /.box-header -->
         <div class="box-body">
@@ -108,7 +108,7 @@
 
             		echo "<form role=\"form\" action=\"updateFramework.php\" method=\"post\" enctype=\"multipart/form-data\">";
 			echo "<input type=\"hidden\" name=\"csrf_token\" value=\"$csrf_token\"/>";
-                	echo "<button type=\"submit\" class=\"btn btn-primary\">Upgrade DejaVu Console</button>";
+                	echo "<button type=\"submit\" class=\"btn btn-primary\">Upgrade DejaVu Engine</button>";
             		echo "</form>";
 
 		}
@@ -124,9 +124,11 @@
 
 
 
-
-
-
+
+
+
+
+
         <div class="box box-primary">
         <div class="box-header with-border">
           <h3 class="box-title">Reboot/Shutdown/Reset DejaVu Console</h3>
@@ -179,6 +181,6 @@
 }
 else 
 {
-		  header('location:loginView.php');
+			  header('location:loginView.php');
 }
 ?>
diff --git a/Console/Decoify/dashboard.php b/Console/Decoify/dashboard.php
@@ -4,11 +4,10 @@
 { 
     session_start(); 
 }
-require_once('includes/common.php');
 
 include 'db.php';
 
-if(isset($_SESSION['user_name']) && isAuthorized($_SESSION)) {
+if(isset($_SESSION['user_name']) && $_SESSION['role'] == 'admin') {
 
 $user_id=$_SESSION['user_id'];  
 

diff --git a/Console/Decoify/db.class.php b/Console/Decoify/db.class.php
diff --git a/Console/Decoify/db.php b/Console/Decoify/db.php
@@ -1,7 +1,6 @@
 <?php
 
 //Connection to database
-require_once('includes/common.php');
 
 function db_connect() {
 
@@ -43,7 +42,7 @@ function check_session(){
   }
 
 
-  if(isset($_SESSION['user_name']) &&  isAuthorized($_SESSION))
+  if(isset($_SESSION['user_name']) &&  $_SESSION['role'] == 'admin')
   {
     $logged_in = 'true';
     return $logged_in;
@@ -105,8 +104,8 @@ function activeAlerts()
 
     $mysqli = db_connect();
     $user_id=$_SESSION['user_id'];
-    $stmt = $mysqli->prepare("select COUNT(Status) as active_events from Alerts where Status=1;");
-    //$stmt->bind_param("s", $user_id); 
+    $stmt = $mysqli->prepare("select COUNT(Status) as active_events from Alerts where Status=1 and user_id=?;");
+    $stmt->bind_param("s", $user_id); 
     $stmt->execute();
     $result = $stmt->get_result();