mirror of
https://github.com/slawkens/myaac.git
synced 2025-10-14 01:34:55 +02:00
Feature: settings (#216)
* New admin panel Pages: Options + Config [WIP] * Forgot the plugin example of options * Rename to settings.php * Add Settings Class * New myaac_settings table * Add $limit parameter to $db->select method * Add $member var annotation * Remove useless title_separator from config * Move $menus to menus.php Also fix active link when menu item has subpage * Settings [WIP] New Settings class New Plugins::load() method Move config.php to settings.php MyAAC Settings will have plugin_name = 'core' Add compat_config.php * Change options.php to settings.php * Change name to settings * Add Settings menu * Add Sections + Add setting($key) function Reorganisation * Add email + password fields as type * Update 33.php * add settings migration * php 8 compatibility * add missing hook * Add categories in tabs, move more settings, revert back getPluginSettings Categories and sections are now not numbered Remove example settings plugin * fix typo * Update .gitignore * Add 36th migration for settings table * Execute migrations just after db connect * Update plugins.php * [WIP] Some work on settings Add hidden settings New method: parse, to parse settings from array Move base html to twig template Remove vocation loading from .xml, instead use predefined voc names * Rename * Fix path * [WIP] More work on settings Move more config to settings (mainly mail_* + some other) Remove mail_admin, wasnt used anywhere Add return type to some functions Add Twig settings(key) function Possibility to save setting to db * Add min, max, step to number field option * Re-enable plugin if disabled and already installed * Add Settings menu, including all plugins with settings One change included in previous commit, due to missclick * Nothing important * Better boolean detection * More detailed error message in settings * Lets call it settings.name instead * Add new function: only_if, to hide fields when they are not enabled [WIP] Not fully finished yet * guild_management: show_if * Hide section title on show_if * Fix: check on page load if radio button is checked * Add: show_if - account_mail_verify * nothing important * Rename team_* variables + add to deprecated * Change variable name * Extract Settings:save function * Add settings.callbacks.get * Move forum config to settings * Move status config to settings * Remove whitespaces * More config to settings: account_types, genders, highscores, admin * Move signature config to settings * Move news config to settings * Rename variable * Save config.php in Settings Egg and hen problem solved :) * Test database connection on save settings -> prevents from making website unusable if connection is wrong * Test server_path -> same There is no config.php anymore, just config.local.php, which can be edited manually and also from admin panel * Remove configs from previous commit * Fix create account, if account_create_character_create is enabled * Add more deprecated configs * Add more info into comment * Update 5-database.php * Fix menu highlighting & opening * Update template.php * Enable script option * Reword email settings + move two new settings * add last_kills_limit + move shop * google_analytics_id * add mail_lost_account_interval * Create character blocked words (by @gpedro), just moved to settings * Fix google_analytics * create character name config moved to settings * Fix for install warning - min/max length * New create character checks configurable: block monsters & spells names * fixes * Improve character npc name check * New setting: donate_column + move donate config to settings * Add super fancy No Refresh saving with a toast * Add new possibility: to deny saving setting if condition is not met * Move database settings to separate category * Fix default value displaying * Add database_hash setting * add last_kills_limit to compat config * Move create character blocked names down * Every setting needs to have default * Move rest of config to settings Remove config.php completely Add new settings category: Game Fix account_login_by_email Min textarea size = 2 + adjusted automatically
This commit is contained in:
@@ -17,7 +17,7 @@ $status['lastCheck'] = 0;
|
||||
$status['uptime'] = '0h 0m';
|
||||
$status['monsters'] = 0;
|
||||
|
||||
if(config('status_enabled') === false) {
|
||||
if(setting('core.status_enabled') === false) {
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -37,9 +37,10 @@ else if(isset($config['lua']['status_port'])) {
|
||||
}
|
||||
|
||||
// ip check
|
||||
if(isset($config['status_ip'][0]))
|
||||
$settingIP = setting('core.status_ip');
|
||||
if(isset($settingIP[0]))
|
||||
{
|
||||
$status_ip = $config['status_ip'];
|
||||
$status_ip = $settingIP;
|
||||
}
|
||||
elseif(!isset($status_ip[0])) // try localhost if no ip specified
|
||||
{
|
||||
@@ -48,10 +49,11 @@ elseif(!isset($status_ip[0])) // try localhost if no ip specified
|
||||
|
||||
// port check
|
||||
$status_port = $config['lua']['statusPort'];
|
||||
if(isset($config['status_port'][0])) {
|
||||
$status_port = $config['status_port'];
|
||||
$settingPort = setting('core.status_port');
|
||||
if(isset($settingPort[0])) {
|
||||
$status_port = $settingPort;
|
||||
}
|
||||
elseif(!isset($status_port[0])) // try 7171 if no ip specified
|
||||
elseif(!isset($status_port[0])) // try 7171 if no port specified
|
||||
{
|
||||
$status_port = 7171;
|
||||
}
|
||||
@@ -94,9 +96,9 @@ if(isset($config['lua']['statustimeout']))
|
||||
|
||||
// get status timeout from server config
|
||||
$status_timeout = eval('return ' . $config['lua']['statusTimeout'] . ';') / 1000 + 1;
|
||||
$status_interval = @$config['status_interval'];
|
||||
if($status_interval && $status_timeout < $config['status_interval']) {
|
||||
$status_timeout = $config['status_interval'];
|
||||
$status_interval = setting('core.status_interval');
|
||||
if($status_interval && $status_timeout < $status_interval) {
|
||||
$status_timeout = $status_interval;
|
||||
}
|
||||
|
||||
if($status['lastCheck'] + $status_timeout < time()) {
|
||||
|
Reference in New Issue
Block a user