AS1024
/
itflow
mirror of https://github.com/itflow-org/itflow
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update settings File naming consistancy to match the rest of ITFlow naming

This commit is contained in:
johnnyq 2022-09-21 12:30:04 -04:00
parent 83a82d2995
commit e5a4451bb9
28 changed files with 59 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
categories.php
View File

@ -1,4 +1,4 @@
<?php include("inc_all_admin.php");
<?php include("inc_all_settings.php");
if(isset($_GET['category'])){
$category = mysqli_real_escape_string($mysqli,$_GET['category']);

2
companies.php
View File

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

2
inc_all_admin.php → inc_all_settings.php
View File

@ -13,7 +13,7 @@ if($session_user_role != 3){
include("header.php");
include("top_nav.php");
include("admin_side_nav.php");
include("settings_side_nav.php");
include("inc_wrapper.php");
include("inc_alert_feedback.php");
include("pagination_head.php");

2
logs.php
View File

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

29
settings-general.php
View File

@ -1,29 +0,0 @@
<?php include("inc_all_admin.php"); ?>
<div class="card card-dark">
<div class="card-header">
<h3 class="card-title"><i class="fa fa-fw fa-cog"></i> General Settings</h3>
</div>
<div class="card-body">
<form action="post.php" method="post" autocomplete="off">
<div class="form-group">
<label>Base URL</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-globe"></i></span>
</div>
<input type="text" class="form-control" name="config_base_url" placeholder="ex host.domain.ext" value="<?php echo $config_base_url; ?>">
</div>
<small class="form-text text-muted">This is used by cron to send the correct url for invoice guest views</small>
</div>
<hr>
<button type="submit" name="edit_general_settings" class="btn btn-primary">Save</button>
</form>
</div>
</div>
<?php include("footer.php");

2
settings-alerts.php → settings_alerts.php
View File

@ -1,4 +1,4 @@
<?php include("inc_all_admin.php"); ?>
<?php include("inc_all_settings.php"); ?>
<div class="card card-dark">
<div class="card-header">

2
settings-api.php → settings_api.php
View File

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

2
settings-backup.php → settings_backup.php
View File

@ -1,4 +1,4 @@
<?php include("inc_all_admin.php"); ?>
<?php include("inc_all_settings.php"); ?>
<div class="card card-dark mb-3">
<div class="card-header">

2
settings-defaults.php → settings_defaults.php
View File

@ -1,4 +1,4 @@
<?php include("inc_all_admin.php"); ?>
<?php include("inc_all_settings.php"); ?>
<div class="card card-dark">
<div class="card-header">

2
settings-integrations.php → settings_integrations.php
View File

@ -1,4 +1,4 @@
<?php include("inc_all_admin.php"); ?>
<?php include("inc_all_settings.php"); ?>
<div class="card card-dark">
<div class="card-header">

2
settings-invoice.php → settings_invoice.php
View File

@ -1,4 +1,4 @@
<?php include("inc_all_admin.php"); ?>
<?php include("inc_all_settings.php"); ?>
<div class="card card-dark">
<div class="card-header">

2
settings-mail.php → settings_mail.php
View File

@ -1,4 +1,4 @@
<?php include("inc_all_admin.php"); ?>
<?php include("inc_all_settings.php"); ?>
<div class="card card-dark">
<div class="card-header">

2
settings-modules.php → settings_modules.php
View File

@ -1,4 +1,4 @@
<?php include("inc_all_admin.php"); ?>
<?php include("inc_all_settings.php"); ?>
<div class="card card-dark">
<div class="card-header">

2
settings-online-payment.php → settings_online_payment.php
View File

@ -1,4 +1,4 @@
<?php include("inc_all_admin.php"); ?>
<?php include("inc_all_settings.php"); ?>
<div class="alert alert-warning">
Work in Progress

2
settings-quote.php → settings_quote.php
View File

@ -1,4 +1,4 @@
<?php include("inc_all_admin.php"); ?>
<?php include("inc_all_settings.php"); ?>
<div class="card card-dark">
<div class="card-header">

57
admin_side_nav.php → settings_side_nav.php
View File

@ -12,7 +12,7 @@
<li class="nav-item mb-3">
<a href="dashboard_financial.php" class="nav-link">
<i class="nav-icon fas fa-arrow-left"></i>
<p class="h4">Back | <strong>Admin</strong></p>
<p class="h4">Back | <strong>Settings</strong></p>
</a>
</li>
@ -31,8 +31,8 @@
</li>
<li class="nav-item">
<a class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings-api.php") { echo "active"; } ?>"
href="settings-api.php">
<a class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings_api.php") { echo "active"; } ?>"
href="settings_api.php">
<i class="nav-icon fas fa-key"></i>
<p>API Keys</p>
</a>
@ -41,8 +41,8 @@
<li class="nav-header mt-3">SETTINGS</li>
<li class="nav-item">
<a class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings-mail.php") { echo "active"; } ?>"
href="settings-mail.php">
<a class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings_mail.php") { echo "active"; } ?>"
href="settings_mail.php">
<i class="nav-icon far fa-envelope"></i>
<p>Mail</p>
</a>
@ -50,40 +50,40 @@
<?php if($config_module_enable_accounting){ ?>
<li class="nav-item">
<a class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings-defaults.php") { echo "active"; } ?>"
href="settings-defaults.php">
<a class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings_defaults.php") { echo "active"; } ?>"
href="settings_defaults.php">
<i class="nav-icon fas fa-cog"></i>
<p>Defaults</p>
</a>
</li>
<li class="nav-item">
<a class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings-invoice.php") { echo "active"; } ?>"
href="settings-invoice.php">
<a class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings_invoice.php") { echo "active"; } ?>"
href="settings_invoice.php">
<i class="nav-icon fas fa-file"></i>
<p>Invoice</p>
</a>
</li>
<li class="nav-item">
<a class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings-quote.php") { echo "active"; } ?>"
href="settings-quote.php">
<a class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings_quote.php") { echo "active"; } ?>"
href="settings_quote.php">
<i class="nav-icon far fa-file"></i>
<p>Quote</p>
</a>
</li>
<li class="nav-item">
<a class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings-alerts.php") { echo "active"; } ?>"
href="settings-alerts.php">
<a class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings_alerts.php") { echo "active"; } ?>"
href="settings_alerts.php">
<i class="nav-icon far fa-bell"></i>
<p>Alerts</p>
</a>
</li>
<li class="nav-item">
<a class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings-online-payment.php") { echo "active"; } ?>"
href="settings-online-payment.php">
<a class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings_online_payment.php") { echo "active"; } ?>"
href="settings_online_payment.php">
<i class="nav-icon far fa-credit-card"></i>
<p>Online Payment</p>
</a>
@ -97,18 +97,25 @@
</li>
<li class="nav-item">
<a href="taxes.php" class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "taxes.php") { echo "active"; } ?>">
<a href="settings_taxes.php" class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings_taxes.php") { echo "active"; } ?>">
<i class="nav-icon fas fa-balance-scale"></i>
<p>Taxes</p>
</a>
</li>
<li class="nav-item">
<a href="settings_tags.php" class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings_tags.php") { echo "active"; } ?>">
<i class="nav-icon fas fa-tag"></i>
<p>Tags</p>
</a>
</li>
<?php } ?>
<?php if($config_module_enable_ticketing){ ?>
<li class="nav-item">
<a class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings-ticket.php") { echo "active"; } ?>"
href="settings-ticket.php">
<a class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings_ticket.php") { echo "active"; } ?>"
href="settings_ticket.php">
<i class="nav-icon fas fa-ticket-alt"></i>
<p>Ticket</p>
</a>
@ -116,31 +123,31 @@
<?php } ?>
<li class="nav-item">
<a href="settings-integrations.php" class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings-integrations.php") { echo "active"; } ?>">
<a href="settings_integrations.php" class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings_integrations.php") { echo "active"; } ?>">
<i class="nav-icon fas fa-puzzle-piece"></i>
<p>Integrations</p>
</a>
</li>
<li class="nav-item">
<a class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings-update.php") { echo "active"; } ?>"
href="settings-update.php">
<a class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings_update.php") { echo "active"; } ?>"
href="settings_update.php">
<i class="nav-icon fas fa-arrow-alt-circle-up"></i>
<p>Update</p>
</a>
</li>
<li class="nav-item">
<a class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings-backup.php") { echo "active"; } ?>"
href="settings-backup.php">
<a class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings_backup.php") { echo "active"; } ?>"
href="settings_backup.php">
<i class="nav-icon fas fa-database"></i>
<p>Backup</p>
</a>
</li>
<li class="nav-item">
<a class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings-modules.php") { echo "active"; } ?>"
href="settings-modules.php">
<a class="nav-link <?php if(basename($_SERVER["PHP_SELF"]) == "settings_modules.php") { echo "active"; } ?>"
href="settings_modules.php">
<i class="nav-icon fas fa-puzzle-piece"></i>
<p>Modules</p>
</a>

0
tag_add_modal.php → settings_tag_add_modal.php
View File

0
tag_edit_modal.php → settings_tag_edit_modal.php
View File

8
tags.php → settings_tags.php
View File

@ -1,4 +1,6 @@
<?php include("inc_all.php");
<?php include("inc_all_settings.php"); ?>
<?php
if(!empty($_GET['sb'])){
$sb = mysqli_real_escape_string($mysqli,$_GET['sb']);
@ -102,7 +104,7 @@ $colors_diff = array_diff($colors_array,$colors_used_array);
<?php
include("tag_edit_modal.php");
include("settings_tag_edit_modal.php");
}
@ -117,7 +119,7 @@ $colors_diff = array_diff($colors_array,$colors_used_array);
<?php
include("tag_add_modal.php");
include("settings_tag_add_modal.php");
include("footer.php");

0
tax_add_modal.php → settings_tax_add_modal.php
View File

0
tax_edit_modal.php → settings_tax_edit_modal.php
View File

6
taxes.php → settings_taxes.php
View File

@ -1,4 +1,4 @@
<?php include("inc_all_admin.php");
<?php include("inc_all_settings.php");
if(!empty($_GET['sb'])){
$sb = mysqli_real_escape_string($mysqli,$_GET['sb']);
@ -64,7 +64,7 @@ $num_rows = mysqli_num_rows($sql);
<?php
include("tax_edit_modal.php");
include("settings_tax_edit_modal.php");
}
if($num_rows == 0){
@ -82,7 +82,7 @@ $num_rows = mysqli_num_rows($sql);
<?php
include("tax_add_modal.php");
include("settings_tax_add_modal.php");
include("footer.php");

2
settings-ticket.php → settings_ticket.php
View File

@ -1,4 +1,4 @@
<?php include("inc_all_admin.php"); ?>
<?php include("inc_all_settings.php"); ?>
<div class="card card-dark">
<div class="card-header">

2
settings-update.php → settings_update.php
View File

@ -1,5 +1,5 @@
<?php
include("inc_all_admin.php");
include("inc_all_settings.php");
include("database_version.php");
?>

2
side_nav.php
View File

@ -184,7 +184,7 @@
<li class="nav-item mt-3">
<a href="users.php" class="nav-link">
<i class="nav-icon fas fa-cog"></i>
<p>Admin</p>
<p>Settings</p>
<i class="fas fa-angle-right nav-icon float-right"></i>
</a>
</li>

2
top_nav.php
View File

@ -45,7 +45,7 @@
</li>
<!-- Menu Footer-->
<li class="user-footer">
<a href="settings-user.php" class="btn btn-default btn-flat">Profile</a>
<a href="user_profile.php" class="btn btn-default btn-flat">Profile</a>
<a href="post.php?logout" class="btn btn-default btn-flat float-right">Sign out</a>
</li>
</ul>

0
settings-user.php → user_profile.php
View File

2
users.php
View File

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