AS1024/itflow
1
0
Fork 0
mirror of https://github.com/itflow-org/itflow synced 2026-03-28 00:05:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #599 from wrongecho/misc-tidy

Browse Source 
Misc tidy
This commit is contained in:
Johnny
2023-02-02 16:02:43 -05:00
committed by GitHub
parent 9754eb27d4 8fe6490915
commit 11155f64b3
10 changed files with 1193 additions and 1214 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
check_login.php
View File

@@ -2,10 +2,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();
} }
@@ -69,7 +69,7 @@ $session_company_country = $row['company_country'];
$session_company_locale = $row['company_locale']; $session_company_locale = $row['company_locale'];
$session_company_currency = $row['company_currency']; $session_company_currency = $row['company_currency'];
include("get_settings.php"); require_once("get_settings.php");
//Detects if using an Apple device and uses Apple Maps instead of google //Detects if using an Apple device and uses Apple Maps instead of google
$iPod = stripos($_SERVER['HTTP_USER_AGENT'], "iPod"); $iPod = stripos($_SERVER['HTTP_USER_AGENT'], "iPod");

20
client_assets.php
View File

@@ -1,4 +1,4 @@
<?php include("inc_all_client.php"); <?php require_once("inc_all_client.php");
//Get Asset Counts //Get Asset Counts
//All Asset Count //All Asset Count
@@ -345,10 +345,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
<?php <?php
include("client_asset_edit_modal.php"); require("client_asset_edit_modal.php");
include("client_asset_copy_modal.php"); require("client_asset_copy_modal.php");
include("client_asset_tickets_modal.php"); require("client_asset_tickets_modal.php");
include("client_asset_interface_add_modal.php"); require("client_asset_interface_add_modal.php");
} }
?> ?>
@@ -356,13 +356,11 @@ $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 <?php
include("client_asset_add_modal.php"); require_once("client_asset_add_modal.php");
include("client_asset_import_modal.php"); require_once("client_asset_import_modal.php");
?> require_once include("footer.php");
<?php include("footer.php"); ?>

16
client_files.php
View File

@@ -1,4 +1,4 @@
<?php include("inc_all_client.php"); <?php require_once("inc_all_client.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");
@@ -40,17 +40,15 @@ $num_of_files = mysqli_num_rows($sql_files_images) + mysqli_num_rows($sql_files_
<div class="col-xl-3 col-lg-3 col-md-6 col-sm-6 mb-3"> <div class="col-xl-3 col-lg-3 col-md-6 col-sm-6 mb-3">
<div class="card"> <div class="card">
<a href="#" data-toggle="modal" data-target="#viewFileModal<?php echo $file_id; ?>"> <a href="#" data-toggle="modal" data-target="#viewFileModal<?php echo $file_id; ?>">
<img class="img-fluid" src="<?php echo "uploads/clients/$session_company_id/$client_id/$file_reference_name"; ?>"> <img class="img-fluid" src="<?php echo "uploads/clients/$session_company_id/$client_id/$file_reference_name"; ?>" alt="<?php echo $file_reference_name ?>">
</a> </a>
<div class="card-footer bg-dark text-white p-1"> <div class="card-footer bg-dark text-white p-1" style="text-align: center;">
<center>
<a href="<?php echo "uploads/clients/$session_company_id/$client_id/$file_reference_name"; ?>" download="<?php echo $file_name; ?>" class="text-white float-left ml-1"><i class="fa fa-cloud-download-alt"></i></a> <a href="<?php echo "uploads/clients/$session_company_id/$client_id/$file_reference_name"; ?>" download="<?php echo $file_name; ?>" class="text-white float-left ml-1"><i class="fa fa-cloud-download-alt"></i></a>
<a href="#" data-toggle="modal" data-target="#shareModal" onclick="populateShareModal(<?php echo "$client_id, 'File', $file_id"; ?>)" class="text-white float-left ml-1"><i class="fa fa-share"></i></a> <a href="#" data-toggle="modal" data-target="#shareModal" onclick="populateShareModal(<?php echo "$client_id, 'File', $file_id"; ?>)" class="text-white float-left ml-1"><i class="fa fa-share"></i></a>
<small><?php echo $file_name; ?></small> <small><?php echo $file_name; ?></small>
<a href="post.php?delete_file=<?php echo $file_id; ?>" class="text-white float-right mr-1"><i class="fa fa-times"></i></a> <a href="post.php?delete_file=<?php echo $file_id; ?>" class="text-white float-right mr-1"><i class="fa fa-times"></i></a>
</center>
</div> </div>
</div> </div>
</div> </div>
@@ -105,8 +103,6 @@ $num_of_files = mysqli_num_rows($sql_files_images) + mysqli_num_rows($sql_files_
</div> </div>
<?php <?php
include("client_file_add_modal.php"); require_once("client_file_add_modal.php");
include("share_modal.php"); require_once("share_modal.php");
?> require_once("footer.php");
<?php include("footer.php"); ?>

6
client_overview.php
View File

@@ -1,4 +1,4 @@
<?php include("inc_all_client.php"); <?php require_once("inc_all_client.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");
@@ -276,6 +276,4 @@ $sql_domains_expiring = mysqli_query($mysqli, "SELECT * FROM domains
<?php <?php
include("footer.php"); require_once("footer.php");
?>

16
invoice.php
View File

@@ -1,6 +1,6 @@
<?php <?php
include("inc_all.php"); require_once("inc_all.php");
if (isset($_GET['invoice_id'])) { if (isset($_GET['invoice_id'])) {
@@ -180,7 +180,7 @@ if (isset($_GET['invoice_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" src="<?php echo "uploads/settings/$company_id/$company_logo"; ?>" alt="Company logo">
</div> </div>
<div class="col-sm-10"> <div class="col-sm-10">
<div class="ribbon-wrapper"> <div class="ribbon-wrapper">
@@ -483,12 +483,12 @@ if (isset($_GET['invoice_id'])) {
</div> </div>
<?php <?php
include("invoice_payment_add_modal.php"); include_once("invoice_payment_add_modal.php");
include("invoice_copy_modal.php"); include_once("invoice_copy_modal.php");
include("invoice_recurring_add_modal.php"); include_once("invoice_recurring_add_modal.php");
include("invoice_edit_modal.php"); include_once("invoice_edit_modal.php");
include("invoice_note_modal.php"); include_once("invoice_note_modal.php");
include("category_quick_add_modal.php"); include_once("category_quick_add_modal.php");
} }
} }

18
notifications.php
View File

@@ -1,6 +1,4 @@
<?php include("inc_all.php"); ?> <?php require_once("inc_all.php");
<?php
$sql = mysqli_query($mysqli, "SELECT * FROM notifications LEFT JOIN clients ON notification_client_id = client_id WHERE notification_dismissed_at IS NULL AND (notification_user_id = $session_user_id OR notification_user_id = 0) AND notifications.company_id = $session_company_id ORDER BY notification_id DESC"); $sql = mysqli_query($mysqli, "SELECT * FROM notifications LEFT JOIN clients ON notification_client_id = client_id WHERE notification_dismissed_at IS NULL AND (notification_user_id = $session_user_id OR notification_user_id = 0) AND notifications.company_id = $session_company_id ORDER BY notification_id DESC");
@@ -63,16 +61,12 @@ $sql = mysqli_query($mysqli,"SELECT * FROM notifications LEFT JOIN clients ON no
</div> </div>
</div> </div>
<?php <?php } else { ?>
}else{ <div class="my-5" style="text-align: center">
?>
<center class="my-5">
<i class='far fa-fw fa-6x fa-bell-slash text-secondary'></i><h3 class='text-secondary mt-3'>No Notifications</h3> <i class='far fa-fw fa-6x fa-bell-slash text-secondary'></i><h3 class='text-secondary mt-3'>No Notifications</h3>
</center> </div>
<?php } ?>
<?php
}
?>
</div> </div>
<?php include("footer.php"); <?php require_once("footer.php");

15
quote.php
View File

@@ -1,6 +1,5 @@
<?php include("inc_all.php"); ?>
<?php <?php
require_once("inc_all.php");
if (isset($_GET['quote_id'])) { if (isset($_GET['quote_id'])) {
@@ -389,15 +388,15 @@ if (isset($_GET['quote_id'])) {
</div> </div>
<?php <?php
include("quote_edit_modal.php"); require_once("quote_edit_modal.php");
include("quote_to_invoice_modal.php"); require_once("quote_to_invoice_modal.php");
include("quote_copy_modal.php"); require_once("quote_copy_modal.php");
include("quote_note_modal.php"); require_once("quote_note_modal.php");
include("category_quick_add_modal.php"); require_once("category_quick_add_modal.php");
} }
include("footer.php"); require_once("footer.php");
?> ?>

10
recurring_invoice.php
View File

@@ -1,4 +1,4 @@
<?php include("inc_all.php"); <?php require_once("inc_all.php");
if (isset($_GET['recurring_id'])) { if (isset($_GET['recurring_id'])) {
@@ -350,13 +350,13 @@ if (isset($_GET['recurring_id'])) {
<?php <?php
include("recurring_invoice_edit_modal.php"); require_once("recurring_invoice_edit_modal.php");
include("recurring_invoice_note_modal.php"); require_once("recurring_invoice_note_modal.php");
include("category_quick_add_modal.php"); require_once("category_quick_add_modal.php");
} }
include("footer.php"); require_once("footer.php");
?> ?>

12
settings_backup.php
View File

@@ -4,10 +4,8 @@
<div class="card-header py-3"> <div class="card-header py-3">
<h3 class="card-title"><i class="fa fa-fw fa-database"></i> Download Database</h3> <h3 class="card-title"><i class="fa fa-fw fa-database"></i> Download Database</h3>
</div> </div>
<div class="card-body"> <div class="card-body" style="text-align: center;">
<center>
<a class="btn btn-primary btn-lg p-3" href="post.php?download_database"><i class="fa fa-fw fa-4x fa-download"></i><br><br>Download</a> <a class="btn btn-primary btn-lg p-3" href="post.php?download_database"><i class="fa fa-fw fa-4x fa-download"></i><br><br>Download</a>
</center>
</div> </div>
</div> </div>
@@ -16,18 +14,20 @@
<h3 class="card-title"><i class="fa fa-fw fa-key"></i> Backup Master Encryption Key</h3> <h3 class="card-title"><i class="fa fa-fw fa-key"></i> Backup Master Encryption Key</h3>
</div> </div>
<div class="card-body"> <div class="card-body">
<center> <div class="card-body">
<form action="post.php" method="POST"> <form action="post.php" method="POST">
<input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>"> <input type="hidden" name="csrf_token" value="<?php echo $_SESSION['csrf_token'] ?>">
<div class="row d-flex justify-content-center">
<div class="input-group col-4"> <div class="input-group col-4">
<div class="input-group-prepend"> <div class="input-group-prepend">
<input type="password" class="form-control" placeholder="Enter your account password" name="password" autocomplete="new-password" required> <input type="password" class="form-control" placeholder="Enter your account password" name="password" autocomplete="new-password" required>
</div> </div>
<button class="btn btn-primary" type="submit" name="backup_master_key"><i class="fa fa-fw fa-key"></i> Get Master Key</button> <button class="btn btn-primary" type="submit" name="backup_master_key"><i class="fa fa-fw fa-key"></i> Get Master Key</button>
</div> </div>
</div>
</form> </form>
</center> </div>
</div> </div>
</div> </div>
<?php include("footer.php"); <?php require_once("footer.php");

26
settings_update.php
View File

@@ -1,7 +1,7 @@
<?php <?php
require_once("inc_all_settings.php"); require_once("inc_all_settings.php");
include("database_version.php"); require_once("database_version.php");
include("config.php"); require_once("config.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);
@@ -22,8 +22,7 @@ $git_log = shell_exec("git log $repo_branch..origin/$repo_branch --pretty=format
<div class="card-header py-3"> <div class="card-header py-3">
<h3 class="card-title"><i class="fas fa-fw fa-arrow-alt-circle-up"></i> Update</h3> <h3 class="card-title"><i class="fas fa-fw fa-arrow-alt-circle-up"></i> Update</h3>
</div> </div>
<div class="card-body"> <div class="card-body" style="text-align: center;">
<center>
<!-- Check if git fetch result is zero (success) --> <!-- Check if git fetch result is zero (success) -->
<?php if ($result !== 0) { ?> <?php if ($result !== 0) { ?>
@@ -34,8 +33,9 @@ $git_log = shell_exec("git log $repo_branch..origin/$repo_branch --pretty=format
<?php if (!empty($git_log)) { ?> <?php if (!empty($git_log)) { ?>
<a class="btn btn-primary btn-lg my-4" href="post.php?update"><i class="fas fa-fw fa-4x fa-arrow-alt-circle-up mb-1"></i><h5>Update App</h5></a> <a class="btn btn-primary btn-lg my-4" href="post.php?update"><i class="fas fa-fw fa-4x fa-arrow-alt-circle-up mb-1"></i><h5>Update App</h5></a>
<?php <hr>
} else {
<?php } else {
if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { ?> if (LATEST_DATABASE_VERSION > CURRENT_DATABASE_VERSION) { ?>
<div class="alert alert-warning" role="alert"> <div class="alert alert-warning" role="alert">
<strong>Ensure you have a current app & database backup before updating!</strong> <strong>Ensure you have a current app & database backup before updating!</strong>
@@ -46,19 +46,13 @@ $git_log = shell_exec("git log $repo_branch..origin/$repo_branch --pretty=format
<small class="text-secondary">Current DB Version: <?php echo CURRENT_DATABASE_VERSION; ?></small> <small class="text-secondary">Current DB Version: <?php echo CURRENT_DATABASE_VERSION; ?></small>
<br> <br>
<small class="text-secondary">Latest DB Version: <?php echo LATEST_DATABASE_VERSION; ?></small> <small class="text-secondary">Latest DB Version: <?php echo LATEST_DATABASE_VERSION; ?></small>
<?php } <?php } else { ?>
else { ?>
<h3 class="text-success"><i class="fas fa-check-square"></i> Latest version!</h3> <h3 class="text-success"><i class="fas fa-check-square"></i> Latest version!</h3>
<small class="text-secondary">Current DB Version: <?php echo CURRENT_DATABASE_VERSION; ?></small> <small class="text-secondary">Current DB Version: <?php echo CURRENT_DATABASE_VERSION; ?></small>
<?php } ?> <?php }
<?php
} }
?>
</center>
<?php if (!empty($git_log)) { ?>
if (!empty($git_log)) {
?>
<table class="table "> <table class="table ">
<thead> <thead>
<tr> <tr>
@@ -83,4 +77,4 @@ $git_log = shell_exec("git log $repo_branch..origin/$repo_branch --pretty=format
<?php <?php
include("footer.php"); require_once("footer.php");