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

* fixed othire account creating/installation

Browse Source 
* fixed unexpected error logging about email fail
* added max_execution_time to the install finish step
This commit is contained in:
slawkens 2018-01-05 09:30:27 +01:00
parent 8b2ad2cf2f
commit e2de0b1440
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,7 @@
<?php <?php
defined('MYAAC') or die('Direct access not allowed!'); defined('MYAAC') or die('Direct access not allowed!');
ini_set('max_execution_time', 300);
if(isset($config['installed']) && $config['installed'] && !isset($_SESSION['saved'])) { if(isset($config['installed']) && $config['installed'] && !isset($_SESSION['saved'])) {
warning($locale['already_installed']); warning($locale['already_installed']);
} }

9
system/libs/pot/OTS_Account.php
View File

@ -249,13 +249,12 @@ class OTS_Account extends OTS_Row_DAO implements IteratorAggregate, Countable
throw new E_OTS_NotLoaded(); throw new E_OTS_NotLoaded();
} }
$lastday = 'lastday';
if(fieldExist('premend', 'accounts'))
$lastday = 'premend';
$field = 'lastday'; $field = 'lastday';
if(isset($this->data['premend'])) { // othire if(fieldExist('premend', 'accounts')) { // othire
$field = 'premend'; $field = 'premend';
if(!isset($this->data['premend'])) {
$this->data['premend'] = 0;
}
} }
// UPDATE query on database // UPDATE query on database

3
system/pages/createaccount.php
View File

@ -203,11 +203,12 @@ if($save)
if(_mail($email, 'Your account on ' . $config['lua']['serverName'], $mailBody)) if(_mail($email, 'Your account on ' . $config['lua']['serverName'], $mailBody))
echo '<br /><small>These informations were send on email address <b>' . $email . '</b>.'; echo '<br /><small>These informations were send on email address <b>' . $email . '</b>.';
else else {
error('An error occorred while sending email (<b>' . $email . '</b>)! Error:<br/>' . $mailer->ErrorInfo . '<br/>More info in system/logs/error.log'); error('An error occorred while sending email (<b>' . $email . '</b>)! Error:<br/>' . $mailer->ErrorInfo . '<br/>More info in system/logs/error.log');
log_append('error.log', '[createaccount.php] An error occorred while sending email: ' . $mailer->ErrorInfo . '. Error: ' . print_r(error_get_last(), true)); log_append('error.log', '[createaccount.php] An error occorred while sending email: ' . $mailer->ErrorInfo . '. Error: ' . print_r(error_get_last(), true));
} }
} }
}
return; return;
} }