mirror/php-typemill
1
0
Fork 0
mirror of https://github.com/typemill/typemill.git synced 2025-08-04 21:27:41 +02:00
Code Issues Releases Wiki Activity

Version 1.0.3 meta-title and namespaces

Browse Source
This commit is contained in:
Sebastian
2017-11-14 22:12:30 +01:00
parent 67d2a487de
commit 91eb536520
19 changed files with 59 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
system/Controllers/Controller.php
View File

@@ -1,6 +1,6 @@
<?php
namespace System\Controllers;
namespace Typemill\Controllers;
/* Use the slim-container */
use Interop\Container\ContainerInterface;

29
system/Controllers/PageController.php
View File

@@ -1,14 +1,14 @@
<?php
namespace System\Controllers;
namespace Typemill\Controllers;
use System\Models\Folder;
use System\Models\WriteCache;
use System\Models\WriteSitemap;
use System\Models\WriteYaml;
use Typemill\Models\Folder;
use Typemill\Models\WriteCache;
use Typemill\Models\WriteSitemap;
use Typemill\Models\WriteYaml;
use \Symfony\Component\Yaml\Yaml;
use System\Models\VersionCheck;
use System\Models\Helpers;
use Typemill\Models\VersionCheck;
use Typemill\Models\Helpers;
class PageController extends Controller
{
@@ -113,9 +113,12 @@ class PageController extends Controller
$Parsedown = new \ParsedownExtra();
/* parse markdown-file to html-string */
$contentHTML = $Parsedown->text($contentMD);
$description = substr(strip_tags($contentHTML),0,150);
$description = trim(preg_replace('/\s+/', ' ', $description));
$contentHTML = $Parsedown->text($contentMD);
$excerpt = substr($contentHTML,0,200);
$excerpt = explode("</h1>", $excerpt);
$title = isset($excerpt[0]) ? strip_tags($excerpt[0]) : $settings['title'];
$description = isset($excerpt[1]) ? strip_tags($excerpt[1]) : false;
$description = $description ? trim(preg_replace('/\s+/', ' ', $description)) : false;
/*
$timer['topiccontroller']=microtime(true);
@@ -125,7 +128,7 @@ class PageController extends Controller
$route = empty($args) && $settings['startpage'] ? '/cover.twig' : '/index.twig';
$this->c->view->render($response, $route, array('navigation' => $structure, 'content' => $contentHTML, 'item' => $item, 'breadcrumb' => $breadcrumb, 'settings' => $settings, 'description' => $description, 'base_url' => $base_url ));
$this->c->view->render($response, $route, array('navigation' => $structure, 'content' => $contentHTML, 'item' => $item, 'breadcrumb' => $breadcrumb, 'settings' => $settings, 'title' => $title, 'description' => $description, 'base_url' => $base_url ));
}
protected function getCachedStructure($cache)
@@ -152,6 +155,4 @@ class PageController extends Controller
return $structure;
}
}
?>
}

8
system/Controllers/SetupController.php
View File

@@ -1,6 +1,6 @@
<?php
namespace System\Controllers;
namespace Typemill\Controllers;
use \Symfony\Component\Yaml\Yaml;
@@ -14,7 +14,7 @@ class SetupController extends Controller
$base_url = $uri->getBaseUrl();
$errors = false;
/* Check, if setting folder is */
/* Check, if setting folder is writable */
if(!is_writable($this->c->get('settings')['settingsPath'])){ $errors['folder'] = 'Your settings folder is not writable.'; }
$data = array(
@@ -133,6 +133,4 @@ class SetupController extends Controller
}
return $themes;
}
}
?>
}