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

Made the php includes much more modular and simpler by lumping them all in 1 file inc_all.php instead of all over the place

Browse Source
This commit is contained in:
johnnyq
2022-02-22 00:29:39 -05:00
parent 7af0c11720
commit 1829c7299e
59 changed files with 145 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
accounts.php
View File

@@ -1,4 +1,4 @@
<?php include("header.php"); ?> <?php include("inc_all.php"); ?>
<?php <?php

2
api_keys.php
View File

@@ -1,4 +1,4 @@
<?php include("header.php"); <?php include("inc_all.php");
//Paging //Paging
if(isset($_GET['p'])){ if(isset($_GET['p'])){

2
assets.php
View File

@@ -1,4 +1,4 @@
<?php include("header.php"); <?php include("inc_all.php");
//Paging //Paging
if(isset($_GET['p'])){ if(isset($_GET['p'])){

2
blank.php
View File

@@ -1,4 +1,4 @@
<?php include("header.php"); ?> <?php include("inc_all.php"); ?>
<!-- Breadcrumbs--> <!-- Breadcrumbs-->
<ol class="breadcrumb"> <ol class="breadcrumb">

2
calendar_events.php
View File

@@ -1,4 +1,4 @@
<?php include("header.php"); ?> <?php include("inc_all.php"); ?>
<link href='plugins/fullcalendar/main.min.css' rel='stylesheet' /> <link href='plugins/fullcalendar/main.min.css' rel='stylesheet' />

2
campaign.php
View File

@@ -1,4 +1,4 @@
<?php include("header.php"); <?php include("inc_all.php");
if(isset($_GET['campaign_id'])){ if(isset($_GET['campaign_id'])){
$campaign_id = intval($_GET['campaign_id']); $campaign_id = intval($_GET['campaign_id']);

2
campaigns.php
View File

@@ -1,4 +1,4 @@
<?php include("header.php"); <?php include("inc_all.php");
//Paging //Paging
if(isset($_GET['p'])){ if(isset($_GET['p'])){

2
categories.php
View File

@@ -1,4 +1,4 @@
<?php include("header.php"); <?php include("inc_all.php");
//Paging //Paging
if(isset($_GET['p'])){ if(isset($_GET['p'])){

11
client.php
View File

@@ -1,6 +1,9 @@
<?php include("config.php"); ?> <?php include("config.php"); ?>
<?php include("functions.php"); ?> <?php include("functions.php"); ?>
<?php include("check_login.php"); ?> <?php include("check_login.php"); ?>
<?php include("header.php"); ?>
<?php include("top_nav.php"); ?>
<?php <?php
@@ -144,7 +147,13 @@ if(isset($_GET['client_id'])){
?> ?>
<?php include("header.php"); ?> <?php
include("inc_side_nav.php");
include("inc_wrapper.php");
include("inc_alert_feedback.php");
?>
<?php <?php

4
clients.php
View File

@@ -1,4 +1,6 @@
<?php include("header.php"); <?php
include("inc_all.php");
//Paging //Paging
if(isset($_GET['p'])){ if(isset($_GET['p'])){

2
companies.php
View File

@@ -1,4 +1,4 @@
<?php include("header.php"); <?php include("inc_all.php");
//Paging //Paging
if(isset($_GET['p'])){ if(isset($_GET['p'])){

2
custom_links.php
View File

@@ -1,4 +1,4 @@
<?php include("header.php"); <?php include("inc_all.php");
//Paging //Paging
if(isset($_GET['p'])){ if(isset($_GET['p'])){

2
dashboard_financial.php
View File

@@ -1,4 +1,4 @@
<?php include("header.php"); ?> <?php include("inc_all.php"); ?>
<?php <?php

2
expenses.php
View File

@@ -1,4 +1,4 @@
<?php include("header.php"); <?php include("inc_all.php");
//Paging //Paging
if(isset($_GET['p'])){ if(isset($_GET['p'])){

2
global_search.php
View File

@@ -1,4 +1,4 @@
<?php include("header.php"); ?> <?php include("inc_all.php"); ?>
<?php <?php

51
header.php
View File

@@ -4,10 +4,6 @@
// uncomment for test // uncomment for test
//$time_start = microtime(true); //$time_start = microtime(true);
include("config.php");
include_once("functions.php");
include("check_login.php");
?> ?>
<!DOCTYPE html> <!DOCTYPE html>
@@ -39,49 +35,4 @@
</head> </head>
<body class="hold-transition sidebar-mini"> <body class="hold-transition sidebar-mini">
<div class="wrapper text-sm"> <div class="wrapper text-sm">
<?php include("top_nav.php"); ?>
<?php
if(basename(parse_url($_SERVER["REQUEST_URI"], PHP_URL_PATH)) == "client.php"){
include("client_side_nav.php");
//}elseif(basename(parse_url($_SERVER["REQUEST_URI"], PHP_URL_PATH)) == "settings-general.php"){
//include("admin_side_nav.php");
}else{
include("side_nav.php");
}
?>
<!-- Content Wrapper. Contains page content -->
<div class="content-wrapper">
<!-- Main content -->
<div class="content mt-3">
<div class="container-fluid">
<?php
//Alert Feedback
if(!empty($_SESSION['alert_message'])){
if (!isset($_SESSION['alert_type'])){
$_SESSION['alert_type'] = "info";
}
?>
<div class="alert alert-<?php echo $_SESSION['alert_type']; ?>" id="alert">
<?php echo $_SESSION['alert_message']; ?>
<button class='close' data-dismiss='alert'>&times;</button>
</div>
<?php
unset($_SESSION['alert_type']);
unset($_SESSION['alert_message']);
}
//Set Records Per Page
if(empty($_SESSION['records_per_page'])){
$_SESSION['records_per_page'] = 10;
}
?>

25
inc_alert_feedback.php Normal file
View File

@@ -0,0 +1,25 @@
<?php
//Alert Feedback
if(!empty($_SESSION['alert_message'])){
if (!isset($_SESSION['alert_type'])){
$_SESSION['alert_type'] = "info";
}
?>
<div class="alert alert-<?php echo $_SESSION['alert_type']; ?>" id="alert">
<?php echo $_SESSION['alert_message']; ?>
<button class='close' data-dismiss='alert'>&times;</button>
</div>
<?php
unset($_SESSION['alert_type']);
unset($_SESSION['alert_message']);
}
//Set Records Per Page
if(empty($_SESSION['records_per_page'])){
$_SESSION['records_per_page'] = 10;
}
?>

12
inc_all.php Normal file
View File

@@ -0,0 +1,12 @@
<?php
include("config.php");
include_once("functions.php");
include("check_login.php");
include("header.php");
include("top_nav.php");
include("inc_side_nav.php");
include("inc_wrapper.php");
include("inc_alert_feedback.php");
?>

11
inc_side_nav.php Normal file
View File

@@ -0,0 +1,11 @@
<?php
if(basename(parse_url($_SERVER["REQUEST_URI"], PHP_URL_PATH)) == "client.php"){
include("client_side_nav.php");
//}elseif(basename(parse_url($_SERVER["REQUEST_URI"], PHP_URL_PATH)) == "settings-general.php"){
//include("admin_side_nav.php");
}else{
include("side_nav.php");
}
?>

31
inc_wrapper.php Normal file
View File

@@ -0,0 +1,31 @@
<!-- Content Wrapper. Contains page content -->
<div class="content-wrapper">
<!-- Main content -->
<div class="content mt-3">
<div class="container-fluid">
<?php
//Alert Feedback
if(!empty($_SESSION['alert_message'])){
if (!isset($_SESSION['alert_type'])){
$_SESSION['alert_type'] = "info";
}
?>
<div class="alert alert-<?php echo $_SESSION['alert_type']; ?>" id="alert">
<?php echo $_SESSION['alert_message']; ?>
<button class='close' data-dismiss='alert'>&times;</button>
</div>
<?php
unset($_SESSION['alert_type']);
unset($_SESSION['alert_message']);
}
//Set Records Per Page
if(empty($_SESSION['records_per_page'])){
$_SESSION['records_per_page'] = 10;
}
?>

2
index.php
View File

@@ -1,4 +1,4 @@
<?php include("header.php"); ?> <?php include("inc_all.php"); ?>
<!-- Breadcrumbs--> <!-- Breadcrumbs-->
<ol class="breadcrumb"> <ol class="breadcrumb">
<li class="breadcrumb-item"> <li class="breadcrumb-item">

2
invoice.php
View File

@@ -1,6 +1,6 @@
<?php <?php
include("header.php"); include("inc_all.php");
if(isset($_GET['invoice_id'])){ if(isset($_GET['invoice_id'])){

2
invoices.php
View File

@@ -1,6 +1,6 @@
<?php <?php
include("header.php"); include("inc_all.php");
$row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Sent' AND company_id = $session_company_id")); $row = mysqli_fetch_assoc(mysqli_query($mysqli,"SELECT COUNT('invoice_id') AS num FROM invoices WHERE invoice_status = 'Sent' AND company_id = $session_company_id"));
$sent_count = $row['num']; $sent_count = $row['num'];

2
logs.php
View File

@@ -1,4 +1,4 @@
<?php include("header.php"); <?php include("inc_all.php");
//Paging //Paging
if(isset($_GET['p'])){ if(isset($_GET['p'])){

2
notifications.php
View File

@@ -1,4 +1,4 @@
<?php include("header.php"); ?> <?php include("inc_all.php"); ?>
<?php <?php

2
notifications_dismissed.php
View File

@@ -1,4 +1,4 @@
<?php include("header.php"); <?php include("inc_all.php");
//Paging //Paging
if(isset($_GET['p'])){ if(isset($_GET['p'])){

2
payments.php
View File

@@ -1,4 +1,4 @@
<?php include("header.php"); <?php include("inc_all.php");
//Paging //Paging
if(isset($_GET['p'])){ if(isset($_GET['p'])){

2
products.php
View File

@@ -1,4 +1,4 @@
<?php include("header.php"); <?php include("inc_all.php");
//Paging //Paging
if(isset($_GET['p'])){ if(isset($_GET['p'])){

2
quote.php
View File

@@ -1,4 +1,4 @@
<?php include("header.php"); ?> <?php include("inc_all.php"); ?>
<?php <?php

2
quotes.php
View File

@@ -1,4 +1,4 @@
<?php include("header.php"); <?php include("inc_all.php");
//Paging //Paging
if(isset($_GET['p'])){ if(isset($_GET['p'])){

2
recurring_invoice.php
View File

@@ -1,4 +1,4 @@
<?php include("header.php"); ?> <?php include("inc_all.php"); ?>
<?php <?php

2
recurring_invoices.php
View File

@@ -1,4 +1,4 @@
<?php include("header.php"); <?php include("inc_all.php");
//Paging //Paging
if(isset($_GET['p'])){ if(isset($_GET['p'])){

2
report_expense_summary.php
View File

@@ -1,4 +1,4 @@
<?php include("header.php"); ?> <?php include("inc_all.php"); ?>
<?php <?php
function roundUpToNearestMultiple($n, $increment = 1000) function roundUpToNearestMultiple($n, $increment = 1000)

2
report_income_summary.php
View File

@@ -1,4 +1,4 @@
<?php include("header.php"); ?> <?php include("inc_all.php"); ?>
<?php <?php
function roundUpToNearestMultiple($n, $increment = 1000) function roundUpToNearestMultiple($n, $increment = 1000)

2
report_profit_loss.php
View File

@@ -1,4 +1,4 @@
<?php include("header.php"); ?> <?php include("inc_all.php"); ?>
<?php <?php

2
report_tax_summary.php
View File

@@ -1,4 +1,4 @@
<?php include("header.php"); ?> <?php include("inc_all.php"); ?>
<?php <?php

2
revenues.php
View File

@@ -1,4 +1,4 @@
<?php include("header.php"); <?php include("inc_all.php");
//Paging //Paging
if(isset($_GET['p'])){ if(isset($_GET['p'])){

2
scheduled_tickets.php
View File

@@ -1,5 +1,5 @@
<?php <?php
include("header.php"); include("inc_all.php");
//Paging //Paging
if(isset($_GET['p'])){ if(isset($_GET['p'])){

2
settings-alerts.php
View File

@@ -1,4 +1,4 @@
<?php include("header.php"); ?> <?php include("inc_all.php"); ?>
<?php include("settings-nav.php"); ?> <?php include("settings-nav.php"); ?>

2
settings-backup.php
View File

@@ -1,4 +1,4 @@
<?php include("header.php"); ?> <?php include("inc_all.php"); ?>
<?php include("settings-nav.php"); ?> <?php include("settings-nav.php"); ?>

2
settings-defaults.php
View File

@@ -1,4 +1,4 @@
<?php include("header.php"); ?> <?php include("inc_all.php"); ?>
<?php include("settings-nav.php"); ?> <?php include("settings-nav.php"); ?>

2
settings-general.php
View File

@@ -1,4 +1,4 @@
<?php include("header.php"); ?> <?php include("inc_all.php"); ?>
<?php include("settings-nav.php"); ?> <?php include("settings-nav.php"); ?>

2
settings-invoice.php
View File

@@ -1,4 +1,4 @@
<?php include("header.php"); ?> <?php include("inc_all.php"); ?>
<?php include("settings-nav.php"); ?> <?php include("settings-nav.php"); ?>

2
settings-mail.php
View File

@@ -1,4 +1,4 @@
<?php include("header.php"); ?> <?php include("inc_all.php"); ?>
<?php include("settings-nav.php"); ?> <?php include("settings-nav.php"); ?>

2
settings-online-payment.php
View File

@@ -1,4 +1,4 @@
<?php include("header.php"); ?> <?php include("inc_all.php"); ?>
<?php include("settings-nav.php"); ?> <?php include("settings-nav.php"); ?>

2
settings-quote.php
View File

@@ -1,4 +1,4 @@
<?php include("header.php"); ?> <?php include("inc_all.php"); ?>
<?php include("settings-nav.php"); ?> <?php include("settings-nav.php"); ?>

2
settings-ticket.php
View File

@@ -1,4 +1,4 @@
<?php include("header.php"); ?> <?php include("inc_all.php"); ?>
<?php include("settings-nav.php"); ?> <?php include("settings-nav.php"); ?>

2
settings-update.php
View File

@@ -1,4 +1,4 @@
<?php include("header.php"); ?> <?php include("inc_all.php"); ?>
<?php include("settings-nav.php"); ?> <?php include("settings-nav.php"); ?>

2
settings-user.php
View File

@@ -1,4 +1,4 @@
<?php include("header.php"); ?> <?php include("inc_all.php"); ?>
<?php <?php

2
tags.php
View File

@@ -1,4 +1,4 @@
<?php include("header.php"); <?php include("inc_all.php");
//Paging //Paging
if(isset($_GET['p'])){ if(isset($_GET['p'])){

2
taxes.php
View File

@@ -1,4 +1,4 @@
<?php include("header.php"); <?php include("inc_all.php");
if(!empty($_GET['sb'])){ if(!empty($_GET['sb'])){
$sb = mysqli_real_escape_string($mysqli,$_GET['sb']); $sb = mysqli_real_escape_string($mysqli,$_GET['sb']);

2
test_noclients.php
View File

@@ -1,4 +1,4 @@
<?php include("header.php"); ?> <?php include("inc_all.php"); ?>
<div class="row justify-content-md-center"> <div class="row justify-content-md-center">
<div class="col-md-5"> <div class="col-md-5">

3
ticket.php
View File

@@ -1,5 +1,4 @@
<?php include("config.php"); ?> <?php include("inc_all.php"); ?>
<?php include("header.php"); ?>
<?php <?php

2
tickets.php
View File

@@ -1,4 +1,4 @@
<?php include("header.php"); <?php include("inc_all.php");
//Paging //Paging
if (isset($_GET['p'])) { if (isset($_GET['p'])) {

2
transfers.php
View File

@@ -1,4 +1,4 @@
<?php include("header.php"); <?php include("inc_all.php");
//Paging //Paging
if(isset($_GET['p'])){ if(isset($_GET['p'])){

2
trips.php
View File

@@ -1,4 +1,4 @@
<?php include("header.php"); <?php include("inc_all.php");
//Paging //Paging
if(isset($_GET['p'])){ if(isset($_GET['p'])){

2
user_logs.php
View File

@@ -1,4 +1,4 @@
<?php include("header.php"); <?php include("inc_all.php");
//Rebuild URL //Rebuild URL

2
users.php
View File

@@ -1,4 +1,4 @@
<?php include("header.php"); <?php include("inc_all.php");
//Paging //Paging
if(isset($_GET['p'])){ if(isset($_GET['p'])){

2
vendors.php
View File

@@ -1,4 +1,4 @@
<?php include("header.php"); <?php include("inc_all.php");
//Paging //Paging
if(isset($_GET['p'])){ if(isset($_GET['p'])){