Changeset 10092

Timestamp:

07/03/08 15:46:16 (2 months ago)

Author:

KRavEN

Message:

moving trunk back to 0.1.0 to create tag

Files:

• plugins/sfCombineFilterPlugin/trunk/README (modified) (1 diff)
• plugins/sfCombineFilterPlugin/trunk/lib/sfCombineFilter.class.php (modified) (6 diffs)
• plugins/sfCombineFilterPlugin/trunk/package.xml (modified) (2 diffs)
• plugins/sfCombineFilterPlugin/trunk/web/combine.php (modified) (11 diffs)

plugins/sfCombineFilterPlugin/trunk/README

@@ -75 +75 @@
-
-Initial public release.
-
-=== 2007-08-02 | 0.1.1 beta ===
-
-Changes by Kiril Angov:
- - Fixes regular expression to match '^/css/'
- - Fixes issues when included files outside of root css and js directories.
- - New: Option to minify the js using JSMin.

plugins/sfCombineFilterPlugin/trunk/lib/sfCombineFilter.class.php

@@ -3 +3 @@
- * This file is part of the sfCombineFilter package.
- *
-
+ 
- * Combine.php Copyright (c) 2006 by Niels Leenheer
- *
@@ -12 +12 @@
-/**
- * This filter combines requested js and css files into a single request each.
-
+ 
- * @package      sfCombineFilter
- * @subpackage   filter
- * @author       Scott Meves <scott@stereointeractive.com>
-
+ 
- */
-class sfCombineFilter extends sfFilter
-{
-
+
-  public function execute ($filterChain)
-  {
-    $filterChain->execute();
-
+    sfLoader::loadHelpers('Asset');
+        
-    if ($this->getParameter('javascripts', true)) {
-      $this->getCombinedJavascripts();
-    }
-
+
-    if ($this->getParameter('stylesheets', true)) {
-
+  
-    }
-  }
-
+
-  protected function getCombinedJavascripts()
-  {
-
+    
-    $sf_relative_url_root = $this->getContext()->getRequest()->getRelativeUrlRoot();
-    $root_js_only = $this->getParameter('root_js_only', true);
-
+
-    $already_seen = array();
-    $combined_sources = array();
-
+
-    foreach (array('first', '', 'last') as $position)
-    {
@@ -57 +59 @@
-
-          $already_seen[$file] = 1;
-
+
-          if (is_array($options) && $this->isAbsolutePath($options))
-          {
-            continue;
-          }
-
+
-          $path = _compute_public_path($file, 'js', 'js');
-
+
-          if ((!$root_js_only && !strpos($path, '://')) || ($root_js_only && strpos($path, $sf_relative_url_root.'/js/') === 0)) {
-preg_replace("/^".str_replace('/', '\/', $sf_relative_url_root.'/js/')."/i"
+str_replace($sf_relative_url_root.'/js/'
-            $response->getParameterHolder()->remove($file, 'helper/asset/auto/javascript'.($position ? '/'.$position : ''));
-          }
@@ -72 +74 @@
-      }
-    }
-
+
-    if (count($combined_sources)) {
-      $combined_sources_str = $sf_relative_url_root . '/js/packed/' . implode(',', $combined_sources);
-      $response->addJavascript($combined_sources_str, '');
-    }
-
+
-  }
-
+
-  protected function getCombinedStylesheets()
-  {
-
+    
-    $sf_relative_url_root = $this->getContext()->getRequest()->getRelativeUrlRoot();
-    $root_css_only = $this->getParameter('root_css_only', true);
-
+
-    $already_seen = array();
-    $combined_sources = array();
-
+
-    foreach (array('first', '', 'last') as $position)
-    {
@@ -103 +105 @@
-
-          $already_seen[$file] = 1;
-
+
-          if (is_array($options) && ($this->isInvalidMediaType($options) || $this->isAbsolutePath($options)))
-          {
-            continue;
-          }
-
+
-          $path = _compute_public_path($file, 'css', 'css');
-
+
-          if ((!$root_css_only && !strpos($path, '://')) || ($root_css_only && strpos($path, $sf_relative_url_root.'/css/') === 0)) {
-preg_replace("/^".str_replace('/', '\/', $sf_relative_url_root.'/css/')."/i"
+str_replace($sf_relative_url_root.'/css/'
-            $response->getParameterHolder()->remove($file, 'helper/asset/auto/stylesheet'.($position ? '/'.$position : ''));
-          }
@@ -128 +130 @@
-    return isset($options['media']) && !in_array($options['media'], array('', 'all', 'screen'));
-  }
-
+
-  protected function isAbsolutePath($options) {
-    return isset($options['absolute']) && $options['absolute'] == true;

plugins/sfCombineFilterPlugin/trunk/package.xml

@@ -11 +11 @@
-  <active>yes</active>
- </lead>
-8-01
-23:50:02
+7-26
+11:34:37
- <version>
-1
-1
+0
+0
- </version>
- <stability>
@@ -25 +25 @@
- <contents>
-  <dir name="/">
-
-
-
-
+
+
+
-   <file md5sum="5a6e3a01bce673b38277f73dc1a8bab5" name="LICENSE" role="data" />
-  </dir>

plugins/sfCombineFilterPlugin/trunk/web/combine.php

@@ -13 +13 @@
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
-
+ 
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
@@ -25 +25 @@
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
+
-// Minor modifications by Scott Meves for use with sfCombineFilterPlugin.
-
-define('SF_ROOT_DIR',    realpath(dirname(__FILE__).'/../../..'));
-require_once(SF_ROOT_DIR.DIRECTORY_SEPARATOR.'config'.DIRECTORY_SEPARATOR.'config.php');
-
-$cache     = true;
-
-
-
-
-
-
+
+
+
-
-// Determine the directory and type we should use
@@ -45 +39 @@
-    break;
-  case 'javascript':
-
+    
-    break;
-  default:
-    header ("HTTP/1.0 503 Not Implemented");
-    exit;
-
+
+
+
-
-$type = $_GET['type'];
@@ -57 +53 @@
-  array_shift($elements);
-}
-
-// Determine last modification date of the files
-$lastmodified = 0;
-
-$files = array();
-while (list(,$element) = each($elements)) {
-
-
-
-
-
-
-
+
+
+
-  } else {
-dir.DIRECTORY_SEPARATOR.
+base . '/' . 
-  }
-
-
+
+ 
-    ($type == 'css' && substr($path, -4) != '.css')) {
-    header ("HTTP/1.0 403 Forbidden");
-
+  
-  }
-
@@ -84 +74 @@
-    exit;
-  }
-
-
+
-  $lastmodified = max($lastmodified, filemtime($path));
-}
@@ -93 +82 @@
-header ("Etag: \"" . $hash . "\"");
-
-
-
+ 
+ 
-{
-  // Return visit and no modifications, so do not send anything
-  header ("HTTP/1.0 304 Not Modified");
-  header ('Content-Length: 0');
-
-
+ 
+ 
-{
-
-  // First time visit or files were modified
-
+ 
-  {
-    // Determine supported compression method
@@ -114 +102 @@
-
-    // Check for buggy versions of Internet Explorer
-
+ 
-      preg_match('/^Mozilla\/4\.0 \(compatible; MSIE ([0-9]\.[0-9])/i', $_SERVER['HTTP_USER_AGENT'], $matches)) {
-      $version = floatval($matches[1]);
-
+
-      if ($version < 6)
-        $encoding = 'none';
-
-
+
+ 
-        $encoding = 'none';
-    }
-
+
-    // Try the cache first to see if the combined files were already generated
-
-    $cachefile = 'cache-' . $hash . '.' . $type . ($encoding != 'none' ? '.' . $encoding : '');
-
+
-    if (file_exists($cachedir . '/' . $cachefile)) {
-      if ($fp = fopen($cachedir . '/' . $cachefile, 'rb')) {
@@ -135 +123 @@
-          header ("Content-Encoding: " . $encoding);
-        }
-
+
-        header ("Content-Type: text/" . $type);
-        header ("Content-Length: " . filesize($cachedir . '/' . $cachefile));
-
+
-        fpassthru($fp);
-        fclose($fp);
@@ -149 +137 @@
-  $contents = '';
-  reset($elements);
-
+
+
+
+
+
+
+
-    $contents .= "\n\n" . file_get_contents($path);
-  }
-
-  if ($_GET['type'] == 'javascript' && $minify_js) {
-    include_once dirname(__FILE__).DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'lib'.DIRECTORY_SEPARATOR.'JSMin.class.php';
-    try {
-      $contents = JSMin::minify($contents);
-    } catch (JSMinException $e) {
-      ;
-    }
-  }
-
-
-  // Send Content-Type
-  header ("Content-Type: text/" . $type);
-
-
+
+ 
-  {
-    // Send compressed contents
@@ -174 +158 @@
-    header ('Content-Length: ' . strlen($contents));
-    echo $contents;
-
-
+ 
+ 
-  {
-    // Send regular contents
@@ -184 +168 @@
-  // Store cache
-  if ($cache) {
-
+
+
+
+
-  }
-}