git.shiar.nl
/
minimedit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
page: store placeholder values in $Page object
[minimedit.git]
/
login
/
post
/
index.php
diff --git
a/login/post/index.php
b/login/post/index.php
index e491e357b53c10090a8abef52ca2ab22441dc823..276848e8dfa4aeffd00d13ccbea2a60eb4affd88 100644
(file)
--- a/
login/post/index.php
+++ b/
login/post/index.php
@@
-1,7
+1,11
@@
<?php
<?php
-$body = ob_get_clean();
-
-if ($User->admin('user') and $username = @$_REQUEST['login']) {
+if (!$User->login) {
+ http_response_code(303);
+ $target = urlencode($_SERVER['REQUEST_URI']);
+ header("Location: /login?goto=$target");
+ exit;
+}
+elseif ($User->admin('user') and $username = @$_REQUEST['login']) {
try {
$user = new User("profile/$username");
}
try {
$user = new User("profile/$username");
}
@@
-9,23
+13,22
@@
if ($User->admin('user') and $username = @$_REQUEST['login']) {
printf('<p class=warn>%s</p>', $e->getMessage());
return;
}
printf('<p class=warn>%s</p>', $e->getMessage());
return;
}
- $
Article->title = $user->login . ': ' . $Articl
e->title;
+ $
Page->title = $user->login . ': ' . $Pag
e->title;
}
else {
$user = $User;
}
}
else {
$user = $User;
}
-$Place['login/name'] = $user->name ?: 'bewoner';
-$Place['user'] = $user->login;
+$P
age->p
lace['login/name'] = $user->name ?: 'bewoner';
+$P
age->p
lace['user'] = $user->login;
if ( $password = trim(@file_get_contents("{$user->dir}/.passwd")) ) {
if (substr($password, 0, 1) == '$') {
$password = NULL; // hashed
}
if ( $password = trim(@file_get_contents("{$user->dir}/.passwd")) ) {
if (substr($password, 0, 1) == '$') {
$password = NULL; // hashed
}
- $Place['pass'] = htmlspecialchars($password) ?: '<em>zelf ingesteld</em>';
+ $P
age->p
lace['pass'] = htmlspecialchars($password) ?: '<em>zelf ingesteld</em>';
}
else {
}
else {
- $Place['pass'] = '<em>onbekend</em>';
+ $P
age->p
lace['pass'] = '<em>onbekend</em>';
}
}
-print '<p class="nav right"><a href="javascript:window.print()">Print</a></p>'."\n";
-print $body;
+print '<aside class="nav"><a href="javascript:window.print()">Print</a></aside>'."\n";