mirror/php-typemill
1
0
Fork 0
mirror of https://github.com/typemill/typemill.git synced 2025-08-10 16:14:20 +02:00
Code Issues Releases Wiki Activity

Version 1.2.14 Magic Table of Contents

Browse Source
This commit is contained in:
Trendschau
2019-05-17 22:09:35 +02:00
parent 34c718f2d7
commit 8c6d4db4dc
37 changed files with 582 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
system/Models/Folder.php
View File

@@ -100,9 +100,20 @@ class Folder
{
$nameParts = self::getStringParts($key);
$fileType = false;
if(array_search('index.md', $name))
{
$fileType = 'md';
}
elseif(array_search('index.txt', $name))
{
$fileType = 'txt';
}
$item->originalName = $key;
$item->elementType = 'folder';
$item->index = array_search('index.md', $name) === false ? false : true;
$item->index = $fileType;
$item->fileType = $fileType;
$item->order = count($nameParts) > 1 ? array_shift($nameParts) : NULL;
$item->name = implode(" ",$nameParts);
$item->name = iconv(mb_detect_encoding($item->name, mb_detect_order(), true), "UTF-8", $item->name);
@@ -161,6 +172,7 @@ class Folder
{
if($item->urlRel === $url)
{
# set item active, needed for move item in navigation
$item->active = true;
$result = $item;
}
@@ -314,7 +326,6 @@ class Folder
return array('structure' => $structure, 'item' => $item);
}
/* get breadcrumb as copied array, set elements active in original and mark parent element in original */
public static function getBreadcrumb($content, $searchArray, $i = NULL, $breadcrumb = NULL)
{
@@ -323,11 +334,22 @@ class Folder
while($i < count($searchArray))
{
$item = $content[$searchArray[$i]];
if($i == count($searchArray)-1)
{
$item->active = true;
}
else
{
$item->activeParent = true;
}
/*
$item->active = true;
if($i == count($searchArray)-2)
{
$item->activeParent = true;
}
*/
$copy = clone($item);
if($copy->elementType == 'folder')

7
system/Models/User.php
View File

@@ -78,11 +78,16 @@ class User extends WriteYaml
public function login($username)
{
$user = $this->getUser($username);
if($user)
{
$user['lastlogin'] = time();
unset($user['password']);
$this->updateUser($user);
$_SESSION['user'] = $user['username'];
$_SESSION['role'] = $user['userrole'];
$_SESSION['login'] = true;
$_SESSION['login'] = $user['lastlogin'];
}
}