AS1024/itflow
1
0
Fork 0
mirror of https://github.com/itflow-org/itflow synced 2026-03-26 23:35:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

General cleanup/tidying

Browse Source
This commit is contained in:
Marcus Hill
2023-02-09 11:32:40 +00:00
parent 9e549adb7e
commit b36719eb99
22 changed files with 1222 additions and 1244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/v1/contacts/create.php
View File

@@ -7,7 +7,7 @@ require_once('../require_post_method.php');
require_once('contact_model.php'); require_once('contact_model.php');
// Default // Default
$insert_id = FALSE; $insert_id = false;
if (!empty($name) && !empty($email) && !empty($client_id)) { if (!empty($name) && !empty($email) && !empty($client_id)) {

2
api/v1/contacts/delete.php
View File

@@ -7,7 +7,7 @@ require_once('../require_post_method.php');
$contact_id = intval($_POST['contact_id']); $contact_id = intval($_POST['contact_id']);
// Default // Default
$delete_count = FALSE; $delete_count = false;
if (!empty($contact_id)) { if (!empty($contact_id)) {
$row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT * FROM contacts WHERE contact_id = $contact_id AND contact_client_id = $client_id AND company_id = '$company_id' LIMIT 1")); $row = mysqli_fetch_assoc(mysqli_query($mysqli, "SELECT * FROM contacts WHERE contact_id = $contact_id AND contact_client_id = $client_id AND company_id = '$company_id' LIMIT 1"));

2
api/v1/contacts/update.php
View File

@@ -7,7 +7,7 @@ require_once('../require_post_method.php');
$contact_id = intval($_POST['contact_id']); $contact_id = intval($_POST['contact_id']);
// Default // Default
$update_count = FALSE; $update_count = false;
if (!empty($contact_id)) { if (!empty($contact_id)) {

2
api/v1/validate_api_key.php
View File

@@ -7,7 +7,7 @@
*/ */
// Includes // Includes
require_once( __DIR__ . '../../../functions.php'); require_once(__DIR__ . '../../../functions.php');
require_once(__DIR__ . "../../../config.php"); require_once(__DIR__ . "../../../config.php");
// JSON header // JSON header

2
base32static.php
View File

@@ -87,7 +87,7 @@ class Base32Static {
$eightBits = str_split($x, 8); $eightBits = str_split($x, 8);
for ($z = 0; $z < count($eightBits); $z++) { for ($z = 0; $z < count($eightBits); $z++) {
$binaryString .= ( ($y = chr(base_convert($eightBits[$z], 2, 10))) || ord($y) == 48 ) ? $y:""; $binaryString .= (($y = chr(base_convert($eightBits[$z], 2, 10))) || ord($y) == 48) ? $y:"";
} }
} }

2
client_contact_details.php
View File

@@ -29,7 +29,7 @@ if (isset($_GET['contact_id'])) {
if ($contact_id == $primary_contact) { if ($contact_id == $primary_contact) {
$primary_contact_display = "<small class='text-success'>Primary Contact</small>"; $primary_contact_display = "<small class='text-success'>Primary Contact</small>";
} else { } else {
$primary_contact_display = FALSE; $primary_contact_display = false;
} }
$contact_location_id = $row['contact_location_id']; $contact_location_id = $row['contact_location_id'];
$location_name = htmlentities($row['location_name']); $location_name = htmlentities($row['location_name']);

2
client_contacts.php
View File

@@ -133,7 +133,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
if ($contact_id == $primary_contact) { if ($contact_id == $primary_contact) {
$primary_contact_display = "<small class='text-success'>Primary Contact</small>"; $primary_contact_display = "<small class='text-success'>Primary Contact</small>";
} else { } else {
$primary_contact_display = FALSE; $primary_contact_display = false;
} }
$contact_location_id = $row['contact_location_id']; $contact_location_id = $row['contact_location_id'];
$location_name = htmlentities($row['location_name']); $location_name = htmlentities($row['location_name']);

41
client_invoices.php
View File

@@ -1,10 +1,9 @@
<?php require_once("inc_all_client.php"); ?>
<?php <?php
require_once("inc_all_client.php");
if (!empty($_GET['sb'])) { if (!empty($_GET['sb'])) {
$sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb'])); $sb = strip_tags(mysqli_real_escape_string($mysqli,$_GET['sb']));
}else{ } else {
$sb = "invoice_number"; $sb = "invoice_number";
} }
@@ -17,7 +16,9 @@ if (!isset($_GET['o'])) {
//Rebuild URL //Rebuild URL
$url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o))); $url_query_strings_sb = http_build_query(array_merge($_GET,array('sb' => $sb, 'o' => $o)));
$sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM invoices $sql = mysqli_query(
$mysqli,
"SELECT SQL_CALC_FOUND_ROWS * FROM invoices
LEFT JOIN categories ON invoice_category_id = category_id LEFT JOIN categories ON invoice_category_id = category_id
WHERE invoice_client_id = $client_id WHERE invoice_client_id = $client_id
AND (CONCAT(invoice_prefix,invoice_number) LIKE '%$q%' OR invoice_scope LIKE '%$q%' OR category_name LIKE '%$q%' OR invoice_status LIKE '%$q%' OR invoice_amount LIKE '%$q%') AND (CONCAT(invoice_prefix,invoice_number) LIKE '%$q%' OR invoice_scope LIKE '%$q%' OR category_name LIKE '%$q%' OR invoice_status LIKE '%$q%' OR invoice_amount LIKE '%$q%')
@@ -27,7 +28,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
?> ?>
<div class="card card-dark"> <div class="card card-dark">
<div class="card-header py-2"> <div class="card-header py-2">
<h3 class="card-title mt-2"><i class="fa fa-fw fa-file"></i> Invoices</h3> <h3 class="card-title mt-2"><i class="fa fa-fw fa-file"></i> Invoices</h3>
<div class="card-tools"> <div class="card-tools">
@@ -81,7 +82,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
$invoice_scope = htmlentities($row['invoice_scope']); $invoice_scope = htmlentities($row['invoice_scope']);
if (empty($invoice_scope)) { if (empty($invoice_scope)) {
$invoice_scope_display = "-"; $invoice_scope_display = "-";
}else{ } else {
$invoice_scope_display = $invoice_scope; $invoice_scope_display = $invoice_scope;
} }
$invoice_status = htmlentities($row['invoice_status']); $invoice_status = htmlentities($row['invoice_status']);
@@ -93,24 +94,24 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
$category_id = $row['category_id']; $category_id = $row['category_id'];
$category_name = htmlentities($row['category_name']); $category_name = htmlentities($row['category_name']);
if (($invoice_status == "Sent" || $invoice_status == "Partial" || $invoice_status == "Viewed") && strtotime($invoice_due) < time() ) { if (($invoice_status == "Sent" || $invoice_status == "Partial" || $invoice_status == "Viewed") && strtotime($invoice_due) < time()) {
$overdue_color = "text-danger font-weight-bold"; $overdue_color = "text-danger font-weight-bold";
}else{ } else {
$overdue_color = ""; $overdue_color = "";
} }
//Set Badge color based off of invoice status //Set Badge color based off of invoice status
if ($invoice_status == "Sent") { if ($invoice_status == "Sent") {
$invoice_badge_color = "warning"; $invoice_badge_color = "warning";
}elseif ($invoice_status == "Viewed") { } elseif ($invoice_status == "Viewed") {
$invoice_badge_color = "info"; $invoice_badge_color = "info";
}elseif ($invoice_status == "Partial") { } elseif ($invoice_status == "Partial") {
$invoice_badge_color = "primary"; $invoice_badge_color = "primary";
}elseif ($invoice_status == "Paid") { } elseif ($invoice_status == "Paid") {
$invoice_badge_color = "success"; $invoice_badge_color = "success";
}elseif ($invoice_status == "Cancelled") { } elseif ($invoice_status == "Cancelled") {
$invoice_badge_color = "danger"; $invoice_badge_color = "danger";
}else{ } else {
$invoice_badge_color = "secondary"; $invoice_badge_color = "secondary";
} }
@@ -149,8 +150,8 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
<?php <?php
include("invoice_copy_modal.php"); require("invoice_copy_modal.php");
include("invoice_edit_modal.php"); require("invoice_edit_modal.php");
} }
?> ?>
@@ -158,10 +159,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
</tbody> </tbody>
</table> </table>
</div> </div>
<?php include("pagination.php"); ?> <?php require_once("pagination.php"); ?>
</div>
</div> </div>
</div>
<?php include("invoice_add_modal.php"); ?> <?php
require_once("invoice_add_modal.php");
<?php include("footer.php"); ?> require_once("footer.php");

2
client_side_nav.php
View File

@@ -144,7 +144,7 @@
<?php if ($config_module_enable_ticketing == 1) { ?> <?php if ($config_module_enable_ticketing == 1) { ?>
<li class="nav-item"> <li class="nav-item">
<a href="client_tickets.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "client_tickets.php" || basename($_SERVER["PHP_SELF"]) == "client_scheduled_tickets.php" ) { echo "active"; } ?>"> <a href="client_tickets.php?client_id=<?php echo $client_id; ?>" class="nav-link <?php if (basename($_SERVER["PHP_SELF"]) == "client_tickets.php" || basename($_SERVER["PHP_SELF"]) == "client_scheduled_tickets.php") { echo "active"; } ?>">
<i class="nav-icon fas fa-life-ring"></i> <i class="nav-icon fas fa-life-ring"></i>
<p> <p>
Tickets Tickets

6
functions.php
View File

@@ -405,7 +405,7 @@ function getDomainRecords($name) {
function getSSL($name) { function getSSL($name) {
$certificate = array(); $certificate = array();
$certificate['success'] = FALSE; $certificate['success'] = false;
// Only run if we think the domain is valid // Only run if we think the domain is valid
if (!filter_var($name, FILTER_VALIDATE_DOMAIN, FILTER_FLAG_HOSTNAME)) { if (!filter_var($name, FILTER_VALIDATE_DOMAIN, FILTER_FLAG_HOSTNAME)) {
@@ -417,7 +417,7 @@ function getSSL($name) {
// Get SSL/TSL certificate (using verify peer false to allow for self-signed certs) for domain on default port // Get SSL/TSL certificate (using verify peer false to allow for self-signed certs) for domain on default port
$socket = "ssl://$name:443"; $socket = "ssl://$name:443";
$get = stream_context_create(array("ssl" => array("capture_peer_cert" => TRUE, "verify_peer" => FALSE,))); $get = stream_context_create(array("ssl" => array("capture_peer_cert" => true, "verify_peer" => false,)));
$read = stream_socket_client($socket, $errno, $errstr, 5, STREAM_CLIENT_CONNECT, $get); $read = stream_socket_client($socket, $errno, $errstr, 5, STREAM_CLIENT_CONNECT, $get);
// If the socket connected // If the socket connected
@@ -427,7 +427,7 @@ function getSSL($name) {
openssl_x509_export($cert['options']['ssl']['peer_certificate'], $export); openssl_x509_export($cert['options']['ssl']['peer_certificate'], $export);
if ($cert_public_key_obj) { if ($cert_public_key_obj) {
$certificate['success'] = TRUE; $certificate['success'] = true;
$certificate['expire'] = date('Y-m-d', $cert_public_key_obj['validTo_time_t']); $certificate['expire'] = date('Y-m-d', $cert_public_key_obj['validTo_time_t']);
$certificate['issued_by'] = strip_tags($cert_public_key_obj['issuer']['O']); $certificate['issued_by'] = strip_tags($cert_public_key_obj['issuer']['O']);
$certificate['public_key'] = $export; $certificate['public_key'] = $export;

18
guest_view_invoice.php
View File

@@ -119,7 +119,7 @@ $sql_invoice_items = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE it
?> ?>
<div class="card"> <div class="card">
<div class="card-header bg-light d-print-none"> <div class="card-header bg-light d-print-none">
<div class="float-right"> <div class="float-right">
<a class="btn btn-secondary" data-toggle="collapse" href="#collapsePreviousInvoices"><i class="fa fa-fw fa-history"></i> Invoice History</a> <a class="btn btn-secondary" data-toggle="collapse" href="#collapsePreviousInvoices"><i class="fa fa-fw fa-history"></i> Invoice History</a>
@@ -282,11 +282,11 @@ $sql_invoice_items = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE it
<div style="white-space:pre-line; text-align: center;"><?php echo $config_invoice_footer; ?></div> <div style="white-space:pre-line; text-align: center;"><?php echo $config_invoice_footer; ?></div>
</div> </div>
</div> </div>
<script src='plugins/pdfmake/pdfmake.min.js'></script> <script src='plugins/pdfmake/pdfmake.min.js'></script>
<script src='plugins/pdfmake/vfs_fonts.js'></script> <script src='plugins/pdfmake/vfs_fonts.js'></script>
<script> <script>
var docDefinition = { var docDefinition = {
info: { info: {
@@ -704,7 +704,7 @@ $sql_invoice_items = mysqli_query($mysqli, "SELECT * FROM invoice_items WHERE it
columnGap: 20 columnGap: 20
} }
} }
</script> </script>
<?php <?php
@@ -742,7 +742,7 @@ if (mysqli_num_rows($sql) > 1) { ?>
$invoice_url_key = htmlentities($row['invoice_url_key']); $invoice_url_key = htmlentities($row['invoice_url_key']);
$invoice_tally_total = $invoice_amount + $invoice_tally_total; $invoice_tally_total = $invoice_amount + $invoice_tally_total;
$difference = time() - strtotime($invoice_due); $difference = time() - strtotime($invoice_due);
$days = floor($difference / (60*60*24) ); $days = floor($difference / (60*60*24));
?> ?>
@@ -800,7 +800,7 @@ if (mysqli_num_rows($sql) > 1) { ?>
$invoice_url_key = htmlentities($row['invoice_url_key']); $invoice_url_key = htmlentities($row['invoice_url_key']);
$invoice_tally_total = $invoice_amount + $invoice_tally_total; $invoice_tally_total = $invoice_amount + $invoice_tally_total;
$difference = strtotime($invoice_due) - time(); $difference = strtotime($invoice_due) - time();
$days = floor($difference / (60*60*24) ); $days = floor($difference / (60*60*24));
?> ?>
@@ -885,7 +885,7 @@ if (mysqli_num_rows($sql) > 1) { ?>
if (strtotime($payment_date) > strtotime($invoice_due)) { if (strtotime($payment_date) > strtotime($invoice_due)) {
$payment_note = "Late"; $payment_note = "Late";
$difference = strtotime($payment_date) - strtotime($invoice_due); $difference = strtotime($payment_date) - strtotime($invoice_due);
$days = floor($difference / (60*60*24) ) . " Days"; $days = floor($difference / (60*60*24)) . " Days";
} else { } else {
$payment_note = ""; $payment_note = "";
$days = ""; $days = "";

2
guest_view_item.php
View File

@@ -1,7 +1,7 @@
<?php <?php
header('Expires: Sun, 01 Jan 2014 00:00:00 GMT'); header('Expires: Sun, 01 Jan 2014 00:00:00 GMT');
header('Cache-Control: no-store, no-cache, must-revalidate'); header('Cache-Control: no-store, no-cache, must-revalidate');
header('Cache-Control: post-check=0, pre-check=0', FALSE); header('Cache-Control: post-check=0, pre-check=0', false);
header('Pragma: no-cache'); header('Pragma: no-cache');
require_once("guest_header.php"); ?> require_once("guest_header.php"); ?>

2
invoices.php
View File

@@ -293,7 +293,7 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
$now = time(); $now = time();
if (($invoice_status == "Sent" || $invoice_status == "Partial" || $invoice_status == "Viewed") && strtotime($invoice_due) + 86400 < $now ) { if (($invoice_status == "Sent" || $invoice_status == "Partial" || $invoice_status == "Viewed") && strtotime($invoice_due) + 86400 < $now) {
$overdue_color = "text-danger font-weight-bold"; $overdue_color = "text-danger font-weight-bold";
} else { } else {
$overdue_color = ""; $overdue_color = "";

8
login.php
View File

@@ -47,11 +47,11 @@ $config_mail_from_email = $row['config_mail_from_email'];
$config_mail_from_name = $row['config_mail_from_name']; $config_mail_from_name = $row['config_mail_from_name'];
// HTTP-Only cookies // HTTP-Only cookies
ini_set("session.cookie_httponly", True); ini_set("session.cookie_httponly", true);
// Tell client to only send cookie(s) over HTTPS // Tell client to only send cookie(s) over HTTPS
if ($config_https_only) { if ($config_https_only) {
ini_set("session.cookie_secure", True); ini_set("session.cookie_secure", true);
} }
// Handle POST login request // Handle POST login request
@@ -108,7 +108,7 @@ if (isset($_POST['login'])) {
// Determine whether 2FA was used (for logs) // Determine whether 2FA was used (for logs)
$extended_log = ''; // Default value $extended_log = ''; // Default value
if ($current_code !== 0 ) { if ($current_code !== 0) {
$extended_log = 'with 2FA'; $extended_log = 'with 2FA';
} }
@@ -120,7 +120,7 @@ if (isset($_POST['login'])) {
$_SESSION['user_name'] = $user_name; $_SESSION['user_name'] = $user_name;
$_SESSION['user_role'] = $row['user_role']; $_SESSION['user_role'] = $row['user_role'];
$_SESSION['csrf_token'] = randomString(156); $_SESSION['csrf_token'] = randomString(156);
$_SESSION['logged'] = TRUE; $_SESSION['logged'] = true;
// Setup encryption session key // Setup encryption session key
if (isset($row['user_specific_encryption_ciphertext']) && $row['user_role'] > 1) { if (isset($row['user_specific_encryption_ciphertext']) && $row['user_role'] > 1) {

20
pagination.php
View File

@@ -13,11 +13,11 @@ $total_pages = ceil($total_found_rows / $_SESSION['records_per_page']);
if ($total_found_rows > 10) { if ($total_found_rows > 10) {
$i=0; $i=0;
?> ?>
<hr> <hr>
<div class="row"> <div class="row">
<div class="col mb-3"> <div class="col mb-3">
<form action="post.php" method="post"> <form action="post.php" method="post">
<select onchange="this.form.submit()" class="input-form select2" name="change_records_per_page"> <select onchange="this.form.submit()" class="input-form select2" name="change_records_per_page">
@@ -50,12 +50,12 @@ if ($total_found_rows > 10) {
} }
if ($p > 1) { if ($p > 1) {
$prev_class = ""; $prev_class = "";
}else{ } else {
$prev_class = "disabled"; $prev_class = "disabled";
} }
if ($p <> $total_pages) { if ($p <> $total_pages) {
$next_class = ""; $next_class = "";
}else{ } else {
$next_class = "disabled"; $next_class = "disabled";
} }
$url_query_strings = http_build_query(array_merge($_GET,array('p' => $i))); $url_query_strings = http_build_query(array_merge($_GET,array('p' => $i)));
@@ -68,10 +68,10 @@ if ($total_found_rows > 10) {
while ($i < $total_pages) { while ($i < $total_pages) {
$i++; $i++;
if (($i == 1) || (($p <= 3) && ($i <= 6)) || (($i > $total_pages - 6) && ($p > $total_pages - 3 )) || (is_int($i / $pages_split)) || (($p > 3) && ($i >= $p - 2) && ($i <= $p + 3)) || ($i == $total_pages)) { if (($i == 1) || (($p <= 3) && ($i <= 6)) || (($i > $total_pages - 6) && ($p > $total_pages - 3)) || (is_int($i / $pages_split)) || (($p > 3) && ($i >= $p - 2) && ($i <= $p + 3)) || ($i == $total_pages)) {
if ($p == $i ) { if ($p == $i) {
$page_class = "active"; $page_class = "active";
}else{ } else {
$page_class = ""; $page_class = "";
} }
echo "<li class='page-item $page_class'><a class='page-link' href='?$url_query_strings&p=$i'>$i</a></li>"; echo "<li class='page-item $page_class'><a class='page-link' href='?$url_query_strings&p=$i'>$i</a></li>";
@@ -86,9 +86,9 @@ if ($total_found_rows > 10) {
</ul> </ul>
</div> </div>
</div> </div>
<?php <?php
} }

4
portal/inc_portal.php
View File

@@ -11,10 +11,10 @@ require_once('portal_functions.php');
if (!isset($_SESSION)) { if (!isset($_SESSION)) {
// HTTP Only cookies // HTTP Only cookies
ini_set("session.cookie_httponly", True); ini_set("session.cookie_httponly", true);
if ($config_https_only) { if ($config_https_only) {
// Tell client to only send cookie(s) over HTTPS // Tell client to only send cookie(s) over HTTPS
ini_set("session.cookie_secure", True); ini_set("session.cookie_secure", true);
} }
session_start(); session_start();
} }

9
portal/invoices.php
View File

@@ -18,9 +18,7 @@ $invoices_sql = mysqli_query($mysqli, "SELECT * FROM invoices WHERE invoice_clie
<div class="col-md-1 text-center"> <div class="col-md-1 text-center">
<?php if (!empty($session_contact_photo)) { ?> <?php if (!empty($session_contact_photo)) { ?>
<img src="<?php echo "../uploads/clients/$session_company_id/$session_client_id/$session_contact_photo"; ?>" alt="..." height="50" width="50" class="img-circle img-responsive"> <img src="<?php echo "../uploads/clients/$session_company_id/$session_client_id/$session_contact_photo"; ?>" alt="..." height="50" width="50" class="img-circle img-responsive">
<?php } else { ?> <?php } else { ?>
<span class="fa-stack fa-2x rounded-left"> <span class="fa-stack fa-2x rounded-left">
<i class="fa fa-circle fa-stack-2x text-secondary"></i> <i class="fa fa-circle fa-stack-2x text-secondary"></i>
<span class="fa fa-stack-1x text-white"><?php echo $session_contact_initials; ?></span> <span class="fa fa-stack-1x text-white"><?php echo $session_contact_initials; ?></span>
@@ -73,7 +71,7 @@ $invoices_sql = mysqli_query($mysqli, "SELECT * FROM invoices WHERE invoice_clie
} }
$now = time(); $now = time();
if (($invoice_status == "Sent" || $invoice_status == "Partial" || $invoice_status == "Viewed") && strtotime($invoice_due) + 86400 < $now ) { if (($invoice_status == "Sent" || $invoice_status == "Partial" || $invoice_status == "Viewed") && strtotime($invoice_due) + 86400 < $now) {
$overdue_color = "text-danger font-weight-bold"; $overdue_color = "text-danger font-weight-bold";
} else { } else {
$overdue_color = ""; $overdue_color = "";
@@ -107,9 +105,8 @@ $invoices_sql = mysqli_query($mysqli, "SELECT * FROM invoices WHERE invoice_clie
</td> </td>
</tr> </tr>
<?php <?php } ?>
}
?>
</tbody> </tbody>
</table> </table>

2
portal/login.php
View File

@@ -46,7 +46,7 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST' && isset($_POST['login'])) {
if ($row['contact_auth_method'] == 'local') { if ($row['contact_auth_method'] == 'local') {
if (password_verify($password, $row['contact_password_hash'])) { if (password_verify($password, $row['contact_password_hash'])) {
$_SESSION['client_logged_in'] = TRUE; $_SESSION['client_logged_in'] = true;
$_SESSION['client_id'] = $row['contact_client_id']; $_SESSION['client_id'] = $row['contact_client_id'];
$_SESSION['contact_id'] = $row['contact_id']; $_SESSION['contact_id'] = $row['contact_id'];
$_SESSION['company_id'] = $row['company_id']; $_SESSION['company_id'] = $row['company_id'];

2
portal/login_microsoft.php
View File

@@ -95,7 +95,7 @@ if (isset($_POST['code']) && $_POST['state'] == session_id()) {
$row = mysqli_fetch_array($sql); $row = mysqli_fetch_array($sql);
if ($row['contact_auth_method'] == 'azure') { if ($row['contact_auth_method'] == 'azure') {
$_SESSION['client_logged_in'] = TRUE; $_SESSION['client_logged_in'] = true;
$_SESSION['client_id'] = $row['contact_client_id']; $_SESSION['client_id'] = $row['contact_client_id'];
$_SESSION['contact_id'] = $row['contact_id']; $_SESSION['contact_id'] = $row['contact_id'];
$_SESSION['company_id'] = $row['company_id']; $_SESSION['company_id'] = $row['company_id'];

46
post.php
View File

@@ -284,7 +284,7 @@ if(isset($_POST['edit_profile'])){
$email = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['email']))); $email = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['email'])));
$new_password = trim($_POST['new_password']); $new_password = trim($_POST['new_password']);
$existing_file_name = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['existing_file_name']))); $existing_file_name = trim(strip_tags(mysqli_real_escape_string($mysqli,$_POST['existing_file_name'])));
$logout = FALSE; $logout = false;
$extended_log_description = ''; $extended_log_description = '';
// Email notification when password or email is changed // Email notification when password or email is changed
@@ -367,7 +367,7 @@ if(isset($_POST['edit_profile'])){
mysqli_query($mysqli,"UPDATE users SET user_password = '$new_password', user_specific_encryption_ciphertext = '$user_specific_encryption_ciphertext' WHERE user_id = $user_id"); mysqli_query($mysqli,"UPDATE users SET user_password = '$new_password', user_specific_encryption_ciphertext = '$user_specific_encryption_ciphertext' WHERE user_id = $user_id");
$extended_log_description .= ", password changed"; $extended_log_description .= ", password changed";
$logout = TRUE; $logout = true;
} }
// Enable extension access, only if it isn't already setup (user doesn't have cookie) // Enable extension access, only if it isn't already setup (user doesn't have cookie)
@@ -377,7 +377,7 @@ if(isset($_POST['edit_profile'])){
mysqli_query($mysqli, "UPDATE users SET user_extension_key = '$extension_key' WHERE user_id = $user_id"); mysqli_query($mysqli, "UPDATE users SET user_extension_key = '$extension_key' WHERE user_id = $user_id");
$extended_log_description .= ", extension access enabled"; $extended_log_description .= ", extension access enabled";
$logout = TRUE; $logout = true;
} }
} }
@@ -4788,19 +4788,19 @@ if(isset($_POST["import_client_contacts_csv"])){
$client_id = intval($_POST['client_id']); $client_id = intval($_POST['client_id']);
$file_name = $_FILES["file"]["tmp_name"]; $file_name = $_FILES["file"]["tmp_name"];
$error = FALSE; $error = false;
//Check file is CSV //Check file is CSV
$file_extension = strtolower(end(explode('.',$_FILES['file']['name']))); $file_extension = strtolower(end(explode('.',$_FILES['file']['name'])));
$allowed_file_extensions = array('csv'); $allowed_file_extensions = array('csv');
if(in_array($file_extension,$allowed_file_extensions) === false){ if(in_array($file_extension,$allowed_file_extensions) === false){
$error = TRUE; $error = true;
$_SESSION['alert_message'] = "Bad file extension"; $_SESSION['alert_message'] = "Bad file extension";
} }
//Check file isn't empty //Check file isn't empty
elseif($_FILES["file"]["size"] < 1){ elseif($_FILES["file"]["size"] < 1){
$error = TRUE; $error = true;
$_SESSION['alert_message'] = "Bad file size (empty?)"; $_SESSION['alert_message'] = "Bad file size (empty?)";
} }
@@ -4808,7 +4808,7 @@ if(isset($_POST["import_client_contacts_csv"])){
$f = fopen($file_name, "r"); $f = fopen($file_name, "r");
$f_columns = fgetcsv($f, 1000, ","); $f_columns = fgetcsv($f, 1000, ",");
if(!$error & count($f_columns) != 8) { if(!$error & count($f_columns) != 8) {
$error = TRUE; $error = true;
$_SESSION['alert_message'] = "Bad column count."; $_SESSION['alert_message'] = "Bad column count.";
} }
@@ -4818,7 +4818,7 @@ if(isset($_POST["import_client_contacts_csv"])){
fgetcsv($file, 1000, ","); // Skip first line fgetcsv($file, 1000, ","); // Skip first line
$row_count = 0; $row_count = 0;
$duplicate_count = 0; $duplicate_count = 0;
while(($column = fgetcsv($file, 1000, ",")) !== FALSE){ while(($column = fgetcsv($file, 1000, ",")) !== false){
$duplicate_detect = 0; $duplicate_detect = 0;
if(isset($column[0])){ if(isset($column[0])){
$name = trim(strip_tags(mysqli_real_escape_string($mysqli, $column[0]))); $name = trim(strip_tags(mysqli_real_escape_string($mysqli, $column[0])));
@@ -5209,19 +5209,19 @@ if(isset($_POST["import_client_locations_csv"])){
$client_id = intval($_POST['client_id']); $client_id = intval($_POST['client_id']);
$file_name = $_FILES["file"]["tmp_name"]; $file_name = $_FILES["file"]["tmp_name"];
$error = FALSE; $error = false;
//Check file is CSV //Check file is CSV
$file_extension = strtolower(end(explode('.',$_FILES['file']['name']))); $file_extension = strtolower(end(explode('.',$_FILES['file']['name'])));
$allowed_file_extensions = array('csv'); $allowed_file_extensions = array('csv');
if(in_array($file_extension,$allowed_file_extensions) === false){ if(in_array($file_extension,$allowed_file_extensions) === false){
$error = TRUE; $error = true;
$_SESSION['alert_message'] = "Bad file extension"; $_SESSION['alert_message'] = "Bad file extension";
} }
//Check file isn't empty //Check file isn't empty
elseif($_FILES["file"]["size"] < 1){ elseif($_FILES["file"]["size"] < 1){
$error = TRUE; $error = true;
$_SESSION['alert_message'] = "Bad file size (empty?)"; $_SESSION['alert_message'] = "Bad file size (empty?)";
} }
@@ -5229,7 +5229,7 @@ if(isset($_POST["import_client_locations_csv"])){
$f = fopen($file_name, "r"); $f = fopen($file_name, "r");
$f_columns = fgetcsv($f, 1000, ","); $f_columns = fgetcsv($f, 1000, ",");
if(!$error & count($f_columns) != 7) { if(!$error & count($f_columns) != 7) {
$error = TRUE; $error = true;
$_SESSION['alert_message'] = "Bad column count."; $_SESSION['alert_message'] = "Bad column count.";
} }
@@ -5239,7 +5239,7 @@ if(isset($_POST["import_client_locations_csv"])){
fgetcsv($file, 1000, ","); // Skip first line fgetcsv($file, 1000, ","); // Skip first line
$row_count = 0; $row_count = 0;
$duplicate_count = 0; $duplicate_count = 0;
while(($column = fgetcsv($file, 1000, ",")) !== FALSE){ while(($column = fgetcsv($file, 1000, ",")) !== false){
$duplicate_detect = 0; $duplicate_detect = 0;
if(isset($column[0])){ if(isset($column[0])){
$name = trim(strip_tags(mysqli_real_escape_string($mysqli, $column[0]))); $name = trim(strip_tags(mysqli_real_escape_string($mysqli, $column[0])));
@@ -5519,19 +5519,19 @@ if(isset($_POST["import_client_assets_csv"])){
$client_id = intval($_POST['client_id']); $client_id = intval($_POST['client_id']);
$file_name = $_FILES["file"]["tmp_name"]; $file_name = $_FILES["file"]["tmp_name"];
$error = FALSE; $error = false;
//Check file is CSV //Check file is CSV
$file_extension = strtolower(end(explode('.',$_FILES['file']['name']))); $file_extension = strtolower(end(explode('.',$_FILES['file']['name'])));
$allowed_file_extensions = array('csv'); $allowed_file_extensions = array('csv');
if(in_array($file_extension,$allowed_file_extensions) === false){ if(in_array($file_extension,$allowed_file_extensions) === false){
$error = TRUE; $error = true;
$_SESSION['alert_message'] = "Bad file extension"; $_SESSION['alert_message'] = "Bad file extension";
} }
//Check file isn't empty //Check file isn't empty
elseif($_FILES["file"]["size"] < 1){ elseif($_FILES["file"]["size"] < 1){
$error = TRUE; $error = true;
$_SESSION['alert_message'] = "Bad file size (empty?)"; $_SESSION['alert_message'] = "Bad file size (empty?)";
} }
@@ -5539,7 +5539,7 @@ if(isset($_POST["import_client_assets_csv"])){
$f = fopen($file_name, "r"); $f = fopen($file_name, "r");
$f_columns = fgetcsv($f, 1000, ","); $f_columns = fgetcsv($f, 1000, ",");
if(!$error & count($f_columns) != 8) { if(!$error & count($f_columns) != 8) {
$error = TRUE; $error = true;
$_SESSION['alert_message'] = "Bad column count."; $_SESSION['alert_message'] = "Bad column count.";
} }
@@ -5549,7 +5549,7 @@ if(isset($_POST["import_client_assets_csv"])){
fgetcsv($file, 1000, ","); // Skip first line fgetcsv($file, 1000, ","); // Skip first line
$row_count = 0; $row_count = 0;
$duplicate_count = 0; $duplicate_count = 0;
while(($column = fgetcsv($file, 1000, ",")) !== FALSE){ while(($column = fgetcsv($file, 1000, ",")) !== false){
$duplicate_detect = 0; $duplicate_detect = 0;
if(isset($column[0])){ if(isset($column[0])){
$name = trim(strip_tags(mysqli_real_escape_string($mysqli, $column[0]))); $name = trim(strip_tags(mysqli_real_escape_string($mysqli, $column[0])));
@@ -6163,19 +6163,19 @@ if(isset($_POST["import_client_logins_csv"])){
$client_id = intval($_POST['client_id']); $client_id = intval($_POST['client_id']);
$file_name = $_FILES["file"]["tmp_name"]; $file_name = $_FILES["file"]["tmp_name"];
$error = FALSE; $error = false;
//Check file is CSV //Check file is CSV
$file_extension = strtolower(end(explode('.',$_FILES['file']['name']))); $file_extension = strtolower(end(explode('.',$_FILES['file']['name'])));
$allowed_file_extensions = array('csv'); $allowed_file_extensions = array('csv');
if(in_array($file_extension,$allowed_file_extensions) === false){ if(in_array($file_extension,$allowed_file_extensions) === false){
$error = TRUE; $error = true;
$_SESSION['alert_message'] = "Bad file extension"; $_SESSION['alert_message'] = "Bad file extension";
} }
//Check file isn't empty //Check file isn't empty
elseif($_FILES["file"]["size"] < 1){ elseif($_FILES["file"]["size"] < 1){
$error = TRUE; $error = true;
$_SESSION['alert_message'] = "Bad file size (empty?)"; $_SESSION['alert_message'] = "Bad file size (empty?)";
} }
@@ -6183,7 +6183,7 @@ if(isset($_POST["import_client_logins_csv"])){
$f = fopen($file_name, "r"); $f = fopen($file_name, "r");
$f_columns = fgetcsv($f, 1000, ","); $f_columns = fgetcsv($f, 1000, ",");
if(!$error & count($f_columns) != 4) { if(!$error & count($f_columns) != 4) {
$error = TRUE; $error = true;
$_SESSION['alert_message'] = "Bad column count."; $_SESSION['alert_message'] = "Bad column count.";
} }
@@ -6193,7 +6193,7 @@ if(isset($_POST["import_client_logins_csv"])){
fgetcsv($file, 1000, ","); // Skip first line fgetcsv($file, 1000, ","); // Skip first line
$row_count = 0; $row_count = 0;
$duplicate_count = 0; $duplicate_count = 0;
while(($column = fgetcsv($file, 1000, ",")) !== FALSE){ while(($column = fgetcsv($file, 1000, ",")) !== false){
$duplicate_detect = 0; $duplicate_detect = 0;
if(isset($column[0])){ if(isset($column[0])){
$name = trim(strip_tags(mysqli_real_escape_string($mysqli, $column[0]))); $name = trim(strip_tags(mysqli_real_escape_string($mysqli, $column[0])));

33
rfc6238.php
View File

@@ -1,7 +1,7 @@
<?php <?php
// http://www.faqs.org/rfcs/rfc6238.html // http://www.faqs.org/rfcs/rfc6238.html
require_once(dirname(__FILE__).'/base32static.php'); require_once(dirname(__FILE__).'/base32static.php');
class TokenAuth6238 { class TokenAuth6238 {
/** /**
* verify * verify
@@ -65,26 +65,7 @@
return $url; return $url;
} }
public static function generateRandomClue($length = 16) {
$b32 = "234567QWERTYUIOPASDFGHJKLZXCVBNM";
$s = "";
for ($i = 0; $i < $length; $i++)
$s .= $b32[rand(0,31)];
return $s;
}
private static function hotp_tobytestream($key) {
$result = array();
$last = strlen($key);
for ($i = 0; $i < $last; $i = $i + 2) {
$x = $key[$i] + $key[$i + 1];
$x = strtoupper($x);
$x = hexdec($x);
$result = $result.chr($x);
}
return $result;
}
private static function oath_hotp ($key, $counter, $debug=false) { private static function oath_hotp ($key, $counter, $debug=false) {
$result = ""; $result = "";
$orgcounter = $counter; $orgcounter = $counter;
@@ -159,12 +140,12 @@
} }
$result = ( $result = (
(($hmac_result[$offset+0] & 0x7f) << 24 ) | (($hmac_result[$offset+0] & 0x7f) << 24) |
(($hmac_result[$offset+1] & 0xff) << 16 ) | (($hmac_result[$offset+1] & 0xff) << 16) |
(($hmac_result[$offset+2] & 0xff) << 8 ) | (($hmac_result[$offset+2] & 0xff) << 8) |
($hmac_result[$offset+3] & 0xff) ($hmac_result[$offset+3] & 0xff)
) % pow(10,$length); ) % pow(10,$length);
return $result; return $result;
} }
} }

17
ticket.php
View File

@@ -1,4 +1,5 @@
<?php include("inc_all.php"); <?php
require_once("inc_all.php");
if (isset($_GET['ticket_id'])) { if (isset($_GET['ticket_id'])) {
$ticket_id = intval($_GET['ticket_id']); $ticket_id = intval($_GET['ticket_id']);
@@ -374,7 +375,7 @@ if (isset($_GET['ticket_id'])) {
<?php <?php
include("ticket_reply_edit_modal.php"); require("ticket_reply_edit_modal.php");
} }
@@ -490,7 +491,7 @@ if (isset($_GET['ticket_id'])) {
<br> <br>
<?php } <?php }
if ($ticket_asset_count > 0 ) { ?> if ($ticket_asset_count > 0) { ?>
<button class="btn btn-block btn-secondary" data-toggle="modal" data-target="#assetTicketsModal">Service History (<?php echo $ticket_asset_count; ?>)</button> <button class="btn btn-block btn-secondary" data-toggle="modal" data-target="#assetTicketsModal">Service History (<?php echo $ticket_asset_count; ?>)</button>
@@ -617,17 +618,15 @@ if (isset($_GET['ticket_id'])) {
</div> </div>
<?php <?php
include("ticket_edit_modal.php"); require("ticket_edit_modal.php");
include("ticket_merge_modal.php"); require("ticket_merge_modal.php");
include("ticket_invoice_add_modal.php"); require("ticket_invoice_add_modal.php");
} }
} }
?> require_once("footer.php");
<?php include_once("footer.php");
if ($ticket_status !== "Closed") { ?> if ($ticket_status !== "Closed") { ?>
<!-- Ticket Time Tracking JS --> <!-- Ticket Time Tracking JS -->