@@ -21,7 +21,7 @@ |
||
21 | 21 | { |
22 | 22 | /** |
23 | 23 | * @var \SplFileInfo $this |
24 | - */ |
|
24 | + */ |
|
25 | 25 | $ext = Registry::get('Phile_Settings')['content_ext']; |
26 | 26 | return (preg_match('/^[^\.]{1}.*' . $ext . '/', $this->getFilename()) > 0); |
27 | 27 | } |
@@ -23,6 +23,6 @@ |
||
23 | 23 | * @var \SplFileInfo $this |
24 | 24 | */ |
25 | 25 | $ext = Registry::get('Phile_Settings')['content_ext']; |
26 | - return (preg_match('/^[^\.]{1}.*' . $ext . '/', $this->getFilename()) > 0); |
|
26 | + return (preg_match('/^[^\.]{1}.*'.$ext.'/', $this->getFilename()) > 0); |
|
27 | 27 | } |
28 | 28 | } |
@@ -84,12 +84,12 @@ discard block |
||
84 | 84 | defined('PHILE_VERSION') || define('PHILE_VERSION', '1.8.0'); |
85 | 85 | defined('PHILE_CLI_MODE') || define('PHILE_CLI_MODE', (php_sapi_name() === 'cli')); |
86 | 86 | defined('DS') || define('DS', DIRECTORY_SEPARATOR); |
87 | - defined('ROOT_DIR') || define('ROOT_DIR', realpath(__DIR__ . DS . '..' . DS . '..' . DS) . DS); |
|
88 | - defined('LIB_DIR') || define('LIB_DIR', ROOT_DIR . 'lib' . DS); |
|
89 | - defined('PLUGINS_DIR') || define('PLUGINS_DIR', ROOT_DIR . 'plugins' . DS); |
|
90 | - defined('THEMES_DIR') || define('THEMES_DIR', ROOT_DIR . 'themes' . DS); |
|
91 | - defined('CACHE_DIR') || define('CACHE_DIR', LIB_DIR . 'cache' . DS); |
|
92 | - defined('STORAGE_DIR') || define('STORAGE_DIR', LIB_DIR . 'datastorage' . DS); |
|
87 | + defined('ROOT_DIR') || define('ROOT_DIR', realpath(__DIR__.DS.'..'.DS.'..'.DS).DS); |
|
88 | + defined('LIB_DIR') || define('LIB_DIR', ROOT_DIR.'lib'.DS); |
|
89 | + defined('PLUGINS_DIR') || define('PLUGINS_DIR', ROOT_DIR.'plugins'.DS); |
|
90 | + defined('THEMES_DIR') || define('THEMES_DIR', ROOT_DIR.'themes'.DS); |
|
91 | + defined('CACHE_DIR') || define('CACHE_DIR', LIB_DIR.'cache'.DS); |
|
92 | + defined('STORAGE_DIR') || define('STORAGE_DIR', LIB_DIR.'datastorage'.DS); |
|
93 | 93 | } |
94 | 94 | |
95 | 95 | /** |
@@ -100,8 +100,8 @@ discard block |
||
100 | 100 | spl_autoload_extensions(".php"); |
101 | 101 | // load phile core |
102 | 102 | spl_autoload_register( |
103 | - function ($className) { |
|
104 | - $fileName = LIB_DIR . str_replace("\\", DS, $className) . '.php'; |
|
103 | + function($className) { |
|
104 | + $fileName = LIB_DIR.str_replace("\\", DS, $className).'.php'; |
|
105 | 105 | if (file_exists($fileName)) { |
106 | 106 | include_once $fileName; |
107 | 107 | } |
@@ -110,7 +110,7 @@ discard block |
||
110 | 110 | // load phile plugins |
111 | 111 | spl_autoload_register('\Phile\Plugin\PluginRepository::autoload'); |
112 | 112 | |
113 | - include LIB_DIR . 'vendor' . DS . 'autoload.php'; |
|
113 | + include LIB_DIR.'vendor'.DS.'autoload.php'; |
|
114 | 114 | } |
115 | 115 | |
116 | 116 | /** |
@@ -118,8 +118,8 @@ discard block |
||
118 | 118 | */ |
119 | 119 | protected function initializeConfiguration() |
120 | 120 | { |
121 | - $defaults = Utility::load(ROOT_DIR . 'default_config.php'); |
|
122 | - $localSettings = Utility::load(ROOT_DIR . 'config.php'); |
|
121 | + $defaults = Utility::load(ROOT_DIR.'default_config.php'); |
|
122 | + $localSettings = Utility::load(ROOT_DIR.'config.php'); |
|
123 | 123 | if (is_array($localSettings)) { |
124 | 124 | $this->settings = array_replace_recursive($defaults, $localSettings); |
125 | 125 | } else { |
@@ -68,7 +68,7 @@ |
||
68 | 68 | /** |
69 | 69 | * content directory |
70 | 70 | */ |
71 | -$config['content_dir'] = ROOT_DIR . 'content' . DS; |
|
71 | +$config['content_dir'] = ROOT_DIR.'content'.DS; |
|
72 | 72 | |
73 | 73 | /** |
74 | 74 | * extension of content files |