Compare commits

..

25 Commits

Author SHA1 Message Date
slawkens
8ec08b5a61 This is always true 2023-11-11 08:41:40 +01:00
slawkens
19346efc38 More info to confirm dialog 2023-11-11 08:38:15 +01:00
slawkens
c9d5c6cfd7 Add new changelog link 2023-11-11 08:37:32 +01:00
slawkens
4461c03d48 Fix changelog link 2023-11-11 08:33:44 +01:00
slawkens
60c7ef2391 Fix news type 2023-11-11 08:32:55 +01:00
slawkens
d6c35bcbb5 Formatting 2023-11-11 08:28:00 +01:00
slawkens
4e87e7e9dc clear_cache & maintenance csrf 2023-11-11 08:27:48 +01:00
slawkens
08a19158b3 Fix new page/news links 2023-11-11 08:12:02 +01:00
slawkens
9a306886fb Update mailer.php 2023-11-11 08:02:02 +01:00
slawkens
719c542757 add info function, same as note($message) 2023-11-11 08:01:58 +01:00
slawkens
1ed24afc7d Move definitions 2023-11-11 08:01:39 +01:00
slawkens
66479e64ed Plugins csrf 2023-11-11 07:53:24 +01:00
slawkens
4e26f07ab6 Menus: better csrf + add success message on reset colors 2023-11-11 07:41:43 +01:00
slawkens
13e6eb5666 Admin panel: Pages csrf 2023-11-11 07:37:21 +01:00
slawkens
56306dfb0a Use admin.links instead 2023-11-11 07:22:58 +01:00
slawkens
f27172691c Refactor admin newses + add csrf 2023-11-11 07:22:43 +01:00
slawkens
5578dbaa83 news/id route 2023-11-11 06:31:28 +01:00
slawkens
549c08c096 Admin Panel: changelogs csrf protection 2023-11-11 06:08:09 +01:00
slawkens
0127a4f417 Fix token generate 2023-11-11 06:07:33 +01:00
slawkens
08074d8d4f Merge branch 'develop' into feature/csrf 2023-11-11 05:40:17 +01:00
slawkens
198cc5a09d Cosmetics 2023-09-16 11:30:35 +02:00
slawkens
3e7cbbb63b Merge branch 'develop' into feature/csrf 2023-09-16 11:09:34 +02:00
slawkens
8e3a71b36b Merge branch 'develop' into feature/csrf 2023-09-16 10:25:49 +02:00
slawkens
0e33fd103c feature: csrf protection 2023-09-16 09:23:51 +02:00
slawkens
046c0b5cf4 Fix alert class name 2023-09-16 07:12:04 +02:00
7 changed files with 5 additions and 50 deletions

View File

@@ -30,27 +30,6 @@ if(!$db->hasTable('myaac_account_actions')) {
throw new RuntimeException('Seems that the table <strong>myaac_account_actions</strong> of MyAAC doesn\'t exist in the database. This is a fatal error. You can try to reinstall MyAAC by visiting <a href="' . BASE_URL . 'install">this</a> url.'); throw new RuntimeException('Seems that the table <strong>myaac_account_actions</strong> of MyAAC doesn\'t exist in the database. This is a fatal error. You can try to reinstall MyAAC by visiting <a href="' . BASE_URL . 'install">this</a> url.');
} }
$hooks->register('debugbar_admin_head_end', HOOK_ADMIN_HEAD_END, function ($params) {
global $debugBar;
if (!isset($debugBar)) {
return;
}
$debugBarRenderer = $debugBar->getJavascriptRenderer();
echo $debugBarRenderer->renderHead();
});
$hooks->register('debugbar_admin_body_end', HOOK_ADMIN_BODY_END, function ($params) {
global $debugBar;
if (!isset($debugBar)) {
return;
}
$debugBarRenderer = $debugBar->getJavascriptRenderer();
echo $debugBarRenderer->render();
});
require SYSTEM . 'status.php'; require SYSTEM . 'status.php';
require SYSTEM . 'login.php'; require SYSTEM . 'login.php';
require __DIR__ . '/includes/functions.php'; require __DIR__ . '/includes/functions.php';

View File

@@ -26,7 +26,7 @@
if (version_compare(phpversion(), '8.0', '<')) die('PHP version 8.0 or higher is required.'); if (version_compare(phpversion(), '8.0', '<')) die('PHP version 8.0 or higher is required.');
const MYAAC = true; const MYAAC = true;
const MYAAC_VERSION = '1.0-dev'; const MYAAC_VERSION = '0.10.0-dev';
const DATABASE_VERSION = 36; const DATABASE_VERSION = 36;
const TABLE_PREFIX = 'myaac_'; const TABLE_PREFIX = 'myaac_';
define('START_TIME', microtime(true)); define('START_TIME', microtime(true));

View File

@@ -16,8 +16,7 @@
"peppeocchi/php-cron-scheduler": "4.*" "peppeocchi/php-cron-scheduler": "4.*"
}, },
"require-dev": { "require-dev": {
"filp/whoops": "^2.15", "filp/whoops": "^2.15"
"maximebf/debugbar": "dev-master"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {

View File

@@ -469,30 +469,20 @@ function tickers()
*/ */
function template_place_holder($type): string function template_place_holder($type): string
{ {
global $twig, $template_place_holders, $debugBar; global $twig, $template_place_holders;
$ret = ''; $ret = '';
if (isset($debugBar)) {
$debugBarRenderer = $debugBar->getJavascriptRenderer();
}
if(array_key_exists($type, $template_place_holders) && is_array($template_place_holders[$type])) if(array_key_exists($type, $template_place_holders) && is_array($template_place_holders[$type]))
$ret = implode($template_place_holders[$type]); $ret = implode($template_place_holders[$type]);
if($type === 'head_start') { if($type === 'head_start') {
$ret .= template_header(); $ret .= template_header();
if (isset($debugBar)) {
$ret .= $debugBarRenderer->renderHead();
}
} }
elseif ($type === 'body_start') { elseif ($type === 'body_start') {
$ret .= $twig->render('browsehappy.html.twig'); $ret .= $twig->render('browsehappy.html.twig');
} }
elseif($type === 'body_end') { elseif($type === 'body_end') {
$ret .= template_ga_code(); $ret .= template_ga_code();
if (isset($debugBar)) {
$ret .= $debugBarRenderer->render();
}
} }
return $ret; return $ret;

View File

@@ -16,16 +16,10 @@ if(!isset($config['installed']) || !$config['installed']) {
throw new RuntimeException('MyAAC has not been installed yet or there was error during installation. Please install again.'); throw new RuntimeException('MyAAC has not been installed yet or there was error during installation. Please install again.');
} }
use DebugBar\StandardDebugBar;
if(config('env') === 'dev') { if(config('env') === 'dev') {
require SYSTEM . 'exception.php'; require SYSTEM . 'exception.php';
} }
if (config('env') === 'dev' || getBoolean(config('enable_debugbar'))) {
$debugBar = new StandardDebugBar();
}
if(empty($config['server_path'])) { if(empty($config['server_path'])) {
throw new RuntimeException('Server Path has been not set. Go to config.php and set it.'); throw new RuntimeException('Server Path has been not set. Go to config.php and set it.');
} }

View File

@@ -370,14 +370,7 @@ class POT
throw new RuntimeException('Please install PHP pdo extension. MyAAC will not work without it.'); throw new RuntimeException('Please install PHP pdo extension. MyAAC will not work without it.');
} }
global $debugBar; $this->db = new OTS_DB_MySQL($params);
if (isset($debugBar)) {
$this->db = new DebugBar\DataCollector\PDO\TraceablePDO(new OTS_DB_MySQL($params));
$debugBar->addCollector(new DebugBar\DataCollector\PDO\PDOCollector($this->db));
}
else {
$this->db = new OTS_DB_MySQL($params);
}
$this->db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); $this->db->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
} }

View File

@@ -123,7 +123,7 @@ if(isset($config['boxes']))
document.getElementById("submenu_"+activeSubmenuItem).style.color = "white"; document.getElementById("submenu_"+activeSubmenuItem).style.color = "white";
document.getElementById("ActiveSubmenuItemIcon_"+activeSubmenuItem).style.visibility = "visible"; document.getElementById("ActiveSubmenuItemIcon_"+activeSubmenuItem).style.visibility = "visible";
menus = localStorage.getItem('menus'); menus = localStorage.getItem('menus');
if(menus == null || menus.lastIndexOf("&") === -1) { if(menus.lastIndexOf("&") === -1) {
menus = "news=1&account=0&community=0&library=0&forum=0<?php if (setting('core.gifts_system')) echo '&shops=0'; ?>&"; menus = "news=1&account=0&community=0&library=0&forum=0<?php if (setting('core.gifts_system')) echo '&shops=0'; ?>&";
} }
FillMenuArray(); FillMenuArray();