mirror of
https://github.com/slawkens/myaac.git
synced 2025-04-26 17:29:21 +02:00

* 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
124 lines
4.8 KiB
PHP
124 lines
4.8 KiB
PHP
<?php
|
|
/**
|
|
* Database connection
|
|
*
|
|
* @package MyAAC
|
|
* @author Slawkens <slawkens@gmail.com>
|
|
* @copyright 2019 MyAAC
|
|
* @link https://my-aac.org
|
|
*/
|
|
defined('MYAAC') or die('Direct access not allowed!');
|
|
|
|
if (!isset($config['database_overwrite'])) {
|
|
$config['database_overwrite'] = false;
|
|
}
|
|
|
|
if(!$config['database_overwrite'] && !isset($config['database_user'][0], $config['database_password'][0], $config['database_name'][0]))
|
|
{
|
|
if(isset($config['lua']['sqlType'])) {// tfs 0.3
|
|
if(isset($config['lua']['mysqlHost'])) {// tfs 0.2
|
|
$config['otserv_version'] = TFS_02;
|
|
$config['database_type'] = 'mysql';
|
|
$config['database_host'] = $config['lua']['mysqlHost'];
|
|
$config['database_port'] = $config['lua']['mysqlPort'];
|
|
$config['database_user'] = $config['lua']['mysqlUser'];
|
|
$config['database_password'] = $config['lua']['mysqlPass'];
|
|
$config['database_name'] = $config['lua']['mysqlDatabase'];
|
|
$config['database_encryption'] = $config['lua']['passwordType'];
|
|
}
|
|
else {
|
|
$config['otserv_version'] = TFS_03;
|
|
$config['database_type'] = $config['lua']['sqlType'];
|
|
$config['database_host'] = $config['lua']['sqlHost'];
|
|
$config['database_port'] = $config['lua']['sqlPort'];
|
|
$config['database_user'] = $config['lua']['sqlUser'];
|
|
$config['database_password'] = $config['lua']['sqlPass'];
|
|
$config['database_name'] = $config['lua']['sqlDatabase'];
|
|
|
|
$config['database_encryption'] = $config['lua']['encryptionType'];
|
|
if(!isset($config['database_encryption']) || empty($config['database_encryption'])) // before 0.3.6
|
|
$config['database_encryption'] = $config['lua']['passwordType'];
|
|
}
|
|
}
|
|
else if(isset($config['lua']['mysqlHost'])) // tfs 1.0
|
|
{
|
|
$config['otserv_version'] = TFS_02;
|
|
$config['database_type'] = 'mysql';
|
|
$config['database_host'] = $config['lua']['mysqlHost'];
|
|
$config['database_port'] = $config['lua']['mysqlPort'];
|
|
$config['database_user'] = $config['lua']['mysqlUser'];
|
|
$config['database_password'] = $config['lua']['mysqlPass'];
|
|
$config['database_name'] = $config['lua']['mysqlDatabase'];
|
|
if(!isset($config['database_socket'][0])) {
|
|
$config['database_socket'] = isset($config['lua']['mysqlSock']) ? trim($config['lua']['mysqlSock']) : '';
|
|
}
|
|
$config['database_encryption'] = 'sha1';
|
|
}
|
|
else if(isset($config['lua']['database_type'])) // otserv
|
|
{
|
|
$config['otserv_version'] = OTSERV;
|
|
$config['database_type'] = $config['lua']['database_type'];
|
|
$config['database_host'] = $config['lua']['database_host'];
|
|
$config['database_port'] = $config['lua']['database_port'];
|
|
$config['database_user'] = $config['lua']['database_username'];
|
|
$config['database_password'] = $config['lua']['database_password'];
|
|
$config['database_name'] = $config['lua']['database_schema'];
|
|
$config['database_encryption'] = isset($config['lua']['passwordtype']) ? $config['lua']['passwordtype'] : $config['lua']['password_type'];
|
|
$config['database_salt'] = isset($config['lua']['passwordsalt']) ? $config['lua']['passwordsalt'] : $config['lua']['password_salt'];
|
|
}
|
|
else if(isset($config['lua']['sql_host'])) // otserv 0.6.3 / 0.6.4
|
|
{
|
|
$config['otserv_version'] = OTSERV_06;
|
|
$config['database_type'] = $config['lua']['sql_type'];
|
|
$config['database_host'] = $config['lua']['sql_host'];
|
|
$config['database_port'] = $config['lua']['sql_port'];
|
|
$config['database_user'] = $config['lua']['sql_user'];
|
|
$config['database_password'] = $config['lua']['sql_pass'];
|
|
$config['database_name'] = $config['lua']['sql_db'];
|
|
$config['database_encryption'] = isset($config['lua']['passwordtype']) ? $config['lua']['passwordtype'] : $config['lua']['password_type'];
|
|
$config['database_salt'] = isset($config['lua']['passwordsalt']) ? $config['lua']['passwordsalt'] : $config['lua']['password_salt'];
|
|
}
|
|
}
|
|
|
|
if(isset($config['lua']['useMD5Passwords']) && getBoolean($config['lua']['useMD5Passwords']))
|
|
$config['database_encryption'] = 'md5';
|
|
|
|
if(!isset($config['database_log'])) {
|
|
$config['database_log'] = false;
|
|
}
|
|
|
|
if(!isset($config['database_socket'])) {
|
|
$config['database_socket'] = '';
|
|
}
|
|
|
|
try {
|
|
$ots->connect(array(
|
|
'host' => $config['database_host'],
|
|
'user' => $config['database_user'],
|
|
'password' => $config['database_password'],
|
|
'database' => $config['database_name'],
|
|
'log' => $config['database_log'],
|
|
'socket' => @$config['database_socket'],
|
|
'persistent' => @$config['database_persistent']
|
|
)
|
|
);
|
|
|
|
$db = POT::getInstance()->getDBHandle();
|
|
}
|
|
catch(PDOException $error) {
|
|
if(isset($cache) && $cache->enabled()) {
|
|
$cache->delete('config_lua');
|
|
}
|
|
|
|
if(defined('MYAAC_INSTALL')) {
|
|
return; // installer will take care of this
|
|
}
|
|
|
|
throw new RuntimeException('ERROR: Cannot connect to MySQL database.<br/>' .
|
|
'Possible reasons:' .
|
|
'<ul>' .
|
|
'<li>MySQL is not configured propertly in <i>config.lua</i>.</li>' .
|
|
'<li>MySQL server is not running.</li>' .
|
|
'</ul>' . $error->getMessage());
|
|
}
|