github
/
phpservermon
mirror of https://github.com/phpservermon/phpservermon
1
0
Fork 0
Code Issues Releases Wiki Activity

fixing redirect on config after language change

pull/89/head
Pepijn Over 2014-04-25 00:25:15 +02:00
parent d79ba42e85
commit a2eacb2bce
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/psm/Module/Config/Controller/ConfigController.class.php
View File

@ -61,7 +61,7 @@ class ConfigController extends AbstractController {
'sms_gateway_password', 'sms_gateway_password',
'sms_from', 'sms_from',
); );
private $default_tab = 'general'; private $default_tab = 'general';
function __construct(Database $db, Template $tpl) { function __construct(Database $db, Template $tpl) {
@ -120,19 +120,19 @@ class ConfigController extends AbstractController {
} }
$tpl_data[$this->default_tab . '_active'] = 'active'; $tpl_data[$this->default_tab . '_active'] = 'active';
$modal = new \psm\Util\Module\Modal($this->tpl, 'testEmail', \psm\Util\Module\Modal::MODAL_TYPE_OKCANCEL); $modal = new \psm\Util\Module\Modal($this->tpl, 'testEmail', \psm\Util\Module\Modal::MODAL_TYPE_OKCANCEL);
$this->addModal($modal); $this->addModal($modal);
$modal->setTitle(psm_get_lang('servers', 'send_email')); $modal->setTitle(psm_get_lang('servers', 'send_email'));
$modal->setMessage(psm_get_lang('config', 'test_email')); $modal->setMessage(psm_get_lang('config', 'test_email'));
$modal->setOKButtonLabel(psm_get_lang('config', 'send')); $modal->setOKButtonLabel(psm_get_lang('config', 'send'));
$modal = new \psm\Util\Module\Modal($this->tpl, 'testSMS', \psm\Util\Module\Modal::MODAL_TYPE_OKCANCEL); $modal = new \psm\Util\Module\Modal($this->tpl, 'testSMS', \psm\Util\Module\Modal::MODAL_TYPE_OKCANCEL);
$this->addModal($modal); $this->addModal($modal);
$modal->setTitle(psm_get_lang('servers', 'send_sms')); $modal->setTitle(psm_get_lang('servers', 'send_sms'));
$modal->setMessage(psm_get_lang('config', 'test_sms')); $modal->setMessage(psm_get_lang('config', 'test_sms'));
$modal->setOKButtonLabel(psm_get_lang('config', 'send')); $modal->setOKButtonLabel(psm_get_lang('config', 'send'));
$this->tpl->addTemplateData($this->getTemplateId(), $tpl_data); $this->tpl->addTemplateData($this->getTemplateId(), $tpl_data);
} }
@ -186,10 +186,12 @@ class ConfigController extends AbstractController {
if($changed) { if($changed) {
$this->addMessage(psm_get_lang('config', 'updated'), 'success'); $this->addMessage(psm_get_lang('config', 'updated'), 'success');
} else {
$this->addMessage(psm_get_lang('config', 'nochanges'));
} }
if(!empty($_POST['test_email'])) { if(!empty($_POST['test_email'])) {
// build mail object // build mail object
$mail = psm_build_mail(); $mail = psm_build_mail();
$message = psm_get_lang('config', 'test_message'); $message = psm_get_lang('config', 'test_message');
$mail->Subject = $message; $mail->Subject = $message;
@ -215,12 +217,10 @@ class ConfigController extends AbstractController {
$this->addMessage(psm_get_lang('config', 'sms_error'), 'error'); $this->addMessage(psm_get_lang('config', 'sms_error'), 'error');
} }
} }
} elseif(!$changed) {
$this->addMessage(psm_get_lang('config', 'nochanges'));
} }
if($clean['language'] != psm_get_conf('language')) { if($clean['language'] != psm_get_conf('language')) {
header('Location: ' . $_SERVER['REQUEST_URI']); header('Location: ' . psm_build_url(array('mod' => 'config'), true, false));
die(); die();
} }