Digitalstack/myaac
2
0
Fork 0
mirror of https://github.com/slawkens/myaac.git synced 2025-04-27 09:49:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

One more early exit

Browse Source
This commit is contained in:
slawkens 2024-05-30 11:18:06 +02:00
parent 9e23ec6745
commit 66ecc487a1
1 changed files with 161 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

114
install/steps/7-finish.php
View File

@ -12,53 +12,56 @@ if(isset($config['installed']) && $config['installed'] && !isset($_SESSION['save
} }
require SYSTEM . 'init.php'; require SYSTEM . 'init.php';
if(!$error) { if($error) {
if(USE_ACCOUNT_NAME || USE_ACCOUNT_NUMBER) return;
}
if(USE_ACCOUNT_NAME || USE_ACCOUNT_NUMBER)
$account = isset($_SESSION['var_account']) ? $_SESSION['var_account'] : null; $account = isset($_SESSION['var_account']) ? $_SESSION['var_account'] : null;
else else
$account_id = isset($_SESSION['var_account_id']) ? $_SESSION['var_account_id'] : null; $account_id = isset($_SESSION['var_account_id']) ? $_SESSION['var_account_id'] : null;
$password = $_SESSION['var_password']; $password = $_SESSION['var_password'];
if(USE_ACCOUNT_SALT) if(USE_ACCOUNT_SALT)
{ {
$salt = generateRandomString(10, false, true, true); $salt = generateRandomString(10, false, true, true);
$password = $salt . $password; $password = $salt . $password;
} }
$account_db = new OTS_Account(); $account_db = new OTS_Account();
if(isset($account)) if(isset($account))
$account_db->find($account); $account_db->find($account);
else else
$account_db->load($account_id); $account_db->load($account_id);
$player_name = $_SESSION['var_player_name']; $player_name = $_SESSION['var_player_name'];
$player_db = new OTS_Player(); $player_db = new OTS_Player();
$player_db->find($player_name); $player_db->find($player_name);
if(!$player_db->isLoaded()) if(!$player_db->isLoaded())
{ {
$player = new OTS_Player(); $player = new OTS_Player();
$player->setName($player_name); $player->setName($player_name);
$player_used = &$player; $player_used = &$player;
} }
else { else {
$player_used = &$player_db; $player_used = &$player_db;
} }
$groups = new OTS_Groups_List(); $groups = new OTS_Groups_List();
$player_used->setGroupId($groups->getHighestId()); $player_used->setGroupId($groups->getHighestId());
$email = $_SESSION['var_email']; $email = $_SESSION['var_email'];
if($account_db->isLoaded()) { if($account_db->isLoaded()) {
$account_db->setPassword(encrypt($password)); $account_db->setPassword(encrypt($password));
$account_db->setEMail($email); $account_db->setEMail($email);
$account_db->save(); $account_db->save();
$account_used = &$account_db; $account_used = &$account_db;
} }
else { else {
$new_account = new OTS_Account(); $new_account = new OTS_Account();
if(USE_ACCOUNT_NAME) { if(USE_ACCOUNT_NAME) {
$new_account->create($account); $new_account->create($account);
@ -76,37 +79,37 @@ if(!$error) {
$new_account->logAction('Account created.'); $new_account->logAction('Account created.');
$account_used = &$new_account; $account_used = &$new_account;
} }
if(USE_ACCOUNT_SALT) if(USE_ACCOUNT_SALT)
$account_used->setCustomField('salt', $salt); $account_used->setCustomField('salt', $salt);
$account_used->setCustomField('web_flags', FLAG_ADMIN + FLAG_SUPER_ADMIN); $account_used->setCustomField('web_flags', FLAG_ADMIN + FLAG_SUPER_ADMIN);
$account_used->setCustomField('country', 'us'); $account_used->setCustomField('country', 'us');
if($db->hasColumn('accounts', 'group_id')) if($db->hasColumn('accounts', 'group_id'))
$account_used->setCustomField('group_id', $groups->getHighestId()); $account_used->setCustomField('group_id', $groups->getHighestId());
if($db->hasColumn('accounts', 'type')) if($db->hasColumn('accounts', 'type'))
$account_used->setCustomField('type', 6); $account_used->setCustomField('type', 6);
if(!$player_db->isLoaded()) if(!$player_db->isLoaded())
$player->setAccountId($account_used->getId()); $player->setAccountId($account_used->getId());
else else
$player_db->setAccountId($account_used->getId()); $player_db->setAccountId($account_used->getId());
success($locale['step_database_created_account']); success($locale['step_database_created_account']);
setSession('account', $account_used->getId()); setSession('account', $account_used->getId());
setSession('password', encrypt($password)); setSession('password', encrypt($password));
setSession('remember_me', true); setSession('remember_me', true);
if($player_db->isLoaded()) { if($player_db->isLoaded()) {
$player_db->save(); $player_db->save();
} }
else { else {
$player->save(); $player->save();
} }
if(!News::all()->count()) { if(!News::all()->count()) {
$player_id = 0; $player_id = 0;
$tmpNewsPlayer = \MyAAC\Models\Player::where('name', $player_name)->first(); $tmpNewsPlayer = \MyAAC\Models\Player::where('name', $player_name)->first();
if($tmpNewsPlayer) { if($tmpNewsPlayer) {
@ -136,10 +139,10 @@ if(!$error) {
]); ]);
success($locale['step_database_created_news']); success($locale['step_database_created_news']);
} }
$settings = Settings::getInstance(); $settings = Settings::getInstance();
foreach($_SESSION as $key => $value) { foreach($_SESSION as $key => $value) {
if (in_array($key, ['var_usage', 'var_date_timezone', 'var_client'])) { if (in_array($key, ['var_usage', 'var_date_timezone', 'var_client'])) {
if ($key == 'var_usage') { if ($key == 'var_usage') {
$key = 'anonymous_usage_statistics'; $key = 'anonymous_usage_statistics';
@ -152,15 +155,15 @@ if(!$error) {
$settings->updateInDatabase('core', $key, $value); $settings->updateInDatabase('core', $key, $value);
} }
} }
success('Settings saved.'); success('Settings saved.');
$twig->display('install.installer.html.twig', array( $twig->display('install.installer.html.twig', array(
'url' => 'tools/7-finish.php', 'url' => 'tools/7-finish.php',
'message' => $locale['importing_spinner'] 'message' => $locale['importing_spinner']
)); ));
if(!isset($_SESSION['installed'])) { if(!isset($_SESSION['installed'])) {
if (!array_key_exists('CI', getenv())) { if (!array_key_exists('CI', getenv())) {
$report_url = 'https://my-aac.org/report_install.php?v=' . MYAAC_VERSION . '&b=' . urlencode(BASE_URL); $report_url = 'https://my-aac.org/report_install.php?v=' . MYAAC_VERSION . '&b=' . urlencode(BASE_URL);
if (function_exists('curl_version')) if (function_exists('curl_version'))
@ -177,14 +180,13 @@ if(!$error) {
} }
$_SESSION['installed'] = true; $_SESSION['installed'] = true;
} }
foreach($_SESSION as $key => $value) { foreach($_SESSION as $key => $value) {
if(strpos($key, 'var_') !== false) if(strpos($key, 'var_') !== false)
unset($_SESSION[$key]); unset($_SESSION[$key]);
} }
unset($_SESSION['saved']); unset($_SESSION['saved']);
if(file_exists(CACHE . 'install.txt')) { if(file_exists(CACHE . 'install.txt')) {
unlink(CACHE . 'install.txt'); unlink(CACHE . 'install.txt');
}
} }