From 329321644a4c997124d60b5bd2660cad00a22c0f Mon Sep 17 00:00:00 2001 From: Manuel Cillero Date: Sat, 5 Aug 2017 00:43:16 +0200 Subject: [PATCH] New version 6.x-1.11 for Advanced CSS/JS Aggregation module --- install/CHANGELOG.txt | 2 +- sites/all/modules/advagg/README.txt | 4 +- sites/all/modules/advagg/advagg.admin.inc | 27 +- sites/all/modules/advagg/advagg.info | 6 +- sites/all/modules/advagg/advagg.install | 8 +- sites/all/modules/advagg/advagg.module | 214 +++++++++-- .../advagg/advagg_bundler/advagg_bundler.info | 6 +- .../advagg_bundler/advagg_bundler.install | 88 ++++- .../advagg_bundler/advagg_bundler.module | 119 +++++- .../advagg_css_compress.info | 6 +- .../advagg_css_compress.module | 12 +- .../advagg/advagg_css_compress/yui/CSSMin.inc | 348 +++++++++++++----- .../advagg_css_compress/yui/Compressor.inc | 249 ------------- .../advagg/advagg_js_cdn/advagg_js_cdn.info | 6 +- .../advagg/advagg_js_cdn/advagg_js_cdn.module | 24 +- .../advagg_js_compress.info | 6 +- .../advagg_js_compress.module | 23 +- 17 files changed, 734 insertions(+), 414 deletions(-) delete mode 100644 sites/all/modules/advagg/advagg_css_compress/yui/Compressor.inc diff --git a/install/CHANGELOG.txt b/install/CHANGELOG.txt index b870969..2dce367 100644 --- a/install/CHANGELOG.txt +++ b/install/CHANGELOG.txt @@ -4,7 +4,7 @@ SuiteDesk 0.1.0, 2017-07-24 * Based on Drupal 6.38 - Final release (2016-02-24) * Main modules: Advanced CSS/JS Aggregation - + Advanced CSS/JS Aggregation 6.x-1.9 + + Advanced CSS/JS Aggregation 6.x-1.11 CCK + CCK 6.x-3.0-alpha4 diff --git a/sites/all/modules/advagg/README.txt b/sites/all/modules/advagg/README.txt index b3ef0fb..10f632b 100644 --- a/sites/all/modules/advagg/README.txt +++ b/sites/all/modules/advagg/README.txt @@ -364,9 +364,9 @@ http://drupal.org/node/1116618 ### location ~* files/advagg_(?:css|js)/ { access_log off; + gzip_static on; expires max; add_header ETag ""; - add_header Cache-Control "max-age=290304000, no-transform, public"; - add_header Last-Modified "Wed, 20 Jan 1988 04:20:42 GMT"; + add_header Cache-Control "max-age=31449600, no-transform, public"; try_files $uri @drupal; } diff --git a/sites/all/modules/advagg/advagg.admin.inc b/sites/all/modules/advagg/advagg.admin.inc index 489d977..fd273d6 100644 --- a/sites/all/modules/advagg/advagg.admin.inc +++ b/sites/all/modules/advagg/advagg.admin.inc @@ -163,10 +163,15 @@ function advagg_admin_info_form() { $filepath = $css_path . '/css_missing' . mt_rand() . time() . '_0.css'; $url = _advagg_build_url($filepath); + $htauth_user = variable_get('advagg_async_test_username', ''); + $htauth_pass = variable_get('advagg_async_test_password', ''); $headers = array( 'Host' => $_SERVER['HTTP_HOST'], 'Connection' => 'close', ); + if ($htauth_user && $htauth_pass) { + $headers['Authorization'] = 'Basic ' . base64_encode($htauth_user . ':' . $htauth_pass); + } timer_start(__FUNCTION__ . 'local'); $data_local = drupal_http_request($url, $headers); @@ -240,6 +245,21 @@ function advagg_admin_settings_form() { ), )), ); + $form['advagg_async_test'] = array( + '#type' => 'fieldset', + '#title' => t('Async Test HTTP Basic Credentials'), + '#collapsed' => TRUE, + '#collapsible' => TRUE, + ); + $form['advagg_async_test']['advagg_async_test_username'] = array( + '#type' => 'textfield', + '#title' => t('Username'), + '#default_value' => variable_get('advagg_async_test_username', ''), + ); + $form['advagg_async_test']['advagg_async_test_password'] = array( + '#type' => 'password', + '#title' => t('Password'), + ); $form['advagg_gzip_compression'] = array( '#type' => 'checkbox', '#title' => t('Gzip CSS/JS files'), @@ -266,7 +286,7 @@ function advagg_admin_settings_form() { '#field_prefix' => '
' . t('You are using a private file system. You must serve aggregated files via a public folder.') . '
', '#title' => t('Use a different directory for storing advagg files'), '#default_value' => variable_get('advagg_custom_files_dir', ADVAGG_CUSTOM_FILES_DIR), - '#description' => check_plain(t('You need to create a publicly writable directory (same permissions as Drupals files folder).') . ' ' . $extra . ' ' . t('If you do not need this, you can put a space in this box.')), + '#description' => check_plain(t('You need to create a publicly writable directory (same permissions as Drupals files folder) and it needs to be relative to the Drupal index.php file.') . ' ' . $extra . ' ' . t('If you do not need this, you can put a space in this box.')), '#required' => TRUE, ); } @@ -452,6 +472,11 @@ function advagg_admin_settings_form_validate($form, &$form_state) { function advagg_admin_settings_form_submit($form, &$form_state) { global $conf; + // Pull the old password if it wasn't changed by the user. + if (!empty($form_state['values']['advagg_async_test_username']) && empty($form_state['values']['advagg_async_test_password'])) { + $form_state['values']['advagg_async_test_password'] = variable_get('advagg_async_test_password', ''); + } + // Gzip & htaccess checks. list($css_path, $js_path) = advagg_get_root_files_dir(); $css_path .= '/.htaccess'; diff --git a/sites/all/modules/advagg/advagg.info b/sites/all/modules/advagg/advagg.info index 41ca1d3..074ad6b 100644 --- a/sites/all/modules/advagg/advagg.info +++ b/sites/all/modules/advagg/advagg.info @@ -3,9 +3,9 @@ description = Aggregates multiple CSS/JS files, serves them with gzip encoding a package = Advanced CSS/JS Aggregation core = 6.x -; Information added by drupal.org packaging script on 2012-06-25 -version = "6.x-1.9" +; Information added by Drupal.org packaging script on 2017-03-18 +version = "6.x-1.11" core = "6.x" project = "advagg" -datestamp = "1340665277" +datestamp = "1489800488" diff --git a/sites/all/modules/advagg/advagg.install b/sites/all/modules/advagg/advagg.install index c77b80e..60c648e 100644 --- a/sites/all/modules/advagg/advagg.install +++ b/sites/all/modules/advagg/advagg.install @@ -326,10 +326,16 @@ function advagg_check_missing_handler() { // Setup request list($css_path, $js_path) = advagg_get_root_files_dir(); $url = _advagg_build_url($css_path . $filepath . '.css'); + $htauth_user = variable_get('advagg_async_test_username', ''); + $htauth_pass = variable_get('advagg_async_test_password', ''); $headers = array( 'Host' => $_SERVER['HTTP_HOST'], 'Connection' => 'close', ); + if ($htauth_user && $htauth_pass) { + $headers['Authorization'] = 'Basic ' . base64_encode($htauth_user . ':' . $htauth_pass); + } + // Check that the menu router handler is working. If it's not working the rest // of the tests are pointless. @@ -898,7 +904,7 @@ function advagg_update_6108() { af.filetype FROM {advagg_bundles} AS ab INNER JOIN {advagg_files} AS af USING ( filename_md5 ) - GROUP BY bundle_md5"); + GROUP BY bundle_md5 , ab.counter, af.filetype"); while ($row = db_fetch_array($results)) { $filename = advagg_build_filename($row['filetype'], $row['bundle_md5'], $row['counter']); if ($row['filetype'] == 'css') { diff --git a/sites/all/modules/advagg/advagg.module b/sites/all/modules/advagg/advagg.module index 6478e28..4597bb3 100644 --- a/sites/all/modules/advagg/advagg.module +++ b/sites/all/modules/advagg/advagg.module @@ -101,6 +101,11 @@ define('ADVAGG_CLOSURE', TRUE); */ define('ADVAGG_STRICT_JS_BUNDLES', TRUE); +/** + * Default value for how long the request can go before php times out. + */ +define('ADVAGG_SET_TIME_LIMIT', 240); + /** * Default mode for aggregate creation. * @@ -359,6 +364,10 @@ function advagg_init() { $conf['advagg_use_full_cache'] = FALSE; } + // Include the ctools_ajax_run_page_preprocess() function. + if (function_exists('ctools_include')) { + ctools_include('ajax'); + } // Disable ctools_ajax_page_preprocess() if this functionality is available. if (variable_get('advagg_enabled', ADVAGG_ENABLED) && function_exists('ctools_ajax_run_page_preprocess')) { ctools_ajax_run_page_preprocess(FALSE); @@ -438,8 +447,9 @@ function advagg_get_root_files_dir($reset = FALSE) { $custom_path = variable_get('advagg_custom_files_dir', ADVAGG_CUSTOM_FILES_DIR); } if (empty($custom_path)) { - $css_path = file_create_path('advagg_css'); - $js_path = file_create_path('advagg_js'); + $file_path = file_directory_path(); + $css_path = file_create_path($file_path . '/advagg_css'); + $js_path = file_create_path($file_path . '/advagg_js'); return array($css_path, $js_path); } file_check_directory($custom_path, FILE_CREATE_DIRECTORY); @@ -967,7 +977,7 @@ function advagg_get_filename($files, $filetype, $counter = FALSE, $bundle_md5 = $counters[$key] = $values['bundle_md5']; } } - $result = advagg_db_multi_select_in('advagg_bundles', 'bundle_md5', "'%s'", $counters, array('counter', 'bundle_md5'), 'GROUP BY bundle_md5'); + $result = advagg_db_multi_select_in('advagg_bundles', 'bundle_md5', "'%s'", $counters, array('counter', 'bundle_md5'), 'GROUP BY bundle_md5, counter'); while ($row = db_fetch_array($result)) { $key = array_search($row['bundle_md5'], $counters); if (empty($filenames[$key]['counter']) && $filenames[$key]['counter'] !== 0) { @@ -1414,7 +1424,34 @@ function advagg_file_copy(&$source, $dest = 0, $replace = FILE_EXISTS_RENAME) { return FALSE; } - if (!@copy($source, $dest)) { + // Perform the replace operation. Since there could be multiple processes + // writing to the same file, the best option is to create a temporary file in + // the same directory and then rename it to the destination. A temporary file + // is needed if the directory is mounted on a separate machine; thus ensuring + // the rename command stays local. + $result = FALSE; + if ($replace == FILE_EXISTS_REPLACE) { + // Get a temporary filename in the destination directory. + $temporary_file = tempnam(dirname($dest), 'file'); + // Place contents in the temporary file. + if ($temporary_file && @copy($source, $temporary_file)) { + if (!$result = @rename($temporary_file, $dest)) { + // Unlink and try again for windows. Rename on windows does not replace + // the file if it already exists. + @unlink($dest); + $result = @rename($temporary_file, $dest); + } + // Remove temporary_file if rename failed. + if (!$result) { + @unlink($temporary_file); + } + } + } + // Perform the copy operation. + else { + $result = @copy($source, $dest); + } + if ($result === FALSE) { drupal_set_message(t('The selected file %file could not be copied. ' . $dest, array('%file' => $source)), 'error'); return 0; } @@ -1462,7 +1499,7 @@ function advagg_checksum($filename) { } } } - elseif ($mode = 'md5') { + elseif ($mode == 'md5') { $checksum = md5(file_get_contents($filename)); } } @@ -1560,7 +1597,7 @@ function advagg_get_bundle_from_filename($filename) { function advagg_flush_caches() { // Try to allocate enough time to flush the cache if (function_exists('set_time_limit')) { - @set_time_limit(240); + @set_time_limit(variable_get('advagg_set_time_limit', ADVAGG_SET_TIME_LIMIT)); } global $_advagg; @@ -1779,7 +1816,7 @@ function advagg_build_uri($path) { } // Use the patched version of file_create_url(). else { - $path = file_create_url($path); + $path = advagg_file_create_url($path); } // Return here if the path was changed above. if (strcmp($original_path, $path) != 0) { @@ -1793,7 +1830,7 @@ function advagg_build_uri($path) { $hook_file_url_alter = module_implements('file_url_alter'); } if (!empty($hook_file_url_alter)) { - $path = file_create_url($path); + $path = advagg_file_create_url($path); // Return here if the path was changed above. if (strcmp($original_path, $path) != 0) { return $path; @@ -1804,6 +1841,63 @@ function advagg_build_uri($path) { return base_path() . $path; } +/** + * Create the download path to a file. + * + * There are two kinds of local files: + * - "created files", i.e. those in the files directory (which is stored in + * the file_directory_path variable and can be retrieved using + * file_directory_path()). These are files that have either been uploaded by + * users or were generated automatically (for example through CSS + * aggregation). + * - "shipped files", i.e. those outside of the files directory, which ship as + * part of Drupal core or contributed modules or themes. + * + * @param $path + * A string containing the Drupal path (i.e. path relative to the Drupal + * root directory) of the file to generate the URL for. + * @return + * A string containing a URL that can be used to download the file. + */ +function advagg_file_create_url($path) { + // Clean up Windows paths. + $old_path = $path = str_replace('\\', '/', $path); + + drupal_alter('file_url', $path); + + // If any module has altered the path, then return the alteration. + if ($path != $old_path) { + return $path; + } + + // Otherwise serve the file from Drupal's web server. This point will only + // be reached when either no custom_file_url_rewrite() function has been + // defined, or when that function returned FALSE, thereby indicating that it + // cannot (or doesn't wish to) rewrite the URL. This is typically because + // the file doesn't match some conditions to be served from a CDN or static + // file server, or because the file has not yet been synced to the CDN or + // static file server. + + // Shipped files. + if (strpos($path, file_directory_path() . '/') !== 0) { + return base_path() . $path; + } + // Created files. + else { + switch (variable_get('file_downloads', FILE_DOWNLOADS_PUBLIC)) { + case FILE_DOWNLOADS_PUBLIC: + return $GLOBALS['base_url'] . '/' . $path; + case FILE_DOWNLOADS_PRIVATE: + // Strip file_directory_path from $path. Private downloads' URLs are + // rewritten to be served relatively to system/files (which is a menu + // callback that streams the file) instead of relatively to the file + // directory path. + $path = file_directory_strip($path); + return url('system/files/' . $path, array('absolute' => TRUE)); + } + } +} + /** * ***MODIFIED CORE FUNCTIONS BELOW*** * @@ -2066,7 +2160,7 @@ function advagg_process_css($css = NULL, $noagg = FALSE) { $files = array(); foreach ($types as $type) { foreach ($type as $file => $cache) { - if ($cache) { + if ($cache && advagg_file_exists($file)) { $files[] = $file; $files_included[$media][$file] = TRUE; unset($files_aggregates_included[$file]); @@ -2664,9 +2758,9 @@ function advagg_css_js_file_builder($type, $files, $query_string = '', $counter // Only generate once. $lock_name = 'advagg_' . $filename; - if (!lock_acquire($lock_name)) { + if (!lock_acquire($lock_name) && !$force) { if (variable_get('advagg_aggregate_mode', ADVAGG_AGGREGATE_MODE) == 0 ) { - $locks[] = array($lock_name => $filepath); + $locks[$lock_name] = $filepath; $output[$filepath] = array( 'prefix' => $prefix, 'suffix' => $suffix, @@ -2771,15 +2865,32 @@ function advagg_css_js_file_builder($type, $files, $query_string = '', $counter * string containing all the files. */ function advagg_build_css_bundle($files) { - $data = ''; + // Check if CSS compression is enabled. + if (module_exists('advagg_css') && (variable_get('advagg_css_compress_agg_files', ADVAGG_CSS_COMPRESS_AGG_FILES) || variable_get('advagg_css_compress_inline', ADVAGG_CSS_COMPRESS_INLINE))) { + $optimize = FALSE; + } + else { + $optimize = TRUE; + } + // Build aggregate CSS file. + $data = ''; foreach ($files as $file) { - $contents = drupal_load_stylesheet($file, TRUE); - // Return the path to where this CSS file originated from. - $base = base_path() . dirname($file) . '/'; - _drupal_build_css_path(NULL, $base); - // Prefix all paths within this CSS file, ignoring external and absolute paths. - $data .= preg_replace_callback('/url\([\'"]?(?![a-z]+:|\/+)([^\'")]+)[\'"]?\)/i', '_drupal_build_css_path', $contents); + $contents = advagg_drupal_load_stylesheet($file, $optimize); + + // Build the base URL of this CSS file: start with the full URL. + $css_base_url = advagg_file_create_url($file); + // Move to the parent. + $css_base_url = substr($css_base_url, 0, strrpos($css_base_url, '/')); + // Simplify to a relative URL if the stylesheet URL starts with the + // base URL of the website. + if (substr($css_base_url, 0, strlen($GLOBALS['base_root'])) == $GLOBALS['base_root']) { + $css_base_url = substr($css_base_url, strlen($GLOBALS['base_root'])); + } + + _drupal_build_css_path(NULL, $css_base_url . '/'); + // Anchor all paths in the CSS with its base URL, ignoring external and absolute paths. + $data .= preg_replace_callback('/url\(\s*[\'"]?(?![a-z]+:|\/+)([^\'")]+)[\'"]?\s*\)/i', '_drupal_build_css_path', $contents); } // Per the W3C specification at http://www.w3.org/TR/REC-CSS2/cascade.html#at-import, @@ -2806,9 +2917,10 @@ function advagg_build_js_bundle($files) { $data = ''; // Build aggregate JS file. foreach ($files as $file) { - // Append a ';' and a newline after each JS file to prevent them from running together. + // Append a ';', '/**/', and a newline after each JS file to prevent them + // from running together. if (advagg_file_exists($file)) { - $data .= file_get_contents($file) . ";\n"; + $data .= @file_get_contents($file) . ";/**/\n"; } } return $data; @@ -3013,14 +3125,26 @@ function advagg_add_css_inline($data = NULL, $media = 'all', $prefix = NULL, $su * We use HTML-safe strings, i.e. with <, > and & escaped. */ function advagg_drupal_to_js($var) { + // Different versions of PHP handle json_encode() differently. + static $php550; static $php530; + if (!isset($php550)) { + $php550 = version_compare(PHP_VERSION, '5.5.0', '>='); + } if (!isset($php530)) { $php530 = version_compare(PHP_VERSION, '5.3.0', '>='); } // json_encode on PHP prior to PHP 5.3.0 doesn't support options. if ($php530) { - return json_encode($var, JSON_HEX_QUOT | JSON_HEX_TAG | JSON_HEX_AMP | JSON_HEX_APOS); + // Default json encode options. + $options = JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_AMP | JSON_HEX_QUOT; + if ($php550) { + // Output partial json if PHP >= 5.5.0. + $options |= JSON_PARTIAL_OUTPUT_ON_ERROR; + } + // Encode to JSON. + return @json_encode($var, $options); } // if json_encode exists, use it. @@ -3197,6 +3321,54 @@ function _advagg_drupal_load_stylesheet($matches) { return preg_replace('/url\(\s*([\'"]?)(?![a-z]+:|\/+)/i', 'url(\1' . $directory, $file); } +/** + * Loads the stylesheet and resolves all @import commands. + * + * Loads a stylesheet and replaces @import commands with the contents of the + * imported file. Use this instead of file_get_contents when processing + * stylesheets. + * + * The returned contents are compressed removing white space and comments only + * when CSS aggregation is enabled. This optimization will not apply for + * color.module enabled themes with CSS aggregation turned off. + * + * @param $file + * Name of the stylesheet to be processed. + * @param $optimize + * Defines if CSS contents should be compressed or not. + * @param $reset_basepath + * Used internally to facilitate recursive resolution of @import commands. + * + * @return + * Contents of the stylesheet, including any resolved @import commands. + */ +function advagg_drupal_load_stylesheet($file, $optimize = NULL, $reset_basepath = TRUE) { + // These statics are not cache variables, so we don't use drupal_static(). + static $_optimize, $basepath; + if ($reset_basepath) { + $basepath = ''; + } + // Store the value of $optimize for preg_replace_callback with nested + // @import loops. + if (isset($optimize)) { + $_optimize = $optimize; + } + // Stylesheets are relative one to each other. Start by adding a base path + // prefix provided by the parent stylesheet (if necessary). + if ($basepath && !file_uri_scheme($file)) { + $file = $basepath . '/' . $file; + } + $basepath = dirname($file); + // Load the CSS stylesheet. We suppress errors because themes may specify + // stylesheets in their .info file that don't exist in the theme's path, + // but are merely there to disable certain module CSS files. + if ($contents = @file_get_contents($file)) { + // Return the processed stylesheet. + return advagg_drupal_load_stylesheet_content($contents, $_optimize); + } + return ''; +} + /** * Perform an HTTP request; does not wait for reply & you will never get it * back. diff --git a/sites/all/modules/advagg/advagg_bundler/advagg_bundler.info b/sites/all/modules/advagg/advagg_bundler/advagg_bundler.info index 3942358..c5a2a40 100644 --- a/sites/all/modules/advagg/advagg_bundler/advagg_bundler.info +++ b/sites/all/modules/advagg/advagg_bundler/advagg_bundler.info @@ -4,9 +4,9 @@ package = Advanced CSS/JS Aggregation core = 6.x dependencies[] = advagg -; Information added by drupal.org packaging script on 2012-06-25 -version = "6.x-1.9" +; Information added by Drupal.org packaging script on 2017-03-18 +version = "6.x-1.11" core = "6.x" project = "advagg" -datestamp = "1340665277" +datestamp = "1489800488" diff --git a/sites/all/modules/advagg/advagg_bundler/advagg_bundler.install b/sites/all/modules/advagg/advagg_bundler/advagg_bundler.install index ad8c182..6574cd7 100644 --- a/sites/all/modules/advagg/advagg_bundler/advagg_bundler.install +++ b/sites/all/modules/advagg/advagg_bundler/advagg_bundler.install @@ -6,7 +6,14 @@ */ /** - * Implementation of hook_enable(). + * Implements hook_install(). + */ +function advagg_bundler_install() { + drupal_install_schema('advagg_bundler'); +} + +/** + * Implements hook_enable(). */ function advagg_bundler_enable() { // Flush advagg caches. @@ -17,7 +24,7 @@ function advagg_bundler_enable() { } /** - * Implementation of hook_disable(). + * Implements hook_disable(). */ function advagg_bundler_disable() { // Flush advagg caches. @@ -36,6 +43,8 @@ function advagg_bundler_uninstall() { variable_del('advagg_bundler_max_css'); variable_del('advagg_bundler_max_js'); variable_del('advagg_bundler_active'); + + drupal_uninstall_schema('advagg_bundler'); } /** @@ -50,3 +59,78 @@ function advagg_bundler_requirements($phase) { } return $requirements; } + +/** + * Implements hook_schema(). + */ +function advagg_bundler_schema() { + $schema['advagg_bundler_selector_count'] = array( + 'description' => 'Keep track of when the files were modified.', + 'fields' => array( + 'filename' => array( + 'description' => 'Path of the file relative to Drupal webroot.', + 'type' => 'text', + 'size' => 'normal', + 'not null' => TRUE, + ), + 'filename_md5' => array( + 'description' => 'MD5 hash of filename', + 'type' => 'varchar', + 'length' => 32, + 'not null' => TRUE, + 'default' => '', + ), + 'selector_count' => array( + 'description' => 'CSS selector count of the file.', + 'type' => 'int', + 'not null' => TRUE, + ), + 'timestamp' => array( + 'description' => 'Last modified timestamp of the file.', + 'type' => 'int', + 'not null' => TRUE, + ), + ), + 'primary key' => array('filename_md5'), + ); + + return $schema; +} + +/** + * Create new database table {advagg_bundler_selector_count}. + */ +function advagg_bundler_update_6100() { + $schema['advagg_bundler_selector_count'] = array( + 'description' => 'Keep track of when the files were modified.', + 'fields' => array( + 'filename' => array( + 'description' => 'Path of the file relative to Drupal webroot.', + 'type' => 'text', + 'size' => 'normal', + 'not null' => TRUE, + ), + 'filename_md5' => array( + 'description' => 'MD5 hash of filename', + 'type' => 'varchar', + 'length' => 32, + 'not null' => TRUE, + 'default' => '', + ), + 'selector_count' => array( + 'description' => 'CSS selector count of the file.', + 'type' => 'int', + 'not null' => TRUE, + ), + 'timestamp' => array( + 'description' => 'Last modified timestamp of the file.', + 'type' => 'int', + 'not null' => TRUE, + ), + ), + 'primary key' => array('filename_md5'), + ); + $ret = array(); + db_create_table($ret, 'advagg_bundler_selector_count', $schema['advagg_bundler_selector_count']); + return $ret; +} diff --git a/sites/all/modules/advagg/advagg_bundler/advagg_bundler.module b/sites/all/modules/advagg/advagg_bundler/advagg_bundler.module index 6d74a0b..bd83c4a 100644 --- a/sites/all/modules/advagg/advagg_bundler/advagg_bundler.module +++ b/sites/all/modules/advagg/advagg_bundler/advagg_bundler.module @@ -30,6 +30,11 @@ define('ADVAGG_BUNDLER_OUTDATED', 1209600); */ define('ADVAGG_BUNDLER_ACTIVE', TRUE); +/** + * CSS selector limit in a single stylesheet on IE9 and below. + */ +define('SELECTOR_SPLIT_VALUE', 4095); + /** * Implementation of hook_menu */ @@ -58,7 +63,6 @@ function advagg_bundler_advagg_filenames_alter(&$filenames) { // Get max number of sub aggregates to create. $max_css = variable_get('advagg_bundler_max_css', ADVAGG_BUNDLER_MAX_CSS); $max_js = variable_get('advagg_bundler_max_js', ADVAGG_BUNDLER_MAX_JS); - $schema = advagg_get_server_schema(); $output = array(); foreach ($filenames as $values) { @@ -66,7 +70,7 @@ function advagg_bundler_advagg_filenames_alter(&$filenames) { $filetype = $values['filetype']; $files = $values['files']; $bundle_md5 = $values['bundle_md5']; - $cached_data_key = 'bundler_' . $schema . '_' . $bundle_md5; + $cached_data_key = 'bundler_' . $bundle_md5; // Try cache first; cache table is cache_advagg_bundle_reuse. $cached_data = advagg_cached_bundle_get($cached_data_key, 'advagg_bundler_filenames_alter'); @@ -131,7 +135,7 @@ function advagg_bundler_advagg_filenames_alter(&$filenames) { // Make sure we didn't go over the max; if we did merge the smallest bundles // together. - advagg_bundler_merge($groupings, $max); + advagg_bundler_merge($groupings, $max, $filetype); // If only one group then don't do any more processing. The merge algorithm // could have reduce the groupings down to one. @@ -146,7 +150,7 @@ function advagg_bundler_advagg_filenames_alter(&$filenames) { $data = array(); foreach ($groupings as $bundle) { $values['files'] = $bundle; - $values['bundle_md5'] = md5($schema . implode('', $bundle)); + $values['bundle_md5'] = md5(implode('', $bundle)); $data[] = $values; $output[] = $values; } @@ -196,7 +200,7 @@ function advagg_bundler_analysis($filename = '', $force = FALSE) { filename FROM ( SELECT - LPAD(CAST(COUNT(*) AS char(8)), 8, '0') AS count, + LPAD(COUNT(*), 8, '00000000') AS count, bundle_md5, filename_md5 FROM @@ -252,7 +256,7 @@ function advagg_bundler_analysis($filename = '', $force = FALSE) { * @param $max * max number of grouping */ -function advagg_bundler_merge(&$groupings, $max) { +function advagg_bundler_merge(&$groupings, $max, $filetype) { $group_count = count($groupings); if (!empty($max)) { @@ -304,9 +308,7 @@ function advagg_bundler_merge(&$groupings, $max) { } } -// watchdog('debug', $first . "
\n" . $last . "
\n" . str_replace(' ', '    ', nl2br(htmlentities(print_r(array($groupings, $map, $counts), TRUE))))); - - // Create the new merged set + // Create the new merged set. $a = $groupings[$first]; $b = $groupings[$last]; $new_set = array_merge($a, $b); @@ -374,6 +376,101 @@ function advagg_bundler_merge(&$groupings, $max) { $groupings[$merge_candidate_key] = $new_set; } - // Output Debugging info to watchdog. - // watchdog('debug', str_replace(' ', '    ', nl2br(htmlentities(print_r($groupings, TRUE))))); + // Prevent CSS selectors exceeding 4095 due to limits with IE9 and below. + if ($filetype == 'css') { + + // Check each group to see if it exceeds the selector limit. + do { + $groupings_edited = FALSE; + foreach ($groupings as $key => $group) { + + // Restart the selector limit check if the grouping was edited. + if ($groupings_edited) { + break; + } + + $group_selector_counter = 0; + + $selector_counts = advagg_bundler_get_css_selector_count($group); + + for ($i = 0; $i < count($group) && !$groupings_edited; $i++) { + + $selector_count = isset($selector_counts[$group[$i]]) ? $selector_counts[$group[$i]] : 0; + + if ($group_selector_counter + $selector_count > SELECTOR_SPLIT_VALUE) { + $groupings_edited = TRUE; + + // Divide the group. + $first_group = array_splice($group, 0, $i); + $second_group = array_splice($group, 0); + + // Rebuild the array with the new set in the correct place. + $new_groupings = array(); + foreach ($groupings as $k => $files) { + if ($k == $key) { + $new_groupings[$k . '_1'] = $first_group; + $new_groupings[$k . '_2'] = $second_group; + } + else { + $new_groupings[$k] = $files; + } + } + $groupings = $new_groupings; + } + else { + $group_selector_counter += $selector_count; + } + } + } + } while ($groupings_edited); + } +} + +/** + * Gets the selector count of the provided files. + * + * @param array $files + * Array of files to use. + * + * @return array + * The selector counts of each file. + */ +function advagg_bundler_get_css_selector_count($files) { + $results = array(); + $placeholders = db_placeholders($files); + $result = db_query("SELECT filename, selector_count, timestamp FROM {advagg_bundler_selector_count} WHERE filename IN ($placeholders)", $files); + + while ($row = db_fetch_array($result)) { + $modified = 0; + if (is_readable($row['filename'])) { + $modified = filemtime($row['filename']); + } + if ($modified > $row['timestamp']) { + $css = advagg_build_css_bundle(array($row['filename']), TRUE); + + // Get the number of selectors. + // http://stackoverflow.com/questions/12567000/regex-matching-for-counting-css-selectors/12567381#12567381 + $selector_count = preg_match_all('/\{.+?\}|,/s', $css, $matched); + + db_query("UPDATE {advagg_bundler_selector_count} SET timestamp = %d, selector_count = %d WHERE filename LIKE '%s'", $modified, $selector_count, $row['filename']); + + $results[$row['filename']] = $selector_count; + } + else { + $results[$row['filename']] = $row['selector_count']; + } + } + + foreach ($files as $file) { + if (!isset($results[$file]) && file_exists($file)) { + $css = advagg_build_css_bundle(array($file), TRUE); + $selector_count = preg_match_all('/\{.+?\}|,/s', $css, $matched); + + db_query("INSERT INTO {advagg_bundler_selector_count} VALUES('%s', '%s', %d, %d)", $file, md5($file), $selector_count, filemtime($file)); + + $results[$file] = $selector_count; + } + } + + return $results; } diff --git a/sites/all/modules/advagg/advagg_css_compress/advagg_css_compress.info b/sites/all/modules/advagg/advagg_css_compress/advagg_css_compress.info index 30331ce..e1bf719 100644 --- a/sites/all/modules/advagg/advagg_css_compress/advagg_css_compress.info +++ b/sites/all/modules/advagg/advagg_css_compress/advagg_css_compress.info @@ -5,9 +5,9 @@ core = 6.x dependencies[] = advagg php = 5.0 -; Information added by drupal.org packaging script on 2012-06-25 -version = "6.x-1.9" +; Information added by Drupal.org packaging script on 2017-03-18 +version = "6.x-1.11" core = "6.x" project = "advagg" -datestamp = "1340665277" +datestamp = "1489800488" diff --git a/sites/all/modules/advagg/advagg_css_compress/advagg_css_compress.module b/sites/all/modules/advagg/advagg_css_compress/advagg_css_compress.module index d9b1869..e31153a 100644 --- a/sites/all/modules/advagg/advagg_css_compress/advagg_css_compress.module +++ b/sites/all/modules/advagg/advagg_css_compress/advagg_css_compress.module @@ -124,7 +124,7 @@ function advagg_css_compress_css_tidy(&$contents) { // Try to allocate enough time to run CSSTidy. if (function_exists('set_time_limit')) { - @set_time_limit(240); + @set_time_limit(variable_get('advagg_set_time_limit', ADVAGG_SET_TIME_LIMIT)); } // Set configuration. @@ -163,18 +163,12 @@ function advagg_css_compress_css_compressor(&$contents) { * Use the CSSmin library from YUI to compress the CSS. */ function advagg_css_compress_yui_cssmin(&$contents) { - // Include CSS_Compressor from Stephen Clay. -// $filename = drupal_get_path('module', 'advagg_css_compress') . '/yui/Compressor.inc'; -// include_once($filename); -// $contents = preg_replace('/@charset[^;]+;\\s*/', '', $contents); -// $contents = Minify_CSS_Compressor::process($contents); - // Include CSSmin from YUI. $filename = drupal_get_path('module', 'advagg_css_compress') . '/yui/CSSMin.inc'; include_once($filename); $cssmin = new CSSmin(); - // Create a new line after 4k of text. - $contents = trim($cssmin->run($contents, 4096)); + // Compress the CSS splitting lines after 4k of text + $contents = $cssmin->run($contents, 4096); } diff --git a/sites/all/modules/advagg/advagg_css_compress/yui/CSSMin.inc b/sites/all/modules/advagg/advagg_css_compress/yui/CSSMin.inc index aad6b23..d4caa45 100644 --- a/sites/all/modules/advagg/advagg_css_compress/yui/CSSMin.inc +++ b/sites/all/modules/advagg/advagg_css_compress/yui/CSSMin.inc @@ -23,18 +23,32 @@ class CSSmin { + const NL = '___YUICSSMIN_PRESERVED_NL___'; + const TOKEN = '___YUICSSMIN_PRESERVED_TOKEN_'; + const COMMENT = '___YUICSSMIN_PRESERVE_CANDIDATE_COMMENT_'; + const CLASSCOLON = '___YUICSSMIN_PSEUDOCLASSCOLON___'; + private $comments; private $preserved_tokens; + private $memory_limit; + private $max_execution_time; + private $pcre_backtrack_limit; + private $pcre_recursion_limit; + private $raise_php_limits; /** - * @param bool $raisePhpSettingsLimits if true, raisePhpSettingLimits() will - * be called. + * @param bool|int $raise_php_limits + * If true, PHP settings will be raised if needed */ - public function __construct($raisePhpSettingsLimits = true) + public function __construct($raise_php_limits = TRUE) { - if ($raisePhpSettingsLimits) { - $this->raisePhpSettingLimits(); - } + // Set suggested PHP limits + $this->memory_limit = 128 * 1048576; // 128MB in bytes + $this->max_execution_time = 60; // 1 min + $this->pcre_backtrack_limit = 1000 * 1000; + $this->pcre_recursion_limit = 500 * 1000; + + $this->raise_php_limits = (bool) $raise_php_limits; } /** @@ -43,8 +57,16 @@ class CSSmin * @param int|bool $linebreak_pos * @return string */ - public function run($css, $linebreak_pos = FALSE) + public function run($css = '', $linebreak_pos = FALSE) { + if (empty($css)) { + return ''; + } + + if ($this->raise_php_limits) { + $this->do_raise_php_limits(); + } + $this->comments = array(); $this->preserved_tokens = array(); @@ -59,20 +81,23 @@ class CSSmin if ($end_index < 0) { $end_index = $length; } - $this->comments[] = $this->str_slice($css, $start_index + 2, $end_index); - $css = $this->str_slice($css, 0, $start_index + 2) . '___YUICSSMIN_PRESERVE_CANDIDATE_COMMENT_' . (count($this->comments) - 1) . '___' . $this->str_slice($css, $end_index); - $start_index += 2; + $comment_found = $this->str_slice($css, $start_index + 2, $end_index); + $this->comments[] = $comment_found; + $comment_preserve_string = self::COMMENT . (count($this->comments) - 1) . '___'; + $css = $this->str_slice($css, 0, $start_index + 2) . $comment_preserve_string . $this->str_slice($css, $end_index); + // Set correct start_index: Fixes issue #2528130 + $start_index = $end_index + 2 + strlen($comment_preserve_string) - strlen($comment_found); } // preserve strings so their content doesn't get accidentally minified - $css = preg_replace_callback('/(?:"(?:[^\\\\"]|\\\\.|\\\\)*")|'."(?:'(?:[^\\\\']|\\\\.|\\\\)*')/", array($this, 'callback_one'), $css); - + $css = preg_replace_callback('/(?:"(?:[^\\\\"]|\\\\.|\\\\)*")|'."(?:'(?:[^\\\\']|\\\\.|\\\\)*')/S", array($this, 'replace_string'), $css); // Let's divide css code in chunks of 25.000 chars aprox. - // Reason: PHP's PCRE functions like preg_replace have a "backtrack limit" of 100.000 chars by default (php < 5.3.7) - // so if we're dealing with really long strings and a (sub)pattern matches a number of chars greater than - // the backtrack limit number (i.e. /(.*)/s) PCRE functions may fail silently returning NULL and - // $css would be empty. + // Reason: PHP's PCRE functions like preg_replace have a "backtrack limit" + // of 100.000 chars by default (php < 5.3.7) so if we're dealing with really + // long strings and a (sub)pattern matches a number of chars greater than + // the backtrack limit number (i.e. /(.*)/s) PCRE functions may fail silently + // returning NULL and $css would be empty. $charset = ''; $charset_regexp = '/@charset [^;]+;/i'; $css_chunks = array(); @@ -110,45 +135,74 @@ class CSSmin // Minify each chunk for ($i = 0, $n = count($css_chunks); $i < $n; $i++) { $css_chunks[$i] = $this->minify($css_chunks[$i], $linebreak_pos); - // If there is a @charset in a css chunk... + // Keep the first @charset at-rule found if (empty($charset) && preg_match($charset_regexp, $css_chunks[$i], $matches)) { - // delete all of them no matter the chunk - $css_chunks[$i] = preg_replace($charset_regexp, '', $css_chunks[$i]); $charset = $matches[0]; } + // Delete all @charset at-rules + $css_chunks[$i] = preg_replace($charset_regexp, '', $css_chunks[$i]); } - // Update the first chunk and put the charset to the top of the file. + // Update the first chunk and push the charset to the top of the file. $css_chunks[0] = $charset . $css_chunks[0]; return implode('', $css_chunks); } /** - * Get the minimum PHP setting values suggested for CSSmin - * @return array + * Sets the memory limit for this script + * @param int|string $limit */ - public function getSuggestedPhpLimits() + public function set_memory_limit($limit) { - return array( - 'memory_limit' => '128M', - 'pcre.backtrack_limit' => 1000 * 1000, - 'pcre.recursion_limit' => 500 * 1000, - ); + $this->memory_limit = $this->normalize_int($limit); } /** - * Configure PHP to use at least the suggested minimum settings - * - * @todo Move this functionality to separate class. + * Sets the maximum execution time for this script + * @param int|string $seconds */ - public function raisePhpSettingLimits() + public function set_max_execution_time($seconds) { - foreach ($this->getSuggestedPhpLimits() as $key => $val) { - $current = $this->normalizeInt(ini_get($key)); - $suggested = $this->normalizeInt($val); - if ($current < $suggested) { - ini_set($key, $val); + $this->max_execution_time = (int) $seconds; + } + + /** + * Sets the PCRE backtrack limit for this script + * @param int $limit + */ + public function set_pcre_backtrack_limit($limit) + { + $this->pcre_backtrack_limit = (int) $limit; + } + + /** + * Sets the PCRE recursion limit for this script + * @param int $limit + */ + public function set_pcre_recursion_limit($limit) + { + $this->pcre_recursion_limit = (int) $limit; + } + + /** + * Try to configure PHP to use at least the suggested minimum settings + */ + private function do_raise_php_limits() + { + $php_limits = array( + 'memory_limit' => $this->memory_limit, + 'max_execution_time' => $this->max_execution_time, + 'pcre.backtrack_limit' => $this->pcre_backtrack_limit, + 'pcre.recursion_limit' => $this->pcre_recursion_limit + ); + + // If current settings are higher respect them. + foreach ($php_limits as $name => $suggested) { + $current = $this->normalize_int(ini_get($name)); + // memory_limit exception: allow -1 for "no memory limit". + if ($current > -1 && ($suggested == -1 || $current < $suggested)) { + ini_set($name, $suggested); } } } @@ -165,13 +219,17 @@ class CSSmin for ($i = 0, $max = count($this->comments); $i < $max; $i++) { $token = $this->comments[$i]; - $placeholder = '/___YUICSSMIN_PRESERVE_CANDIDATE_COMMENT_' . $i . '___/'; + $placeholder = '/' . self::COMMENT . $i . '___/'; // ! in the first position of the comment means preserve // so push to the preserved tokens keeping the ! if (substr($token, 0, 1) === '!') { $this->preserved_tokens[] = $token; - $css = preg_replace($placeholder, '___YUICSSMIN_PRESERVED_TOKEN_' . (count($this->preserved_tokens) - 1) . '___', $css, 1); + $token_tring = self::TOKEN . (count($this->preserved_tokens) - 1) . '___'; + $css = preg_replace($placeholder, $token_tring, $css, 1); + // Preserve new lines for /*! important comments + $css = preg_replace('/\s*[\n\r\f]+\s*(\/\*'. $token_tring .')/S', self::NL.'$1', $css); + $css = preg_replace('/('. $token_tring .'\*\/)\s*[\n\r\f]+\s*/S', '$1'.self::NL, $css); continue; } @@ -179,10 +237,10 @@ class CSSmin // shorten that to /*\*/ and the next one to /**/ if (substr($token, (strlen($token) - 1), 1) === '\\') { $this->preserved_tokens[] = '\\'; - $css = preg_replace($placeholder, '___YUICSSMIN_PRESERVED_TOKEN_' . (count($this->preserved_tokens) - 1) . '___', $css, 1); + $css = preg_replace($placeholder, self::TOKEN . (count($this->preserved_tokens) - 1) . '___', $css, 1); $i = $i + 1; // attn: advancing the loop $this->preserved_tokens[] = ''; - $css = preg_replace('/___YUICSSMIN_PRESERVE_CANDIDATE_COMMENT_' . $i . '___/', '___YUICSSMIN_PRESERVED_TOKEN_' . (count($this->preserved_tokens) - 1) . '___', $css, 1); + $css = preg_replace('/' . self::COMMENT . $i . '___/', self::TOKEN . (count($this->preserved_tokens) - 1) . '___', $css, 1); continue; } @@ -193,7 +251,7 @@ class CSSmin if ($start_index > 2) { if (substr($css, $start_index - 3, 1) === '>') { $this->preserved_tokens[] = ''; - $css = preg_replace($placeholder, '___YUICSSMIN_PRESERVED_TOKEN_' . (count($this->preserved_tokens) - 1) . '___', $css, 1); + $css = preg_replace($placeholder, self::TOKEN . (count($this->preserved_tokens) - 1) . '___', $css, 1); } } } @@ -206,16 +264,36 @@ class CSSmin // Normalize all whitespace strings to single spaces. Easier to work with that way. $css = preg_replace('/\s+/', ' ', $css); + // Shorten & preserve calculations calc(...) since spaces are important + $css = preg_replace_callback('/calc(\((?:[^\(\)]+|(?1))*\))/i', array($this, 'replace_calc'), $css); + + // Replace positive sign from numbers preceded by : or a white-space before the leading space is removed + // +1.2em to 1.2em, +.8px to .8px, +2% to 2% + $css = preg_replace('/((? -9.0 to -9 + $css = preg_replace('/((?\+\(\)\],])/', '$1', $css); - $css = preg_replace('/___YUICSSMIN_PSEUDOCLASSCOLON___/', ':', $css); + $css = preg_replace_callback('/(?:^|\})(?:(?:[^\{\:])+\:)+(?:[^\{]*\{)/', array($this, 'replace_colon'), $css); + $css = preg_replace('/\s+([\!\{\}\;\:\>\+\(\)\]\~\=,])/', '$1', $css); + $css = preg_replace('/' . self::CLASSCOLON . '/', ':', $css); // retain space for special IE6 cases - $css = preg_replace('/\:first\-(line|letter)(\{|,)/', ':first-$1 $2', $css); + $css = preg_replace('/\:first\-(line|letter)(\{|,)/i', ':first-$1 $2', $css); // no space after the end of a preserved comment $css = preg_replace('/\*\/ /', '*/', $css); @@ -225,41 +303,47 @@ class CSSmin $css = preg_replace('/\band\(/i', 'and (', $css); // Remove the spaces after the things that should not have spaces after them. - $css = preg_replace('/([\!\{\}\:;\>\+\(\[,])\s+/', '$1', $css); + $css = preg_replace('/([\!\{\}\:;\>\+\(\[\~\=,])\s+/S', '$1', $css); // remove unnecessary semicolons $css = preg_replace('/;+\}/', '}', $css); - // Replace 0(px,em,%) with 0. - $css = preg_replace('/([\s\:])(0)(?:px|em|%|in|cm|mm|pc|pt|ex)/i', '$1$2', $css); + // Fix for issue: #2528146 + // Restore semicolon if the last property is prefixed with a `*` (lte IE7 hack) + // to avoid issues on Symbian S60 3.x browsers. + $css = preg_replace('/(\*[a-z0-9\-]+\s*\:[^;\}]+)(\})/', '$1;$2', $css); - // Replace 0 0 0 0; with 0. - $css = preg_replace('/\:0 0 0 0(;|\})/', ':0$1', $css); - $css = preg_replace('/\:0 0 0(;|\})/', ':0$1', $css); - $css = preg_replace('/\:0 0(;|\})/', ':0$1', $css); + // Replace 0 length units 0(px,em,%) with 0. + $css = preg_replace('/((?compress_hex_colors($css); - // border: none -> border:0 - $css = preg_replace_callback('/(border|border\-top|border\-right|border\-bottom|border\-right|outline|background)\:none(;|\})/i', array($this, 'callback_five'), $css); + // border: none to border:0, outline: none to outline:0 + $css = preg_replace('/(border\-?(?:top|right|bottom|left|)|outline)\:none(;|\})/ieS', "strtolower('$1:0$2')", $css); // shorter opacity IE filter $css = preg_replace('/progid\:DXImageTransform\.Microsoft\.Alpha\(Opacity\=/i', 'alpha(opacity=', $css); // Remove empty rules. - $css = preg_replace('/[^\};\{\/]+\{\}/', '', $css); + $css = preg_replace('/[^\};\{\/]+\{\}/S', '', $css); // Some source control tools don't like it when files containing lines longer // than, say 8000 characters, are checked in. The linebreak option is used in @@ -280,15 +364,16 @@ class CSSmin // See SF bug #1980989 $css = preg_replace('/;;+/', ';', $css); + // Restore new lines for /*! important comments + $css = preg_replace('/'. self::NL .'/', "\n", $css); + // restore preserved comments and strings for ($i = 0, $max = count($this->preserved_tokens); $i < $max; $i++) { - $css = preg_replace('/___YUICSSMIN_PRESERVED_TOKEN_' . $i . '___/', $this->preserved_tokens[$i], $css, 1); + $css = preg_replace('/' . self::TOKEN . $i . '___/', $this->preserved_tokens[$i], $css, 1); } // Trim the final string (for any leading or trailing white spaces) - $css = preg_replace('/^\s+|\s+$/', '', $css); - - return $css; + return trim($css); } /** @@ -305,7 +390,7 @@ class CSSmin $max_index = strlen($css) - 1; $append_index = $index = $last_index = $offset = 0; $sb = array(); - $pattern = '/url\(\s*(["\']?)data\:/'; + $pattern = '/url\(\s*(["\']?)data\:/i'; // Since we need to account for non-base64 data urls, we need to handle // ' and ) being part of the data string. Hence switching to indexOf, @@ -344,7 +429,7 @@ class CSSmin $token = preg_replace('/\s+/', '', $token); $this->preserved_tokens[] = $token; - $preserver = 'url(___YUICSSMIN_PRESERVED_TOKEN_' . (count($this->preserved_tokens) - 1) . '___)'; + $preserver = 'url(' . self::TOKEN . (count($this->preserved_tokens) - 1) . '___)'; $sb[] = $preserver; $append_index = $end_index + 1; @@ -363,7 +448,7 @@ class CSSmin } /** - * Utility method to compress hex color values of the form #AABBCC to #ABC. + * Utility method to compress hex color values of the form #AABBCC to #ABC or short color name. * * DOES NOT compress CSS ID selectors which match the above pattern (which would break things). * e.g. #AddressForm { ... } @@ -380,9 +465,21 @@ class CSSmin private function compress_hex_colors($css) { // Look for hex colors inside { ... } (to avoid IDs) and which don't have a =, or a " in front of them (to avoid filters) - $pattern = '/(\=\s*?["\']?)?#([0-9a-f])([0-9a-f])([0-9a-f])([0-9a-f])([0-9a-f])([0-9a-f])(\}|[^0-9a-f{][^{]*?\})/i'; + $pattern = '/(\=\s*?["\']?)?#([0-9a-f])([0-9a-f])([0-9a-f])([0-9a-f])([0-9a-f])([0-9a-f])(\}|[^0-9a-f{][^{]*?\})/iS'; $_index = $index = $last_index = $offset = 0; $sb = array(); + // See: http://ajaxmin.codeplex.com/wikipage?title=CSS%20Colors + $short_safe = array( + '#808080' => 'gray', + '#008000' => 'green', + '#800000' => 'maroon', + '#000080' => 'navy', + '#808000' => 'olive', + '#800080' => 'purple', + '#c0c0c0' => 'silver', + '#008080' => 'teal', + '#f00' => 'red' + ); while (preg_match($pattern, $css, $m, 0, $offset)) { $index = $this->index_of($css, $m[0], $offset); @@ -399,11 +496,13 @@ class CSSmin strtolower($m[4]) == strtolower($m[5]) && strtolower($m[6]) == strtolower($m[7])) { // Compress. - $sb[] = '#' . strtolower($m[3] . $m[5] . $m[7]); + $hex = '#' . strtolower($m[3] . $m[5] . $m[7]); } else { // Non compressible color, restore but lower case. - $sb[] = '#' . strtolower($m[2] . $m[3] . $m[4] . $m[5] . $m[6] . $m[7]); + $hex = '#' . strtolower($m[2] . $m[3] . $m[4] . $m[5] . $m[6] . $m[7]); } + // replace Hex colors to short safe color names + $sb[] = array_key_exists($hex, $short_safe) ? $short_safe[$hex] : $hex; } $_index = $offset = $last_index - strlen($m[8]); @@ -418,7 +517,7 @@ class CSSmin * --------------------------------------------------------------------------------------------- */ - private function callback_one($matches) + private function replace_string($matches) { $match = $matches[0]; $quote = substr($match, 0, 1); @@ -427,9 +526,9 @@ class CSSmin // maybe the string contains a comment-like substring? // one, maybe more? put'em back then - if (($pos = $this->index_of($match, '___YUICSSMIN_PRESERVE_CANDIDATE_COMMENT_')) >= 0) { + if (($pos = $this->index_of($match, self::COMMENT)) >= 0) { for ($i = 0, $max = count($this->comments); $i < $max; $i++) { - $match = preg_replace('/___YUICSSMIN_PRESERVE_CANDIDATE_COMMENT_' . $i . '___/', $this->comments[$i], $match, 1); + $match = preg_replace('/' . self::COMMENT . $i . '___/', $this->comments[$i], $match, 1); } } @@ -437,40 +536,94 @@ class CSSmin $match = preg_replace('/progid\:DXImageTransform\.Microsoft\.Alpha\(Opacity\=/i', 'alpha(opacity=', $match); $this->preserved_tokens[] = $match; - return $quote . '___YUICSSMIN_PRESERVED_TOKEN_' . (count($this->preserved_tokens) - 1) . '___' . $quote; + return $quote . self::TOKEN . (count($this->preserved_tokens) - 1) . '___' . $quote; } - private function callback_two($matches) + private function replace_colon($matches) { - return preg_replace('/\:/', '___YUICSSMIN_PSEUDOCLASSCOLON___', $matches[0]); + return preg_replace('/\:/', self::CLASSCOLON, $matches[0]); } - private function callback_three($matches) + private function replace_calc($matches) { - return strtolower($matches[1]) . ':0 0' . $matches[2]; + $this->preserved_tokens[] = preg_replace('/\s?([\*\/\(\),])\s?/', '$1', $matches[0]); + return self::TOKEN . (count($this->preserved_tokens) - 1) . '___'; } - private function callback_four($matches) + private function rgb_to_hex($matches) { - $rgbcolors = explode(',', $matches[1]); - for ($i = 0; $i < count($rgbcolors); $i++) { - $rgbcolors[$i] = base_convert(strval(intval($rgbcolors[$i], 10)), 10, 16); - if (strlen($rgbcolors[$i]) === 1) { - $rgbcolors[$i] = '0' . $rgbcolors[$i]; + // Support for percentage values rgb(100%, 0%, 45%); + if ($this->index_of($matches[1], '%') >= 0){ + $rgbcolors = explode(',', str_replace('%', '', $matches[1])); + for ($i = 0; $i < count($rgbcolors); $i++) { + $rgbcolors[$i] = $this->round_number(floatval($rgbcolors[$i]) * 2.55); } + } else { + $rgbcolors = explode(',', $matches[1]); } - return '#' . implode('', $rgbcolors); + + // Values outside the sRGB color space should be clipped (0-255) + for ($i = 0; $i < count($rgbcolors); $i++) { + $rgbcolors[$i] = $this->clamp_number(intval($rgbcolors[$i], 10), 0, 255); + $rgbcolors[$i] = sprintf("%02x", $rgbcolors[$i]); + } + + // Fix for issue #2528093 + if (!preg_match('/[\s\,\);\}]/', $matches[2])){ + $matches[2] = ' ' . $matches[2]; + } + + return '#' . implode('', $rgbcolors) . $matches[2]; } - private function callback_five($matches) + private function hsl_to_hex($matches) { - return strtolower($matches[1]) . ':0' . $matches[2]; + $values = explode(',', str_replace('%', '', $matches[1])); + $h = floatval($values[0]); + $s = floatval($values[1]); + $l = floatval($values[2]); + + // Wrap and clamp, then fraction! + $h = ((($h % 360) + 360) % 360) / 360; + $s = $this->clamp_number($s, 0, 100) / 100; + $l = $this->clamp_number($l, 0, 100) / 100; + + if ($s == 0) { + $r = $g = $b = $this->round_number(255 * $l); + } else { + $v2 = $l < 0.5 ? $l * (1 + $s) : ($l + $s) - ($s * $l); + $v1 = (2 * $l) - $v2; + $r = $this->round_number(255 * $this->hue_to_rgb($v1, $v2, $h + (1/3))); + $g = $this->round_number(255 * $this->hue_to_rgb($v1, $v2, $h)); + $b = $this->round_number(255 * $this->hue_to_rgb($v1, $v2, $h - (1/3))); + } + + return $this->rgb_to_hex(array('', $r.','.$g.','.$b, $matches[2])); } /* HELPERS * --------------------------------------------------------------------------------------------- */ + private function hue_to_rgb($v1, $v2, $vh) + { + $vh = $vh < 0 ? $vh + 1 : ($vh > 1 ? $vh - 1 : $vh); + if ($vh * 6 < 1) return $v1 + ($v2 - $v1) * 6 * $vh; + if ($vh * 2 < 1) return $v2; + if ($vh * 3 < 2) return $v1 + ($v2 - $v1) * ((2/3) - $vh) * 6; + return $v1; + } + + private function round_number($n) + { + return intval(floor(floatval($n) + 0.5), 10); + } + + private function clamp_number($n, $min, $max) + { + return min(max($n, $min), $max); + } + /** * PHP port of Javascript's "indexOf" function for strings only * Author: Tubal Martin http://blog.margenn.com @@ -519,7 +672,6 @@ class CSSmin return ($substring === FALSE) ? '' : $substring; } - /** * PHP port of Javascript's "slice" function for strings only * Author: Tubal Martin http://blog.margenn.com @@ -557,20 +709,20 @@ class CSSmin } /** - * Convert strings like "64M" to int values + * Convert strings like "64M" or "30" to int values * @param mixed $size * @return int */ - private function normalizeInt($size) + private function normalize_int($size) { if (is_string($size)) { switch (substr($size, -1)) { - case 'M': case 'm': return (int)$size * 1048576; - case 'K': case 'k': return (int)$size * 1024; - case 'G': case 'g': return (int)$size * 1073741824; - default: return (int) $size; + case 'M': case 'm': return $size * 1048576; + case 'K': case 'k': return $size * 1024; + case 'G': case 'g': return $size * 1073741824; } } + return (int) $size; } } \ No newline at end of file diff --git a/sites/all/modules/advagg/advagg_css_compress/yui/Compressor.inc b/sites/all/modules/advagg/advagg_css_compress/yui/Compressor.inc deleted file mode 100644 index c6cdd8b..0000000 --- a/sites/all/modules/advagg/advagg_css_compress/yui/Compressor.inc +++ /dev/null @@ -1,249 +0,0 @@ - - * @author http://code.google.com/u/1stvamp/ (Issue 64 patch) - */ -class Minify_CSS_Compressor { - - /** - * Minify a CSS string - * - * @param string $css - * - * @param array $options (currently ignored) - * - * @return string - */ - public static function process($css, $options = array()) - { - $obj = new Minify_CSS_Compressor($options); - return $obj->_process($css); - } - - /** - * @var array - */ - protected $_options = null; - - /** - * Are we "in" a hack? I.e. are some browsers targetted until the next comment? - * - * @var bool - */ - protected $_inHack = false; - - - /** - * Constructor - * - * @param array $options (currently ignored) - */ - private function __construct($options) { - $this->_options = $options; - } - - /** - * Minify a CSS string - * - * @param string $css - * - * @return string - */ - protected function _process($css) - { - $css = str_replace("\r\n", "\n", $css); - - // preserve empty comment after '>' - // http://www.webdevout.net/css-hacks#in_css-selectors - $css = preg_replace('@>/\\*\\s*\\*/@', '>/*keep*/', $css); - - // preserve empty comment between property and value - // http://css-discuss.incutio.com/?page=BoxModelHack - $css = preg_replace('@/\\*\\s*\\*/\\s*:@', '/*keep*/:', $css); - $css = preg_replace('@:\\s*/\\*\\s*\\*/@', ':/*keep*/', $css); - - // apply callback to all valid comments (and strip out surrounding ws - $css = preg_replace_callback('@\\s*/\\*([\\s\\S]*?)\\*/\\s*@' - ,array($this, '_commentCB'), $css); - - // remove ws around { } and last semicolon in declaration block - $css = preg_replace('/\\s*{\\s*/', '{', $css); - $css = preg_replace('/;?\\s*}\\s*/', '}', $css); - - // remove ws surrounding semicolons - $css = preg_replace('/\\s*;\\s*/', ';', $css); - - // remove ws around urls - $css = preg_replace('/ - url\\( # url( - \\s* - ([^\\)]+?) # 1 = the URL (really just a bunch of non right parenthesis) - \\s* - \\) # ) - /x', 'url($1)', $css); - - // remove ws between rules and colons - $css = preg_replace('/ - \\s* - ([{;]) # 1 = beginning of block or rule separator - \\s* - ([\\*_]?[\\w\\-]+) # 2 = property (and maybe IE filter) - \\s* - : - \\s* - (\\b|[#\'"-]) # 3 = first character of a value - /x', '$1$2:$3', $css); - - // remove ws in selectors - $css = preg_replace_callback('/ - (?: # non-capture - \\s* - [^~>+,\\s]+ # selector part - \\s* - [,>+~] # combinators - )+ - \\s* - [^~>+,\\s]+ # selector part - { # open declaration block - /x' - ,array($this, '_selectorsCB'), $css); - - // minimize hex colors - $css = preg_replace('/([^=])#([a-f\\d])\\2([a-f\\d])\\3([a-f\\d])\\4([\\s;\\}])/i' - , '$1#$2$3$4$5', $css); - - // remove spaces between font families - $css = preg_replace_callback('/font-family:([^;}]+)([;}])/' - ,array($this, '_fontFamilyCB'), $css); - - $css = preg_replace('/@import\\s+url/', '@import url', $css); - - // replace any ws involving newlines with a single newline - $css = preg_replace('/[ \\t]*\\n+\\s*/', "\n", $css); - - // separate common descendent selectors w/ newlines (to limit line lengths) - $css = preg_replace('/([\\w#\\.\\*]+)\\s+([\\w#\\.\\*]+){/', "$1\n$2{", $css); - - // Use newline after 1st numeric value (to limit line lengths). - $css = preg_replace('/ - ((?:padding|margin|border|outline):\\d+(?:px|em)?) # 1 = prop : 1st numeric value - \\s+ - /x' - ,"$1\n", $css); - - // prevent triggering IE6 bug: http://www.crankygeek.com/ie6pebug/ - $css = preg_replace('/:first-l(etter|ine)\\{/', ':first-l$1 {', $css); - - return trim($css); - } - - /** - * Replace what looks like a set of selectors - * - * @param array $m regex matches - * - * @return string - */ - protected function _selectorsCB($m) - { - // remove ws around the combinators - return preg_replace('/\\s*([,>+~])\\s*/', '$1', $m[0]); - } - - /** - * Process a comment and return a replacement - * - * @param array $m regex matches - * - * @return string - */ - protected function _commentCB($m) - { - $hasSurroundingWs = (trim($m[0]) !== $m[1]); - $m = $m[1]; - // $m is the comment content w/o the surrounding tokens, - // but the return value will replace the entire comment. - if ($m === 'keep') { - return '/**/'; - } - if ($m === '" "') { - // component of http://tantek.com/CSS/Examples/midpass.html - return '/*" "*/'; - } - if (preg_match('@";\\}\\s*\\}/\\*\\s+@', $m)) { - // component of http://tantek.com/CSS/Examples/midpass.html - return '/*";}}/* */'; - } - if ($this->_inHack) { - // inversion: feeding only to one browser - if (preg_match('@ - ^/ # comment started like /*/ - \\s* - (\\S[\\s\\S]+?) # has at least some non-ws content - \\s* - /\\* # ends like /*/ or /**/ - @x', $m, $n)) { - // end hack mode after this comment, but preserve the hack and comment content - $this->_inHack = false; - return "/*/{$n[1]}/**/"; - } - } - if (substr($m, -1) === '\\') { // comment ends like \*/ - // begin hack mode and preserve hack - $this->_inHack = true; - return '/*\\*/'; - } - if ($m !== '' && $m[0] === '/') { // comment looks like /*/ foo */ - // begin hack mode and preserve hack - $this->_inHack = true; - return '/*/*/'; - } - if ($this->_inHack) { - // a regular comment ends hack mode but should be preserved - $this->_inHack = false; - return '/**/'; - } - // Issue 107: if there's any surrounding whitespace, it may be important, so - // replace the comment with a single space - return $hasSurroundingWs // remove all other comments - ? ' ' - : ''; - } - - /** - * Process a font-family listing and return a replacement - * - * @param array $m regex matches - * - * @return string - */ - protected function _fontFamilyCB($m) - { - // Issue 210: must not eliminate WS between words in unquoted families - $pieces = preg_split('/(\'[^\']+\'|"[^"]+")/', $m[1], null, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY); - $out = 'font-family:'; - while (null !== ($piece = array_shift($pieces))) { - if ($piece[0] !== '"' && $piece[0] !== "'") { - $piece = preg_replace('/\\s+/', ' ', $piece); - $piece = preg_replace('/\\s?,\\s?/', ',', $piece); - } - $out .= $piece; - } - return $out . $m[2]; - } -} diff --git a/sites/all/modules/advagg/advagg_js_cdn/advagg_js_cdn.info b/sites/all/modules/advagg/advagg_js_cdn/advagg_js_cdn.info index 0fcfdfb..b8b283c 100644 --- a/sites/all/modules/advagg/advagg_js_cdn/advagg_js_cdn.info +++ b/sites/all/modules/advagg/advagg_js_cdn/advagg_js_cdn.info @@ -4,9 +4,9 @@ package = Advanced CSS/JS Aggregation core = 6.x dependencies[] = advagg -; Information added by drupal.org packaging script on 2012-06-25 -version = "6.x-1.9" +; Information added by Drupal.org packaging script on 2017-03-18 +version = "6.x-1.11" core = "6.x" project = "advagg" -datestamp = "1340665277" +datestamp = "1489800488" diff --git a/sites/all/modules/advagg/advagg_js_cdn/advagg_js_cdn.module b/sites/all/modules/advagg/advagg_js_cdn/advagg_js_cdn.module index bb0ae05..8ef20d8 100644 --- a/sites/all/modules/advagg/advagg_js_cdn/advagg_js_cdn.module +++ b/sites/all/modules/advagg/advagg_js_cdn/advagg_js_cdn.module @@ -47,7 +47,7 @@ function advagg_js_cdn_advagg_js_pre_alter(&$javascript, $preprocess_js, $public if (empty($jquery_update_version)) { $jquery_update_version = variable_get('advagg_js_cdn_jquery_update_version', jquery_update_get_version()); } - $jquery_update_filepath = drupal_get_path('module', 'jquery_update'); + $jquery_update_filepath = advagg_js_cdn_get_jquery_path(); } if (module_exists('jquery_ui')) { // jquery_ui_get_version hits disk and doesn't get cached. @@ -81,7 +81,11 @@ function advagg_js_cdn_advagg_js_pre_alter(&$javascript, $preprocess_js, $public foreach ($data as $path => $info) { // jquery.js if ($cdn_jquery) { - if (isset($jquery_update_filepath) && ($path == $jquery_update_filepath . '/replace/jquery.min.js' || $path == $jquery_filepath . '/replace/jquery.js')) { + if ( isset($jquery_update_filepath) + && ( $path == $jquery_update_filepath . '/jquery.min.js' + || $path == $jquery_update_filepath . '/jquery.js' + ) + ) { $info['preprocess'] = FALSE; $javascript['external'][$schema . '://ajax.googleapis.com/ajax/libs/jquery/' . $jquery_update_version . '/jquery.min.js'] = $info; unset($javascript[$type][$path]); @@ -144,3 +148,19 @@ function advagg_js_cdn_get_jquery_ui_path() { return $jquery_ui_path; } + +/** + * Get the path for the jquery.js file. + * + * @return + * path to jquery.js file. + */ +function advagg_js_cdn_get_jquery_path() { + if (function_exists('jquery_update_jquery_path')) { + return dirname(jquery_update_jquery_path()); + } + else { + $jquery_update_filepath = drupal_get_path('module', 'jquery_update'); + return $jquery_update_filepath . '/replace/'; + } +} diff --git a/sites/all/modules/advagg/advagg_js_compress/advagg_js_compress.info b/sites/all/modules/advagg/advagg_js_compress/advagg_js_compress.info index 1aae7ac..4079f73 100644 --- a/sites/all/modules/advagg/advagg_js_compress/advagg_js_compress.info +++ b/sites/all/modules/advagg/advagg_js_compress/advagg_js_compress.info @@ -4,9 +4,9 @@ package = Advanced CSS/JS Aggregation core = 6.x dependencies[] = advagg -; Information added by drupal.org packaging script on 2012-06-25 -version = "6.x-1.9" +; Information added by Drupal.org packaging script on 2017-03-18 +version = "6.x-1.11" core = "6.x" project = "advagg" -datestamp = "1340665277" +datestamp = "1489800488" diff --git a/sites/all/modules/advagg/advagg_js_compress/advagg_js_compress.module b/sites/all/modules/advagg/advagg_js_compress/advagg_js_compress.module index 6257606..1d5c67a 100644 --- a/sites/all/modules/advagg/advagg_js_compress/advagg_js_compress.module +++ b/sites/all/modules/advagg/advagg_js_compress/advagg_js_compress.module @@ -93,7 +93,7 @@ function advagg_js_compress_init() { */ function advagg_js_compress_advagg_files_table($row, $checksum) { // IF the file has changed, test it's compressibility. - if ($row['filetype'] = 'js' && $checksum != $row['checksum']) { + if ($row['filetype'] === 'js' && $checksum !== $row['checksum']) { $files_to_test[] = array( 'md5' => $row['filename_md5'], 'filename' => $row['filename'], @@ -175,6 +175,12 @@ function advagg_js_compress_advagg_js_inline_alter(&$contents) { } if ($compressor == 1) { $contents = jsmin($contents); + + // Ensure that $contents ends with ; or }. + if (strpbrk(substr(trim($contents), -1), ';}') === FALSE) { + // ; or } not found, add in ; to the end of $contents. + $contents = trim($contents) . ';'; + } } // If using a cache set it. @@ -266,6 +272,12 @@ function advagg_js_compress_prep(&$contents, $files, $bundle_md5) { } elseif ($compressor == 1) { $contents = jsmin($contents); + + // Ensure that $contents ends with ; or }. + if (strpbrk(substr(trim($contents), -1), ';}') === FALSE) { + // ; or } not found, add in ; to the end of $contents. + $contents = trim($contents) . ';'; + } } } $url = url($file, array('absolute' => TRUE)); @@ -285,7 +297,7 @@ function advagg_js_compress_prep(&$contents, $files, $bundle_md5) { function advagg_js_compress_jsminplus(&$contents) { // Try to allocate enough time to run JSMin+. if (function_exists('set_time_limit')) { - @set_time_limit(240); + @set_time_limit(variable_get('advagg_set_time_limit', ADVAGG_SET_TIME_LIMIT)); } // Only include jsminplus.inc if the JSMinPlus class doesn't exist. @@ -305,6 +317,13 @@ function advagg_js_compress_jsminplus(&$contents) { if (!empty($error)) { throw new Exception($error); } + + // Ensure that $contents ends with ; or }. + if (strpbrk(substr(trim($contents), -1), ';}') === FALSE) { + // ; or } not found, add in ; to the end of $contents. + $contents = trim($contents) . ';'; + } + // Get the JS string length after the compression operation. $after = strlen($contents); }