ThaMunsta/itflow
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More general code cleanup/formatting

Browse Source
This commit is contained in:
Marcus Hill
2023-01-23 21:37:32 +00:00
parent bd1ac7708c
commit a340df0df9
6 changed files with 418 additions and 420 deletions
Download Patch File Download Diff File Expand all files Collapse all files
logs.php
+14 -14
View File
@@ -2,7 +2,7 @@
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 = "log_id"; $sb = "log_id";
} }
@@ -22,31 +22,31 @@ if (empty($_GET['canned_date'])) {
if ($_GET['canned_date'] == "custom" && !empty($_GET['dtf'])) { if ($_GET['canned_date'] == "custom" && !empty($_GET['dtf'])) {
$dtf = strip_tags(mysqli_real_escape_string($mysqli,$_GET['dtf'])); $dtf = strip_tags(mysqli_real_escape_string($mysqli,$_GET['dtf']));
$dtt = strip_tags(mysqli_real_escape_string($mysqli,$_GET['dtt'])); $dtt = strip_tags(mysqli_real_escape_string($mysqli,$_GET['dtt']));
}elseif ($_GET['canned_date'] == "today") { } elseif ($_GET['canned_date'] == "today") {
$dtf = date('Y-m-d'); $dtf = date('Y-m-d');
$dtt = date('Y-m-d'); $dtt = date('Y-m-d');
}elseif ($_GET['canned_date'] == "yesterday") { } elseif ($_GET['canned_date'] == "yesterday") {
$dtf = date('Y-m-d',strtotime("yesterday")); $dtf = date('Y-m-d',strtotime("yesterday"));
$dtt = date('Y-m-d',strtotime("yesterday")); $dtt = date('Y-m-d',strtotime("yesterday"));
}elseif ($_GET['canned_date'] == "thisweek") { } elseif ($_GET['canned_date'] == "thisweek") {
$dtf = date('Y-m-d',strtotime("monday this week")); $dtf = date('Y-m-d',strtotime("monday this week"));
$dtt = date('Y-m-d'); $dtt = date('Y-m-d');
}elseif ($_GET['canned_date'] == "lastweek") { } elseif ($_GET['canned_date'] == "lastweek") {
$dtf = date('Y-m-d',strtotime("monday last week")); $dtf = date('Y-m-d',strtotime("monday last week"));
$dtt = date('Y-m-d',strtotime("sunday last week")); $dtt = date('Y-m-d',strtotime("sunday last week"));
}elseif ($_GET['canned_date'] == "thismonth") { } elseif ($_GET['canned_date'] == "thismonth") {
$dtf = date('Y-m-01'); $dtf = date('Y-m-01');
$dtt = date('Y-m-d'); $dtt = date('Y-m-d');
}elseif ($_GET['canned_date'] == "lastmonth") { } elseif ($_GET['canned_date'] == "lastmonth") {
$dtf = date('Y-m-d',strtotime("first day of last month")); $dtf = date('Y-m-d',strtotime("first day of last month"));
$dtt = date('Y-m-d',strtotime("last day of last month")); $dtt = date('Y-m-d',strtotime("last day of last month"));
}elseif ($_GET['canned_date'] == "thisyear") { } elseif ($_GET['canned_date'] == "thisyear") {
$dtf = date('Y-01-01'); $dtf = date('Y-01-01');
$dtt = date('Y-m-d'); $dtt = date('Y-m-d');
}elseif ($_GET['canned_date'] == "lastyear") { } elseif ($_GET['canned_date'] == "lastyear") {
$dtf = date('Y-m-d',strtotime("first day of january last year")); $dtf = date('Y-m-d',strtotime("first day of january last year"));
$dtt = date('Y-m-d',strtotime("last day of december last year")); $dtt = date('Y-m-d',strtotime("last day of december last year"));
}else{ } else {
$dtf = "0000-00-00"; $dtf = "0000-00-00";
$dtt = "9999-00-00"; $dtt = "9999-00-00";
} }
@@ -54,7 +54,7 @@ if ($_GET['canned_date'] == "custom" && !empty($_GET['dtf'])) {
//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 logs $sql = mysqli_query($mysqli, "SELECT SQL_CALC_FOUND_ROWS * FROM logs
LEFT JOIN users ON log_user_id = user_id LEFT JOIN users ON log_user_id = user_id
LEFT JOIN clients ON log_client_id = client_id LEFT JOIN clients ON log_client_id = client_id
WHERE (log_type LIKE '%$q%' OR log_action LIKE '%$q%' OR log_description LIKE '%$q%' OR log_ip LIKE '%$q%' OR log_user_agent LIKE '%$q%' OR user_name LIKE '%$q%' OR client_name LIKE '%$q%') WHERE (log_type LIKE '%$q%' OR log_action LIKE '%$q%' OR log_description LIKE '%$q%' OR log_ip LIKE '%$q%' OR log_user_agent LIKE '%$q%' OR user_name LIKE '%$q%' OR client_name LIKE '%$q%')
@@ -62,11 +62,11 @@ $sql = mysqli_query($mysqli,"SELECT SQL_CALC_FOUND_ROWS * FROM logs
ORDER BY $sb $o LIMIT $record_from, $record_to" ORDER BY $sb $o LIMIT $record_from, $record_to"
); );
$num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); $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-3"> <div class="card-header py-3">
<h3 class="card-title"><i class="fa fa-fw fa-eye"></i> Audit Logs</h3> <h3 class="card-title"><i class="fa fa-fw fa-eye"></i> Audit Logs</h3>
</div> </div>
@@ -181,6 +181,6 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
</div> </div>
<?php include("pagination.php"); ?> <?php include("pagination.php"); ?>
</div> </div>
</div> </div>
<?php include("footer.php"); <?php include("footer.php");
settings_backup.php
+4 -4
View File
@@ -1,6 +1,6 @@
<?php require_once("inc_all_settings.php"); ?> <?php require_once("inc_all_settings.php"); ?>
<div class="card card-dark mb-3"> <div class="card card-dark mb-3">
<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>
@@ -9,9 +9,9 @@
<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> </center>
</div> </div>
</div> </div>
<div class="card card-dark"> <div class="card card-dark">
<div class="card-header py-3"> <div class="card-header py-3">
<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>
@@ -28,6 +28,6 @@
</form> </form>
</center> </center>
</div> </div>
</div> </div>
<?php include("footer.php"); <?php include("footer.php");
settings_quote.php
+2 -2
View File
@@ -1,6 +1,6 @@
<?php require_once("inc_all_settings.php"); ?> <?php require_once("inc_all_settings.php"); ?>
<div class="card card-dark"> <div class="card card-dark">
<div class="card-header py-3"> <div class="card-header py-3">
<h3 class="card-title"><i class="fa fa-fw fa-file"></i> Quote Settings</h3> <h3 class="card-title"><i class="fa fa-fw fa-file"></i> Quote Settings</h3>
</div> </div>
@@ -58,6 +58,6 @@
</form> </form>
</div> </div>
</div> </div>
<?php include("footer.php"); <?php include("footer.php");
settings_tags.php
+11 -13
View File
@@ -1,35 +1,33 @@
<?php require_once("inc_all_settings.php"); ?> <?php require_once("inc_all_settings.php");
<?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 = "tag_name"; $sb = "tag_name";
} }
//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 tags $sql = mysqli_query($mysqli, "SELECT SQL_CALC_FOUND_ROWS * FROM tags
WHERE tag_name LIKE '%$q%' WHERE tag_name LIKE '%$q%'
AND company_id = $session_company_id AND company_id = $session_company_id
ORDER BY $sb $o LIMIT $record_from, $record_to" ORDER BY $sb $o LIMIT $record_from, $record_to"
); );
$num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()")); $num_rows = mysqli_fetch_row(mysqli_query($mysqli, "SELECT FOUND_ROWS()"));
if ($num_row > 0) { if ($num_row > 0) {
//Colors Used //Colors Used
$sql_colors_used = mysqli_query($mysqli,"SELECT tag_color FROM tags $sql_colors_used = mysqli_query($mysqli, "SELECT tag_color FROM tags
WHERE tag_archived_at IS NULL WHERE tag_archived_at IS NULL
AND company_id = $session_company_id" AND company_id = $session_company_id"
); );
while ($color_used_row = mysqli_fetch_array($sql_colors_used)) { while ($color_used_row = mysqli_fetch_array($sql_colors_used)) {
$colors_used_array[] = $color_used_row['tag_color']; $colors_used_array[] = $color_used_row['tag_color'];
} }
$colors_diff = array_diff($colors_array,$colors_used_array); $colors_diff = array_diff($colors_array, $colors_used_array);
}else{ }else{
$colors_diff = $colors_array; $colors_diff = $colors_array;
@@ -119,8 +117,8 @@ $colors_diff = array_diff($colors_array,$colors_used_array);
<?php <?php
include("settings_tag_add_modal.php"); include("settings_tag_add_modal.php");
include("footer.php"); include("footer.php");
?> ?>
settings_taxes.php
+3 -3
View File
@@ -2,7 +2,7 @@
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 = "tax_name"; $sb = "tax_name";
} }
@@ -82,8 +82,8 @@ $num_rows = mysqli_num_rows($sql);
<?php <?php
include("settings_tax_add_modal.php"); include("settings_tax_add_modal.php");
include("footer.php"); include("footer.php");
?> ?>
settings_theme.php
+3 -3
View File
@@ -1,6 +1,6 @@
<?php require_once("inc_all_settings.php"); ?> <?php require_once("inc_all_settings.php"); ?>
<div class="card card-dark"> <div class="card card-dark">
<div class="card-header py-3"> <div class="card-header py-3">
<h3 class="card-title"><i class="fa fa-fw fa-palette"></i> Theme</h3> <h3 class="card-title"><i class="fa fa-fw fa-palette"></i> Theme</h3>
</div> </div>
@@ -12,7 +12,7 @@
<?php <?php
foreach($colors_array as $color) { foreach ($colors_array as $color) {
?> ?>
@@ -37,6 +37,6 @@
</form> </form>
</div> </div>
</div> </div>
<?php include("footer.php"); <?php include("footer.php");