[eGroupWare-svn] r55952 - in /trunk: egroupware/api/src/Framework/Bundle.php egroupware/api/src/Framework/CssIncludes.php phpgwapi/inc/min/

Author: ralfbecker
Date: Sat Apr 30 16:30:13 2016
New Revision: 55952

URL: http://svn.stylite.de/viewvc/egroupware?rev=55952&view=rev
Log:
no more dynamic minifying

Removed:
    trunk/phpgwapi/inc/min/
Modified:
    trunk/egroupware/api/src/Framework/Bundle.php
    trunk/egroupware/api/src/Framework/CssIncludes.php

Modified: trunk/egroupware/api/src/Framework/Bundle.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/src/Framework/Bundle.php?rev=55952&r1=55951&r2=55952&view=diff
==============================================================================
--- trunk/egroupware/api/src/Framework/Bundle.php (original)
+++ trunk/egroupware/api/src/Framework/Bundle.php Sat Apr 30 16:30:13 2016
@@ -133,6 +133,7 @@
 	{
 		$debug_minify = $GLOBALS['egw_info']['server']['debug_minify'] === 'True';
 		// ignore not existing minurl
+		if (!empty($minurl) && !file_exists(EGW_SERVER_ROOT.$minurl)) $minurl = null;
 		$to_include_first = $to_include = $to_minify = array();
 		$max_modified = 0;
 		$query = null;
@@ -149,7 +150,7 @@
 				$to_include_first[] = $path . '?' . $mod;
 			}
 			// for now minify does NOT support query parameters, nor php files generating javascript
-			elseif ($debug_minify || $query || substr($path, -3) != '.js')
+			elseif ($debug_minify || $query || substr($path, -3) != '.js' || empty($minurl))
 			{
 				$path .= '?'. $mod.($query ? '&'.$query : '');
 				$to_include[] = $path;
@@ -162,6 +163,8 @@
 		}
 		if (!$debug_minify && $to_minify)
 		{
+			$path = $minurl.'?'.filemtime(EGW_SERVER_ROOT.$minurl);
+			/* no more dynamic minifying
 			if (!empty($minurl) && file_exists(EGW_SERVER_ROOT.$minurl) &&
 				($mod=filemtime(EGW_SERVER_ROOT.$minurl)) >= $max_modified)
 			{
@@ -175,7 +178,7 @@
 					'f='.implode(',', $to_minify) .
 					($GLOBALS['egw_info']['server']['debug_minify'] === 'debug' ? '&debug' : '').
 					'&'.$max_modified;
-			}
+			}*/
 			// need to include minified javascript before not minified stuff like jscalendar-setup, as it might depend on it
 			array_unshift($to_include, $path);
 		}

Modified: trunk/egroupware/api/src/Framework/CssIncludes.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/src/Framework/CssIncludes.php?rev=55952&r1=55951&r2=55952&view=diff
==============================================================================
--- trunk/egroupware/api/src/Framework/CssIncludes.php (original)
+++ trunk/egroupware/api/src/Framework/CssIncludes.php Sat Apr 30 16:30:13 2016
@@ -105,7 +105,7 @@
 	{
 		// add all css files from self::includeCSS
 		$max_modified = 0;
-		$debug_minify = true;	//no more dynamic minifying: $GLOBALS['egw_info']['server']['debug_minify'] === 'True';
+		//no more dynamic minifying: $debug_minify = $GLOBALS['egw_info']['server']['debug_minify'] === 'True';
 		$base_path = $GLOBALS['egw_info']['server']['webserver_url'];
 		if ($base_path[0] != '/') $base_path = parse_url($base_path, PHP_URL_PATH);
 		$css_files = '';
@@ -117,7 +117,7 @@
 				if (($mod = filemtime(EGW_SERVER_ROOT.$file)) > $max_modified) $max_modified = $mod;
 
 				// do NOT include app.css or categories.php, as it changes from app to app
-				if ($debug_minify || substr($path, -8) == '/app.css' || substr($file,-14) == 'categories.php')
+				//no more dynamic minifying: if ($debug_minify || substr($path, -8) == '/app.css' || substr($file,-14) == 'categories.php')
 				{
 					$css_files .= '<link href="'.$GLOBALS['egw_info']['server']['webserver_url'].$path.($query ? '&' : '?').$mod.'" type="text/css" rel="StyleSheet" />'."\n";
 				}


------------------------------------------------------------------------------
Find and fix application performance issues faster with Applications Manager
Applications Manager provides deep performance insights into multiple tiers of
your business applications. It resolves application problems quickly and
reduces your MTTR. Get your free trial!
https://ad.doubleclick.net/ddm/clk/302982198;130105516;z