mirror/php-typemill
1
0
Fork 0
mirror of https://github.com/typemill/typemill.git synced 2025-07-31 19:30:40 +02:00
Code Issues Releases Wiki Activity

Version 1.3.8: Roles and Rights

Browse Source
This commit is contained in:
trendschau
2020-07-16 12:53:08 +02:00
parent 18c3af69c5
commit 93afe9f845
5 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
system/Models/Folder.php
View File

@@ -69,7 +69,7 @@ class Folder
if($fileType == 'md')
{
$folderContent[] = $item;
$folderContent[] = $item;
}
if($draft === true && $fileType == 'txt')
@@ -166,7 +166,7 @@ class Folder
$item->folderContent = self::getFolderContentDetails($name, $extended, $baseUrl, $item->urlRel, $item->urlRelWoF, $item->path, $item->keyPath, $item->chapter);
}
else
elseif($name)
{
# do not use files in base folder (only folders are allowed)
# if(!isset($keyPath)) continue;

4
system/Models/User.php
View File

@@ -125,7 +125,6 @@ class User extends WriteYaml
{
$user['lastlogin'] = time();
unset($user['password']);
$this->updateUser($user);
$_SESSION['user'] = $user['username'];
$_SESSION['role'] = $user['userrole'];
@@ -139,6 +138,9 @@ class User extends WriteYaml
{
$_SESSION['lastname'] = $user['lastname'];
}
# update user last login
$this->updateUser($user);
}
}