aboutsummaryrefslogtreecommitdiff
path: root/app/class/controllerconnect.php
diff options
context:
space:
mode:
authorvincent-peugnet <v.peugnet@free.fr>2019-01-14 19:24:19 +0100
committervincent-peugnet <v.peugnet@free.fr>2019-01-14 19:24:19 +0100
commit8130427ec508f1d66553b52052c840c311081061 (patch)
tree23bab28db0f649618aa6bea024dcee84a9a25308 /app/class/controllerconnect.php
parenteb30a63c819ca50ebbc896eb293a0745dcd043be (diff)
downloadwcms-8130427ec508f1d66553b52052c840c311081061.tar.gz
wcms-8130427ec508f1d66553b52052c840c311081061.zip
fix save art out of session
Diffstat (limited to 'app/class/controllerconnect.php')
-rw-r--r--app/class/controllerconnect.php36
1 files changed, 19 insertions, 17 deletions
diff --git a/app/class/controllerconnect.php b/app/class/controllerconnect.php
index 2e3f976..d0e3ee5 100644
--- a/app/class/controllerconnect.php
+++ b/app/class/controllerconnect.php
@@ -6,31 +6,33 @@ class Controllerconnect extends Controller
public function log()
{
if (isset($_POST['log'])) {
- if (isset($_POST['id'])) {
- $id = $_POST['id'];
- } else {
- $id = null;
- }
+ $id = $_POST['id'] ?? null;
+ $route = $_POST['route'] ?? 'home';
if ($_POST['log'] === 'login') {
- $this->login($id);
+ $this->login($route, $id);
} elseif ($_POST['log'] === 'logout') {
- $this->logout($id);
+ $this->logout($route, $id);
}
}
-
}
public function connect()
{
- $this->showtemplate('connect', []);
+ if(isset($_SESSION['artupdate'])) {
+ $artupdate['route'] = 'artedit';
+ $artupdate['id'] = $_SESSION['artupdate']['id'];
+ } else {
+ $artupdate = [$route = 'home'];
+ }
+ $this->showtemplate('connect', $artupdate);
}
- public function login($id)
+ public function login($route, $id = null)
{
if (isset($_POST['pass'])) {
$this->user = $this->usermanager->login($_POST['pass']);
@@ -41,21 +43,21 @@ class Controllerconnect extends Controller
}
}
- if (!empty($id)) {
- $this->routedirect('artread/', ['art' => $id]);
+ if ($id !== null) {
+ $this->routedirect($route, ['art' => $id]);
} else {
- $this->routedirect('home');
+ $this->routedirect($route);
}
}
- public function logout($id)
+ public function logout($route, $id = null)
{
$this->user = $this->usermanager->logout();
$this->usermanager->writesession($this->user);
- if (!empty($id)) {
- $this->routedirect('artread/', ['art' => $id]);
+ if ($id !== null && $route !== 'home') {
+ $this->routedirect($route, ['art' => $id]);
} else {
- $this->routedirect('home');
+ $this->routedirect($route);
}
}