From dd00f48e5b160b07a94a62380c1fccdcbdb38e81 Mon Sep 17 00:00:00 2001 From: Marcus Hill Date: Sun, 1 Jan 2023 16:05:48 +0000 Subject: [PATCH] Portal code style tidy --- portal/check_login.php | 28 +-- portal/inc_portal.php | 26 +-- portal/index.php | 146 +++++++-------- portal/login.php | 206 ++++++++++----------- portal/login_microsoft.php | 10 +- portal/login_reset.php | 358 ++++++++++++++++++------------------ portal/portal_functions.php | 44 ++--- portal/portal_header.php | 88 ++++----- portal/profile.php | 40 ++-- portal/ticket.php | 2 +- portal/ticket_add.php | 72 ++++---- portal/ticket_view_all.php | 96 +++++----- 12 files changed, 558 insertions(+), 558 deletions(-) diff --git a/portal/check_login.php b/portal/check_login.php index 8b82da8a..e0a6cfe1 100644 --- a/portal/check_login.php +++ b/portal/check_login.php @@ -5,27 +5,27 @@ * Checks if the client is logged in or not */ -if(!isset($_SESSION)){ - // HTTP Only cookies - ini_set("session.cookie_httponly", True); - if($config_https_only){ - // Tell client to only send cookie(s) over HTTPS - ini_set("session.cookie_secure", True); - } - session_start(); +if (!isset($_SESSION)) { + // HTTP Only cookies + ini_set("session.cookie_httponly", True); + if ($config_https_only) { + // Tell client to only send cookie(s) over HTTPS + ini_set("session.cookie_secure", True); + } + session_start(); } -if(!$_SESSION['client_logged_in']){ - header("Location: login.php"); - die; +if (!$_SESSION['client_logged_in']) { + header("Location: login.php"); + die; } // SESSION FINGERPRINT -$session_ip = strip_tags(mysqli_real_escape_string($mysqli,get_ip())); -$session_os = strip_tags(mysqli_real_escape_string($mysqli,get_os())); +$session_ip = strip_tags(mysqli_real_escape_string($mysqli, get_ip())); +$session_os = strip_tags(mysqli_real_escape_string($mysqli, get_os())); // Get user agent -$session_user_agent = strip_tags(mysqli_real_escape_string($mysqli,$_SERVER['HTTP_USER_AGENT'])); +$session_user_agent = strip_tags(mysqli_real_escape_string($mysqli, $_SERVER['HTTP_USER_AGENT'])); // Get info from session $session_client_id = $_SESSION['client_id']; diff --git a/portal/inc_portal.php b/portal/inc_portal.php index bcabab29..36f5f3ee 100644 --- a/portal/inc_portal.php +++ b/portal/inc_portal.php @@ -4,19 +4,19 @@ * Includes for all pages (except login) */ -include('../config.php'); -include('../functions.php'); -include('check_login.php'); -include('portal_functions.php'); +require_once('../config.php'); +require_once('../functions.php'); +require_once('check_login.php'); +require_once('portal_functions.php'); -if(!isset($_SESSION)){ - // HTTP Only cookies - ini_set("session.cookie_httponly", True); - if($config_https_only){ - // Tell client to only send cookie(s) over HTTPS - ini_set("session.cookie_secure", True); - } - session_start(); +if (!isset($_SESSION)) { + // HTTP Only cookies + ini_set("session.cookie_httponly", True); + if ($config_https_only) { + // Tell client to only send cookie(s) over HTTPS + ini_set("session.cookie_secure", True); + } + session_start(); } -include("portal_header.php"); \ No newline at end of file +require_once("portal_header.php"); \ No newline at end of file diff --git a/portal/index.php b/portal/index.php index 60e49b6c..50f5858c 100644 --- a/portal/index.php +++ b/portal/index.php @@ -8,18 +8,18 @@ require_once("inc_portal.php"); // Ticket status from GET if (!isset($_GET['status'])) { - // If nothing is set, assume we only want to see open tickets - $status = 'Open'; - $ticket_status_snippet = "ticket_status != 'Closed'"; + // If nothing is set, assume we only want to see open tickets + $status = 'Open'; + $ticket_status_snippet = "ticket_status != 'Closed'"; } elseif (isset($_GET['status']) && ($_GET['status']) == 'Open') { - $status = 'Open'; - $ticket_status_snippet = "ticket_status != 'Closed'"; + $status = 'Open'; + $ticket_status_snippet = "ticket_status != 'Closed'"; } elseif (isset($_GET['status']) && ($_GET['status']) == 'Closed') { - $status = 'Closed'; - $ticket_status_snippet = "ticket_status = 'Closed'"; + $status = 'Closed'; + $ticket_status_snippet = "ticket_status = 'Closed'"; } else { - $status = '%'; - $ticket_status_snippet = "ticket_status LIKE '%'"; + $status = '%'; + $ticket_status_snippet = "ticket_status LIKE '%'"; } $contact_tickets = mysqli_query($mysqli, "SELECT * FROM tickets LEFT JOIN contacts ON ticket_contact_id = contact_id WHERE $ticket_status_snippet AND ticket_contact_id = '$session_contact_id' AND ticket_client_id = '$session_client_id' ORDER BY ticket_id DESC"); @@ -41,39 +41,39 @@ $total_tickets = $row['total_tickets']; ?> - - - + + +
- - " alt="..." class=" img-size-50 img-circle"> - - - - + + + - - -
+ + " alt="..." class=" img-size-50 img-circle"> + + + + -
- - -
-
- 		-
-

Welcome, !

-
-
-
+
-
+ +
+
+ 		+
+

Welcome, !

+
+
+
-
- -
-
+
+ +
+ +
+
@@ -86,46 +86,46 @@ $total_tickets = $row['total_tickets']; "; - echo ""; - echo ""; - echo ""; - echo ""; + while ($ticket = mysqli_fetch_array($contact_tickets)) { + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; } ?>
$ticket[ticket_prefix]$ticket[ticket_number] $ticket[ticket_subject]$ticket[ticket_status]
$ticket[ticket_prefix]$ticket[ticket_number] $ticket[ticket_subject]$ticket[ticket_status]
+
+
+
+ +
+ New ticket +
+ +
+ + +
+
My Open tickets |
+
+ + + +
+
Resolved tickets |
+
+ + + +
+
All my tickets |
+
+ + +
-
-
- -
- New ticket -
- -
- - -
-
My Open tickets |
-
- - -
-
Resolved tickets |
-
- - - -
-
All my tickets |
-
- - -
-
- - \ No newline at end of file + \ No newline at end of file diff --git a/portal/login.php b/portal/login.php index ff10e1ce..bf25864b 100644 --- a/portal/login.php +++ b/portal/login.php @@ -9,20 +9,20 @@ require_once('../config.php'); require_once('../functions.php'); require_once ('../get_settings.php'); -if(!isset($_SESSION)){ - // HTTP Only cookies - ini_set("session.cookie_httponly", True); - if($config_https_only){ - // Tell client to only send cookie(s) over HTTPS - ini_set("session.cookie_secure", True); - } - session_start(); +if (!isset($_SESSION)) { + // HTTP Only cookies + ini_set("session.cookie_httponly", True); + if ($config_https_only) { + // Tell client to only send cookie(s) over HTTPS + ini_set("session.cookie_secure", True); + } + session_start(); } $ip = strip_tags(mysqli_real_escape_string($mysqli,get_ip())); -$user_agent = strip_tags(mysqli_real_escape_string($mysqli,$_SERVER['HTTP_USER_AGENT'])); +$user_agent = strip_tags(mysqli_real_escape_string($mysqli, $_SERVER['HTTP_USER_AGENT'])); -$sql_settings = mysqli_query($mysqli,"SELECT config_azure_client_id FROM settings WHERE company_id = '1'"); +$sql_settings = mysqli_query($mysqli, "SELECT config_azure_client_id FROM settings WHERE company_id = '1'"); $settings = mysqli_fetch_array($sql_settings); $client_id = $settings['config_azure_client_id']; @@ -30,119 +30,119 @@ $company_sql = mysqli_query($mysqli, "SELECT company_name FROM companies WHERE c $company_results = mysqli_fetch_array($company_sql); $company_name = $company_results['company_name']; -if($_SERVER['REQUEST_METHOD'] == 'POST' && isset($_POST['login'])){ +if ($_SERVER['REQUEST_METHOD'] == 'POST' && isset($_POST['login'])) { - $email = strip_tags(mysqli_real_escape_string($mysqli, $_POST['email'])); - $password = $_POST['password']; - - if(!filter_var($email, FILTER_VALIDATE_EMAIL)){ - $_SESSION['login_message'] = 'Invalid e-mail'; - } - else{ - $sql = mysqli_query($mysqli, "SELECT * FROM contacts WHERE contact_email = '$email' LIMIT 1"); - $row = mysqli_fetch_array($sql); - if($row['contact_auth_method'] == 'local'){ - if(password_verify($password, $row['contact_password_hash'])){ - - $_SESSION['client_logged_in'] = TRUE; - $_SESSION['client_id'] = $row['contact_client_id']; - $_SESSION['contact_id'] = $row['contact_id']; - $_SESSION['company_id'] = $row['company_id']; - $_SESSION['login_method'] = "local"; - - header("Location: index.php"); - - mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Client Login', log_action = 'Success', log_description = 'Client contact $row[contact_email] successfully logged in locally', log_ip = '$ip', log_user_agent = '$user_agent', log_created_at = NOW(), log_client_id = $row[contact_client_id]"); - - } - else{ - mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Client Login', log_action = 'Failed', log_description = 'Failed client portal login attempt using $email', log_ip = '$ip', log_user_agent = '$user_agent', log_created_at = NOW()"); - $_SESSION['login_message'] = 'Incorrect username or password.'; - } + $email = strip_tags(mysqli_real_escape_string($mysqli, $_POST['email'])); + $password = $_POST['password']; + if (!filter_var($email, FILTER_VALIDATE_EMAIL)) { + $_SESSION['login_message'] = 'Invalid e-mail'; } - else{ - mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Client Login', log_action = 'Failed', log_description = 'Failed client portal login attempt using $email', log_ip = '$ip', log_user_agent = '$user_agent', log_created_at = NOW()"); - $_SESSION['login_message'] = 'Incorrect username or password.'; + else { + $sql = mysqli_query($mysqli, "SELECT * FROM contacts WHERE contact_email = '$email' LIMIT 1"); + $row = mysqli_fetch_array($sql); + if ($row['contact_auth_method'] == 'local') { + if (password_verify($password, $row['contact_password_hash'])) { + + $_SESSION['client_logged_in'] = TRUE; + $_SESSION['client_id'] = $row['contact_client_id']; + $_SESSION['contact_id'] = $row['contact_id']; + $_SESSION['company_id'] = $row['company_id']; + $_SESSION['login_method'] = "local"; + + header("Location: index.php"); + + mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Client Login', log_action = 'Success', log_description = 'Client contact $row[contact_email] successfully logged in locally', log_ip = '$ip', log_user_agent = '$user_agent', log_created_at = NOW(), log_client_id = $row[contact_client_id]"); + + } + else { + mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Client Login', log_action = 'Failed', log_description = 'Failed client portal login attempt using $email', log_ip = '$ip', log_user_agent = '$user_agent', log_created_at = NOW()"); + $_SESSION['login_message'] = 'Incorrect username or password.'; + } + + } + else { + mysqli_query($mysqli, "INSERT INTO logs SET log_type = 'Client Login', log_action = 'Failed', log_description = 'Failed client portal login attempt using $email', log_ip = '$ip', log_user_agent = '$user_agent', log_created_at = NOW()"); + $_SESSION['login_message'] = 'Incorrect username or password.'; + } } - } } ?> - - - <?php echo $company_name; ?> | Client Portal Login + + + <?php echo $company_name; ?> | Client Portal Login - - - + + + - - + + - - + + - - + +