Skip to content

Commit

Permalink
Merge pull request #1053 from itflow-org/tidy
Browse files Browse the repository at this point in the history 
Tidying
  • Loading branch information
@wrongecho
wrongecho committed Sep 14, 2024
2 parents 6975d6e + 4a6d312 commit 970efa7
Show file tree
Hide file tree
Showing 33 changed files with 214 additions and 297 deletions.
2 changes: 1 addition & 1 deletion accounts.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
$sql = mysqli_query(
$mysqli,
"SELECT SQL_CALC_FOUND_ROWS * FROM accounts
LEFT JOIN account_types ON account_types.account_type_id = accounts.account_type
LEFT JOIN account_types ON account_types.account_type_id = accounts.account_type
WHERE (account_name LIKE '%$q%' OR account_type_name LIKE '%$q%')
AND account_archived_at IS NULL
ORDER BY $sort $order LIMIT $record_from, $record_to"
Expand Down
3 changes: 2 additions & 1 deletion admin_account_types.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,4 +180,5 @@
require_once "footer.php";


?>
?>

10 changes: 5 additions & 5 deletions admin_account_types_add_modal.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
<div class="form-group">
<label>Account Type</label>
<select class="form-control select2" name="type" required>
<option value="" <?php if ($account_type == NULL) echo "selected"; ?>>- Select -</option>
<option value="1" <?php if ($account_type == 'Assets') echo "selected"; ?>>Assets</option>
<option value="2" <?php if ($account_type == 'Liabilities') echo "selected"; ?>>Liabilities</option>
<option value="3" <?php if ($account_type == 'Equity') echo "selected"; ?>>Equity</option>
<option value="" <?php if ($account_type == NULL) { echo "selected"; } ?>>- Select -</option>
<option value="1" <?php if ($account_type == 'Assets') { echo "selected"; } ?>>Assets</option>
<option value="2" <?php if ($account_type == 'Liabilities') { echo "selected"; } ?>>Liabilities</option>
<option value="3" <?php if ($account_type == 'Equity') { echo "selected"; } ?>>Equity</option>
</select>
</div>
<div class="form-group">
Expand All @@ -34,4 +34,4 @@
</form>
</div>
</div>
</div>
</div>
6 changes: 3 additions & 3 deletions admin_account_types_edit_modal.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@
<div class="form-group">
<label>Account Type</label>
<select class="form-control select2" name="type" required>
<option value="1" <?php if ($account_parent == 1) echo 'selected'; ?>>Assets</option>
<option value="2" <?php if ($account_parent == 2) echo 'selected'; ?>>Liabilities</option>
<option value="3" <?php if ($account_parent == 3) echo 'selected'; ?>>Equity</option>
<option value="1" <?php if ($account_parent == 1) { echo 'selected'; } ?>>Assets</option>
<option value="2" <?php if ($account_parent == 2) { echo 'selected'; } ?>>Liabilities</option>
<option value="3" <?php if ($account_parent == 3) { echo 'selected'; } ?>>Equity</option>
</select>
</div>

Expand Down
2 changes: 1 addition & 1 deletion admin_bulk_mail.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,4 +149,4 @@

<?php

require_once "footer.php";
require_once "footer.php";
2 changes: 0 additions & 2 deletions admin_debug.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,6 @@ function fetchDatabaseStructureFromServer() {
}
}

//$mysqli->close();

return $tables;
}

Expand Down
58 changes: 29 additions & 29 deletions admin_document_template_details.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
$purifier = new HTMLPurifier($purifier_config);

if (isset($_GET['document_id'])) {
$document_id = intval($_GET['document_id']);
$document_id = intval($_GET['document_id']);
}

$sql_document = mysqli_query($mysqli, "SELECT * FROM documents WHERE document_template = 1 AND document_id = $document_id");
Expand All @@ -26,36 +26,36 @@

?>

<ol class="breadcrumb d-print-none">
<li class="breadcrumb-item">
<a href="clients.php">Home</a>
</li>
<li class="breadcrumb-item">
<a href="admin_users.php">Admin</a>
</li>
<li class="breadcrumb-item">
<a href="admin_document_templates.php">Document Templates</a>
</li>
<li class="breadcrumb-item active"><i class="fas fa-file mr-2"></i><?php echo $document_name; ?></li>
</ol>

<div class="card card-dark">
<div class="card-header">

<h3 class="card-title mt-2"><i class="fa fa-fw fa-file mr-2"></i><?php echo $document_name; ?></h3>

<div class="card-tools">
<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#editDocumentTemplateModal<?php echo $document_id; ?>">
<i class="fas fa-edit mr-2"></i>Edit
</button>
<ol class="breadcrumb d-print-none">
<li class="breadcrumb-item">
<a href="clients.php">Home</a>
</li>
<li class="breadcrumb-item">
<a href="admin_users.php">Admin</a>
</li>
<li class="breadcrumb-item">
<a href="admin_document_templates.php">Document Templates</a>
</li>
<li class="breadcrumb-item active"><i class="fas fa-file mr-2"></i><?php echo $document_name; ?></li>
</ol>

<div class="card card-dark">
<div class="card-header">

<h3 class="card-title mt-2"><i class="fa fa-fw fa-file mr-2"></i><?php echo $document_name; ?></h3>

<div class="card-tools">
<button type="button" class="btn btn-primary" data-toggle="modal" data-target="#editDocumentTemplateModal<?php echo $document_id; ?>">
<i class="fas fa-edit mr-2"></i>Edit
</button>
</div>
</div>
<div class="card-body prettyContent">
<?php echo $document_content; ?>
</div>
</div>
</div>
<div class="card-body prettyContent">
<?php echo $document_content; ?>
</div>
</div>

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

<?php

Expand Down
180 changes: 90 additions & 90 deletions admin_ticket_template_details.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
$purifier = new HTMLPurifier($purifier_config);

if (isset($_GET['ticket_template_id'])) {
$ticket_template_id = intval($_GET['ticket_template_id']);
$ticket_template_id = intval($_GET['ticket_template_id']);
}

$sql_ticket_templates = mysqli_query($mysqli, "SELECT * FROM ticket_templates WHERE ticket_template_id = $ticket_template_id");
Expand All @@ -30,101 +30,101 @@

?>

<ol class="breadcrumb d-print-none">
<li class="breadcrumb-item">
<a href="clients.php">Home</a>
</li>
<li class="breadcrumb-item">
<a href="admin_users.php">Admin</a>
</li>
<li class="breadcrumb-item">
<a href="admin_ticket_templates.php">Ticket Templates</a>
</li>
<li class="breadcrumb-item active"><i class="fas fa-life-ring mr-2"></i><?php echo $ticket_template_name; ?></li>
</ol>

<div class="row">
<div class="col-8">

<div class="card card-dark">
<div class="card-header">
<h3 class="card-title mt-2">
<div class="media">
<i class="fa fa-fw fa-2x fa-life-ring mr-3"></i>
<div class="media-body">
<h3 class="mb-0"><?php echo $ticket_template_name; ?></h3>
<div><small class="text-secondary"><?php echo $ticket_template_description; ?></small></div>
<ol class="breadcrumb d-print-none">
<li class="breadcrumb-item">
<a href="clients.php">Home</a>
</li>
<li class="breadcrumb-item">
<a href="admin_users.php">Admin</a>
</li>
<li class="breadcrumb-item">
<a href="admin_ticket_templates.php">Ticket Templates</a>
</li>
<li class="breadcrumb-item active"><i class="fas fa-life-ring mr-2"></i><?php echo $ticket_template_name; ?></li>
</ol>

<div class="row">
<div class="col-8">

<div class="card card-dark">
<div class="card-header">
<h3 class="card-title mt-2">
<div class="media">
<i class="fa fa-fw fa-2x fa-life-ring mr-3"></i>
<div class="media-body">
<h3 class="mb-0"><?php echo $ticket_template_name; ?></h3>
<div><small class="text-secondary"><?php echo $ticket_template_description; ?></small></div>
</div>
</div>
</h3>
<div class="card-tools">
<button type="button" class="btn btn-default btn-sm" data-toggle="modal" data-target="#editTicketTemplateModal<?php echo $template_id; ?>">
<i class="fas fa-edit"></i>
</button>
</div>
</div>
<h5><?php echo $ticket_subject; ?></h5>
<div class="card-body prettyContent">
<?php echo $ticket_template_details; ?>
</div>
</div>
</div>
</h3>
<div class="card-tools">
<button type="button" class="btn btn-default btn-sm" data-toggle="modal" data-target="#editTicketTemplateModal<?php echo $template_id; ?>">
<i class="fas fa-edit"></i>
</button>

</div>
</div>
<h5><?php echo $ticket_subject; ?></h5>
<div class="card-body prettyContent">
<?php echo $ticket_template_details; ?>
</div>
</div>

</div>

<div class="col-4">

<div class="card card-dark">
<div class="card-header">
<h5 class="card-title"><i class="fa fa-fw fa-tasks mr-2"></i>Tasks</h5>
</div>
<div class="card-body">
<form action="post.php" method="post" autocomplete="off">
<input type="hidden" name="ticket_template_id" value="<?php echo $ticket_template_id; ?>">
<div class="form-group">
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-tasks"></i></span>
</div>
<input type="text" class="form-control" name="task_name" placeholder="Task name">
<div class="input-group-append">
<button type="submit" name="add_ticket_template_task" class="btn btn-primary"><i class="fas fa-fw fa-check mr-2"></i>Create</button>
</div>
</div>
</div>
</form>
<table class="table table-striped table-sm">
<?php
while($row = mysqli_fetch_array($sql_task_templates)){
$task_id = intval($row['task_template_id']);
$task_name = nullable_htmlentities($row['task_template_name']);
$task_order = intval($row['task_template_order']);
$task_description = nullable_htmlentities($row['task_template_description']);
?>
<tr>
<td><i class="far fa-fw fa-square text-secondary"></i></td>
<td><?php echo $task_name; ?></td>
<td class="text-right">
<button type="button" class="btn btn-link btn-sm text-secondary" data-toggle="modal" data-target="#editTaskModal<?php echo $task_id; ?>">
<i class="fa fa-fw fa-pencil-alt"></i>
</button>
<a href="post.php?delete_task_template=<?php echo $task_id; ?>" class="btn btn-link btn-sm text-danger">
<i class="fa fa-fw fa-trash-alt"></i>
</a>
</td>
</tr>
<?php
require "task_edit_modal.php";
}
?>
</table>
</div>
</div>
<div class="col-4">

<div class="card card-dark">
<div class="card-header">
<h5 class="card-title"><i class="fa fa-fw fa-tasks mr-2"></i>Tasks</h5>
</div>
<div class="card-body">
<form action="post.php" method="post" autocomplete="off">
<input type="hidden" name="ticket_template_id" value="<?php echo $ticket_template_id; ?>">
<div class="form-group">
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fa fa-fw fa-tasks"></i></span>
</div>
<input type="text" class="form-control" name="task_name" placeholder="Task name">
<div class="input-group-append">
<button type="submit" name="add_ticket_template_task" class="btn btn-primary"><i class="fas fa-fw fa-check mr-2"></i>Create</button>
</div>
</div>
</div>
</form>
<table class="table table-striped table-sm">
<?php
while($row = mysqli_fetch_array($sql_task_templates)){
$task_id = intval($row['task_template_id']);
$task_name = nullable_htmlentities($row['task_template_name']);
$task_order = intval($row['task_template_order']);
$task_description = nullable_htmlentities($row['task_template_description']);
?>
<tr>
<td><i class="far fa-fw fa-square text-secondary"></i></td>
<td><?php echo $task_name; ?></td>
<td class="text-right">
<button type="button" class="btn btn-link btn-sm text-secondary" data-toggle="modal" data-target="#editTaskModal<?php echo $task_id; ?>">
<i class="fa fa-fw fa-pencil-alt"></i>
</button>
<a href="post.php?delete_task_template=<?php echo $task_id; ?>" class="btn btn-link btn-sm text-danger">
<i class="fa fa-fw fa-trash-alt"></i>
</a>
</td>
</tr>
<?php
require "task_edit_modal.php";
}
?>
</table>
</div>
</div>

</div>
</div>

</div>
</div>

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

<?php

Expand Down
2 changes: 1 addition & 1 deletion admin_users.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@

$sql_last_login = mysqli_query(
$mysqli,
"SELECT * FROM logs
"SELECT * FROM logs
WHERE log_user_id = $user_id AND log_type = 'Login'
ORDER BY log_id DESC LIMIT 1"
);
Expand Down
11 changes: 0 additions & 11 deletions ajax.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -458,17 +458,6 @@
echo json_encode($response);
}

/*
* Dynamic TOTP "resolver"
* When provided with a TOTP secret, returns a 6-digit code
* // TODO: Check if this can now be removed
*/
if (isset($_GET['get_totp_token'])) {
$otp = TokenAuth6238::getTokenCode(strtoupper($_GET['totp_secret']));

echo json_encode($otp);
}

/*
* NEW TOTP getter for client login/passwords page
* When provided with a login ID, checks permissions and returns the 6-digit code
Expand Down
4 changes: 2 additions & 2 deletions api/v1/validate_api_key.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
*/

// Includes
require_once(__DIR__ . '../../../functions.php');
require_once(__DIR__ . "../../../config.php");
require_once __DIR__ . '../../../functions.php';
require_once __DIR__ . "../../../config.php";

// JSON header
header('Content-Type: application/json');
Expand Down
Loading

0 comments on commit 970efa7

Please sign in to comment.