mirror of
				https://github.com/slawkens/myaac.git
				synced 2025-10-29 23:16:23 +01:00 
			
		
		
		
	 a72d1a3c9f
			
		
	
	a72d1a3c9f
	
	
	
		
			
			* 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
		
			
				
	
	
		
			79 lines
		
	
	
		
			2.8 KiB
		
	
	
	
		
			PHP
		
	
	
	
	
	
			
		
		
	
	
			79 lines
		
	
	
		
			2.8 KiB
		
	
	
	
		
			PHP
		
	
	
	
	
	
| <?php
 | |
| /**
 | |
|  * Register Account New
 | |
|  *
 | |
|  * @package   MyAAC
 | |
|  * @author    Gesior <jerzyskalski@wp.pl>
 | |
|  * @author    Slawkens <slawkens@gmail.com>
 | |
|  * @copyright 2019 MyAAC
 | |
|  * @link      https://my-aac.org
 | |
|  */
 | |
| defined('MYAAC') or die('Direct access not allowed!');
 | |
| 
 | |
| $title = 'Register Account';
 | |
| require __DIR__ . '/base.php';
 | |
| 
 | |
| if(!$logged) {
 | |
| 	return;
 | |
| }
 | |
| 
 | |
| if(isset($_POST['reg_password']))
 | |
| 	$reg_password = encrypt((USE_ACCOUNT_SALT ? $account_logged->getCustomField('salt') : '') . $_POST['reg_password']);
 | |
| 
 | |
| $reckey = $account_logged->getCustomField('key');
 | |
| if((!setting('core.account_generate_new_reckey') || !setting('core.mail_enabled')) || empty($reckey)) {
 | |
| 	$errors[] = 'You cant get new recovery key.';
 | |
| 	$twig->display('error_box.html.twig', array('errors' => $errors));
 | |
| }
 | |
| else
 | |
| {
 | |
| 	$points = $account_logged->getCustomField(setting('core.donate_column'));
 | |
| 	if(isset($_POST['registeraccountsave']) && $_POST['registeraccountsave'] == '1')
 | |
| 	{
 | |
| 		if($reg_password == $account_logged->getPassword())
 | |
| 		{
 | |
| 			if($points >= setting('core.account_generate_new_reckey_price'))
 | |
| 			{
 | |
| 				$show_form = false;
 | |
| 				$new_rec_key = generateRandomString(10, false, true, true);
 | |
| 
 | |
| 				$mailBody = $twig->render('mail.account.register.html.twig', array(
 | |
| 					'recovery_key' => $new_rec_key
 | |
| 				));
 | |
| 
 | |
| 				if(_mail($account_logged->getEMail(), $config['lua']['serverName']." - new recovery key", $mailBody))
 | |
| 				{
 | |
| 					$account_logged->setCustomField('key', $new_rec_key);
 | |
| 					$account_logged->setCustomField(setting('core.donate_column'), $account_logged->getCustomField(setting('core.donate_column')) - setting('core.account_generate_new_reckey_price'));
 | |
| 					$account_logged->logAction('Generated new recovery key for ' . setting('core.account_generate_new_reckey_price') . ' premium points.');
 | |
| 					$message = '<br />Your recovery key were send on email address <b>'.$account_logged->getEMail().'</b> for '.setting('core.account_generate_new_reckey_price').' premium points.';
 | |
| 				}
 | |
| 				else
 | |
| 					$message = '<br /><p class="error">An error occurred while sending email ( <b>'.$account_logged->getEMail().'</b> ) with recovery key! Recovery key not changed. Try again later. For Admin: More info can be found in system/logs/mailer-error.log</p>';
 | |
| 
 | |
| 				$twig->display('success.html.twig', array(
 | |
| 					'title' => 'Account Registered',
 | |
| 					'description' => '<ul>' . $message . '</ul>'
 | |
| 				));
 | |
| 			}
 | |
| 			else
 | |
| 				$errors[] = 'You need ' . setting('core.account_generate_new_reckey_price') . ' premium points to generate new recovery key. You have <b>'.$points.'<b> premium points.';
 | |
| 		}
 | |
| 		else
 | |
| 			$errors[] = 'Wrong password to account.';
 | |
| 	}
 | |
| 
 | |
| 	//show errors if not empty
 | |
| 	if(!empty($errors)) {
 | |
| 		$twig->display('error_box.html.twig', array('errors' => $errors));
 | |
| 	}
 | |
| 
 | |
| 	if($show_form)
 | |
| 	{
 | |
| 		//show form
 | |
| 		$twig->display('account.generate_new_recovery_key.html.twig', array(
 | |
| 			'points' => $points
 | |
| 		));
 | |
| 	}
 | |
| }
 |