D3Public/daux.io
8
0
Fork 0
Code Pull Requests Releases Activity

Fix code style

Browse Source
This commit is contained in:
Stéphane Goetz 2015-08-16 22:26:00 +02:00
parent a7aff213de
commit d02ac85697
3 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libs/Tree/Builder.php
View File

@ -15,7 +15,8 @@ class Builder
'.DS_Store', 'Thumbs.db', '.DS_Store', 'Thumbs.db',
]; ];
protected static function isIgnored(\SplFileInfo $file, $ignore) { protected static function isIgnored(\SplFileInfo $file, $ignore)
{
if (in_array($file->getFilename(), static::$IGNORED)) { if (in_array($file->getFilename(), static::$IGNORED)) {
return true; return true;
} }

11
libs/Tree/Directory.php
View File

@ -59,8 +59,7 @@ class Directory extends Entry
/* /*
If the inherit_index flag is set, then we seek child content If the inherit_index flag is set, then we seek child content
*/ */
if ( if ($this->getConfig()['mode'] == Daux::LIVE_MODE
$this->getConfig()['mode'] == Daux::LIVE_MODE
&& !empty($this->getConfig()['live']['inherit_index']) && !empty($this->getConfig()['live']['inherit_index'])
&& $first_page = $this->seekFirstPage() && $first_page = $this->seekFirstPage()
) { ) {
@ -74,18 +73,18 @@ class Directory extends Entry
* Seek the first available page from descendants * Seek the first available page from descendants
* @return Content|null * @return Content|null
*/ */
public function seekFirstPage(){ public function seekFirstPage()
{
if ($this instanceof Directory) { if ($this instanceof Directory) {
$index_key = $this->getConfig()['index_key']; $index_key = $this->getConfig()['index_key'];
if (isset($this->children[$index_key])) { if (isset($this->children[$index_key])) {
return $this->children[$index_key]; return $this->children[$index_key];
} }
foreach( $this->children AS $node_key => $node ){ foreach ($this->children as $node_key => $node) {
if ($node instanceof Content) { if ($node instanceof Content) {
return $node; return $node;
} }
if( if ($node instanceof Directory
$node instanceof Directory
&& strpos($node->getUri(), '.') !== 0 && strpos($node->getUri(), '.') !== 0
&& $childNode = $node->seekFirstPage() ) { && $childNode = $node->seekFirstPage() ) {
return $childNode; return $childNode;