Changeset 16094 for events

Timestamp:

07/22/08 21:45:24 (5 years ago)

Author:

heavenshell

Message:

Update phtmlc ver 0.5

Files:

• events/phpframework/zend_framework/trunk/library/Revulo/View/Phtmlc.php (modified) (9 diffs)

events/phpframework/zend_framework/trunk/library/Revulo/View/Phtmlc.php

@@ -16 +16 @@
  * @copyright   2008 revulo
  * @license     http://www.opensource.org/licenses/bsd-license.php  New BSD License
- * @version     Release: 0.4
+ * @version     Release: 0.5
  * @link        http://www.revulo.com/ZendFramework/Component/Phtmlc.html
  */
@@ -28 +28 @@
 
     /**
-     * Flag to compile template fragments into one phtml file
+     * Compile template fragments into one phtml file
      * @var     boolean
      */
@@ -84 +84 @@
 
     /**
+     * Sets the flag to compile template fragments into one phtml file.
+     *
+     * @param   boolean $flag
+     * @return  Revulo_View_Phtmlc
+     */
+    public function compileFragments($flag = true)
+    {
+        $this->_compileFragments = ($flag) ? true : false;
+        return $this;
+    }
+
+    /**
      * Sets the directory path to compiled view scripts.
      *
@@ -91 +103 @@
     public function setCompilePath($path)
     {
-        $path = rtrim($path, '/\\') . DIRECTORY_SEPARATOR;
+        $path = rtrim($path, '/\\');
         if (is_dir($path) && is_writable($path)) {
             $this->_compilePath = $path;
@@ -100 +112 @@
 
     /**
-     * Sets the flag to compile template fragments into one phtml file.
-     *
-     * @param   boolean $flag
-     * @return  Revulo_View_Phtmlc
-     */
-    public function compileFragments($flag = true)
-    {
-        $this->_compileFragments = ($flag) ? true : false;
-        return $this;
+     * Returns the directory path to compiled view scripts.
+     *
+     * @param   string  $path   Directory path to the view script
+     * @return  string
+     */
+    protected function _getCompilePath($path)
+    {
+        if (isset($this->_compilePath)) {
+            if (class_exists('Zend_Controller_Front', false)) {
+                $module = Zend_Controller_Front::getInstance()->getRequest()->getModuleName();
+                return $this->_compilePath . DIRECTORY_SEPARATOR . $module;
+            } else {
+                return $this->_compilePath;
+            }
+        } else {
+            return $this->_getDefaultCompilePath($path);
+        }
     }
 
@@ -119 +139 @@
     protected function _getDefaultCompilePath($path)
     {
-        return dirname($path) . DIRECTORY_SEPARATOR . 'compile' . DIRECTORY_SEPARATOR;
+        return dirname($path) . DIRECTORY_SEPARATOR . 'compile';
     }
 
@@ -143 +163 @@
 
         $filename = substr($filename, strlen($dir));
-
-        if (isset($this->_compilePath)) {
-            return $this->_compilePath . $filename;
-        } else {
-            return $this->_getDefaultCompilePath($dir) . $filename;
-        }
+        return $this->_getCompilePath($dir) . DIRECTORY_SEPARATOR . $filename;
     }
 
@@ -162 +177 @@
     protected function _read($filename)
     {
-        $buffer = trim(file_get_contents($filename));
+        $buffer = file_get_contents($filename);
 
         if ($this->_compileFragments === true) {
@@ -202 +217 @@
         }
 
-        $pattern     = '/<\?=\s*(.*?)[;\s]*\?>/';
+        $pattern     = '/<\?=\s*(.*?)[;\s]*\?>/s';
         $replacement = '<?php echo ' . $escape . ' ?>';
         return preg_replace($pattern, $replacement, $buffer);