General tidy/spacing cleanups
This commit is contained in:
+1
-3
@@ -1,6 +1,4 @@
|
|||||||
<?php include("inc_all_client.php"); ?>
|
<?php include("inc_all_client.php");
|
||||||
|
|
||||||
<?php
|
|
||||||
|
|
||||||
$sql_files_images = mysqli_query($mysqli, "SELECT * FROM files WHERE file_client_id = $client_id AND (file_ext LIKE 'JPG' OR file_ext LIKE 'jpg' OR file_ext LIKE 'JPEG' OR file_ext LIKE 'jpeg' OR file_ext LIKE 'png' OR file_ext LIKE 'PNG') ORDER BY file_name ASC");
|
$sql_files_images = mysqli_query($mysqli, "SELECT * FROM files WHERE file_client_id = $client_id AND (file_ext LIKE 'JPG' OR file_ext LIKE 'jpg' OR file_ext LIKE 'JPEG' OR file_ext LIKE 'jpeg' OR file_ext LIKE 'png' OR file_ext LIKE 'PNG') ORDER BY file_name ASC");
|
||||||
|
|
||||||
|
|||||||
+1
-3
@@ -1,6 +1,4 @@
|
|||||||
<?php include("inc_all_client.php"); ?>
|
<?php include("inc_all_client.php");
|
||||||
|
|
||||||
<?php
|
|
||||||
|
|
||||||
$sql_contacts = mysqli_query($mysqli, "SELECT * FROM contacts WHERE contact_client_id = $client_id AND contact_archived_at IS NULL AND contacts.company_id = $session_company_id ORDER BY contact_updated_at, contact_created_at DESC LIMIT 5");
|
$sql_contacts = mysqli_query($mysqli, "SELECT * FROM contacts WHERE contact_client_id = $client_id AND contact_archived_at IS NULL AND contacts.company_id = $session_company_id ORDER BY contact_updated_at, contact_created_at DESC LIMIT 5");
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,4 @@
|
|||||||
<?php include("inc_all.php"); ?>
|
<?php include("inc_all.php");
|
||||||
|
|
||||||
<?php
|
|
||||||
|
|
||||||
// Quick fix to prevent non-admins (i.e. techs) seeing financials - redirect to client list
|
// Quick fix to prevent non-admins (i.e. techs) seeing financials - redirect to client list
|
||||||
// To be removed when we have a proper technical dashboard for techs
|
// To be removed when we have a proper technical dashboard for techs
|
||||||
|
|||||||
@@ -1,6 +1,4 @@
|
|||||||
<?php include("guest_header.php"); ?>
|
<?php include("guest_header.php");
|
||||||
|
|
||||||
<?php
|
|
||||||
|
|
||||||
if (isset($_GET['invoice_id'], $_GET['url_key'])) {
|
if (isset($_GET['invoice_id'], $_GET['url_key'])) {
|
||||||
|
|
||||||
|
|||||||
@@ -7,10 +7,10 @@
|
|||||||
|
|
||||||
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();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,4 @@
|
|||||||
<?php include("inc_all.php"); ?>
|
<?php include("inc_all.php");
|
||||||
|
|
||||||
<?php
|
|
||||||
|
|
||||||
if (isset($_GET['recurring_id'])) {
|
if (isset($_GET['recurring_id'])) {
|
||||||
|
|
||||||
@@ -116,7 +114,7 @@ if (isset($_GET['recurring_id'])) {
|
|||||||
|
|
||||||
<div class="row mb-4">
|
<div class="row mb-4">
|
||||||
<div class="col-sm-2">
|
<div class="col-sm-2">
|
||||||
<img class="img-fluid" src="<?php echo "uploads/settings/$company_id/$company_logo"; ?>">
|
<img class="img-fluid" alt="Company logo" src="<?php echo "uploads/settings/$company_id/$company_logo"; ?>">
|
||||||
</div>
|
</div>
|
||||||
<div class="col-sm-10">
|
<div class="col-sm-10">
|
||||||
<h3 class="text-right"><strong>Recurring Invoice</strong><br><small class="text-secondary"><?php echo ucwords($recurring_frequency); ?>ly</small></h3>
|
<h3 class="text-right"><strong>Recurring Invoice</strong><br><small class="text-secondary"><?php echo ucwords($recurring_frequency); ?>ly</small></h3>
|
||||||
|
|||||||
+2
-5
@@ -1,12 +1,9 @@
|
|||||||
<?php
|
<?php
|
||||||
include("inc_all_settings.php");
|
include("inc_all_settings.php");
|
||||||
include("database_version.php");
|
include("database_version.php");
|
||||||
include("config.php")
|
include("config.php");
|
||||||
?>
|
|
||||||
|
|
||||||
<?php
|
// Fetch the latest code changes but don't apply them
|
||||||
|
|
||||||
//fetch the latest code changes but don't apply them
|
|
||||||
exec("git fetch", $output, $result);
|
exec("git fetch", $output, $result);
|
||||||
$latest_version = exec("git rev-parse origin/$repo_branch");
|
$latest_version = exec("git rev-parse origin/$repo_branch");
|
||||||
$current_version = exec("git rev-parse HEAD");
|
$current_version = exec("git rev-parse HEAD");
|
||||||
|
|||||||
+3
-5
@@ -1,6 +1,4 @@
|
|||||||
<?php include("inc_all.php"); ?>
|
<?php include("inc_all.php");
|
||||||
|
|
||||||
<?php
|
|
||||||
|
|
||||||
if (isset($_GET['ticket_id'])) {
|
if (isset($_GET['ticket_id'])) {
|
||||||
$ticket_id = intval($_GET['ticket_id']);
|
$ticket_id = intval($_GET['ticket_id']);
|
||||||
@@ -17,7 +15,7 @@ if (isset($_GET['ticket_id'])) {
|
|||||||
if (mysqli_num_rows($sql) == 0) {
|
if (mysqli_num_rows($sql) == 0) {
|
||||||
echo "<center><h1 class='text-secondary mt-5'>Nothing to see here</h1><a class='btn btn-lg btn-secondary mt-3' href='tickets.php'><i class='fa fa-fw fa-arrow-left'></i> Go Back</a></center>";
|
echo "<center><h1 class='text-secondary mt-5'>Nothing to see here</h1><a class='btn btn-lg btn-secondary mt-3' href='tickets.php'><i class='fa fa-fw fa-arrow-left'></i> Go Back</a></center>";
|
||||||
|
|
||||||
include("footer.php");
|
include_once("footer.php");
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
@@ -580,7 +578,7 @@ if (isset($_GET['ticket_id'])) {
|
|||||||
|
|
||||||
?>
|
?>
|
||||||
|
|
||||||
<?php include("footer.php");
|
<?php include_once("footer.php");
|
||||||
|
|
||||||
if ($ticket_status !== "Closed") { ?>
|
if ($ticket_status !== "Closed") { ?>
|
||||||
<!-- Ticket Time Tracking JS -->
|
<!-- Ticket Time Tracking JS -->
|
||||||
|
|||||||
+2
-4
@@ -1,6 +1,4 @@
|
|||||||
<?php include("inc_all.php"); ?>
|
<?php include("inc_all.php");
|
||||||
|
|
||||||
<?php
|
|
||||||
|
|
||||||
$sql_recent_logins = mysqli_query($mysqli, "SELECT * FROM logs
|
$sql_recent_logins = mysqli_query($mysqli, "SELECT * FROM logs
|
||||||
WHERE log_type = 'Login' OR log_type = 'Login 2FA' AND log_action = 'Success' AND log_user_id = $session_user_id
|
WHERE log_type = 'Login' OR log_type = 'Login 2FA' AND log_action = 'Success' AND log_user_id = $session_user_id
|
||||||
@@ -28,7 +26,7 @@ $sql_recent_logs = mysqli_query($mysqli,"SELECT * FROM logs
|
|||||||
<?php if (empty($session_avatar)) { ?>
|
<?php if (empty($session_avatar)) { ?>
|
||||||
<i class="fas fa-user-circle fa-8x text-secondary"></i>
|
<i class="fas fa-user-circle fa-8x text-secondary"></i>
|
||||||
<?php } else { ?>
|
<?php } else { ?>
|
||||||
<img src="<?php echo "uploads/users/$session_user_id/$session_avatar"; ?>" class="img-fluid">
|
<img alt="User avatar" src="<?php echo "uploads/users/$session_user_id/$session_avatar"; ?>" class="img-fluid">
|
||||||
<?php } ?>
|
<?php } ?>
|
||||||
<h4 class="text-secondary mt-2"><?php echo htmlentities($session_user_role_display); ?></h4>
|
<h4 class="text-secondary mt-2"><?php echo htmlentities($session_user_role_display); ?></h4>
|
||||||
</center>
|
</center>
|
||||||
|
|||||||
Reference in New Issue
Block a user