Skip to content

Commit

Permalink
Structure rework: Moved most php files that are included to /includes…
Browse files Browse the repository at this point in the history
… renamed pagination.php to filter_footer.php, updated all file to reference new filter_footer and includes
  • Loading branch information
johnnyq committed Jan 11, 2025
1 parent a917946 commit 98f9083
Show file tree
Hide file tree
Showing 143 changed files with 295 additions and 295 deletions.
6 changes: 3 additions & 3 deletions accounts.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
$sort = "account_name";
$order = "ASC";

require_once "inc_all.php";
require_once "includes/inc_all.php";

// Perms
enforceUserPermission('module_financial');
Expand Down Expand Up @@ -116,11 +116,11 @@
</tbody>
</table>
</div>
<?php require_once "pagination.php"; ?>
<?php require_once "includes/filter_footer.php"; ?>
</div>
</div>

<?php

require_once "account_add_modal.php";
require_once "footer.php";
require_once "includes/footer.php";
6 changes: 3 additions & 3 deletions admin_api.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
$sort = "api_key_name";
$order = "ASC";

require_once "inc_all_admin.php";
require_once "includes/inc_all_admin.php";


//Rebuild URL
Expand Down Expand Up @@ -166,7 +166,7 @@
</form>

</div>
<?php require_once "pagination.php";
<?php require_once "includes/filter_footer.php";
?>
</div>
</div>
Expand All @@ -176,5 +176,5 @@
<?php
require_once "admin_api_key_add_modal.php";

require_once "footer.php";
require_once "includes/footer.php";

6 changes: 3 additions & 3 deletions admin_app_log.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
$sort = "app_log_id";
$order = "DESC";

require_once "inc_all_admin.php";
require_once "includes/inc_all_admin.php";

// Log Type Filter
if (isset($_GET['type']) & !empty($_GET['type'])) {
Expand Down Expand Up @@ -184,10 +184,10 @@
</tbody>
</table>
</div>
<?php require_once "pagination.php";
<?php require_once "includes/filter_footer.php";
?>
</div>
</div>

<?php
require_once "footer.php";
require_once "includes/footer.php";
6 changes: 3 additions & 3 deletions admin_audit_log.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
$sort = "log_id";
$order = "DESC";

require_once "inc_all_admin.php";
require_once "includes/inc_all_admin.php";

// User Filter
if (isset($_GET['user']) & !empty($_GET['user'])) {
Expand Down Expand Up @@ -295,11 +295,11 @@
</tbody>
</table>
</div>
<?php require_once "pagination.php";
<?php require_once "includes/filter_footer.php";
?>
</div>
</div>

<?php
require_once "footer.php";
require_once "includes/footer.php";

4 changes: 2 additions & 2 deletions admin_backup.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
require_once "inc_all_admin.php";
require_once "includes/inc_all_admin.php";
?>

<div class="card card-dark mb-3">
Expand Down Expand Up @@ -34,5 +34,5 @@
</div>

<?php
require_once "footer.php";
require_once "includes/footer.php";

4 changes: 2 additions & 2 deletions admin_bulk_mail.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
require_once "inc_all_admin.php";
require_once "includes/inc_all_admin.php";


$sql = mysqli_query($mysqli, "SELECT * FROM contacts
Expand Down Expand Up @@ -149,4 +149,4 @@

<?php

require_once "footer.php";
require_once "includes/footer.php";
6 changes: 3 additions & 3 deletions admin_category.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
$sort = "category_name";
$order = "ASC";

require_once "inc_all_admin.php";
require_once "includes/inc_all_admin.php";


if (isset($_GET['category'])) {
Expand Down Expand Up @@ -186,12 +186,12 @@ class="fas fa-fw fa-archive mr-2"></i>Archived</a>
</tbody>
</table>
</div>
<?php require_once "pagination.php";
<?php require_once "includes/filter_footer.php";
?>
</div>
</div>

<?php
require_once "admin_category_add_modal.php";

require_once "footer.php";
require_once "includes/footer.php";
6 changes: 3 additions & 3 deletions admin_custom_link.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
$sort = "custom_link_name";
$order = "ASC";

require_once "inc_all_admin.php";
require_once "includes/inc_all_admin.php";


//Rebuild URL
Expand Down Expand Up @@ -141,13 +141,13 @@
</tbody>
</table>
</div>
<?php require_once "pagination.php";
<?php require_once "includes/filter_footer.php";
?>
</div>
</div>

<?php
require_once "admin_custom_link_add_modal.php";

require_once "footer.php";
require_once "includes/footer.php";

4 changes: 2 additions & 2 deletions admin_debug.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

require_once "inc_all_admin.php";
require_once "includes/inc_all_admin.php";

require_once "database_version.php";

Expand Down Expand Up @@ -755,5 +755,5 @@ function getDirStats($dir) {

<?php

require_once "footer.php";
require_once "includes/footer.php";

2 changes: 1 addition & 1 deletion admin_document_template.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
$sort = "document_name";
$order = "ASC";

require_once "inc_all_admin.php";
require_once "includes/inc_all_admin.php";

// Search query SQL snippet
if (!empty($q)) {
Expand Down
4 changes: 2 additions & 2 deletions admin_document_template_details.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

require_once "inc_all_admin.php";
require_once "includes/inc_all_admin.php";


//Initialize the HTML Purifier to prevent XSS
Expand Down Expand Up @@ -61,5 +61,5 @@

require_once "admin_document_template_edit_modal.php";

require_once "footer.php";
require_once "includes/footer.php";

4 changes: 2 additions & 2 deletions admin_legacy_debug.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
require_once "inc_all_admin.php";
require_once "includes/inc_all_admin.php";

require_once "database_version.php";

Expand Down Expand Up @@ -331,5 +331,5 @@ function get_crontab() {

<?php

require_once "footer.php";
require_once "includes/footer.php";

6 changes: 3 additions & 3 deletions admin_mail_queue.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
$sort = "email_id";
$order = "DESC";

require_once "inc_all_admin.php";
require_once "includes/inc_all_admin.php";

//Rebuild URL
$url_query_strings_sort = http_build_query($get_copy);
Expand Down Expand Up @@ -209,11 +209,11 @@
</div>
</form>

<?php require_once "pagination.php"; ?>
<?php require_once "includes/filter_footer.php"; ?>
</div>
</div>

<script src="js/bulk_actions.js"></script>

<?php
require_once "footer.php";
require_once "includes/footer.php";
4 changes: 2 additions & 2 deletions admin_mail_queue_message_view.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

require_once "inc_all_admin.php";
require_once "includes/inc_all_admin.php";

//Initialize the HTML Purifier to prevent XSS
require "plugins/htmlpurifier/HTMLPurifier.standalone.php";
Expand Down Expand Up @@ -74,4 +74,4 @@

<?php

require_once "footer.php";
require_once "includes/footer.php";
6 changes: 3 additions & 3 deletions admin_project_template.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
$sort = "project_template_name";
$order = "ASC";

require_once "inc_all_admin.php";
require_once "includes/inc_all_admin.php";


//Rebuild URL
Expand Down Expand Up @@ -138,12 +138,12 @@
</tbody>
</table>
</div>
<?php require_once "pagination.php";
<?php require_once "includes/filter_footer.php";
?>
</div>
</div>

<?php
require_once "admin_project_template_add_modal.php";

require_once "footer.php";
require_once "includes/footer.php";
4 changes: 2 additions & 2 deletions admin_project_template_details.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

require_once "inc_all_admin.php";
require_once "includes/inc_all_admin.php";


if (isset($_GET['project_template_id'])) {
Expand Down Expand Up @@ -227,7 +227,7 @@

}

require_once "footer.php";
require_once "includes/footer.php";

?>

Expand Down
6 changes: 3 additions & 3 deletions admin_role.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
$sort = "user_role_is_admin";
$order = "DESC";

require_once "inc_all_admin.php";
require_once "includes/inc_all_admin.php";


//Rebuild URL
Expand Down Expand Up @@ -134,7 +134,7 @@
</tbody>
</table>
</div>
<?php require_once "pagination.php";
<?php require_once "includes/filter_footer.php";
?>
</div>
</div>
Expand All @@ -143,5 +143,5 @@

require_once "admin_role_add_modal.php";

require_once "footer.php";
require_once "includes/footer.php";

4 changes: 2 additions & 2 deletions admin_settings_ai.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

require_once "inc_all_admin.php";
require_once "includes/inc_all_admin.php";
?>

<div class="card card-dark">
Expand Down Expand Up @@ -73,5 +73,5 @@
</div>

<?php
require_once "footer.php";
require_once "includes/footer.php";

4 changes: 2 additions & 2 deletions admin_settings_company.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
require_once "inc_all_admin.php";
require_once "includes/inc_all_admin.php";


$sql = mysqli_query($mysqli,"SELECT * FROM companies, settings WHERE companies.company_id = settings.company_id AND companies.company_id = 1");
Expand Down Expand Up @@ -145,5 +145,5 @@
</div>

<?php
require_once "footer.php";
require_once "includes/footer.php";

6 changes: 3 additions & 3 deletions admin_settings_custom_fields.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
$sort = "custom_field_label";
$order = "ASC";

require_once "inc_all_admin.php";
require_once "includes/inc_all_admin.php";


if (isset($_GET['table'])) {
Expand Down Expand Up @@ -112,13 +112,13 @@
</tbody>
</table>
</div>
<?php require_once "pagination.php";
<?php require_once "includes/filter_footer.php";
?>
</div>
</div>

<?php
require_once "custom_field_create_modal.php";

require_once "footer.php";
require_once "includes/footer.php";

4 changes: 2 additions & 2 deletions admin_settings_default.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?php

require_once "inc_all_admin.php";
require_once "includes/inc_all_admin.php";
?>

<div class="card card-dark">
Expand Down Expand Up @@ -249,4 +249,4 @@
</div>

<?php
require_once "footer.php";
require_once "includes/footer.php";
Loading

0 comments on commit 98f9083

Please sign in to comment.