Skip to content

cleanup #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
baraql wants to merge 2 commits into
base: main
Choose a base branch
from
Open

cleanup #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
da3a37b
cleanup
JoeWang3 Dec 5, 2023
49efd2f
update
JoeWang3 Dec 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions addAppeals.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
include 'connect.php';
include_once "appeals_function.php";

session_start();
// session_start();

if (!isset($_SESSION['loggedin']) || $_SESSION['loggedin'] !== true) {
header("Location: index.html");
exit();
}
// if (!isset($_SESSION['loggedin']) || $_SESSION['loggedin'] !== true) {
// header("Location: index.html");
// exit();
// }

$criminal_ID = array_key_exists("criminal_ID", $_GET) ? $_GET['criminal_ID'] : null;
if ($criminal_ID == null) {
Expand Down
10 changes: 5 additions & 5 deletions addCharges.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
include 'connect.php';
include_once "addcharges_function.php";

session_start();
// session_start();

if (!isset($_SESSION['loggedin']) || $_SESSION['loggedin'] !== true) {
header("Location: index.html");
exit();
}
// if (!isset($_SESSION['loggedin']) || $_SESSION['loggedin'] !== true) {
// header("Location: index.html");
// exit();
// }

$criminal_ID = array_key_exists("criminal_ID", $_GET) ? $_GET['criminal_ID'] : null;
if ($criminal_ID == null) {
Expand Down
4 changes: 0 additions & 4 deletions addCrimeofficers.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
<?php
// new.php

if (isset($_POST['crimeID'])) {
$crimeID = $_POST['crimeID'];
// Perform additional queries using $crimeID

// Display the crimeID (you can replace this with your actual logic)
echo "Crime ID: $crimeID";
} else {
echo "No crime ID received";
Expand Down
3 changes: 0 additions & 3 deletions addCrimes.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
<?php
// Assuming you have a valid database connection stored in $con
// Ensure that the connection is established before this code

session_start();

if (!isset($_SESSION['loggedin']) || $_SESSION['loggedin'] !== true) {
// echo "not logged in";
header("Location: index.html");
exit();
}
Expand Down
1 change: 0 additions & 1 deletion addSentences.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
session_start();

if (!isset($_SESSION['loggedin']) || $_SESSION['loggedin'] !== true) {
// echo "not logged in";
header("Location: index.html");
exit();
}
Expand Down
12 changes: 6 additions & 6 deletions addalias.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@
include 'connect.php';
include_once "addco_functions.php";

session_start();
// session_start();

// if (!isset($_SESSION['loggedin']) || $_SESSION['loggedin'] !== true) {
// header("Location: index.html");
// exit();
// }

if (!isset($_SESSION['loggedin']) || $_SESSION['loggedin'] !== true) {
header("Location: index.html");
exit();
}
/*
criminal_ID
crime_ID
Expand All @@ -31,7 +32,6 @@
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Add Alias</title>
<!-- the whole "check" function, I don't think we need-->
<script>
function check(form) {
return true;
Expand Down
10 changes: 9 additions & 1 deletion addalias_functions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,22 @@
<?php
include 'connect.php';
include 'user.php';

/*
criminal_ID
crime_ID
officer_ID
*/

session_start();

if (!isset($_SESSION['loggedin']) || $_SESSION['loggedin'] !== true) {
header("Location: index.html");
exit();
}

function add_alias() {
User::checkPerm();
global $con;

$sql = "INSERT INTO `alias`(`alias_id`, `criminal_ID`, `alias`) VALUES (NULL, ?, ?)";
Expand All @@ -35,7 +43,7 @@ function add_alias() {
}

function delete_alias() {

User::checkPerm();
global $con;
// $officer_ID = array_key_exists('officer_ID', $_POST) ? $_POST['officer_ID'] : die("Officer ID required!");
$criminal_ID = $_POST['criminal_ID'];
Expand Down
14 changes: 12 additions & 2 deletions addcharges_function.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
<?php
include 'connect.php';
include 'user.php';

session_start();

if (!isset($_SESSION['loggedin']) || $_SESSION['loggedin'] !== true) {
header("Location: index.html");
exit();
}

class Charge
{
public $charge_ID;
Expand Down Expand Up @@ -49,7 +58,7 @@ function get_charge_info_from_db()

function add_charge()
{
var_dump($_POST);
User::checkPerm();


global $con;
Expand Down Expand Up @@ -92,7 +101,7 @@ function add_charge()

function update_charge()
{

User::checkPerm();

global $con;
$criminal_ID = array_key_exists('criminal_ID', $_REQUEST) ? $_REQUEST['criminal_ID'] : die("Criminal ID required!");
Expand Down Expand Up @@ -134,6 +143,7 @@ function update_charge()

function delete_charge()
{
User::checkPerm();
global $con;
$charge_ID = array_key_exists('charge_ID', $_POST) ? $_POST['charge_ID'] : die("Charge ID required!");
$criminal_ID = $_POST['criminal_ID'];
Expand Down
18 changes: 7 additions & 11 deletions addco.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@
include 'connect.php';
include_once "addco_functions.php";

session_start();
// session_start();

// if (!isset($_SESSION['loggedin']) || $_SESSION['loggedin'] !== true) {
// header("Location: index.html");
// exit();
// }

if (!isset($_SESSION['loggedin']) || $_SESSION['loggedin'] !== true) {
header("Location: index.html");
exit();
}
/*
criminal_ID
crime_ID
Expand All @@ -21,15 +22,11 @@
exit();
}

//im assuming this is for either edit or appeal

if (isset($_GET['officer_ID'])) {
//only delete and update send a 'm' val
//delete: $method = d
//update: $method = u
$method = $_GET['m'];

} else {
//add: $method = a
$method = 'a';
}

Expand All @@ -43,7 +40,6 @@
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Add Crime Officers</title>
<!-- the whole "check" function, I don't think we need-->
<script>
function check(form) {
return true;
Expand Down
11 changes: 10 additions & 1 deletion addco_functions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
<?php
include 'connect.php';
include 'user.php';

session_start();

if (!isset($_SESSION['loggedin']) || $_SESSION['loggedin'] !== true) {
header("Location: index.html");
exit();
}

function add_co() {
User::checkPerm();
global $con;
$officer_ID = array_key_exists('officer_ID', $_REQUEST) ? $_REQUEST['officer_ID'] : die("officer ID required!");

Expand Down Expand Up @@ -33,6 +41,7 @@ function add_co() {
}

function update_co() {
User::checkPerm();
global $con;
$criminal_ID = array_key_exists('criminal_ID', $_REQUEST) ? $_REQUEST['criminal_ID'] : die("Criminal ID required!");

Expand Down Expand Up @@ -61,6 +70,7 @@ function update_co() {
}

function delete_co() {
User::checkPerm();

global $con;
$officer_ID = array_key_exists('officer_ID', $_POST) ? $_POST['officer_ID'] : die("Officer ID required!");
Expand All @@ -87,7 +97,6 @@ function delete_co() {
} else {
return;
}
var_dump($_POST);

if ($method == 'a') {
add_co();
Expand Down
142 changes: 0 additions & 142 deletions addcrimes2.php
View file
Open in desktop

This file was deleted.

Loading