Digitalstack/myaac
2
0
Fork 0
mirror of https://github.com/slawkens/myaac.git synced 2025-10-18 19:53:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/phpstan

Browse Source
This commit is contained in:
slawkens
2024-02-18 12:12:19 +01:00
parent dbae1ccd04 e23a749e4c
commit c7fdbac537
88 changed files with 633 additions and 3495 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
admin/template/template.php
View File

@@ -6,7 +6,7 @@
<?php echo template_header(true); ?>
<title><?php echo (isset($title) ? $title . ' - ' : '') . $config['lua']['serverName'];?></title>
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<link rel="stylesheet" href="<?php echo BASE_URL; ?>tools/css/adminlte.min.css">
<link rel="stylesheet" href="<?php echo BASE_URL; ?>tools/ext/admin-lte/css/adminlte.min.css">
<link rel="stylesheet" href="<?php echo BASE_URL; ?>tools/css/font-awesome.min.css">
<?php if (isset($use_datatable)) { ?>
<link rel="stylesheet" href="<?php echo BASE_URL; ?>tools/css/datatables.bs.min.css">
@@ -191,13 +191,13 @@ if ($logged && admin()) {
]);
}
?>
<script src="<?php echo BASE_URL; ?>tools/js/bootstrap.min.js"></script>
<script src="<?php echo BASE_URL; ?>tools/js/jquery-ui.min.js"></script>
<script src="<?php echo BASE_URL; ?>tools/ext/bootstrap/js/bootstrap.min.js"></script>
<script src="<?php echo BASE_URL; ?>tools/ext/jquery-ui/jquery-ui.min.js"></script>
<?php if (isset($use_datatable)) { ?>
<script src="<?php echo BASE_URL; ?>tools/js/datatables.min.js"></script>
<script src="<?php echo BASE_URL; ?>tools/js/datatables.bs.min.js"></script>
<?php } ?>
<script src="<?php echo BASE_URL; ?>tools/js/adminlte.min.js"></script>
<script src="<?php echo BASE_URL; ?>tools/ext/admin-lte/js/adminlte.min.js"></script>
<?php $hooks->trigger(HOOK_ADMIN_BODY_END); ?>
</body>
</html>

4
admin/tools/reload_data.php
View File

@@ -25,7 +25,7 @@
use MyAAC\DataLoader;
define('MYAAC_ADMIN', true);
const MYAAC_ADMIN = true;
require '../../common.php';
require SYSTEM . 'functions.php';
@@ -37,7 +37,7 @@ if (!admin())
ini_set('max_execution_time', 300);
ob_implicit_flush();
ob_end_flush();
@ob_end_flush();
header('X-Accel-Buffering: no');
require LOCALE . 'en/main.php';