SeaCMS/pico
3
0
Fork 0
Code Issues Pull Requests Activity

Various small improvements

Browse Source
This commit is contained in:
Daniel Rudolf 2016-12-06 19:03:58 +01:00
parent 7a6e4f8271
commit 5cf47e65de
No known key found for this signature in database
GPG Key ID: A061F02CD8DE4538
4 changed files with 31 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/AbstractPicoPlugin.php
View File

@ -238,7 +238,7 @@ abstract class AbstractPicoPlugin implements PicoPluginInterface
protected function checkDependants($recursive) protected function checkDependants($recursive)
{ {
$dependants = $this->getDependants(); $dependants = $this->getDependants();
if (!empty($dependants)) { if ($dependants) {
if ($recursive) { if ($recursive) {
foreach ($this->getDependants() as $pluginName => $plugin) { foreach ($this->getDependants() as $pluginName => $plugin) {
if ($plugin->isEnabled()) { if ($plugin->isEnabled()) {

46
lib/Pico.php
View File

@ -295,6 +295,11 @@ class Pico
*/ */
public function run() public function run()
{ {
// check lock
if ($this->locked) {
throw new LogicException('You cannot run the same Pico instance multiple times');
}
// lock Pico // lock Pico
$this->locked = true; $this->locked = true;
@ -378,7 +383,7 @@ class Pico
// render template // render template
$this->twigVariables = $this->getTwigVariables(); $this->twigVariables = $this->getTwigVariables();
if (isset($this->meta['template']) && $this->meta['template']) { if (!empty($this->meta['template'])) {
$templateName = $this->meta['template']; $templateName = $this->meta['template'];
} else { } else {
$templateName = 'index'; $templateName = 'index';
@ -639,6 +644,7 @@ class Pico
'base_url' => '', 'base_url' => '',
'rewrite_url' => null, 'rewrite_url' => null,
'theme' => 'default', 'theme' => 'default',
'theme_url' => '',
'date_format' => '%D %T', 'date_format' => '%D %T',
'twig_config' => array('cache' => false, 'autoescape' => false, 'debug' => false), 'twig_config' => array('cache' => false, 'autoescape' => false, 'debug' => false),
'pages_order_by' => 'alpha', 'pages_order_by' => 'alpha',
@ -648,7 +654,7 @@ class Pico
'timezone' => '' 'timezone' => ''
); );
if (empty($this->config['base_url'])) { if (!$this->config['base_url']) {
$this->config['base_url'] = $this->getBaseUrl(); $this->config['base_url'] = $this->getBaseUrl();
} else { } else {
$this->config['base_url'] = rtrim($this->config['base_url'], '/') . '/'; $this->config['base_url'] = rtrim($this->config['base_url'], '/') . '/';
@ -658,7 +664,7 @@ class Pico
$this->config['rewrite_url'] = $this->isUrlRewritingEnabled(); $this->config['rewrite_url'] = $this->isUrlRewritingEnabled();
} }
if (empty($this->config['content_dir'])) { if (!$this->config['content_dir']) {
// try to guess the content directory // try to guess the content directory
if (is_dir($this->getRootDir() . 'content')) { if (is_dir($this->getRootDir() . 'content')) {
$this->config['content_dir'] = $this->getRootDir() . 'content/'; $this->config['content_dir'] = $this->getRootDir() . 'content/';
@ -669,7 +675,7 @@ class Pico
$this->config['content_dir'] = $this->getAbsolutePath($this->config['content_dir']); $this->config['content_dir'] = $this->getAbsolutePath($this->config['content_dir']);
} }
if (empty($this->config['theme_url'])) { if (!$this->config['theme_url']) {
$this->config['theme_url'] = $this->getBaseThemeUrl(); $this->config['theme_url'] = $this->getBaseThemeUrl();
} elseif (preg_match('#^[A-Za-z][A-Za-z0-9+\-.]*://#', $this->config['theme_url'])) { } elseif (preg_match('#^[A-Za-z][A-Za-z0-9+\-.]*://#', $this->config['theme_url'])) {
$this->config['theme_url'] = rtrim($this->config['theme_url'], '/') . '/'; $this->config['theme_url'] = rtrim($this->config['theme_url'], '/') . '/';
@ -677,7 +683,7 @@ class Pico
$this->config['theme_url'] = $this->getBaseUrl() . rtrim($this->config['theme_url'], '/') . '/'; $this->config['theme_url'] = $this->getBaseUrl() . rtrim($this->config['theme_url'], '/') . '/';
} }
if (empty($this->config['timezone'])) { if (!$this->config['timezone']) {
// explicitly set a default timezone to prevent a E_NOTICE // explicitly set a default timezone to prevent a E_NOTICE
// when no timezone is set; the `date_default_timezone_get()` // when no timezone is set; the `date_default_timezone_get()`
// function always returns a timezone, at least UTC // function always returns a timezone, at least UTC
@ -774,7 +780,7 @@ class Pico
{ {
// use QUERY_STRING; e.g. /pico/?sub/page // use QUERY_STRING; e.g. /pico/?sub/page
$pathComponent = isset($_SERVER['QUERY_STRING']) ? $_SERVER['QUERY_STRING'] : ''; $pathComponent = isset($_SERVER['QUERY_STRING']) ? $_SERVER['QUERY_STRING'] : '';
if (!empty($pathComponent)) { if ($pathComponent) {
$pathComponent = strstr($pathComponent, '&', true) ?: $pathComponent; $pathComponent = strstr($pathComponent, '&', true) ?: $pathComponent;
if (strpos($pathComponent, '=') === false) { if (strpos($pathComponent, '=') === false) {
$this->requestUrl = trim(rawurldecode($pathComponent), '/'); $this->requestUrl = trim(rawurldecode($pathComponent), '/');
@ -786,8 +792,8 @@ class Pico
$basePath = dirname($_SERVER['SCRIPT_NAME']) . '/'; $basePath = dirname($_SERVER['SCRIPT_NAME']) . '/';
$basePathLength = strlen($basePath); $basePathLength = strlen($basePath);
$requestUri = $_SERVER['REQUEST_URI']; $requestUri = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '';
if (substr($requestUri, 0, $basePathLength) === $basePath) { if ($requestUri && (substr($requestUri, 0, $basePathLength) === $basePath)) {
$requestUri = substr($requestUri, $basePathLength); $requestUri = substr($requestUri, $basePathLength);
$requestUri = strstr($requestUri, '?', true) ?: $requestUri; $requestUri = strstr($requestUri, '?', true) ?: $requestUri;
$this->requestUrl = rtrim(rawurldecode($requestUri), '/'); $this->requestUrl = rtrim(rawurldecode($requestUri), '/');
@ -825,7 +831,7 @@ class Pico
$contentDir = $this->getConfig('content_dir'); $contentDir = $this->getConfig('content_dir');
$contentExt = $this->getConfig('content_ext'); $contentExt = $this->getConfig('content_ext');
if (empty($requestUrl)) { if (!$requestUrl) {
return $contentDir . 'index' . $contentExt; return $contentDir . 'index' . $contentExt;
} else { } else {
// prevent content_dir breakouts // prevent content_dir breakouts
@ -844,7 +850,7 @@ class Pico
$requestFileParts[] = $requestUrlPart; $requestFileParts[] = $requestUrlPart;
} }
if (empty($requestFileParts)) { if (!$requestFileParts) {
return $contentDir . 'index' . $contentExt; return $contentDir . 'index' . $contentExt;
} }
@ -1041,7 +1047,7 @@ class Pico
} }
$meta['date_formatted'] = utf8_encode(strftime($this->getConfig('date_format'), $meta['time'])); $meta['date_formatted'] = utf8_encode(strftime($this->getConfig('date_format'), $meta['time']));
} else { } else {
$meta['time'] = $meta['date_formatted'] = ''; $meta['date'] = $meta['time'] = $meta['date_formatted'] = '';
} }
} else { } else {
// guarantee array key existance // guarantee array key existance
@ -1125,7 +1131,7 @@ class Pico
$variables['%theme_url%'] = $this->getBaseThemeUrl() . $this->getConfig('theme'); $variables['%theme_url%'] = $this->getBaseThemeUrl() . $this->getConfig('theme');
// replace %meta.*% // replace %meta.*%
if (!empty($meta)) { if ($meta) {
foreach ($meta as $metaKey => $metaValue) { foreach ($meta as $metaKey => $metaValue) {
if (is_scalar($metaValue) || ($metaValue === null)) { if (is_scalar($metaValue) || ($metaValue === null)) {
$variables['%meta.' . $metaKey . '%'] = strval($metaValue); $variables['%meta.' . $metaKey . '%'] = strval($metaValue);
@ -1483,7 +1489,7 @@ class Pico
public function getBaseUrl() public function getBaseUrl()
{ {
$baseUrl = $this->getConfig('base_url'); $baseUrl = $this->getConfig('base_url');
if (!empty($baseUrl)) { if ($baseUrl) {
return $baseUrl; return $baseUrl;
} }
@ -1555,11 +1561,11 @@ class Pico
} }
} }
if (!empty($queryData)) { if ($queryData) {
$queryData = ($this->isUrlRewritingEnabled() || empty($page)) ? '?' . $queryData : '&' . $queryData; $queryData = ($this->isUrlRewritingEnabled() || !$page) ? '?' . $queryData : '&' . $queryData;
} }
if (empty($page)) { if (!$page) {
return $this->getBaseUrl() . $queryData; return $this->getBaseUrl() . $queryData;
} elseif (!$this->isUrlRewritingEnabled()) { } elseif (!$this->isUrlRewritingEnabled()) {
return $this->getBaseUrl() . '?' . rawurlencode($page) . $queryData; return $this->getBaseUrl() . '?' . rawurlencode($page) . $queryData;
@ -1587,7 +1593,7 @@ class Pico
public function getBaseThemeUrl() public function getBaseThemeUrl()
{ {
$themeUrl = $this->getConfig('theme_url'); $themeUrl = $this->getConfig('theme_url');
if (!empty($themeUrl)) { if ($themeUrl) {
return $themeUrl; return $themeUrl;
} }
@ -1708,7 +1714,7 @@ class Pico
return $defaultValue; return $defaultValue;
} }
$filter = !empty($filter) ? (is_string($filter) ? filter_id($filter) : (int) $filter) : false; $filter = $filter ? (is_string($filter) ? filter_id($filter) : (int) $filter) : false;
if (!$filter) { if (!$filter) {
return false; return false;
} }
@ -1762,7 +1768,7 @@ class Pico
if (is_dir($directory . '/' . $file)) { if (is_dir($directory . '/' . $file)) {
// get files recursively // get files recursively
$result = array_merge($result, $this->getFiles($directory . '/' . $file, $fileExtension, $order)); $result = array_merge($result, $this->getFiles($directory . '/' . $file, $fileExtension, $order));
} elseif (empty($fileExtension) || (substr($file, -$fileExtensionLength) === $fileExtension)) { } elseif (!$fileExtension || (substr($file, -$fileExtensionLength) === $fileExtension)) {
$result[] = $directory . '/' . $file; $result[] = $directory . '/' . $file;
} }
} }
@ -1809,7 +1815,7 @@ class Pico
*/ */
public function triggerEvent($eventName, array $params = array()) public function triggerEvent($eventName, array $params = array())
{ {
if (!empty($this->plugins)) { if ($this->plugins) {
foreach ($this->plugins as $plugin) { foreach ($this->plugins as $plugin) {
// only trigger events for plugins that implement PicoPluginInterface // only trigger events for plugins that implement PicoPluginInterface
// deprecated events (plugins for Pico 0.9 and older) will be triggered by `PicoDeprecated` // deprecated events (plugins for Pico 0.9 and older) will be triggered by `PicoDeprecated`

2
lib/PicoTwigExtension.php
View File

@ -196,7 +196,7 @@ class PicoTwigExtension extends Twig_Extension
*/ */
public static function getKeyOfVar($var, $keyPath) public static function getKeyOfVar($var, $keyPath)
{ {
if (empty($keyPath)) { if (!$keyPath) {
return null; return null;
} elseif (!is_array($keyPath)) { } elseif (!is_array($keyPath)) {
$keyPath = array($keyPath); $keyPath = array($keyPath);

2
plugins/00-PicoDeprecated.php
View File

@ -66,7 +66,7 @@ class PicoDeprecated extends AbstractPicoPlugin
*/ */
public function onPluginsLoaded(array &$plugins) public function onPluginsLoaded(array &$plugins)
{ {
if (!empty($plugins)) { if ($plugins) {
foreach ($plugins as $plugin) { foreach ($plugins as $plugin) {
if (!($plugin instanceof PicoPluginInterface)) { if (!($plugin instanceof PicoPluginInterface)) {
// the plugin doesn't implement PicoPluginInterface; it uses deprecated events // the plugin doesn't implement PicoPluginInterface; it uses deprecated events