Changeset 5963

Timestamp:

01/24/12 23:55:50 (4 months ago)

Author:

vain

Message:

• fixed iterateDir() and added more parameters for better reuse

File:

• trunk/core/viewhelper/theme.core.php (modified) (3 diffs)

trunk/core/viewhelper/theme.core.php

@@ -323 +323 @@
     {
         $themes = array();
-        
+
         $themes = array_merge(
             self::iterateDir(ROOT_THEMES_FRONTEND, 'frontend'),
@@ -332 +332 @@
     }
 
-    protected static function iterateDir($dir, $type)
+    /**
+     * Iterates over a theme dir (backend / frontend) and fetches some data.
+     *
+     * @param string $dir ROOT_THEMES_FRONTEND, ROOT_THEMES_BACKEND
+     * @param string $type 'frontend' or 'backend'
+     * @param boolean $only_index_name
+     * @return string
+     */
+    protected static function iterateDir($dir, $type, $only_index_name = true)
     {
         $dirs = '';
@@ -347 +355 @@
                 $i++;
 
-                # add fullpath
-                $themes[$i]['path'] = $dir->getPathName();
-
-                # add dirname
-                $themes[$i]['name'] = (string) $dir;
-
-                # set frontend as type
-                $themes[$i]['type']    = $type;
+                if($only_index_name === false)
+                {
+                    # add fullpath
+                    $themes[$i]['path'] = $dir->getPathName();
+
+                    # set frontend as type
+                    $themes[$i]['type']    = $type;
+
+                    # add dirname
+                    $themes[$i]['name'] = $type . DS .  (string) $dir;
+                }
+                else
+                {
+                    # add dirname
+                    $themes[$i] = $type . DS . (string) $dir;
+                }
+
+
             }
         }