From 8bcee8a976362bb2b23af6306cfcd1339380bd60 Mon Sep 17 00:00:00 2001
From: emkael <emkael@tlen.pl>
Date: Wed, 9 Mar 2016 16:14:49 +0100
Subject: * URL construction fixes
---
app/php/pages/Login.php | 7 +++++--
app/php/pages/Signup.php | 7 +++----
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/app/php/pages/Login.php b/app/php/pages/Login.php
index d7be42b..c4d33c2 100644
--- a/app/php/pages/Login.php
+++ b/app/php/pages/Login.php
@@ -6,13 +6,16 @@ class Login extends TPage {
if ($this->Page->IsValid) {
$this->Response->redirect(
$this->Application->getModule('auth')->ReturnUrl
- ?: NULL
+ ?: $this->Service->constructUrl(NULL)
);
}
}
public function validatePassword($sender, $param) {
- $param->IsValid = $this->Application->getModule('auth')->login($this->Login->Text, $this->Password->Text);
+ $param->IsValid = $this->Application->getModule('auth')->login(
+ $this->Login->Text,
+ $this->Password->Text
+ );
}
}
diff --git a/app/php/pages/Signup.php b/app/php/pages/Signup.php
index c999e65..4ee62dd 100644
--- a/app/php/pages/Signup.php
+++ b/app/php/pages/Signup.php
@@ -15,10 +15,9 @@ class Signup extends TPage {
$newUser->Password = password_hash($this->Password->Text, PASSWORD_DEFAULT);
$newUser->IsAdmin = $this->Admin->Checked;
$newUser->save();
- $this->Response->redirect($this->Request->constructUrl(
- $this->Service->ID,
- NULL
- ));
+ $this->Response->redirect(
+ $this->Service->constructUrl(NULL)
+ );
}
}
--
cgit v1.2.3