Only in /Users/jlind/Sites/drupal_2012_03_23_11_46/sites/default/files/coder_upgrade/old/advagg: .git
diff -up -r advagg.admin.inc advagg.admin.inc
--- advagg.admin.inc 2012-03-23 12:08:13.000000000 -0600
+++ advagg.admin.inc 2012-03-23 13:02:15.000000000 -0600
@@ -36,27 +36,27 @@ function advagg_admin_info_form() {
$form = array();
$form['info'] = array(
- '#type' => 'fieldset',
- '#collapsible' => TRUE,
- '#collapsed' => TRUE,
- '#title' => t('Hook Theme Info'),
+ '#type' => 'fieldset',
+ '#collapsible' => TRUE,
+ '#collapsed' => TRUE,
+ '#title' => t('Hook Theme Info'),
);
init_theme();
$hooks = theme_get_registry();
$data = implode("\n", $hooks['page']['preprocess functions']);
$form['info']['advagg_debug_info'] = array(
- '#type' => 'textarea',
- '#default_value' => $data,
- '#rows' => count($hooks['page']['preprocess functions'])+1,
+ '#type' => 'textarea',
+ '#default_value' => $data,
+ '#rows' => count($hooks['page']['preprocess functions']) + 1,
);
$types = db_query("SELECT DISTINCT(filetype) FROM {advagg_files}");
while ($type = db_result($types)) {
$form[$type] = array(
- '#type' => 'fieldset',
- '#collapsible' => TRUE,
- '#collapsed' => TRUE,
- '#title' => t('@type files', array('@type' => drupal_strtoupper($type))),
+ '#type' => 'fieldset',
+ '#collapsible' => TRUE,
+ '#collapsed' => TRUE,
+ '#title' => t('@type files', array('@type' => drupal_strtoupper($type))),
);
// filename filename_md5 checksum filetype counter data
$results = db_query("SELECT * FROM {advagg_files} WHERE filetype = '%s'", $type);
@@ -66,19 +66,19 @@ function advagg_admin_info_form() {
list($data, $rows) = advagg_form_print_r($data);
$form[$type][$row['filename_md5']] = array(
- '#type' => 'textarea',
- '#title' => check_plain($row['filename']),
- '#default_value' => $data,
- '#rows' => $rows-1,
- '#description' => t('File has changed %counter times', array('%counter' => $row['counter'])),
+ '#type' => 'textarea',
+ '#title' => check_plain($row['filename']),
+ '#default_value' => $data,
+ '#rows' => $rows -1,
+ '#description' => t('File has changed %counter times', array('%counter' => $row['counter'])),
);
}
else {
$form[$type][$row['filename_md5']] = array(
- '#type' => 'markup',
- '#value' => '<div>' . format_plural($row['counter'], 'changed 1 time - %file<br />', 'changed %counter times - %file<br /></div>', array(
- '%counter' => $row['counter'],
- '%file' => $row['filename'],
+ '#type' => 'markup',
+ '#value' => '<div>' . format_plural($row['counter'], 'changed 1 time - %file<br />', 'changed %counter times - %file<br /></div>', array(
+ '%counter' => $row['counter'],
+ '%file' => $row['filename'],
)),
);
}
@@ -87,22 +87,20 @@ function advagg_admin_info_form() {
// Get hooks in use.
$hooks = array(
- 'advagg_css_alter' => array(),
- 'advagg_css_inline_alter' => array(),
- 'advagg_css_pre_alter' => array(),
- 'advagg_css_extra_alter' => array(),
-
- 'advagg_js_alter' => array(),
- 'advagg_js_inline_alter' => array(),
- 'advagg_js_pre_alter' => array(),
- 'advagg_js_extra_alter' => array(),
+ 'advagg_css_alter' => array(),
+ 'advagg_css_inline_alter' => array(),
+ 'advagg_css_pre_alter' => array(),
+ 'advagg_css_extra_alter' => array(),
+ 'advagg_js_alter' => array(),
+ 'advagg_js_inline_alter' => array(),
+ 'advagg_js_pre_alter' => array(),
+ 'advagg_js_extra_alter' => array(),
'advagg_js_header_footer_alter' => array(),
-
- 'advagg_filenames_alter' => array(),
- 'advagg_files_table' => array(),
- 'advagg_master_reset' => array(),
- 'advagg_disable_processor' => array(),
- 'advagg_disable_page_cache' => array(),
+ 'advagg_filenames_alter' => array(),
+ 'advagg_files_table' => array(),
+ 'advagg_master_reset' => array(),
+ 'advagg_disable_processor' => array(),
+ 'advagg_disable_page_cache' => array(),
'advagg_bundler_analysis_alter' => array(),
);
foreach ($hooks as $hook => $values) {
@@ -117,22 +115,22 @@ function advagg_admin_info_form() {
foreach ($hooks as $hook => $values) {
if (empty($values)) {
$form['hooks_implemented'][$hook] = array(
- '#type' => 'markup',
- '#value' => '<div><strong>' . check_plain($hook) . ':</strong><br /> ' . t('None') . '</div>',
+ '#type' => 'markup',
+ '#value' => '<div><strong>' . check_plain($hook) . ':</strong><br /> ' . t('None') . '</div>',
);
}
else {
$form['hooks_implemented'][$hook] = array(
- '#type' => 'markup',
- '#value' => '<div><strong>' . check_plain($hook) . ':</strong><br /> ' . filter_xss(implode('<br /> ', $values)) . '</div>',
+ '#type' => 'markup',
+ '#value' => '<div><strong>' . check_plain($hook) . ':</strong><br /> ' . filter_xss(implode('<br /> ', $values)) . '</div>',
);
}
}
$form['hooks_implemented'] += array(
- '#type' => 'fieldset',
- '#collapsible' => TRUE,
- '#collapsed' => TRUE,
- '#title' => t('Modules implementing advagg hooks'),
+ '#type' => 'fieldset',
+ '#collapsible' => TRUE,
+ '#collapsed' => TRUE,
+ '#title' => t('Modules implementing advagg hooks'),
);
// If any files are missing list them.
@@ -140,25 +138,25 @@ function advagg_admin_info_form() {
$results = db_query("SELECT * FROM {advagg_files} WHERE checksum = '-1' ORDER BY filetype ASC");
while ($row = db_fetch_array($results)) {
$form['missing'][$row['filename_md5']] = array(
- '#type' => 'markup',
- '#value' => '<div>' . check_plain($row['filename']) . '<br /></div>',
+ '#type' => 'markup',
+ '#value' => '<div>' . check_plain($row['filename']) . '<br /></div>',
);
}
if (!empty($form['missing'])) {
$form['missing'] += array(
- '#type' => 'fieldset',
- '#collapsible' => TRUE,
- '#collapsed' => FALSE,
- '#title' => t('Missing files'),
+ '#type' => 'fieldset',
+ '#collapsible' => TRUE,
+ '#collapsed' => FALSE,
+ '#title' => t('Missing files'),
);
}
// Asynchronous raw output
$form['async'] = array(
- '#type' => 'fieldset',
- '#collapsible' => TRUE,
- '#collapsed' => TRUE,
- '#title' => t('Asynchronous debug info'),
+ '#type' => 'fieldset',
+ '#collapsible' => TRUE,
+ '#collapsed' => TRUE,
+ '#title' => t('Asynchronous debug info'),
);
list($css_path, $js_path) = advagg_get_root_files_dir();
@@ -175,10 +173,10 @@ function advagg_admin_info_form() {
$data_local->timer = timer_stop(__FUNCTION__ . 'local');
list($data, $rows) = advagg_form_print_r($data_local);
$form['async']['normal'] = array(
- '#type' => 'textarea',
- '#title' => check_plain($url),
- '#default_value' => $data,
- '#rows' => min($rows+1, 50),
+ '#type' => 'textarea',
+ '#title' => check_plain($url),
+ '#default_value' => $data,
+ '#rows' => min($rows + 1, 50),
);
if (module_exists('cdn')) {
@@ -195,10 +193,10 @@ function advagg_admin_info_form() {
$data_cdn->timer = timer_stop(__FUNCTION__ . 'cdn');
list($data, $rows) = advagg_form_print_r($data_cdn);
$form['async']['cdn'] = array(
- '#type' => 'textarea',
- '#title' => check_plain($url_cdn),
- '#default_value' => $data,
- '#rows' => min($rows+1, 50),
+ '#type' => 'textarea',
+ '#title' => check_plain($url_cdn),
+ '#default_value' => $data,
+ '#rows' => min($rows + 1, 50),
);
}
@@ -217,93 +215,93 @@ function advagg_admin_settings_form() {
$bundle_count = db_result(db_query("SELECT COUNT(*) FROM (SELECT bundle_md5 FROM {advagg_bundles} GROUP BY bundle_md5) as temp"));
$form['advagg_enabled'] = array(
- '#type' => 'checkbox',
- '#title' => t('Enable Advanced Aggregation'),
- '#default_value' => variable_get('advagg_enabled', ADVAGG_ENABLED),
+ '#type' => 'checkbox',
+ '#title' => t('Enable Advanced Aggregation'),
+ '#default_value' => variable_get('advagg_enabled', ADVAGG_ENABLED),
);
$form['advagg_closure'] = array(
- '#type' => 'checkbox',
- '#title' => t('Use AdvAgg in closure'),
- '#default_value' => variable_get('advagg_closure', ADVAGG_CLOSURE),
- '#description' => t('If enabled javascript files in the closure region will be aggregated.'),
+ '#type' => 'checkbox',
+ '#title' => t('Use AdvAgg in closure'),
+ '#default_value' => variable_get('advagg_closure', ADVAGG_CLOSURE),
+ '#description' => t('If enabled javascript files in the closure region will be aggregated.'),
);
// Make sure the advagg_check_missing_handler function is available.
module_load_install('advagg');
$ret = advagg_check_missing_handler();
$form['advagg_async_generation'] = array(
- '#type' => 'checkbox',
- '#title' => t('Generate CSS/JS files on request (async mode)'),
- '#default_value' => variable_get('advagg_async_generation', ADVAGG_ASYNC_GENERATION),
- '#disabled' => $ret['advagg_async_generation']['severity'] == REQUIREMENT_ERROR ? TRUE : FALSE,
- '#description' => t('Current State: !value', array(
+ '#type' => 'checkbox',
+ '#title' => t('Generate CSS/JS files on request (async mode)'),
+ '#default_value' => variable_get('advagg_async_generation', ADVAGG_ASYNC_GENERATION),
+ '#disabled' => $ret['advagg_async_generation']['severity'] == REQUIREMENT_ERROR ? TRUE : FALSE,
+ '#description' => t('Current State: !value', array(
'!value' => filter_xss(' '
. $ret['advagg_async_generation']['value'] . ' '
. (!empty($ret['advagg_async_generation']['description']) ? $ret['advagg_async_generation']['description'] : '') . ' '
- )
+ ),
)),
);
$form['advagg_gzip_compression'] = array(
- '#type' => 'checkbox',
- '#title' => t('Gzip CSS/JS files'),
- '#default_value' => variable_get('advagg_gzip_compression', ADVAGG_GZIP_COMPRESSION),
- '#description' => t('This might break CSS/JS handling at the Apache level. If it does, use the rules for your webroot level htaccess file before re-enabling. Directions on what to change are located in the <a href="@readme">readme</a> file. In short, be sure to test this out.', array('@readme' => url($readme))),
+ '#type' => 'checkbox',
+ '#title' => t('Gzip CSS/JS files'),
+ '#default_value' => variable_get('advagg_gzip_compression', ADVAGG_GZIP_COMPRESSION),
+ '#description' => t('This might break CSS/JS handling at the Apache level. If it does, use the rules for your webroot level htaccess file before re-enabling. Directions on what to change are located in the <a href="@readme">readme</a> file. In short, be sure to test this out.', array('@readme' => url($readme))),
);
$form['advagg_dir_htaccess'] = array(
- '#type' => 'checkbox',
- '#title' => t('Generate .htaccess files in the advagg_* dirs'),
- '#default_value' => variable_get('advagg_dir_htaccess', ADVAGG_DIR_HTACCESS),
- '#description' => t('Disable if your using the rules from the <a href="@readme">readme</a> file in your webroot level htaccess file.', array('@readme' => url($readme))),
+ '#type' => 'checkbox',
+ '#title' => t('Generate .htaccess files in the advagg_* dirs'),
+ '#default_value' => variable_get('advagg_dir_htaccess', ADVAGG_DIR_HTACCESS),
+ '#description' => t('Disable if your using the rules from the <a href="@readme">readme</a> file in your webroot level htaccess file.', array('@readme' => url($readme))),
);
$form['advagg_rebuild_on_flush'] = array(
- '#type' => 'checkbox',
- '#title' => t('Regenerate flushed bundles in the cache flush request'),
- '#default_value' => variable_get('advagg_rebuild_on_flush', ADVAGG_REBUILD_ON_FLUSH),
- '#description' => t('You can enable if your server will not timeout on a request. This will call advagg_rebuild_bundle() as a <a href="http://php.net/register-shutdown-function">shutdown function</a> for every bundle that has been marked as expired; thus rebuilding that bundle in the same request as the flush.'),
+ '#type' => 'checkbox',
+ '#title' => t('Regenerate flushed bundles in the cache flush request'),
+ '#default_value' => variable_get('advagg_rebuild_on_flush', ADVAGG_REBUILD_ON_FLUSH),
+ '#description' => t('You can enable if your server will not timeout on a request. This will call advagg_rebuild_bundle() as a <a href="http://php.net/register-shutdown-function">shutdown function</a> for every bundle that has been marked as expired; thus rebuilding that bundle in the same request as the flush.'),
);
$public_downloads = (variable_get('file_downloads', FILE_DOWNLOADS_PUBLIC) == FILE_DOWNLOADS_PUBLIC);
if (!$public_downloads) {
$extra = module_exists('boost') ? t('If boost is installed, you can use the cache directory for advagg files.') : '';
$form['advagg_custom_files_dir'] = array(
- '#type' => 'textfield',
- '#field_prefix' => '<div>' . t('You are using a private file system. You must serve aggregated files via a public folder.') . '</div>',
- '#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.')),
- '#required' => TRUE,
+ '#type' => 'textfield',
+ '#field_prefix' => '<div>' . t('You are using a private file system. You must serve aggregated files via a public folder.') . '</div>',
+ '#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.')),
+ '#required' => TRUE,
);
}
$options = array(
- 0 => t('Wait for locks'),
- 1 => t('Do not wait for locks'),
- 2 => t('Only serve aggregated files if they are already built (only works if async is enabled)'),
+ 0 => t('Wait for locks'),
+ 1 => t('Do not wait for locks'),
+ 2 => t('Only serve aggregated files if they are already built (only works if async is enabled)'),
);
$form['advagg_aggregate_mode'] = array(
- '#type' => 'radios',
- '#title' => t('Aggregation Inclusion Mode'),
- '#default_value' => variable_get('advagg_aggregate_mode', ADVAGG_AGGREGATE_MODE),
- '#options' => $options,
- '#description' => t('Should the page wait for the aggregate to be built before including the file, or should it send out the page with aggregates not included.'),
+ '#type' => 'radios',
+ '#title' => t('Aggregation Inclusion Mode'),
+ '#default_value' => variable_get('advagg_aggregate_mode', ADVAGG_AGGREGATE_MODE),
+ '#options' => $options,
+ '#description' => t('Should the page wait for the aggregate to be built before including the file, or should it send out the page with aggregates not included.'),
);
$form['advagg_page_cache_mode'] = array(
- '#type' => 'checkbox',
- '#title' => t('Disable page caching if all aggregates are not included on the page.'),
- '#default_value' => variable_get('advagg_page_cache_mode', ADVAGG_PAGE_CACHE_MODE),
+ '#type' => 'checkbox',
+ '#title' => t('Disable page caching if all aggregates are not included on the page.'),
+ '#default_value' => variable_get('advagg_page_cache_mode', ADVAGG_PAGE_CACHE_MODE),
);
$form['advagg_checksum_mode'] = array(
- '#type' => 'radios',
- '#title' => t('File Checksum Mode'),
- '#default_value' => variable_get('advagg_checksum_mode', ADVAGG_CHECKSUM_MODE),
- '#options' => array(
+ '#type' => 'radios',
+ '#title' => t('File Checksum Mode'),
+ '#default_value' => variable_get('advagg_checksum_mode', ADVAGG_CHECKSUM_MODE),
+ '#options' => array(
'mtime' => 'mtime',
'md5' => 'md5',
),
- '#description' => t('If Drupal is on multiple servers and the file system is not shared; using md5 is recommended. The file modification time (mtime) could be different with this type of setup. WARNING: Changing this value will invalidate all bundles and new ones will have to be built.'),
+ '#description' => t('If Drupal is on multiple servers and the file system is not shared; using md5 is recommended. The file modification time (mtime) could be different with this type of setup. WARNING: Changing this value will invalidate all bundles and new ones will have to be built.'),
);
$form['advagg_server_addr'] = array(
- '#type' => 'textfield',
- '#title' => t('IP Address to send all asynchronous requests to'),
- '#default_value' => variable_get('advagg_server_addr', FALSE),
- '#description' => t('If left blank it will use the same server as the request. If set to -1 it will use the host name instead of an IP address.'),
+ '#type' => 'textfield',
+ '#title' => t('IP Address to send all asynchronous requests to'),
+ '#default_value' => variable_get('advagg_server_addr', FALSE),
+ '#description' => t('If left blank it will use the same server as the request. If set to -1 it will use the host name instead of an IP address.'),
);
// $form['advagg_debug'] = array(
// '#type' => 'checkbox',
@@ -312,74 +310,74 @@ function advagg_admin_settings_form() {
// );
$form['flush'] = array(
- '#type' => 'fieldset',
- '#title' => t('Smart cache flush'),
- '#description' => t('Scan all files referenced in aggregated files. If any of them have changed, increment the counters containing that file and rebuild the bundle.'),
+ '#type' => 'fieldset',
+ '#title' => t('Smart cache flush'),
+ '#description' => t('Scan all files referenced in aggregated files. If any of them have changed, increment the counters containing that file and rebuild the bundle.'),
);
$form['flush']['advagg_flush'] = array(
- '#type' => 'submit',
- '#value' => t('Flush AdvAgg Cache'),
+ '#type' => 'submit',
+ '#value' => t('Flush AdvAgg Cache'),
'#submit' => array('advagg_admin_flush_cache_button'),
);
$form['rebuild'] = array(
- '#type' => 'fieldset',
- '#collapsible' => TRUE,
- '#collapsed' => TRUE,
- '#title' => t('Cache Rebuild'),
- '#description' => t('Recreate all aggregated files. Useful if JS or CSS compression was just enabled. %count Files', array('%count' => $bundle_count)),
+ '#type' => 'fieldset',
+ '#collapsible' => TRUE,
+ '#collapsed' => TRUE,
+ '#title' => t('Cache Rebuild'),
+ '#description' => t('Recreate all aggregated files. Useful if JS or CSS compression was just enabled. %count Files', array('%count' => $bundle_count)),
);
$form['rebuild']['advagg_rebuild'] = array(
- '#type' => 'submit',
- '#value' => t('Rebuild AdvAgg Cache'),
+ '#type' => 'submit',
+ '#value' => t('Rebuild AdvAgg Cache'),
'#submit' => array('advagg_admin_batch_rebuild'),
);
$form['forced_rebuild'] = array(
- '#type' => 'fieldset',
- '#collapsible' => TRUE,
- '#collapsed' => TRUE,
- '#title' => t('Forced Cache Rebuild'),
- '#description' => t('Recreate all aggregated files by incrementing internal counter for every bundle. %count Files', array('%count' => $bundle_count)),
+ '#type' => 'fieldset',
+ '#collapsible' => TRUE,
+ '#collapsed' => TRUE,
+ '#title' => t('Forced Cache Rebuild'),
+ '#description' => t('Recreate all aggregated files by incrementing internal counter for every bundle. %count Files', array('%count' => $bundle_count)),
);
$form['forced_rebuild']['advagg_forced_build'] = array(
- '#type' => 'submit',
- '#value' => t('Force all counters to be increment by one'),
+ '#type' => 'submit',
+ '#value' => t('Force all counters to be increment by one'),
'#submit' => array('advagg_admin_batch_rebuild'),
);
$form['master_reset'] = array(
- '#type' => 'fieldset',
- '#collapsible' => TRUE,
- '#collapsed' => TRUE,
- '#title' => t('Master Reset'),
- '#description' => t('Clean Slate - Truncate all advagg tables and delete all advagg files. Useful for testing purposes. Running this on a production site is not a good idea.'),
+ '#type' => 'fieldset',
+ '#collapsible' => TRUE,
+ '#collapsed' => TRUE,
+ '#title' => t('Master Reset'),
+ '#description' => t('Clean Slate - Truncate all advagg tables and delete all advagg files. Useful for testing purposes. Running this on a production site is not a good idea.'),
);
$form['master_reset']['advagg_reset'] = array(
- '#type' => 'submit',
- '#value' => t('Master Reset'),
- '#submit' => array('advagg_admin_master_reset'),
+ '#type' => 'submit',
+ '#value' => t('Master Reset'),
+ '#submit' => array('advagg_admin_master_reset'),
);
$form['htaccess'] = array(
- '#type' => 'fieldset',
- '#collapsible' => TRUE,
- '#collapsed' => TRUE,
- '#title' => t('Rebuild htaccess files'),
- '#description' => t('This will recreate the htaccess files located in the advagg_* directories.'),
+ '#type' => 'fieldset',
+ '#collapsible' => TRUE,
+ '#collapsed' => TRUE,
+ '#title' => t('Rebuild htaccess files'),
+ '#description' => t('This will recreate the htaccess files located in the advagg_* directories.'),
);
$form['htaccess']['advagg_recreate_htaccess'] = array(
- '#type' => 'submit',
- '#value' => t('Recreate htaccess files'),
+ '#type' => 'submit',
+ '#value' => t('Recreate htaccess files'),
'#submit' => array('advagg_admin_recreate_htaccess'),
);
$form['bypass'] = array(
- '#type' => 'fieldset',
- '#title' => t('Aggregation Bypass Cookie'),
- '#description' => t('This will set or remove a cookie that disables aggregation for the remainder of the browser session.'),
+ '#type' => 'fieldset',
+ '#title' => t('Aggregation Bypass Cookie'),
+ '#description' => t('This will set or remove a cookie that disables aggregation for the remainder of the browser session.'),
);
$form['bypass']['submit'] = array(
- '#type' => 'submit',
+ '#type' => 'submit',
#'#button_type' => 'button',
- '#value' => t('Toggle the "aggregation bypass cookie" for this browser'),
- '#attributes' => array('onclick' => 'javascript:return advagg_toggle_cookie()'),
- '#submit' => array('advagg_admin_toggle_bypass_cookie'),
+ '#value' => t('Toggle the "aggregation bypass cookie" for this browser'),
+ '#attributes' => array('onclick' => 'javascript:return advagg_toggle_cookie()'),
+ '#submit' => array('advagg_admin_toggle_bypass_cookie'),
);
$form['#submit'][] = 'advagg_admin_settings_form_submit';
@@ -635,7 +633,7 @@ function advagg_admin_rebuild_bundles($i
function advagg_admin_rebuild_bundles_done($success, $results, $operations) {
if ($success) {
// Here we do something meaningful with the results.
- $message = count($results) .' files generated.';
+ $message = count($results) . ' files generated.';
$message .= theme('item_list', $results);
}
else {
diff -up -r advagg.install advagg.install
--- advagg.install 2012-03-23 12:08:13.000000000 -0600
+++ advagg.install 2012-03-23 13:02:15.000000000 -0600
@@ -117,57 +117,57 @@ function advagg_requirements($phase) {
list($css_path, $js_path) = advagg_get_root_files_dir();
if (!file_check_directory($css_path, FILE_CREATE_DIRECTORY)) {
$requirements['advagg_css_path'] = array(
- 'title' => $t('Adv CSS/JS Agg - CSS Path'),
- 'severity' => REQUIREMENT_ERROR,
- 'value' => $t('CSS directory is not created or writable'),
+ 'title' => $t('Adv CSS/JS Agg - CSS Path'),
+ 'severity' => REQUIREMENT_ERROR,
+ 'value' => $t('CSS directory is not created or writable'),
'description' => $t('%path is not setup correctly.', array('%path' => $css_path)),
);
}
if (!file_check_directory($js_path, FILE_CREATE_DIRECTORY)) {
$requirements['advagg_js_path'] = array(
- 'title' => $t('Adv CSS/JS Agg - JS Path'),
- 'severity' => REQUIREMENT_ERROR,
- 'value' => $t('JS directory is not created or writable'),
+ 'title' => $t('Adv CSS/JS Agg - JS Path'),
+ 'severity' => REQUIREMENT_ERROR,
+ 'value' => $t('JS directory is not created or writable'),
'description' => $t('%path is not setup correctly.', array('%path' => $js_path)),
);
}
if (variable_get('preprocess_css', FALSE) || variable_get('preprocess_js', FALSE)) {
$requirements['advagg_core_off'] = array(
- 'title' => $t('Adv CSS/JS Agg - Core Variables'),
- 'severity' => REQUIREMENT_ERROR,
- 'value' => $t('Cores CSS and/or JS aggregation is enabled'),
+ 'title' => $t('Adv CSS/JS Agg - Core Variables'),
+ 'severity' => REQUIREMENT_ERROR,
+ 'value' => $t('Cores CSS and/or JS aggregation is enabled'),
'description' => $t('"Optimize CSS files" and "Optimize JavaScript files" on the <a href="@performance">performance page</a> should be disabled.', array('@performance' => url('admin/settings/performance'))),
);
}
if (variable_get('advagg_enabled', ADVAGG_ENABLED) == FALSE) {
$requirements['advagg_not_on'] = array(
- 'title' => $t('Adv CSS/JS Agg - Enabled'),
- 'severity' => REQUIREMENT_WARNING,
- 'value' => $t('Advanced CSS/JS aggregation is not currently enabled.'),
+ 'title' => $t('Adv CSS/JS Agg - Enabled'),
+ 'severity' => REQUIREMENT_WARNING,
+ 'value' => $t('Advanced CSS/JS aggregation is not currently enabled.'),
'description' => $t('Go to the Advanced CSS/JS aggregation <a href="@settings">settings page</a> and enable it.', array('@settings' => url('admin/settings/advagg'))),
);
}
if (module_exists('css_gzip')) {
$requirements['advagg_css_gzip'] = array(
- 'title' => $t('Adv CSS/JS Agg - CSS Gzip'),
- 'severity' => REQUIREMENT_WARNING,
- 'value' => $t('The CSS Gzip module is enabled'),
+ 'title' => $t('Adv CSS/JS Agg - CSS Gzip'),
+ 'severity' => REQUIREMENT_WARNING,
+ 'value' => $t('The CSS Gzip module is enabled'),
'description' => $t('On the <a href="@modules">modules page</a> you can disable it, as this module is no longer needed.', array('@modules' => url('admin/build/modules'))),
);
}
if (module_exists('csstidy')) {
$requirements['advagg_csstidy'] = array(
- 'title' => $t('Adv CSS/JS Agg - CSS Tidy'),
- 'severity' => REQUIREMENT_WARNING,
- 'value' => $t('The CSS Tidy module is enabled'),
+ 'title' => $t('Adv CSS/JS Agg - CSS Tidy'),
+ 'severity' => REQUIREMENT_WARNING,
+ 'value' => $t('The CSS Tidy module is enabled'),
'description' => $t('On the <a href="@modules">modules page</a> you can disable it, as this module is no longer needed.', array('@modules' => url('admin/build/modules'))),
);
}
if (module_exists('javascript_aggregator')) {
$requirements['advagg_javascript_aggregator'] = array(
- 'title' => $t('Adv CSS/JS Agg - Javascript Aggregator'),
- 'severity' => REQUIREMENT_WARNING,
- 'value' => $t('The Javascript Aggregator is enabled'),
+ 'title' => $t('Adv CSS/JS Agg - Javascript Aggregator'),
+ 'severity' => REQUIREMENT_WARNING,
+ 'value' => $t('The Javascript Aggregator is enabled'),
'description' => $t('On the <a href="@modules">modules page</a> you can disable it, as this module is no longer needed. Once uninstalled be sure to enable the "Use AdvAgg in closure" setting on the <a href="@config">advagg config page</a>', array(
'@modules' => url('admin/build/modules'),
'@config' => url('admin/settings/advagg/config'),
@@ -176,49 +176,49 @@ function advagg_requirements($phase) {
}
if (module_exists('unlimited_css')) {
$requirements['advagg_unlimited_css'] = array(
- 'title' => $t('Adv CSS/JS Agg - IE Unlimited CSS Loader'),
- 'severity' => REQUIREMENT_WARNING,
- 'value' => $t('The IE Unlimited CSS Loader module is enabled'),
+ 'title' => $t('Adv CSS/JS Agg - IE Unlimited CSS Loader'),
+ 'severity' => REQUIREMENT_WARNING,
+ 'value' => $t('The IE Unlimited CSS Loader module is enabled'),
'description' => $t('On the <a href="@modules">modules page</a> you can disable it, as this module is no longer needed.', array('@modules' => url('admin/build/modules'))),
);
}
if (module_exists('ie_css_optimizer')) {
$requirements['advagg_unlimited_css'] = array(
- 'title' => $t('Adv CSS/JS Agg - IE CSS Optimizer'),
- 'severity' => REQUIREMENT_WARNING,
- 'value' => $t('The IE CSS Optimizer module is enabled'),
+ 'title' => $t('Adv CSS/JS Agg - IE CSS Optimizer'),
+ 'severity' => REQUIREMENT_WARNING,
+ 'value' => $t('The IE CSS Optimizer module is enabled'),
'description' => $t('On the <a href="@modules">modules page</a> you can disable it, as this module is no longer needed.', array('@modules' => url('admin/build/modules'))),
);
}
if (module_exists('cmscdn')) {
$requirements['advagg_cmscdn'] = array(
- 'title' => $t('Adv CSS/JS Agg - CMS CDN'),
- 'severity' => REQUIREMENT_WARNING,
- 'value' => $t('The CMS CDN module is enabled.'),
+ 'title' => $t('Adv CSS/JS Agg - CMS CDN'),
+ 'severity' => REQUIREMENT_WARNING,
+ 'value' => $t('The CMS CDN module is enabled.'),
'description' => $t('On the <a href="@modules">modules page</a> you can disable it, as this module is no longer needed.', array('@modules' => url('admin/build/modules'))),
);
}
if (module_exists('bundlecache')) {
$requirements['advagg_bundlecache'] = array(
- 'title' => $t('Adv CSS/JS Agg - BundleCache'),
- 'severity' => REQUIREMENT_WARNING,
- 'value' => $t('The BundleCache module is enabled.'),
+ 'title' => $t('Adv CSS/JS Agg - BundleCache'),
+ 'severity' => REQUIREMENT_WARNING,
+ 'value' => $t('The BundleCache module is enabled.'),
'description' => $t('On the <a href="@modules">modules page</a> you can disable it, as this module is no longer needed.', array('@modules' => url('admin/build/modules'))),
);
}
if (module_exists('css_emimage') && !function_exists('css_emimage_advagg_filenames_alter')) {
$requirements['advagg_css_emimage'] = array(
- 'title' => $t('Adv CSS/JS Agg - CSS Embedded Images'),
- 'severity' => REQUIREMENT_WARNING,
- 'value' => $t('CSS Embedded Images module needs a patch.'),
+ 'title' => $t('Adv CSS/JS Agg - CSS Embedded Images'),
+ 'severity' => REQUIREMENT_WARNING,
+ 'value' => $t('CSS Embedded Images module needs a patch.'),
'description' => $t('You need to apply the latest patch from this issue <a href="@issue">CSS Embedded Images - Add in support for advaggs hooks</a>; otherwise these 2 modules are not compatible with each other.', array('@issue' => 'http://drupal.org/node/1078060')),
);
}
if (isset($_advagg['closure']) && $_advagg['closure'] == FALSE) {
$requirements['advagg_closure'] = array(
- 'title' => $t('Adv CSS/JS Agg - Closure'),
- 'severity' => REQUIREMENT_WARNING,
- 'value' => $t('Your theme implements its own closure function.'),
+ 'title' => $t('Adv CSS/JS Agg - Closure'),
+ 'severity' => REQUIREMENT_WARNING,
+ 'value' => $t('Your theme implements its own closure function.'),
'description' => $t('To solve this problem, you unfortunately have to modify your theme. Copy the phptemplate_closure() function found in <a href="@link">advagg.module source code</a> and integrate it into your theme phptemplate_closure() function or <themename>_closure() function.', array('@link' => 'http://drupalcode.org/project/advagg.git/blob/refs/heads/6.x-1.x:/advagg.module#l201')),
);
}
@@ -229,9 +229,9 @@ function advagg_requirements($phase) {
$file_path_blacklist = array_filter($file_path_blacklist);
if (array_search('*.js', $file_path_blacklist) !== FALSE) {
$requirements['advagg_cdn_js_blacklist'] = array(
- 'title' => $t('Adv CSS/JS Agg - CDN Settings'),
- 'severity' => REQUIREMENT_WARNING,
- 'value' => $t('The CDN module is set to blacklist all *.js files.'),
+ 'title' => $t('Adv CSS/JS Agg - CDN Settings'),
+ 'severity' => REQUIREMENT_WARNING,
+ 'value' => $t('The CDN module is set to blacklist all *.js files.'),
'description' => $t('Check your <a href="@cdn">CDN settings</a> and adjust the blacklist to not include "*.js". Testing is important in this case. "*tiny_mce.js" is a file/pattern we had to add to the blacklist after removing *.js from it.', array('@cdn' => url('admin/settings/cdn/other'))),
);
}
@@ -241,12 +241,12 @@ function advagg_requirements($phase) {
$function = advagg_install_theme_registry_location($hooks);
if ($function != 'advagg_processor') {
$requirements['advagg_theme'] = array(
- 'title' => $t('Adv CSS/JS Agg - Theme Hook'),
- 'severity' => REQUIREMENT_ERROR,
- 'value' => $t('Theme hook is not in the correct place.'),
+ 'title' => $t('Adv CSS/JS Agg - Theme Hook'),
+ 'severity' => REQUIREMENT_ERROR,
+ 'value' => $t('Theme hook is not in the correct place.'),
'description' => $t('On the <a href="@performance">performance page</a> clear the cache. If this is still an issue open up a bug on the <a href="http://drupal.org/node/add/project-issue/advagg">advagg issue queue</a> and be sure to include the "Hook Theme Info" output from the Advanced CSS/JS aggregation <a href="@settings">settings page</a>.', array(
- '@performance' => url('admin/settings/performance'),
- '@settings' => url('admin/settings/advagg'),
+ '@performance' => url('admin/settings/performance'),
+ '@settings' => url('admin/settings/advagg'),
)),
);
}
@@ -254,11 +254,11 @@ function advagg_requirements($phase) {
$function = $hooks['closure']['function'];
if ($function != 'phptemplate_closure' && variable_get('advagg_closure', ADVAGG_CLOSURE)) {
$requirements['advagg_closure'] = array(
- 'title' => $t('Adv CSS/JS Agg - Closure'),
- 'severity' => REQUIREMENT_ERROR,
- 'value' => $t('Closure theme function issue.') . $function,
+ 'title' => $t('Adv CSS/JS Agg - Closure'),
+ 'severity' => REQUIREMENT_ERROR,
+ 'value' => $t('Closure theme function issue.') . $function,
'description' => $t('On the <a href="@performance">performance page</a> clear the cache or just the theme registry if you know how to do that. If this is still an issue open up a bug on the <a href="http://drupal.org/node/add/project-issue/advagg">advagg issue queue</a>.', array(
- '@performance' => url('admin/settings/performance'),
+ '@performance' => url('admin/settings/performance'),
)),
);
}
@@ -313,9 +313,9 @@ function advagg_check_missing_handler()
// Don't run the test if site is offline
if (variable_get('site_offline', 0)) {
$ret['advagg_async_offline'] = array(
- 'title' => $t('Adv CSS/JS Agg - Asynchronous Mode'),
- 'severity' => REQUIREMENT_WARNING,
- 'value' => $t('Unknown. Currently set to @value.', array('@value' => $async ? 'TRUE' : 'FALSE')),
+ 'title' => $t('Adv CSS/JS Agg - Asynchronous Mode'),
+ 'severity' => REQUIREMENT_WARNING,
+ 'value' => $t('Unknown. Currently set to @value.', array('@value' => $async ? 'TRUE' : 'FALSE')),
'description' => $t('This can not be tested while the site is in <a href="@maintenance">offline mode</a>', array('@maintenance' => url('admin/settings/site-maintenance'))),
);
return $ret;
@@ -335,9 +335,9 @@ function advagg_check_missing_handler()
if (empty($item['page_callback']) || strpos($item['page_callback'], 'advagg') === FALSE) {
$item = str_replace(' ', ' ', nl2br(htmlentities(print_r($item, TRUE))));
$ret['advagg_async_generation_menu_issue'] = array(
- 'title' => $t('Adv CSS/JS Agg - Async Mode'),
- 'severity' => REQUIREMENT_WARNING,
- 'value' => $t('Flush your caches'),
+ 'title' => $t('Adv CSS/JS Agg - Async Mode'),
+ 'severity' => REQUIREMENT_WARNING,
+ 'value' => $t('Flush your caches'),
'description' => $t('You need to flush your menu cache. This can be done near the bottom of the <a href="@performance">performance page</a>. If this does not fix the issue copy this info below when opening up an <a href="http://drupal.org/node/add/project-issue/advagg">issue for advagg</a>: <br /> !info', array(
'@performance' => url('admin/settings/performance'),
'!info' => $item,
@@ -349,9 +349,9 @@ function advagg_check_missing_handler()
if (empty($item['page_callback']) || strpos($item['page_callback'], 'advagg') === FALSE) {
$item = str_replace(' ', ' ', nl2br(htmlentities(print_r($item, TRUE))));
$ret['advagg_async_generation_menu_issue'] = array(
- 'title' => $t('Adv CSS/JS Agg - Async Mode'),
- 'severity' => REQUIREMENT_WARNING,
- 'value' => $t('Flush your caches'),
+ 'title' => $t('Adv CSS/JS Agg - Async Mode'),
+ 'severity' => REQUIREMENT_WARNING,
+ 'value' => $t('Flush your caches'),
'description' => $t('You need to flush your menu cache. This can be done near the bottom of the <a href="@performance">performance page</a>. If this does not fix the issue copy this info below when opening up an <a href="http://drupal.org/node/add/project-issue/advagg">issue for advagg</a>: <br /> !info', array(
'@performance' => url('admin/settings/performance'),
'!info' => $item,
@@ -418,9 +418,9 @@ function advagg_check_missing_handler()
$extra_404 = $t('If you are still having issues you can go to the <a href="@info">AdvAgg information tab</a> and select Asynchronous debug info. If creating an issue on d.o be sure to include this information @cdn_extra.',
array(
- '@info' => url('admin/settings/advagg/info'),
- '@cdn_extra' => $cdn_extra,
- )
+ '@info' => url('admin/settings/advagg/info'),
+ '@cdn_extra' => $cdn_extra,
+ )
);
$extra_404 .= module_exists('stage_file_proxy') ? $t('<a href="http://drupal.org/project/stage_file_proxy">Stage File Proxy</a> needs <a href="http://drupal.org/node/1078218">this patch</a> applied to it in order for advagg to work correctly.') : '';
@@ -428,35 +428,35 @@ function advagg_check_missing_handler()
$cdn_failed = FALSE;
if (isset($parts_css) && empty($parts_css)) {
$ret['advagg_async_generation_css_cdn'] = array(
- 'title' => $t('Adv CSS/JS Agg - CDN Async Mode'),
- 'severity' => REQUIREMENT_WARNING,
- 'value' => $t('CSS CDN Issue'),
+ 'title' => $t('Adv CSS/JS Agg - CDN Async Mode'),
+ 'severity' => REQUIREMENT_WARNING,
+ 'value' => $t('CSS CDN Issue'),
'description' => $t('Your current CDN settings are not rewriting the URL for advagg CSS files to point to your CDN. Most likely you need to adjust your <a href="@cdnother">CDN exceptions</a> to allow CSS files from advagg.', array('@cdnother' => url('admin/settings/cdn/other'))),
);
}
if (isset($parts_js) && empty($parts_js)) {
$ret['advagg_async_generation_js_cdn'] = array(
- 'title' => $t('Adv CSS/JS Agg - CDN Async Mode'),
- 'severity' => REQUIREMENT_WARNING,
- 'value' => $t('JS CDN Issue'),
+ 'title' => $t('Adv CSS/JS Agg - CDN Async Mode'),
+ 'severity' => REQUIREMENT_WARNING,
+ 'value' => $t('JS CDN Issue'),
'description' => $t('Your current CDN settings are not rewriting the URL for advagg JS files to point to your CDN. Most likely you need to adjust your <a href="@cdnother">CDN exceptions</a> to allow JS files from advagg.', array('@cdnother' => url('admin/settings/cdn/other'))),
);
}
if (isset($data_cdn_css)) {
if ($data_cdn_css->code != 200 && $mode == CDN_MODE_BASIC && (!empty($data_cdn_css->headers['X-AdvAgg']) || (!empty($data_cdn_css->data) && strpos($data_cdn_css->data, '<!-- advagg_missing_fast404 -->') !== FALSE))) {
$ret['advagg_async_generation_css_cdn'] = array(
- 'title' => $t('Adv CSS/JS Agg - CDN Async Mode'),
- 'severity' => REQUIREMENT_OK,
- 'value' => $t('CSS CDN'),
+ 'title' => $t('Adv CSS/JS Agg - CDN Async Mode'),
+ 'severity' => REQUIREMENT_OK,
+ 'value' => $t('CSS CDN'),
'description' => $t('Requests through the CDN are getting back to advagg for CSS files.'),
);
}
else {
$cdn_failed = TRUE;
$ret['advagg_async_generation_css_cdn'] = array(
- 'title' => $t('Adv CSS/JS Agg - CDN Async Mode'),
- 'severity' => REQUIREMENT_WARNING,
- 'value' => $t('CSS CDN Issue'),
+ 'title' => $t('Adv CSS/JS Agg - CDN Async Mode'),
+ 'severity' => REQUIREMENT_WARNING,
+ 'value' => $t('CSS CDN Issue'),
'description' => $t('Check your <a href="@cdn">CDN settings</a>; CSS request is not coming back when routed through the CDN. ', array('@cdn' => url('admin/settings/cdn'))) . $extra_404,
);
}
@@ -464,18 +464,18 @@ function advagg_check_missing_handler()
if (isset($data_cdn_js)) {
if ($data_cdn_js->code != 200 && $mode == CDN_MODE_BASIC && (!empty($data_cdn_js->headers['X-AdvAgg']) || (!empty($data_cdn_js->data) && strpos($data_cdn_js->data, '<!-- advagg_missing_fast404 -->') !== FALSE))) {
$ret['advagg_async_generation_js_cdn'] = array(
- 'title' => $t('Adv CSS/JS Agg - CDN Async Mode'),
- 'severity' => REQUIREMENT_OK,
- 'value' => $t('JS CDN'),
+ 'title' => $t('Adv CSS/JS Agg - CDN Async Mode'),
+ 'severity' => REQUIREMENT_OK,
+ 'value' => $t('JS CDN'),
'description' => $t('Requests through the CDN are getting back to advagg for JS files.'),
);
}
else {
$cdn_failed = TRUE;
$ret['advagg_async_generation_js_cdn'] = array(
- 'title' => $t('Adv CSS/JS Agg - CDN Async Mode'),
- 'severity' => REQUIREMENT_WARNING,
- 'value' => $t('JS CDN Issue'),
+ 'title' => $t('Adv CSS/JS Agg - CDN Async Mode'),
+ 'severity' => REQUIREMENT_WARNING,
+ 'value' => $t('JS CDN Issue'),
'description' => $t('Check your <a href="@cdn">CDN settings</a>; JS request is not coming back when routed through the CDN. ', array('@cdn' => url('admin/settings/cdn'))) . $extra_404,
);
}
@@ -487,23 +487,23 @@ function advagg_check_missing_handler()
if ($async == -1 && !$cdn_failed) {
variable_set('advagg_async_generation', TRUE);
$ret['advagg_async_generation'] = array(
- 'title' => $t('Adv CSS/JS Agg - Asynchronous Mode'),
- 'severity' => REQUIREMENT_OK,
- 'value' => $t('Is now set to TRUE.'),
+ 'title' => $t('Adv CSS/JS Agg - Asynchronous Mode'),
+ 'severity' => REQUIREMENT_OK,
+ 'value' => $t('Is now set to TRUE.'),
);
}
if ($async == 0) {
$ret['advagg_async_generation'] = array(
- 'title' => $t('Adv CSS/JS Agg - Asynchronous Mode'),
- 'severity' => REQUIREMENT_WARNING,
- 'value' => $t('Could be changed to TRUE.'),
+ 'title' => $t('Adv CSS/JS Agg - Asynchronous Mode'),
+ 'severity' => REQUIREMENT_WARNING,
+ 'value' => $t('Could be changed to TRUE.'),
);
}
if ($async == 1) {
$ret['advagg_async_generation'] = array(
- 'title' => $t('Adv CSS/JS Agg - Asynchronous Mode'),
- 'severity' => REQUIREMENT_OK,
- 'value' => $t('Already set to TRUE'),
+ 'title' => $t('Adv CSS/JS Agg - Asynchronous Mode'),
+ 'severity' => REQUIREMENT_OK,
+ 'value' => $t('Already set to TRUE'),
);
}
if ($cdn_failed) {
@@ -521,11 +521,11 @@ function advagg_check_missing_handler()
$file = file_get_contents($directory . '/.htaccess');
if (stripos($file, "RewriteEngine off") !== FALSE) {
$ret['advagg_htaccess'] = array(
- 'title' => $t('Adv CSS/JS Agg - Files Dir htaccess'),
- 'severity' => REQUIREMENT_ERROR,
- 'value' => $t('The htaccess file in %dir is non standard.', array('%dir' => $directory)),
+ 'title' => $t('Adv CSS/JS Agg - Files Dir htaccess'),
+ 'severity' => REQUIREMENT_ERROR,
+ 'value' => $t('The htaccess file in %dir is non standard.', array('%dir' => $directory)),
'description' => $t('You need to modify your htaccess file in your files directory. See <a href="@url">this link</a> for more info.', array(
- '@url' => 'http://drupal.org/node/1171244#comment-4770544',
+ '@url' => 'http://drupal.org/node/1171244#comment-4770544',
)),
);
}
@@ -534,9 +534,9 @@ function advagg_check_missing_handler()
// Build error message.
if (empty($ret['advagg_htaccess'])) {
$ret['advagg_async_generation'] = array(
- 'title' => $t('Adv CSS/JS Agg - Asynchronous Mode'),
- 'severity' => REQUIREMENT_ERROR,
- 'value' => $t('Set to FALSE.'),
+ 'title' => $t('Adv CSS/JS Agg - Asynchronous Mode'),
+ 'severity' => REQUIREMENT_ERROR,
+ 'value' => $t('Set to FALSE.'),
'description' => $t('Check to see if you have fast 404s, if so create an exception for this module. The <a href="@readme">readme file</a> explains what needs to be changed. You can try flushing the menu cache as well. ', array('@readme' => url($readme))) . $extra_404,
);
}
@@ -544,21 +544,21 @@ function advagg_check_missing_handler()
// Set socket timeout relative to local round trip.
$timeout = variable_get('advagg_socket_timeout', -1);
- $new_time = ceil(($time_local['time']+51)/1000);
+ $new_time = ceil(($time_local['time'] + 51) / 1000);
if ($async) {
if ($timeout == -1 || $timeout != $new_time) {
variable_set('advagg_socket_timeout', $new_time);
$ret['advagg_socket_timeout'] = array(
- 'title' => $t('Adv CSS/JS Agg - Socket Timeout'),
- 'severity' => REQUIREMENT_OK,
- 'value' => $t('Set to %time seconds. Raw timer: %raw', array('%time' => $new_time, '%raw' => $time_local['time'])),
+ 'title' => $t('Adv CSS/JS Agg - Socket Timeout'),
+ 'severity' => REQUIREMENT_OK,
+ 'value' => $t('Set to %time seconds. Raw timer: %raw', array('%time' => $new_time, '%raw' => $time_local['time'])),
);
}
else {
$ret['advagg_socket_timeout'] = array(
- 'title' => $t('Adv CSS/JS Agg - Socket Timeout'),
- 'severity' => REQUIREMENT_OK,
- 'value' => $t('Already set to %time seconds. Raw timer: %raw', array('%time' => $new_time, '%raw' => $time_local['time'])),
+ 'title' => $t('Adv CSS/JS Agg - Socket Timeout'),
+ 'severity' => REQUIREMENT_OK,
+ 'value' => $t('Already set to %time seconds. Raw timer: %raw', array('%time' => $new_time, '%raw' => $time_local['time'])),
);
}
}
@@ -708,16 +708,15 @@ function advagg_schema() {
),
),
'indexes' => array(
- 'root' => array('root'),
- 'timestamp' => array('timestamp'),
- 'counter' => array('counter'),
+ 'root' => array('root'),
+ 'timestamp' => array('timestamp'),
+ 'counter' => array('counter'),
'root_timestamp' => array(
'root',
'timestamp',
),
),
- 'primary key' => array('bundle_md5', 'filename_md5'),
-
+ 'primary key' => array('bundle_md5', 'filename_md5'),
);
return $schema;
@@ -731,11 +730,11 @@ function advagg_update_6100() {
// Add in data column
db_add_field($ret, 'advagg_files', 'data', array(
- 'description' => 'Extra data about this file. Example would be what compressors work with it.',
- 'type' => 'text',
- 'not null' => TRUE,
- 'size' => 'big',
- ));
+ 'description' => 'Extra data about this file. Example would be what compressors work with it.',
+ 'type' => 'text',
+ 'not null' => TRUE,
+ 'size' => 'big',
+ ));
return $ret;
}
@@ -779,11 +778,11 @@ function advagg_update_6102() {
// Add in root column.
db_add_field($ret, 'advagg_bundles', 'root', array(
- 'description' => 'If 1 then it is a root file. 0 means not root file.',
- 'type' => 'int',
- 'not null' => TRUE,
- 'default' => 0,
- ));
+ 'description' => 'If 1 then it is a root file. 0 means not root file.',
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'default' => 0,
+ ));
return $ret;
}
@@ -825,7 +824,10 @@ function advagg_update_6105() {
variable_del('advagg_strict_js_bundles');
cache_clear_all('*', 'cache_advagg_bundle_reuse', TRUE);
cache_clear_all('*', 'cache_advagg_file_builder', TRUE);
- $ret[] = array('success' => TRUE, 'query' => 'advagg bundle_reuse & file_builder caches flushed.');
+ $ret[] = array(
+ 'success' => TRUE,
+ 'query' => 'advagg bundle_reuse & file_builder caches flushed.',
+ );
return $ret;
}
@@ -837,7 +839,10 @@ function advagg_update_6106() {
$ret = array();
cache_clear_all('*', 'cache_advagg_files_data', TRUE);
- $ret[] = array('success' => TRUE, 'query' => 'advagg files_data cache flushed.');
+ $ret[] = array(
+ 'success' => TRUE,
+ 'query' => 'advagg files_data cache flushed.',
+ );
return $ret;
}
@@ -850,7 +855,10 @@ function advagg_update_6107() {
if (db_table_exists('cache_advagg_file_builder')) {
cache_clear_all('*', 'cache_advagg_file_builder', TRUE);
- $ret[] = array('success' => TRUE, 'query' => 'advagg file_builder cache flushed.');
+ $ret[] = array(
+ 'success' => TRUE,
+ 'query' => 'advagg file_builder cache flushed.',
+ );
db_drop_table($ret, 'cache_advagg_file_builder');
}
@@ -868,11 +876,11 @@ function advagg_update_6108() {
// Add in timestamp column.
db_add_field($ret, 'advagg_bundles', 'timestamp', array(
- 'description' => 'Last used timestamp of the bundle.',
- 'type' => 'int',
- 'not null' => TRUE,
- 'default' => 0,
- ));
+ 'description' => 'Last used timestamp of the bundle.',
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'default' => 0,
+ ));
// Add in indexes.
db_add_index($ret, 'advagg_bundles', 'root', array('root'));
@@ -897,17 +905,23 @@ function advagg_update_6108() {
else {
$file_type_path = $js_path;
}
- $filepath = $file_type_path .'/'. $filename;
+ $filepath = $file_type_path . '/' . $filename;
$data = cache_get($filepath, 'cache_advagg');
if (!empty($data->data)) {
// Set timestamp if it exists in the cache.
// Not using update_sql() so we can pass in % arguments.
db_query("UPDATE {advagg_bundles} SET timestamp = %d WHERE bundle_md5 = '%s'", $data->data, $row['bundle_md5']);
- $ret[] = array('success' => TRUE, 'query' => 'Timestamp added for: ' . $filename . '.');
+ $ret[] = array(
+ 'success' => TRUE,
+ 'query' => 'Timestamp added for: ' . $filename . '.',
+ );
}
else {
- $ret[] = array('success' => TRUE, 'query' => 'No timestamp found for: ' . $filename . '.');
+ $ret[] = array(
+ 'success' => TRUE,
+ 'query' => 'No timestamp found for: ' . $filename . '.',
+ );
}
}
@@ -915,7 +929,10 @@ function advagg_update_6108() {
foreach ($cache_tables as $table) {
cache_clear_all('*', $table, TRUE);
}
- $ret[] = array('success' => TRUE, 'query' => 'AdvAgg Caches Flushed.');
+ $ret[] = array(
+ 'success' => TRUE,
+ 'query' => 'AdvAgg Caches Flushed.',
+ );
return $ret;
}
@@ -931,11 +948,11 @@ function advagg_update_6109() {
// Add in timestamp column.
db_add_field($ret, 'advagg_files', 'filesize', array(
- 'description' => 'The filesize of the file in bytes.',
- 'type' => 'int',
- 'not null' => TRUE,
- 'default' => 0,
- ));
+ 'description' => 'The filesize of the file in bytes.',
+ 'type' => 'int',
+ 'not null' => TRUE,
+ 'default' => 0,
+ ));
// Add in an index.
db_add_index($ret, 'advagg_files', 'filesize', array('filesize'));
@@ -950,11 +967,17 @@ function advagg_update_6109() {
if (!empty($size)) {
db_query("UPDATE {advagg_files} SET filesize = %d WHERE filename_md5 = '%s'", $size, $row['filename_md5']);
$updated = TRUE;
- $ret[] = array('success' => TRUE, 'query' => 'Filesize added for: ' . $row['filename'] . '.');
+ $ret[] = array(
+ 'success' => TRUE,
+ 'query' => 'Filesize added for: ' . $row['filename'] . '.',
+ );
}
}
if (!$updated) {
- $ret[] = array('success' => FALSE, 'query' => 'Could not get the filesize for for: ' . $row['filename'] . '.');
+ $ret[] = array(
+ 'success' => FALSE,
+ 'query' => 'Could not get the filesize for for: ' . $row['filename'] . '.',
+ );
}
}
diff -up -r advagg.missing.inc advagg.missing.inc
--- advagg.missing.inc 2012-03-23 12:08:13.000000000 -0600
+++ advagg.missing.inc 2012-03-23 13:02:15.000000000 -0600
@@ -88,14 +88,14 @@ function advagg_missing_regenerate() {
$file_type_path = $css_path;
}
$new_filename = advagg_build_filename($type, $md5, $counter);
- $filepath = $file_type_path .'/'. $new_filename;
+ $filepath = $file_type_path . '/' . $new_filename;
// Only process if we got an older counter.
// If we have an out of range counter see if a simlar file exists and serve
// that up.
if ($counter > $counter_in_db || $counter < 0) {
$new_filename = advagg_build_filename($type, $md5, $counter_in_db);
- $filepath = $file_type_path .'/'. $new_filename;
+ $filepath = $file_type_path . '/' . $new_filename;
advagg_missing_send_file($filepath, advagg_build_uri($filepath), $type);
exit;
}
@@ -201,7 +201,7 @@ function advagg_missing_remove_cache($bu
if (!empty($filenames)) {
foreach ($filenames as $key => $info) {
$filename = $info['filename'];
- $filepath = $file_type_path .'/'. $filename;
+ $filepath = $file_type_path . '/' . $filename;
cache_set($filepath, FALSE, 'cache_advagg', TRUE);
}
@@ -228,7 +228,7 @@ function advagg_missing_async_opp($outpu
// Calculate Content Length
if ($length == 0) {
$output .= "\n";
- $length = (advagg_missing_strlen($output)-1);
+ $length = (advagg_missing_strlen($output) -1);
}
// Prime php for background operations
$loop = 0;
@@ -342,8 +342,8 @@ function advagg_missing_file_create_path
return $dest;
}
// Not found, try again with prefixed directory path.
- else if (file_check_location($file_path .'/'. $dest, $file_path)) {
- return $file_path .'/'. $dest;
+ else if (file_check_location($file_path . '/' . $dest, $file_path)) {
+ return $file_path . '/' . $dest;
}
}
// File not found.
diff -up -r advagg.module advagg.module
--- advagg.module 2012-03-23 12:08:13.000000000 -0600
+++ advagg.module 2012-03-23 13:02:17.000000000 -0600
@@ -162,14 +162,14 @@ if (variable_get('advagg_closure', ADVAG
if (!function_exists('phptemplate_closure')) {
/**
- * Execute hook_footer() which is run at the end of the page right before
- * the close of the body tag.
- *
- * @param $main (optional)
- * Whether the current page is the front page of the site.
- * @return
- * A string containing the results of the hook_footer() calls.
- */
+ * Execute hook_footer() which is run at the end of the page right before
+ * the close of the body tag.
+ *
+ * @param $main (optional)
+ * Whether the current page is the front page of the site.
+ * @return
+ * A string containing the results of the hook_footer() calls.
+ */
function phptemplate_closure($main = 0) {
global $_advagg;
$_advagg['closure'] = TRUE;
@@ -292,7 +292,7 @@ function advagg_cron() {
// Set the oldest file/bundle to keep at 2 weeks.
$max_time = module_exists('advagg_bundler') ? variable_get('advagg_bundler_outdated', ADVAGG_BUNDLER_OUTDATED) : 1209600;
$max_file_time = time() - $max_time;
- $max_bundle_time = time() - ($max_time*3);
+ $max_bundle_time = time() - ($max_time * 3);
$bundles_removed = 0;
$files_removed = array();
@@ -384,8 +384,8 @@ function advagg_theme_registry_alter(&$t
// If ctools hasn't been patched remove it from getting pre-processed.
if ( !empty($_advagg['ctools_patched'])
- && module_exists('ctools')
- && $key = array_search('ctools_ajax_page_preprocess', $theme_registry['page']['preprocess functions'])
+ && module_exists('ctools')
+ && $key = array_search('ctools_ajax_page_preprocess', $theme_registry['page']['preprocess functions'])
) {
unset($theme_registry['page']['preprocess functions'][$key]);
}
@@ -545,30 +545,30 @@ function advagg_string_ends_with($haysta
// Define substr_compare if it doesn't exist (PHP 4 fix).
if (!function_exists('substr_compare')) {
/**
- * Binary safe comparison of two strings from an offset, up to length
- * characters.
- *
- * Compares main_str from position offset with str up to length characters.
- * @see http://php.net/substr-compare#53084
- *
- * @param $main_str
- * The main string being compared.
- * @param $str
- * The secondary string being compared.
- * @param $offset
- * The start position for the comparison. If negative, it starts counting
- * from the end of the string.
- * @param $length
- * The length of the comparison. The default value is the largest of the
- * length of the str compared to the length of main_str less the offset.
- * @param $case_insensitivity
- * If TRUE, comparison is case insensitive.
- * @return
- * Returns < 0 if main_str from position offset is less than str, > 0 if
- * it is greater than str, and 0 if they are equal. If offset is equal to
- * or greater than the length of main_str or length is set and is less than
- * 1, substr_compare() prints a warning and returns FALSE.
- */
+ * Binary safe comparison of two strings from an offset, up to length
+ * characters.
+ *
+ * Compares main_str from position offset with str up to length characters.
+ * @see http://php.net/substr-compare#53084
+ *
+ * @param $main_str
+ * The main string being compared.
+ * @param $str
+ * The secondary string being compared.
+ * @param $offset
+ * The start position for the comparison. If negative, it starts counting
+ * from the end of the string.
+ * @param $length
+ * The length of the comparison. The default value is the largest of the
+ * length of the str compared to the length of main_str less the offset.
+ * @param $case_insensitivity
+ * If TRUE, comparison is case insensitive.
+ * @return
+ * Returns < 0 if main_str from position offset is less than str, > 0 if
+ * it is greater than str, and 0 if they are equal. If offset is equal to
+ * or greater than the length of main_str or length is set and is less than
+ * 1, substr_compare() prints a warning and returns FALSE.
+ */
function substr_compare($main_str, $str, $offset, $length = NULL, $case_insensitivity = FALSE) {
$offset = (int) $offset;
@@ -608,7 +608,7 @@ function advagg_string_ends_with($haysta
if ($needle_len > $haystack_len) {
return FALSE;
}
- return substr_compare($haystack, $needle, $haystack_len-$needle_len, $needle_len, TRUE) === 0;
+ return substr_compare($haystack, $needle, $haystack_len -$needle_len, $needle_len, TRUE) === 0;
}
/**
@@ -830,7 +830,7 @@ function advagg_jquery_updater(&$js) {
unset($js['core']['misc/jquery.js']);
// Loop through each of the required replacements.
- $replacement_path = drupal_get_path('module', 'jquery_update') .'/replace/';
+ $replacement_path = drupal_get_path('module', 'jquery_update') . '/replace/';
foreach (jquery_update_get_replacements() as $type => $replacements) {
foreach ($replacements as $find => $replace) {
// If the file to replace is loaded on this page...
@@ -1085,7 +1085,10 @@ function advagg_find_existing_bundle(&$f
// Make sure bundle has the same number of files if using strict matching.
if (!empty($count) && $count == $files_count) {
$bundle_md5 = $new_md5;
- $data = array(array('files' => $files, 'bundle_md5' => $bundle_md5));
+ $data = array(array(
+ 'files' => $files,
+ 'bundle_md5' => $bundle_md5,
+ ));
cache_set($cached_data_key, $data, 'cache_advagg_bundle_reuse', CACHE_TEMPORARY);
return;
}
@@ -1487,7 +1490,7 @@ function advagg_get_bundle_from_filename
$type = substr($filename, 0, strpos($filename, '_'));
// Get extension
- $ext = substr($filename, strpos($filename, '.', 37)+1);
+ $ext = substr($filename, strpos($filename, '.', 37) + 1);
// Make sure extension is the same as the type.
if ($ext != $type) {
@@ -1497,11 +1500,11 @@ function advagg_get_bundle_from_filename
// Extract info from wanted filename.
if ($type == 'css') {
$md5 = substr($filename, 4, 32);
- $counter = substr($filename, 37, strpos($filename, '.', 38)-37);
+ $counter = substr($filename, 37, strpos($filename, '.', 38) -37);
}
elseif ($type == 'js') {
$md5 = substr($filename, 3, 32);
- $counter = substr($filename, 36, strpos($filename, '.', 37)-36);
+ $counter = substr($filename, 36, strpos($filename, '.', 37) -36);
}
else {
return t('Wrong file type.');
@@ -1818,7 +1821,7 @@ function advagg_process_css_js_prep($noa
// browser-caching. The string changes on every update or full cache
// flush, forcing browsers to load a new copy of the files, as the
// URL changed.
- $query_string = '?'. substr(variable_get('css_js_query_string', '0'), 0, 1);
+ $query_string = '?' . substr(variable_get('css_js_query_string', '0'), 0, 1);
return array($preprocess, $public_downloads, $query_string);
}
@@ -2114,8 +2117,8 @@ function advagg_unlimited_css_builder($e
// Test for versions > 1.5
// Test for Pocket IE
if ( stristr($_SERVER['HTTP_USER_AGENT'], 'microsoft internet explorer')
- || stristr($_SERVER['HTTP_USER_AGENT'], 'msie')
- || stristr($_SERVER['HTTP_USER_AGENT'], 'mspie')
+ || stristr($_SERVER['HTTP_USER_AGENT'], 'msie')
+ || stristr($_SERVER['HTTP_USER_AGENT'], 'mspie')
) {
$is_ie = TRUE;
}
@@ -2165,19 +2168,19 @@ function advagg_unlimited_css_traditiona
if (isset($css_file['href'])) {
$href = $css_file['href'];
if ($prefix != $last_prefix) {
- $styles .= $last_suffix . "\n" . $prefix . '<link type="text/css" rel="stylesheet" media="'. $media .'" href="'. $href . '" />' . "\n";
+ $styles .= $last_suffix . "\n" . $prefix . '<link type="text/css" rel="stylesheet" media="' . $media . '" href="' . $href . '" />' . "\n";
}
else {
- $styles .= '<link type="text/css" rel="stylesheet" media="'. $media .'" href="'. $href . '" />' . "\n";
+ $styles .= '<link type="text/css" rel="stylesheet" media="' . $media . '" href="' . $href . '" />' . "\n";
}
}
else {
$data = $css_file['data'];
if ($prefix != $last_prefix) {
- $styles .= $last_suffix . "\n" . $prefix . '<style type="text/css" media="'. $media .'">' . "\n" . $data . "\n" . '</style>' . "\n";
+ $styles .= $last_suffix . "\n" . $prefix . '<style type="text/css" media="' . $media . '">' . "\n" . $data . "\n" . '</style>' . "\n";
}
else {
- $styles .= '<style type="text/css" media="'. $media .'">' . "\n" . $data . "\n" . '</style>' . "\n";
+ $styles .= '<style type="text/css" media="' . $media . '">' . "\n" . $data . "\n" . '</style>' . "\n";
}
}
$last_prefix = $prefix;
@@ -2203,17 +2206,17 @@ function advagg_unlimited_css_import($fi
$href = $css_file['href'];
if ($media_new != $media || $counter > variable_get('advagg_css_count_threshold', ADVAGG_CSS_COUNT_THRESHOLD)) {
if ($media && !empty($import)) {
- $styles .= "\n" . '<style type="text/css" media="'. $media .'">' . "\n". $import .'</style>';
+ $styles .= "\n" . '<style type="text/css" media="' . $media . '">' . "\n" . $import . '</style>';
$import = '';
}
$counter = 0;
$media = $media_new;
}
- $import .= '@import "'. $href .'";'."\n";
+ $import .= '@import "' . $href . '";' . "\n";
$counter++;
}
if ($media && !empty($import)) {
- $styles .= "\n".'<style type="text/css" media="'. $media .'">'."\n". $import .'</style>';
+ $styles .= "\n" . '<style type="text/css" media="' . $media . '">' . "\n" . $import . '</style>';
}
}
@@ -2269,7 +2272,11 @@ function advagg_process_js($master_set,
$setting_no_preprocess = array();
$inline_no_preprocess = array();
$external_no_preprocess = array();
- $output_no_preprocess = array('core' => array(), 'module' => array(), 'theme' => array());
+ $output_no_preprocess = array(
+ 'core' => array(),
+ 'module' => array(),
+ 'theme' => array(),
+ );
$output_preprocess = array();
$preprocess_list = array();
$js_settings_array = array();
@@ -2325,7 +2332,7 @@ function advagg_process_js($master_set,
// Additionally, go through any remaining scripts if JS preprocessing is on and output the non-cached ones.
foreach ($data as $path => $info) {
if (!$info['preprocess'] || !$public_downloads || !$preprocess_js) {
- $output_no_preprocess[$type][] = array(advagg_build_uri($path) . ($info['cache'] ? $query_string : '?'. time()), $info['defer'], $info['prefix'], $info['suffix']);
+ $output_no_preprocess[$type][] = array(advagg_build_uri($path) . ($info['cache'] ? $query_string : '?' . time()), $info['defer'], $info['prefix'], $info['suffix']);
$files_included[$path] = $info['preprocess'];
}
else {
@@ -2425,22 +2432,22 @@ function advagg_js_builder($external_no_
if (!empty($external_no_preprocess)) {
foreach ($external_no_preprocess as $values) {
- list ($src, $defer, $prefix, $suffix) = $values;
- $output .= $prefix . '<script type="text/javascript"'. ($defer ? ' defer="defer"' : '') . ' src="'. $src . '"></script>' . $suffix . "\n";
+ list($src, $defer, $prefix, $suffix) = $values;
+ $output .= $prefix . '<script type="text/javascript"' . ($defer ? ' defer="defer"' : '') . ' src="' . $src . '"></script>' . $suffix . "\n";
}
}
if (!empty($output_preprocess)) {
foreach ($output_preprocess as $values) {
- list ($src, $prefix, $suffix) = $values;
- $output .= $prefix . '<script type="text/javascript" src="'. $src .'"></script>' . $suffix . "\n";
+ list($src, $prefix, $suffix) = $values;
+ $output .= $prefix . '<script type="text/javascript" src="' . $src . '"></script>' . $suffix . "\n";
}
}
foreach ($output_no_preprocess as $type => $list) {
if (!empty($list)) {
foreach ($list as $values) {
- list ($src, $defer, $prefix, $suffix) = $values;
+ list($src, $defer, $prefix, $suffix) = $values;
$output .= $prefix . '<script type="text/javascript"' . ($defer ? ' defer="defer"' : '') . ' src="' . $src . '"></script>' . $suffix . "\n";
}
}
@@ -2454,8 +2461,8 @@ function advagg_js_builder($external_no_
if (!empty($inline_no_preprocess)) {
foreach ($inline_no_preprocess as $values) {
- list ($code, $defer, $prefix, $suffix) = $values;
- $output .= $prefix . '<script type="text/javascript"'. ($defer ? ' defer="defer"' : '') .'>' . $embed_prefix . $code . $embed_suffix . '</script>' . $suffix . "\n";
+ list($code, $defer, $prefix, $suffix) = $values;
+ $output .= $prefix . '<script type="text/javascript"' . ($defer ? ' defer="defer"' : '') . '>' . $embed_prefix . $code . $embed_suffix . '</script>' . $suffix . "\n";
}
}
@@ -2555,7 +2562,7 @@ function advagg_css_js_file_builder($typ
$bundle_md5 = $info['bundle_md5'];
$prefix = '';
$suffix = '';
- $filepath = $file_type_path .'/'. $filename;
+ $filepath = $file_type_path . '/' . $filename;
// Invoke hook_advagg_js_extra_alter() or hook_advagg_css_extra_alter to
// give installed modules a chance to modify the prefix or suffix for a
@@ -2592,13 +2599,21 @@ function advagg_css_js_file_builder($typ
// Return filepath if we are going to wait for the bundle to be
// generated or if the bundle already exists.
if (variable_get('advagg_aggregate_mode', ADVAGG_AGGREGATE_MODE) < 2 || advagg_bundle_built($filepath)) {
- $output[$filepath] = array('prefix' => $prefix, 'suffix' => $suffix, 'files' => array_map('advagg_return_true', array_flip($files)));
+ $output[$filepath] = array(
+ 'prefix' => $prefix,
+ 'suffix' => $suffix,
+ 'files' => array_map('advagg_return_true', array_flip($files)),
+ );
}
else {
// Aggregate isn't built yet, send back the files that where going to
// be in it.
foreach ($files as $file) {
- $output[$file . $query_string] = array('prefix' => '', 'suffix' => '', 'files' => array($file . $query_string => TRUE));
+ $output[$file . $query_string] = array(
+ 'prefix' => '',
+ 'suffix' => '',
+ 'files' => array($file . $query_string => TRUE),
+ );
}
$cacheable = FALSE;
advagg_disable_page_cache();
@@ -2611,13 +2626,21 @@ function advagg_css_js_file_builder($typ
if (!lock_acquire($lock_name)) {
if (variable_get('advagg_aggregate_mode', ADVAGG_AGGREGATE_MODE) == 0 ) {
$locks[] = array($lock_name => $filepath);
- $output[$filepath] = array('prefix' => $prefix, 'suffix' => $suffix, 'files' => array_map('advagg_return_true', array_flip($files)));
+ $output[$filepath] = array(
+ 'prefix' => $prefix,
+ 'suffix' => $suffix,
+ 'files' => array_map('advagg_return_true', array_flip($files)),
+ );
}
else {
// Aggregate isn't built yet, send back the files that where going
// to be in it.
foreach ($files as $file) {
- $output[$file . $query_string] = array('prefix' => '', 'suffix' => '', 'files' => array($file . $query_string => TRUE));
+ $output[$file . $query_string] = array(
+ 'prefix' => '',
+ 'suffix' => '',
+ 'files' => array($file . $query_string => TRUE),
+ );
}
$cacheable = FALSE;
advagg_disable_page_cache();
@@ -2664,7 +2687,11 @@ function advagg_css_js_file_builder($typ
else {
$files_used = array_merge($files_used, $files);
}
- $output[$filepath] = array('prefix' => $prefix, 'suffix' => $suffix, 'files' => array_map('advagg_return_true', array_flip($files)));
+ $output[$filepath] = array(
+ 'prefix' => $prefix,
+ 'suffix' => $suffix,
+ 'files' => array_map('advagg_return_true', array_flip($files)),
+ );
}
// Wait for all locks before returning.
@@ -2708,7 +2735,7 @@ function advagg_build_css_bundle($files)
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) .'/';
+ $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);
@@ -2740,7 +2767,7 @@ function advagg_build_js_bundle($files)
foreach ($files as $file) {
// 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;
@@ -3039,7 +3066,7 @@ function advagg_drupal_to_js($var) {
foreach ($var as $k => $v) {
$output[] = advagg_drupal_to_js(strval($k)) . ': ' . advagg_drupal_to_js($v);
}
- return '{ ' . implode(', ', $output) .' }';
+ return '{ ' . implode(', ', $output) . ' }';
default:
return 'null';
}
@@ -3126,7 +3153,7 @@ function _advagg_drupal_load_stylesheet(
// Alter all internal url() paths. Leave external paths alone. We don't need
// to normalize absolute paths here (i.e. remove folder/... segments) because
// that will be done later.
- return preg_replace('/url\(\s*([\'"]?)(?![a-z]+:|\/+)/i', 'url(\1'. $directory, $file);
+ return preg_replace('/url\(\s*([\'"]?)(?![a-z]+:|\/+)/i', 'url(\1' . $directory, $file);
}
/**
@@ -3219,7 +3246,7 @@ function advagg_async_connect_http_reque
$flags = STREAM_CLIENT_CONNECT;
if (variable_get('advagg_async_socket_connect', ADVAGG_ASYNC_SOCKET_CONNECT)) {
- $flags = STREAM_CLIENT_ASYNC_CONNECT|STREAM_CLIENT_CONNECT;
+ $flags = STREAM_CLIENT_ASYNC_CONNECT | STREAM_CLIENT_CONNECT;
}
if (empty($options['context'])) {
$fp = @stream_socket_client($socket, $errno, $errstr, $options['timeout'], $flags);
@@ -3301,7 +3328,7 @@ function advagg_async_connect_http_reque
* (optional) A file pointer.
* @param $request
* (optional) A string containing the request headers to send to the server.
- * @param $timeout
+ * @param $timeout
* (optional) An integer holding the stream timeout value.
* @return bool
* TRUE if function worked as planed.
@@ -3441,7 +3468,7 @@ function advagg_ctools_process_js_files(
// them into account so we don't double-load scripts.
static $replacements = NULL;
if (!isset($replacements)) {
- $replacements = module_invoke_all('js_replacements');
+ $replacements = module_invoke_all('js_replacements');
}
$settings = array();
@@ -3546,7 +3573,7 @@ function advagg_get_js_css_get_array($js
// Setup variables.
$variables = array(
'css' => array(),
- 'js' => array(),
+ 'js' => array(),
);
// Setup render functions.
$css_function = variable_get('advagg_css_render_function', ADVAGG_CSS_RENDER_FUNCTION);
@@ -3632,9 +3659,9 @@ function advagg_get_js_css_get_array($js
*/
function advagg_css_array($external_no_preprocess, $module_no_preprocess, $output_no_preprocess, $output_preprocess, $theme_no_preprocess, $inline_no_preprocess, $inline_included, $files_included, $files_aggregates_included) {
return array(
- 'inline' => $inline_included,
- 'files' => $files_included,
- 'files_aggregates' => $files_aggregates_included,
+ 'inline' => $inline_included,
+ 'files' => $files_included,
+ 'files_aggregates' => $files_aggregates_included,
);
}
@@ -3666,10 +3693,10 @@ function advagg_css_array($external_no_p
*/
function advagg_js_array($external_no_preprocess, $output_preprocess, $output_no_preprocess, $setting_no_preprocess, $inline_no_preprocess, $scope, $js_settings_array, $inline_included, $files_included, $files_aggregates_included) {
return array(
- 'settings' => $js_settings_array,
- 'inline' => $inline_included,
- 'files' => $files_included,
- 'files_aggregates' => $files_aggregates_included,
+ 'settings' => $js_settings_array,
+ 'inline' => $inline_included,
+ 'files' => $files_included,
+ 'files_aggregates' => $files_aggregates_included,
);
}
@@ -3723,7 +3750,7 @@ function _advagg_build_url($filepath = '
// Server auth.
$auth = '';
if (isset($_SERVER['AUTH_TYPE']) && $_SERVER['AUTH_TYPE'] == 'Basic') {
- $auth = $_SERVER['PHP_AUTH_USER'] . ':' . $_SERVER['PHP_AUTH_PW'] .'@';
+ $auth = $_SERVER['PHP_AUTH_USER'] . ':' . $_SERVER['PHP_AUTH_PW'] . '@';
}
// Host.
diff -up -r advagg_bundler/advagg_bundler.admin.inc advagg_bundler/advagg_bundler.admin.inc
--- advagg_bundler/advagg_bundler.admin.inc 2012-03-23 12:08:13.000000000 -0600
+++ advagg_bundler/advagg_bundler.admin.inc 2012-03-23 13:02:17.000000000 -0600
@@ -23,10 +23,10 @@ function advagg_bundler_admin_settings_f
$form = array();
$form['advagg_bundler_active'] = array(
- '#type' => 'checkbox',
- '#title' => t('Bundler is Active'),
- '#default_value' => variable_get('advagg_bundler_active', ADVAGG_BUNDLER_ACTIVE),
- '#description' => t('If not checked, the bundler will passively monitor your site, but it will not split up aggregates.'),
+ '#type' => 'checkbox',
+ '#title' => t('Bundler is Active'),
+ '#default_value' => variable_get('advagg_bundler_active', ADVAGG_BUNDLER_ACTIVE),
+ '#description' => t('If not checked, the bundler will passively monitor your site, but it will not split up aggregates.'),
);
$options = array(
@@ -43,25 +43,25 @@ function advagg_bundler_admin_settings_f
10 => 10,
);
$form['advagg_bundler_max_css'] = array(
- '#type' => 'select',
- '#title' => t('Max Number Of CSS Bundles Per Page'),
- '#default_value' => variable_get('advagg_bundler_max_css', ADVAGG_BUNDLER_MAX_CSS),
- '#options' => $options,
- '#description' => t('If 0 is selected then the bundler is disabled'),
+ '#type' => 'select',
+ '#title' => t('Max Number Of CSS Bundles Per Page'),
+ '#default_value' => variable_get('advagg_bundler_max_css', ADVAGG_BUNDLER_MAX_CSS),
+ '#options' => $options,
+ '#description' => t('If 0 is selected then the bundler is disabled'),
);
$form['advagg_bundler_max_js'] = array(
- '#type' => 'select',
- '#title' => t('Max Number Of JS Bundles Per Page'),
- '#default_value' => variable_get('advagg_bundler_max_js', ADVAGG_BUNDLER_MAX_JS),
- '#options' => $options,
- '#description' => t('If 0 is selected then the bundler is disabled'),
+ '#type' => 'select',
+ '#title' => t('Max Number Of JS Bundles Per Page'),
+ '#default_value' => variable_get('advagg_bundler_max_js', ADVAGG_BUNDLER_MAX_JS),
+ '#options' => $options,
+ '#description' => t('If 0 is selected then the bundler is disabled'),
);
$form['info'] = array(
- '#type' => 'fieldset',
- '#collapsible' => TRUE,
- '#collapsed' => TRUE,
- '#title' => t('Raw Grouping Info'),
+ '#type' => 'fieldset',
+ '#collapsible' => TRUE,
+ '#collapsed' => TRUE,
+ '#title' => t('Raw Grouping Info'),
);
module_load_include('inc', 'advagg', 'advagg.admin');
$analysis = advagg_bundler_analysis('', TRUE);
@@ -74,10 +74,10 @@ function advagg_bundler_admin_settings_f
list($rawtext, $rows) = advagg_form_print_r($data);
$form['info']['advagg_bundler_info'] = array(
- '#type' => 'textarea',
- '#title' => t('%count different groupings', array('%count' => count($data))),
- '#default_value' => $rawtext,
- '#rows' => $rows-1,
+ '#type' => 'textarea',
+ '#title' => t('%count different groupings', array('%count' => count($data))),
+ '#default_value' => $rawtext,
+ '#rows' => $rows -1,
);
return system_settings_form($form);
diff -up -r advagg_css_compress/advagg_css_compress.admin.inc advagg_css_compress/advagg_css_compress.admin.inc
--- advagg_css_compress/advagg_css_compress.admin.inc 2012-03-23 12:08:13.000000000 -0600
+++ advagg_css_compress/advagg_css_compress.admin.inc 2012-03-23 13:02:17.000000000 -0600
@@ -23,51 +23,51 @@ function advagg_css_compress_admin_setti
$form = array();
$form['advagg_css_compress_agg_files'] = array(
- '#type' => 'checkbox',
- '#title' => t('Compress CSS Files'),
- '#default_value' => variable_get('advagg_css_compress_agg_files', ADVAGG_CSS_COMPRESS_AGG_FILES),
+ '#type' => 'checkbox',
+ '#title' => t('Compress CSS Files'),
+ '#default_value' => variable_get('advagg_css_compress_agg_files', ADVAGG_CSS_COMPRESS_AGG_FILES),
);
$form['advagg_css_compress_inline'] = array(
- '#type' => 'checkbox',
- '#title' => t('Compress Inline CSS'),
- '#default_value' => variable_get('advagg_css_compress_inline', ADVAGG_CSS_COMPRESS_INLINE),
+ '#type' => 'checkbox',
+ '#title' => t('Compress Inline CSS'),
+ '#default_value' => variable_get('advagg_css_compress_inline', ADVAGG_CSS_COMPRESS_INLINE),
);
$advagg_css_compressor = variable_get('advagg_css_compressor', ADVAGG_CSS_COMPRESSOR);
$form['advagg_css_compressor'] = array(
- '#type' => 'radios',
- '#title' => t('Select the compression library to use'),
- '#default_value' => $advagg_css_compressor,
- '#options' => array(
+ '#type' => 'radios',
+ '#title' => t('Select the compression library to use'),
+ '#default_value' => $advagg_css_compressor,
+ '#options' => array(
0 => 'CSSTidy',
1 => 'CSS Compressor',
),
- '#description' => t('<a href="@csscompressor">CSS Compressor</a> is a faster CSS compression alternative. <a href="@csstidy">CSSTidy</a> is a well known CSS compression library, but it has some known issues/limitations.',
+ '#description' => t('<a href="@csscompressor">CSS Compressor</a> is a faster CSS compression alternative. <a href="@csstidy">CSSTidy</a> is a well known CSS compression library, but it has some known issues/limitations.',
array(
- '@csscompressor' => 'http://www.codenothing.com/css-compressor/',
- '@csstidy' => 'https://github.com/Cerdic/CSSTidy',
- )
+ '@csscompressor' => 'http://www.codenothing.com/css-compressor/',
+ '@csstidy' => 'https://github.com/Cerdic/CSSTidy',
+ )
),
);
if ($advagg_css_compressor == 0) {
$form['advagg_css_compress_preserve_css'] = array(
- '#type' => 'checkbox',
- '#title' => t('CSSTidy: Preserve CSS'),
- '#default_value' => variable_get('advagg_css_compress_preserve_css', ADVAGG_CSS_COMPRESS_PRESERVE_CSS),
- '#description' => t('If disabled CSS selectors will try to be merged together, significantly reducing the css file size. May result in broken layouts is disabled. This only applies to compression through the CSSTidy library.'),
+ '#type' => 'checkbox',
+ '#title' => t('CSSTidy: Preserve CSS'),
+ '#default_value' => variable_get('advagg_css_compress_preserve_css', ADVAGG_CSS_COMPRESS_PRESERVE_CSS),
+ '#description' => t('If disabled CSS selectors will try to be merged together, significantly reducing the css file size. May result in broken layouts is disabled. This only applies to compression through the CSSTidy library.'),
);
}
else {
$form['advagg_css_compress_compressor_level'] = array(
- '#type' => 'radios',
- '#title' => t('CSS Compressor: Select the CSS Compression to use'),
- '#default_value' => variable_get('advagg_css_compress_compressor_level', ADVAGG_CSS_COMPRESS_COMPRESSOR_LEVEL),
- '#options' => array(
- 'safe' => t('Safe mode (99% safe) does zero combinations or organizing. Its the best mode if you use a lot of CSS hacks.'),
- 'sane' => t('Sane mode (90% safe) does most combinations (multiple long hand notations to single shorthand), but still keeps most declarations in their place.'),
+ '#type' => 'radios',
+ '#title' => t('CSS Compressor: Select the CSS Compression to use'),
+ '#default_value' => variable_get('advagg_css_compress_compressor_level', ADVAGG_CSS_COMPRESS_COMPRESSOR_LEVEL),
+ '#options' => array(
+ 'safe' => t('Safe mode (99% safe) does zero combinations or organizing. Its the best mode if you use a lot of CSS hacks.'),
+ 'sane' => t('Sane mode (90% safe) does most combinations (multiple long hand notations to single shorthand), but still keeps most declarations in their place.'),
'small' => t('Small mode (65% safe) reorganizes the whole style sheet, combines as much as it can, and will break most comment hacks.'),
- 'full' => t('Full mode (64% safe) does everything small does, but also converts hex codes to their short color name alternatives.'),
+ 'full' => t('Full mode (64% safe) does everything small does, but also converts hex codes to their short color name alternatives.'),
),
- '#description' => t('This only applies to compression through the CSS Compressor library.'),
+ '#description' => t('This only applies to compression through the CSS Compressor library.'),
);
}
Only in advagg_css_compress/css-compressor-3.x: .gitignore
diff -up -r advagg_css_compress/css-compressor-3.x/src/CSSCompression.inc advagg_css_compress/css-compressor-3.x/src/CSSCompression.inc
--- advagg_css_compress/css-compressor-3.x/src/CSSCompression.inc 2012-03-23 12:08:13.000000000 -0600
+++ advagg_css_compress/css-compressor-3.x/src/CSSCompression.inc 2012-03-23 13:02:18.000000000 -0600
@@ -10,454 +10,429 @@ require( dirname(__FILE__) . '/lib/Excep
require( dirname(__FILE__) . '/lib/Control.inc' );
-Class CSSCompression
-{
- /**
- * CSSCompression Info
- *
- * @const (string) VERSION: Release version
- * @const (string) DATE: Release date
- */
- const VERSION = "[VERSION]";
- const DATE = "[DATE]";
-
- /**
- * WARNING: This should ALWAYS BE FALSE in production
- * When DEV is true, backdoor access to private methods is opened.
- * Only used for unit testing and development.
- */
- const DEV = true;
-
- /**
- * TOKEN is a special string that gets used as a marker within
- * the compressor, and is removed before final output. Make sure
- * this token is unique to your stylsheets.
- *
- * NOTE: This string gets used in regular expressions, and escaping
- * won't help, so don't pick a complicated token.
- */
- const TOKEN = "@____CSSCOMPRESSION_TOKEN____@";
-
- /**
- * The default set of options for every instance.
- */
- public static $defaults = array(
- // Converts long color names to short hex names
- // (aliceblue -> #f0f8ff)
- 'color-long2hex' => true,
-
- // Converts rgb colors to hex
- // (rgb(159,80,98) -> #9F5062, rgb(100%) -> #FFFFFF)
- 'color-rgb2hex' => true,
-
- // Converts long hex codes to short color names (#f5f5dc -> beige)
- // Only works on latest browsers, careful when using
- 'color-hex2shortcolor' => false,
-
- // Converts long hex codes to short hex codes
- // (#44ff11 -> #4f1)
- 'color-hex2shorthex' => true,
-
- // Converts hex codes to safe CSS Level 1 color names
- // (#F00 -> red)
- 'color-hex2safe' => true,
-
- // Converts font-weight names to numbers
- // (bold -> 700)
- 'fontweight2num' => true,
-
- // Removes zero decimals and 0 units
- // (15.0px -> 15px || 0px -> 0)
- 'format-units' => true,
-
- // Lowercases html tags from list
- // (BODY -> body)
- 'lowercase-selectors' => true,
-
- // Converts id and class attribute selectors, to their short selector counterpart
- // (div[id=blah][class=moreblah] -> div#blah.moreblah)
- 'attr2selector' => true,
-
- // Promotes nested id's to the front of the selector
- // (body>div#elem p -> $elem p)
- 'strict-id' => false,
-
- // Add space after pseudo selectors, for ie6
- // (a:first-child{ -> a:first-child {)
- 'pseudo-space' => false,
-
- // Compresses single defined multi-directional properties
- // (margin: 15px 25px 15px 25px -> margin:15px 25px)
- 'directional-compress' => true,
-
- // Combines multiply defined selectors and details
- // (p{color:blue;} p{font-size:12pt} -> p{color:blue;font-size:12pt;})
- // (p{color:blue;} a{color:blue;} -> p,a{color:blue;})
- 'organize' => true,
-
- // Combines color/style/width properties
- // (border-style:dashed;border-color:black;border-width:4px; -> border:4px dashed black)
- 'csw-combine' => true,
-
- // Combines cue/pause properties
- // (cue-before: url(before.au); cue-after: url(after.au) -> cue:url(before.au) url(after.au))
- 'auralcp-combine' => true,
-
- // Combines margin/padding directionals
- // (margin-top:10px;margin-right:5px;margin-bottom:4px;margin-left:1px; -> margin:10px 5px 4px 1px;)
- 'mp-combine' => true,
-
- // Combines border directionals
- // (border-top|right|bottom|left:1px solid black -> border:1px solid black)
- 'border-combine' => true,
-
- // Combines font properties
- // (font-size:12pt; font-family: arial; -> font:12pt arial)
- 'font-combine' => true,
-
- // Combines background properties
- // (background-color: black; background-image: url(bgimg.jpeg); -> background:black url(bgimg.jpeg))
- 'background-combine' => true,
-
- // Combines list-style properties
- // (list-style-type: round; list-style-position: outside -> list-style:round outside)
- 'list-combine' => true,
-
- // Combines border-radius properties
- // {
- // border-top-left-radius: 10px;
- // border-top-right-radius: 10px;
- // border-bottom-right-radius: 10px;
- // border-bottom-left-radius: 10px;
- // }
- // -> { border-radius: 10px; }
- 'border-radius-combine' => true,
-
- // Removes the last semicolon of a property set
- // ({margin: 2px; color: blue;} -> {margin: 2px; color: blue})
- 'unnecessary-semicolons' => true,
-
- // Removes multiple declarations within the same rule set
- 'rm-multi-define' => true,
-
- // Adds all unknown blocks to the top of the output in a comment strip
- // Purely for bug reporting, but also useful to know what isn't being handled
- 'add-unknown' => true,
-
- // Readibility of Compressed Output, Defaults to none
- 'readability' => 0,
- );
-
- /**
- * Modes are predefined sets of configuration for referencing. When creating a mode, all options are set to true,
- * and the mode array defines which options are to be false
- *
- * @mode safe: Safe mode does zero combinations or organizing. It's the best mode if you use a lot of hacks
- * @mode sane: Sane mode does most combinations(multiple long hand notations to single shorthand),
- * --- but still keeps most declarations in their place
- * @mode small: Small mode reorganizes the whole sheet, combines as much as it can, and will break most comment hacks
- * @mode full: Full mode does everything small does, but also converts hex codes to their short color name alternatives
- */
- private static $modes = array(
- 'safe' => array(
- 'color-hex2shortcolor' => false,
- 'attr2selector' => false,
- 'strict-id' => false,
- 'organize' => false,
- 'csw-combine' => false,
- 'auralcp-combine' => false,
- 'mp-combine' => false,
- 'border-combine' => false,
- 'font-combine' => false,
- 'background-combine' => false,
- 'list-combine' => false,
- 'border-radius-combine' => false,
- 'rm-multi-define' => false,
- ),
- 'sane' => array(
- 'color-hex2shortcolor' => false,
- 'strict-id' => false,
- 'organize' => false,
- 'font-combine' => false,
- 'background-combine' => false,
- 'list-combine' => false,
- 'rm-multi-define' => false,
- ),
- 'small' => array(
- 'color-hex2shortcolor' => false,
- 'pseudo-space' => false,
- ),
- 'full' => array(
- 'pseudo-space' => false,
- ),
- );
-
- /**
- * Readability Constants
- *
- * @param (int) READ_MAX: Maximum readability of output
- * @param (int) READ_MED: Medium readability of output
- * @param (int) READ_MIN: Minimal readability of output
- * @param (int) READ_NONE: No readability of output (full compression into single line)
- */
- const READ_MAX = 3;
- const READ_MED = 2;
- const READ_MIN = 1;
- const READ_NONE = 0;
-
- /**
- * Static Helpers
- *
- * @instance express: Use a separate instance from singleton access
- * @instance instance: Saved instance of CSSCompression
- * @param (array) instances: Array of stored instances
- * @param (array) rjson: Comment removal before json decoding
- */
- private static $express;
- private static $instance;
- private static $instances = array();
- private static $rjson = array(
- 'patterns' => array(
- "/^(.*?){/s",
- "/(\t|\s)+\/\/.*/",
- ),
- 'replacements' => array(
- '{',
- '',
- ),
- );
-
- /**
- * Controller Instance
- */
- private $Control;
-
- /**
- * Builds the subclasses, runs the compression if css passed, and merges options
- *
- * @param (string) css: CSS to compress on initialization if needed
- * @param (array) options: Array of preferences to override the defaults
- */
- public function __construct( $css = NULL, $options = NULL ) {
- $this->Control = new CSSCompression_Control( $this );
-
- // Autorun against css passed
- if ( $css ) {
- // Allow passing options/mode only
- if ( is_array( $css ) || array_key_exists( $css, self::$modes ) ) {
- $this->Control->Option->merge( $css );
- }
- else {
- $this->Control->compress( $css, $options );
- }
- }
- // Merge passed options
- else if ( $options ) {
- $this->Control->Option->merge( $options );
- }
- }
-
- /**
- * (Proxy function) Control access to properties
- *
- * - Getting stats/_mode/css returns the current value of that property
- * - Getting options will return the current full options array
- * - Getting anything else returns that current value in the options array or NULL
- *
- * @param (string) name: Name of property that you want to access
- */
- public function __get( $name ) {
- return $this->Control->get( $name );
- }
-
- /**
- * (Proxy function) The setter method only allows
- * access to setting values in the options array
- *
- * @param (string) name: Key name of the option you want to set
- * @param (mixed) value: Value of the option you want to set
- */
- public function __set( $name, $value ) {
- return $this->Control->set( $name, $value );
- }
-
- /**
- * (Proxy function) Merges a predefined set options
- *
- * @param (string) mode: Name of mode to use.
- */
- public function mode( $mode = NULL ) {
- return $this->Control->Option->merge( $mode );
- }
-
- /**
- * Creates a new mode, or overwrites existing mode
- *
- * @param (mixed) mode: Name of the mode, or array of modes
- * @param (array) config: Configuration of the mode
- */
- public static function modes( $mode = NULL, $config = NULL ) {
- if ( $mode === NULL ) {
- return self::$modes;
- }
- else if ( is_array( $mode ) ) {
- return array_merge( self::$modes, $mode );
- }
- else if ( $config === NULL ) {
- return isset( self::$modes[ $mode ] ) ? self::$modes[ $mode ] : NULL;
- }
- else {
- return self::$modes[ $mode ] = $config;
- }
- }
-
- /**
- * (Proxy function) Maintainable access to the options array
- *
- * - Passing no arguments returns the entire options array
- * - Passing a single name argument returns the value for the option
- * - Passing an array will merge the options with the array passed, for object like extension
- * - Passing both a name and value, sets the value to the name key, and returns the value
- *
- * @param (mixed) name: The key name of the option
- * @param (mixed) value: Value to set the option
- */
- public function option( $name = NULL, $value = NULL ) {
- return $this->Control->Option->option( $name, $value );
- }
-
- /**
- * (Proxy function) Run compression on the sheet passed.
- *
- * @param (string) css: Stylesheet to be compressed
- * @param (mixed) options: Array of options or mode to use.
- */
- public function compress( $css = NULL, $options = NULL ) {
- return $this->Control->compress( $css, $options );
- }
-
- /**
- * Static access for direct compression
- *
- * @param (string) css: Stylesheet to be compressed
- * @param (mixed) options: Array of options or mode to use.
- */
- public static function express( $css = NULL, $options = NULL ) {
- if ( ! self::$express ) {
- self::$express = new CSSCompression();
- }
-
- self::$express->reset();
- return self::$express->compress( $css, $options );
- }
-
- /**
- * (Proxy Function) Cleans out compressor and it's subclasses to defaults
- *
- * @params none
- */
- public function reset(){
- return $this->Control->reset();
- }
-
- /**
- * (Proxy Function) Cleans out class variables for next run
- *
- * @params none
- */
- public function flush(){
- return $this->Control->flush();
- }
-
- /**
- * The Singleton access method (for those that want it)
- *
- * @param (string) name: Name of the stored instance
- */
- public static function getInstance( $name = NULL ) {
- if ( $name !== NULL ) {
- if ( ! isset( self::$instances[ $name ] ) ) {
- self::$instances[ $name ] = new self;
- }
-
- return self::$instances[ $name ];
- }
- else if ( ! self::$instance ) {
- self::$instance = new self;
- }
-
- return self::$instance;
- }
-
- /**
- * Reads JOSN based files, strips comments and converts to array
- *
- * @param (string) file: Filename
- */
- public static function getJSON( $file ) {
- // Assume helper file if full path not given
- $file = $file[ 0 ] == '/' ? $file : dirname(__FILE__) . '/helpers/' . $file;
-
- // Strip comments
- $json = preg_replace( self::$rjson['patterns'], self::$rjson['replacements'], file_get_contents( $file ) );
-
- // Decode json
- $json = json_decode( $json, true );
-
- // Check for errors
- if ( $json === NULL ) {
- $e = '';
- // JSON Errors, taken directly from http://php.net/manual/en/function.json-last-error.php
- switch( json_last_error() ) {
- case JSON_ERROR_NONE:
- $e = 'No error has occurred';
- break;
- case JSON_ERROR_DEPTH:
- $e = 'The maximum stack depth has been exceeded';
- break;
- case JSON_ERROR_CTRL_CHAR:
- $e = 'Control character error, possibly incorrectly encoded';
- break;
- case JSON_ERROR_STATE_MISMATCH:
- $e = 'Invalid or malformed JSON';
- break;
- case JSON_ERROR_SYNTAX:
- $e = 'Syntax error';
- break;
- case JSON_ERROR_UTF8:
- $e = 'Malformed UTF-8 characters, possibly incorrectly encoded';
- break;
- default:
- $e = 'Unknown JSON Error';
- break;
- }
-
- throw new CSSCompression_Exception( "JSON Error in $file: $e" );
- }
-
- // Good to go
- return $json;
- }
-
- /**
- * Backdoor access to subclasses
- * ONLY FOR DEVELOPMENT/TESTING.
- *
- * @param (string) class: Name of the focus class
- * @param (string) method: Method function to call
- * @param (array) args: Array of arguments to pass in
- */
- public function access( $class = NULL, $method = NULL, $args = NULL ) {
- if ( ! self::DEV ) {
- throw new CSSCompression_Exception( "CSSCompression is not in development mode." );
- }
- else if ( $class === NULL || $method === NULL || $args === NULL ) {
- throw new CSSCompression_Exception( "Invalid Access Call." );
- }
- else if ( ! is_array( $args ) ) {
- throw new CSSCompression_Exception( "Expecting array of arguments." );
- }
-
- return $this->Control->access( $class, $method, $args );
- }
-};
+class CSSCompression {
+ /**
+ * CSSCompression Info
+ *
+ * @const (string) VERSION: Release version
+ * @const (string) DATE: Release date
+ */
+ const VERSION = "[VERSION]";
+ const DATE = "[DATE]";
+
+ /**
+ * WARNING: This should ALWAYS BE FALSE in production
+ * When DEV is true, backdoor access to private methods is opened.
+ * Only used for unit testing and development.
+ */
+ const DEV = true;
+
+ /**
+ * TOKEN is a special string that gets used as a marker within
+ * the compressor, and is removed before final output. Make sure
+ * this token is unique to your stylsheets.
+ *
+ * NOTE: This string gets used in regular expressions, and escaping
+ * won't help, so don't pick a complicated token.
+ */
+ const TOKEN = "@____CSSCOMPRESSION_TOKEN____@";
+
+ /**
+ * The default set of options for every instance.
+ */
+ public static $defaults = array(
+ // Converts long color names to short hex names
+ // (aliceblue -> #f0f8ff)
+ 'color-long2hex' => true,
+ // Converts rgb colors to hex
+ // (rgb(159,80,98) -> #9F5062, rgb(100%) -> #FFFFFF)
+ 'color-rgb2hex' => true,
+ // Converts long hex codes to short color names (#f5f5dc -> beige)
+ // Only works on latest browsers, careful when using
+ 'color-hex2shortcolor' => false,
+ // Converts long hex codes to short hex codes
+ // (#44ff11 -> #4f1)
+ 'color-hex2shorthex' => true,
+ // Converts hex codes to safe CSS Level 1 color names
+ // (#F00 -> red)
+ 'color-hex2safe' => true,
+ // Converts font-weight names to numbers
+ // (bold -> 700)
+ 'fontweight2num' => true,
+ // Removes zero decimals and 0 units
+ // (15.0px -> 15px || 0px -> 0)
+ 'format-units' => true,
+ // Lowercases html tags from list
+ // (BODY -> body)
+ 'lowercase-selectors' => true,
+ // Converts id and class attribute selectors, to their short selector counterpart
+ // (div[id=blah][class=moreblah] -> div#blah.moreblah)
+ 'attr2selector' => true,
+ // Promotes nested id's to the front of the selector
+ // (body>div#elem p -> $elem p)
+ 'strict-id' => false,
+ // Add space after pseudo selectors, for ie6
+ // (a:first-child{ -> a:first-child {)
+ 'pseudo-space' => false,
+ // Compresses single defined multi-directional properties
+ // (margin: 15px 25px 15px 25px -> margin:15px 25px)
+ 'directional-compress' => true,
+ // Combines multiply defined selectors and details
+ // (p{color:blue;} p{font-size:12pt} -> p{color:blue;font-size:12pt;})
+ // (p{color:blue;} a{color:blue;} -> p,a{color:blue;})
+ 'organize' => true,
+ // Combines color/style/width properties
+ // (border-style:dashed;border-color:black;border-width:4px; -> border:4px dashed black)
+ 'csw-combine' => true,
+ // Combines cue/pause properties
+ // (cue-before: url(before.au); cue-after: url(after.au) -> cue:url(before.au) url(after.au))
+ 'auralcp-combine' => true,
+ // Combines margin/padding directionals
+ // (margin-top:10px;margin-right:5px;margin-bottom:4px;margin-left:1px; -> margin:10px 5px 4px 1px;)
+ 'mp-combine' => true,
+ // Combines border directionals
+ // (border-top|right|bottom|left:1px solid black -> border:1px solid black)
+ 'border-combine' => true,
+ // Combines font properties
+ // (font-size:12pt; font-family: arial; -> font:12pt arial)
+ 'font-combine' => true,
+ // Combines background properties
+ // (background-color: black; background-image: url(bgimg.jpeg); -> background:black url(bgimg.jpeg))
+ 'background-combine' => true,
+ // Combines list-style properties
+ // (list-style-type: round; list-style-position: outside -> list-style:round outside)
+ 'list-combine' => true,
+ // Combines border-radius properties
+ // {
+ // border-top-left-radius: 10px;
+ // border-top-right-radius: 10px;
+ // border-bottom-right-radius: 10px;
+ // border-bottom-left-radius: 10px;
+ // }
+ // -> { border-radius: 10px; }
+ 'border-radius-combine' => true,
+ // Removes the last semicolon of a property set
+ // ({margin: 2px; color: blue;} -> {margin: 2px; color: blue})
+ 'unnecessary-semicolons' => true,
+ // Removes multiple declarations within the same rule set
+ 'rm-multi-define' => true,
+ // Adds all unknown blocks to the top of the output in a comment strip
+ // Purely for bug reporting, but also useful to know what isn't being handled
+ 'add-unknown' => true,
+ // Readibility of Compressed Output, Defaults to none
+ 'readability' => 0,
+ );
+
+ /**
+ * Modes are predefined sets of configuration for referencing. When creating a mode, all options are set to true,
+ * and the mode array defines which options are to be false
+ *
+ * @mode safe: Safe mode does zero combinations or organizing. It's the best mode if you use a lot of hacks
+ * @mode sane: Sane mode does most combinations(multiple long hand notations to single shorthand),
+ * --- but still keeps most declarations in their place
+ * @mode small: Small mode reorganizes the whole sheet, combines as much as it can, and will break most comment hacks
+ * @mode full: Full mode does everything small does, but also converts hex codes to their short color name alternatives
+ */
+ private static $modes = array(
+ 'safe' => array(
+ 'color-hex2shortcolor' => false,
+ 'attr2selector' => false,
+ 'strict-id' => false,
+ 'organize' => false,
+ 'csw-combine' => false,
+ 'auralcp-combine' => false,
+ 'mp-combine' => false,
+ 'border-combine' => false,
+ 'font-combine' => false,
+ 'background-combine' => false,
+ 'list-combine' => false,
+ 'border-radius-combine' => false,
+ 'rm-multi-define' => false,
+ ),
+ 'sane' => array(
+ 'color-hex2shortcolor' => false,
+ 'strict-id' => false,
+ 'organize' => false,
+ 'font-combine' => false,
+ 'background-combine' => false,
+ 'list-combine' => false,
+ 'rm-multi-define' => false,
+ ),
+ 'small' => array(
+ 'color-hex2shortcolor' => false,
+ 'pseudo-space' => false,
+ ),
+ 'full' => array(
+ 'pseudo-space' => false,
+ ),
+ );
+
+ /**
+ * Readability Constants
+ *
+ * @param (int) READ_MAX: Maximum readability of output
+ * @param (int) READ_MED: Medium readability of output
+ * @param (int) READ_MIN: Minimal readability of output
+ * @param (int) READ_NONE: No readability of output (full compression into single line)
+ */
+ const READ_MAX = 3;
+ const READ_MED = 2;
+ const READ_MIN = 1;
+ const READ_NONE = 0;
+
+ /**
+ * Static Helpers
+ *
+ * @instance express: Use a separate instance from singleton access
+ * @instance instance: Saved instance of CSSCompression
+ * @param (array) instances: Array of stored instances
+ * @param (array) rjson: Comment removal before json decoding
+ */
+ private static $express;
+ private static $instance;
+ private static $instances = array();
+ private static $rjson = array(
+ 'patterns' => array(
+ "/^(.*?){/s",
+ "/(\t|\s)+\/\/.*/",
+ ),
+ 'replacements' => array(
+ '{',
+ '',
+ ),
+ );
+
+ /**
+ * Controller Instance
+ */
+ private $Control;
+
+ /**
+ * Builds the subclasses, runs the compression if css passed, and merges options
+ *
+ * @param (string) css: CSS to compress on initialization if needed
+ * @param (array) options: Array of preferences to override the defaults
+ */
+ public function __construct( $css = NULL, $options = NULL ) {
+ $this->Control = new CSSCompression_Control( $this );
+
+ // Autorun against css passed
+ if ( $css ) {
+ // Allow passing options/mode only
+ if ( is_array( $css ) || array_key_exists( $css, self::$modes ) ) {
+ $this->Control->Option->merge( $css );
+ }
+ else {
+ $this->Control->compress( $css, $options );
+ }
+ }
+ // Merge passed options
+ else if ( $options ) {
+ $this->Control->Option->merge( $options );
+ }
+ }
+
+ /**
+ * (Proxy function) Control access to properties
+ *
+ * - Getting stats/_mode/css returns the current value of that property
+ * - Getting options will return the current full options array
+ * - Getting anything else returns that current value in the options array or NULL
+ *
+ * @param (string) name: Name of property that you want to access
+ */
+ public function __get( $name ) {
+ return $this->Control->get( $name );
+ }
+
+ /**
+ * (Proxy function) The setter method only allows
+ * access to setting values in the options array
+ *
+ * @param (string) name: Key name of the option you want to set
+ * @param (mixed) value: Value of the option you want to set
+ */
+ public function __set( $name, $value ) {
+ return $this->Control->set( $name, $value );
+ }
+
+ /**
+ * (Proxy function) Merges a predefined set options
+ *
+ * @param (string) mode: Name of mode to use.
+ */
+ public function mode( $mode = NULL ) {
+ return $this->Control->Option->merge( $mode );
+ }
+
+ /**
+ * Creates a new mode, or overwrites existing mode
+ *
+ * @param (mixed) mode: Name of the mode, or array of modes
+ * @param (array) config: Configuration of the mode
+ */
+ public static function modes( $mode = NULL, $config = NULL ) {
+ if ( $mode === NULL ) {
+ return self::$modes;
+ }
+ else if ( is_array( $mode ) ) {
+ return array_merge( self::$modes, $mode );
+ }
+ else if ( $config === NULL ) {
+ return isset( self::$modes[$mode] ) ? self::$modes[$mode] : NULL;
+ }
+ else {
+ return self::$modes[$mode] = $config;
+ }
+ }
+
+ /**
+ * (Proxy function) Maintainable access to the options array
+ *
+ * - Passing no arguments returns the entire options array
+ * - Passing a single name argument returns the value for the option
+ * - Passing an array will merge the options with the array passed, for object like extension
+ * - Passing both a name and value, sets the value to the name key, and returns the value
+ *
+ * @param (mixed) name: The key name of the option
+ * @param (mixed) value: Value to set the option
+ */
+ public function option( $name = NULL, $value = NULL ) {
+ return $this->Control->Option->option( $name, $value );
+ }
+
+ /**
+ * (Proxy function) Run compression on the sheet passed.
+ *
+ * @param (string) css: Stylesheet to be compressed
+ * @param (mixed) options: Array of options or mode to use.
+ */
+ public function compress( $css = NULL, $options = NULL ) {
+ return $this->Control->compress( $css, $options );
+ }
+
+ /**
+ * Static access for direct compression
+ *
+ * @param (string) css: Stylesheet to be compressed
+ * @param (mixed) options: Array of options or mode to use.
+ */
+ public static function express( $css = NULL, $options = NULL ) {
+ if ( ! self::$express ) {
+ self::$express = new CSSCompression();
+ }
+
+ self::$express->reset();
+ return self::$express->compress( $css, $options );
+ }
+
+ /**
+ * (Proxy Function) Cleans out compressor and it's subclasses to defaults
+ *
+ * @params none
+ */
+ public function reset() {
+ return $this->Control->reset();
+ }
+
+ /**
+ * (Proxy Function) Cleans out class variables for next run
+ *
+ * @params none
+ */
+ public function flush() {
+ return $this->Control->flush();
+ }
+
+ /**
+ * The Singleton access method (for those that want it)
+ *
+ * @param (string) name: Name of the stored instance
+ */
+ public static function getInstance( $name = NULL ) {
+ if ( $name !== NULL ) {
+ if ( ! isset( self::$instances[$name] ) ) {
+ self::$instances[$name] = new self;
+ }
+
+ return self::$instances[$name];
+ }
+ else if ( ! self::$instance ) {
+ self::$instance = new self;
+ }
+
+ return self::$instance;
+ }
+
+ /**
+ * Reads JOSN based files, strips comments and converts to array
+ *
+ * @param (string) file: Filename
+ */
+ public static function getJSON( $file ) {
+ // Assume helper file if full path not given
+ $file = $file[0] == '/' ? $file : dirname(__FILE__) . '/helpers/' . $file;
+
+ // Strip comments
+ $json = preg_replace( self::$rjson['patterns'], self::$rjson['replacements'], file_get_contents( $file ) );
+
+ // Decode json
+ $json = json_decode( $json, true );
+
+ // Check for errors
+ if ( $json === NULL ) {
+ $e = '';
+ // JSON Errors, taken directly from http://php.net/manual/en/function.json-last-error.php
+ switch ( json_last_error() ) {
+ case JSON_ERROR_NONE:
+ $e = 'No error has occurred';
+ break;
+ case JSON_ERROR_DEPTH:
+ $e = 'The maximum stack depth has been exceeded';
+ break;
+ case JSON_ERROR_CTRL_CHAR:
+ $e = 'Control character error, possibly incorrectly encoded';
+ break;
+ case JSON_ERROR_STATE_MISMATCH:
+ $e = 'Invalid or malformed JSON';
+ break;
+ case JSON_ERROR_SYNTAX:
+ $e = 'Syntax error';
+ break;
+ case JSON_ERROR_UTF8:
+ $e = 'Malformed UTF-8 characters, possibly incorrectly encoded';
+ break;
+ default:
+ $e = 'Unknown JSON Error';
+ break;
+ }
+
+ throw new CSSCompression_Exception( "JSON Error in $file: $e" );
+ }
+
+ // Good to go
+ return $json;
+ }
+
+ /**
+ * Backdoor access to subclasses
+ * ONLY FOR DEVELOPMENT/TESTING.
+ *
+ * @param (string) class: Name of the focus class
+ * @param (string) method: Method function to call
+ * @param (array) args: Array of arguments to pass in
+ */
+ public function access( $class = NULL, $method = NULL, $args = NULL ) {
+ if ( ! self::DEV ) {
+ throw new CSSCompression_Exception( "CSSCompression is not in development mode." );
+ }
+ else if ( $class === NULL || $method === NULL || $args === NULL ) {
+ throw new CSSCompression_Exception( "Invalid Access Call." );
+ }
+ else if ( ! is_array( $args ) ) {
+ throw new CSSCompression_Exception( "Expecting array of arguments." );
+ }
+
+ return $this->Control->access( $class, $method, $args );
+ }
+}
diff -up -r advagg_css_compress/css-compressor-3.x/src/lib/Cleanup.inc advagg_css_compress/css-compressor-3.x/src/lib/Cleanup.inc
--- advagg_css_compress/css-compressor-3.x/src/lib/Cleanup.inc 2012-03-23 12:08:13.000000000 -0600
+++ advagg_css_compress/css-compressor-3.x/src/lib/Cleanup.inc 2012-03-23 13:02:18.000000000 -0600
@@ -5,215 +5,214 @@
* Corey Hart @ http://www.codenothing.com
*/
-Class CSSCompression_Cleanup
-{
+class CSSCompression_Cleanup {
- /**
- * Cleanup patterns
- *
- * @class Control: Compression Controller
- * @param (string) token: Copy of the injection token
- * @param (regex) rtoken: Token regex built upon instantiation
- * @param (array) options: Reference to options
- * @param (regex) rsemi: Checks for last semit colon in details
- * @param (regex) rsemicolon: Checks for semicolon without an escape '\' character before it
- * @param (regex) rspace: Checks for space without an escape '\' character before it
- * @param (regex) rcolon: Checks for colon without an escape '\' character before it
- * @param (regex) rquote: Checks for quote (') without an escape '\' character before it
- * @param (array) rescape: Array of patterns for groupings that should be escaped
- * @param (array) escaped: Contains patterns and replacements for espaced characters
- */
- private $Control;
- private $token = '';
- private $rtoken = '';
- private $options = array();
- private $rsemi = "/;$/";
- private $rsemicolon = "/(?<!\\\);/";
- private $rspace = "/(?<!\\\)\s/";
- private $rcolon = "/(?<!\\\):/";
- private $rquote = "/(?<!\\\)'/";
- private $rescape = array(
- "/((?<!\\\)\")(.*?)((?<!\\\)\")/",
- "/((?<!\\\)')(.*?)((?<!\\\)')/",
- "/(url\()(.*?)(\))/",
- );
- private $escaped = array(
- 'search' => array(
- "\\:",
- "\\;",
- "\\}",
- "\\{",
- "\\@",
- "\\!",
- "\\,",
- "\\>",
- "\\+",
- "\\~",
- "\\/",
- "\\*",
- "\\.",
- "\\=",
- "\\#",
- "\\r",
- "\\n",
- "\\t",
- "\\ ",
- ),
- 'replace' => array(
- ":",
- ";",
- "}",
- "{",
- "@",
- "!",
- ",",
- ">",
- "+",
- "~",
- "/",
- "*",
- ".",
- "=",
- "#",
- "\r",
- "\n",
- "\t",
- " ",
- ),
- );
-
- /**
- * Build the token regex based on defined token
- *
- * @param (class) control: CSSCompression Controller
- */
- public function __construct( CSSCompression_Control $control ) {
- $this->Control = $control;
- $this->token = CSSCompression::TOKEN;
- $this->options = &$control->Option->options;
-
- // Have to build the token regexs after initialization
- $this->rtoken = "/($this->token)(.*?)($this->token)/";
- array_push( $this->rescape, $this->rtoken );
- }
-
- /**
- * Central cleanup process, removes all injections
- *
- * @param (array) selectors: Array of selectors
- * @param (array) details: Array of details
- */
- public function cleanup( &$selectors, &$details ) {
- foreach ( $details as $i => &$value ) {
- // Auto skip sections
- if ( isset( $selectors[ $i ] ) && strpos( $selectors[ $i ], $this->token ) === 0 ) {
- continue;
- }
-
- // Removing dupes
- if ( $this->options['rm-multi-define'] ) {
- $value = $this->removeMultipleDefinitions( $value );
- }
-
- $value = $this->removeUnnecessarySemicolon( $value );
- }
-
- return array( $selectors, $details );
- }
-
- /**
- * Removes '\' from possible splitter characters in URLs
- *
- * @param (string) css: Full css sheet
- */
- public function removeInjections( $css ) {
- // Remove escaped characters
- foreach ( $this->rescape as $regex ) {
- $pos = 0;
- while ( preg_match( $regex, $css, $match, PREG_OFFSET_CAPTURE, $pos ) ) {
- $value = $match[ 1 ][ 0 ]
- . str_replace( $this->escaped['search'], $this->escaped['replace'], $match[ 2 ][ 0 ] )
- . $match[ 3 ][ 0 ];
- $css = substr_replace( $css, $value, $match[ 0 ][ 1 ], strlen( $match[ 0 ][ 0 ] ) );
- $pos = $match[ 0 ][ 1 ] + strlen( $value ) + 1;
- }
- }
-
- // Remove token injections
- $pos = 0;
- while ( preg_match( $this->rtoken, $css, $match, PREG_OFFSET_CAPTURE, $pos ) ) {
- $value = $match[ 2 ][ 0 ];
- $id = substr( $css, $match[ 0 ][ 1 ] - 4, 4 ) == '[id=' ? true : false;
- $class = substr( $css, $match[ 0 ][ 1 ] - 7, 7 ) == '[class=' ? true : false;
-
- if ( preg_match( $this->rspace, $value ) || ( ! $id && ! $class ) ) {
- $quote = preg_match( $this->rquote, $value ) ? "\"" : "'";
- $value = "$quote$value$quote";
- $css = substr_replace( $css, $value, $match[ 0 ][ 1 ], strlen( $match[ 0 ][ 0 ] ) );
- $pos = $match[ 0 ][ 1 ] + strlen( $value ) + 1;
- }
- else {
- $css = substr_replace( $css, $value, $match[ 0 ][ 1 ], strlen( $match[ 0 ][ 0 ] ) );
- $pos = $match[ 0 ][ 1 ] + strlen( $value ) + 1;
- }
- }
-
- return $css;
- }
-
- /**
- * Removes multiple definitions that were created during compression
- *
- * @param (string) val: CSS Selector Properties
- */
- private function removeMultipleDefinitions( $val = '' ) {
- $storage = array();
- $arr = preg_split( $this->rsemicolon, $val );
-
- foreach ( $arr as $x ) {
- if ( $x ) {
- list( $a, $b ) = preg_split( $this->rcolon, $x, 2 );
- $storage[ $a ] = $b;
- }
- }
-
- if ( $storage ) {
- $val = '';
- foreach ( $storage as $x => $y ) {
- $val .= "$x:$y;";
- }
- }
-
- // Return converted val
- return $val;
- }
-
- /**
- * Removes last semicolons on the final property of a set
- *
- * @param (string) value: rule set
- */
- private function removeUnnecessarySemicolon( $value ) {
- return preg_replace( $this->rsemi, '', $value );
- }
-
- /**
- * Access to private methods for testing
- *
- * @param (string) method: Method to be called
- * @param (array) args: Array of paramters to be passed in
- */
- public function access( $method, $args ) {
- if ( method_exists( $this, $method ) ) {
- if ( $method == 'cleanup' ) {
- return $this->cleanup( $args[ 0 ], $args[ 1 ] );
- }
- else {
- return call_user_func_array( array( $this, $method ), $args );
- }
- }
- else {
- throw new CSSCompression_Exception( "Unknown method in Cleanup Class - " . $method );
- }
- }
-};
+ /**
+ * Cleanup patterns
+ *
+ * @class Control: Compression Controller
+ * @param (string) token: Copy of the injection token
+ * @param (regex) rtoken: Token regex built upon instantiation
+ * @param (array) options: Reference to options
+ * @param (regex) rsemi: Checks for last semit colon in details
+ * @param (regex) rsemicolon: Checks for semicolon without an escape '\' character before it
+ * @param (regex) rspace: Checks for space without an escape '\' character before it
+ * @param (regex) rcolon: Checks for colon without an escape '\' character before it
+ * @param (regex) rquote: Checks for quote (') without an escape '\' character before it
+ * @param (array) rescape: Array of patterns for groupings that should be escaped
+ * @param (array) escaped: Contains patterns and replacements for espaced characters
+ */
+ private $Control;
+ private $token = '';
+ private $rtoken = '';
+ private $options = array();
+ private $rsemi = "/;$/";
+ private $rsemicolon = "/(?<!\\\);/";
+ private $rspace = "/(?<!\\\)\s/";
+ private $rcolon = "/(?<!\\\):/";
+ private $rquote = "/(?<!\\\)'/";
+ private $rescape = array(
+ "/((?<!\\\)\")(.*?)((?<!\\\)\")/",
+ "/((?<!\\\)')(.*?)((?<!\\\)')/",
+ "/(url\()(.*?)(\))/",
+ );
+ private $escaped = array(
+ 'search' => array(
+ "\\:",
+ "\\;",
+ "\\}",
+ "\\{",
+ "\\@",
+ "\\!",
+ "\\,",
+ "\\>",
+ "\\+",
+ "\\~",
+ "\\/",
+ "\\*",
+ "\\.",
+ "\\=",
+ "\\#",
+ "\\r",
+ "\\n",
+ "\\t",
+ "\\ ",
+ ),
+ 'replace' => array(
+ ":",
+ ";",
+ "}",
+ "{",
+ "@",
+ "!",
+ ",",
+ ">",
+ "+",
+ "~",
+ "/",
+ "*",
+ ".",
+ "=",
+ "#",
+ "\r",
+ "\n",
+ "\t",
+ " ",
+ ),
+ );
+
+ /**
+ * Build the token regex based on defined token
+ *
+ * @param (class) control: CSSCompression Controller
+ */
+ public function __construct( CSSCompression_Control $control ) {
+ $this->Control = $control;
+ $this->token = CSSCompression::TOKEN;
+ $this->options = &$control->Option->options;
+
+ // Have to build the token regexs after initialization
+ $this->rtoken = "/($this->token)(.*?)($this->token)/";
+ array_push( $this->rescape, $this->rtoken );
+ }
+
+ /**
+ * Central cleanup process, removes all injections
+ *
+ * @param (array) selectors: Array of selectors
+ * @param (array) details: Array of details
+ */
+ public function cleanup( &$selectors, &$details ) {
+ foreach ( $details as $i => &$value ) {
+ // Auto skip sections
+ if ( isset( $selectors[$i] ) && strpos( $selectors[$i], $this->token ) === 0 ) {
+ continue;
+ }
+
+ // Removing dupes
+ if ( $this->options['rm-multi-define'] ) {
+ $value = $this->removeMultipleDefinitions( $value );
+ }
+
+ $value = $this->removeUnnecessarySemicolon( $value );
+ }
+
+ return array($selectors, $details);
+ }
+
+ /**
+ * Removes '\' from possible splitter characters in URLs
+ *
+ * @param (string) css: Full css sheet
+ */
+ public function removeInjections( $css ) {
+ // Remove escaped characters
+ foreach ( $this->rescape as $regex ) {
+ $pos = 0;
+ while ( preg_match( $regex, $css, $match, PREG_OFFSET_CAPTURE, $pos ) ) {
+ $value = $match[1][0]
+ . str_replace( $this->escaped['search'], $this->escaped['replace'], $match[2][0] )
+ . $match[3][0];
+ $css = substr_replace( $css, $value, $match[0][1], strlen( $match[0][0] ) );
+ $pos = $match[0][1] + strlen( $value ) + 1;
+ }
+ }
+
+ // Remove token injections
+ $pos = 0;
+ while ( preg_match( $this->rtoken, $css, $match, PREG_OFFSET_CAPTURE, $pos ) ) {
+ $value = $match[2][0];
+ $id = substr( $css, $match[0][1] - 4, 4 ) == '[id=' ? true : false;
+ $class = substr( $css, $match[0][1] - 7, 7 ) == '[class=' ? true : false;
+
+ if ( preg_match( $this->rspace, $value ) || ( ! $id && ! $class ) ) {
+ $quote = preg_match( $this->rquote, $value ) ? "\"" : "'";
+ $value = "$quote$value$quote";
+ $css = substr_replace( $css, $value, $match[0][1], strlen( $match[0][0] ) );
+ $pos = $match[0][1] + strlen( $value ) + 1;
+ }
+ else {
+ $css = substr_replace( $css, $value, $match[0][1], strlen( $match[0][0] ) );
+ $pos = $match[0][1] + strlen( $value ) + 1;
+ }
+ }
+
+ return $css;
+ }
+
+ /**
+ * Removes multiple definitions that were created during compression
+ *
+ * @param (string) val: CSS Selector Properties
+ */
+ private function removeMultipleDefinitions( $val = '' ) {
+ $storage = array();
+ $arr = preg_split( $this->rsemicolon, $val );
+
+ foreach ( $arr as $x ) {
+ if ( $x ) {
+ list( $a, $b ) = preg_split( $this->rcolon, $x, 2 );
+ $storage[$a] = $b;
+ }
+ }
+
+ if ( $storage ) {
+ $val = '';
+ foreach ( $storage as $x => $y ) {
+ $val .= "$x:$y;";
+ }
+ }
+
+ // Return converted val
+ return $val;
+ }
+
+ /**
+ * Removes last semicolons on the final property of a set
+ *
+ * @param (string) value: rule set
+ */
+ private function removeUnnecessarySemicolon( $value ) {
+ return preg_replace( $this->rsemi, '', $value );
+ }
+
+ /**
+ * Access to private methods for testing
+ *
+ * @param (string) method: Method to be called
+ * @param (array) args: Array of paramters to be passed in
+ */
+ public function access( $method, $args ) {
+ if ( method_exists( $this, $method ) ) {
+ if ( $method == 'cleanup' ) {
+ return $this->cleanup( $args[0], $args[1] );
+ }
+ else {
+ return call_user_func_array( array($this, $method), $args );
+ }
+ }
+ else {
+ throw new CSSCompression_Exception( "Unknown method in Cleanup Class - " . $method );
+ }
+ }
+}
diff -up -r advagg_css_compress/css-compressor-3.x/src/lib/Color.inc advagg_css_compress/css-compressor-3.x/src/lib/Color.inc
--- advagg_css_compress/css-compressor-3.x/src/lib/Color.inc 2012-03-23 12:08:13.000000000 -0600
+++ advagg_css_compress/css-compressor-3.x/src/lib/Color.inc 2012-03-23 13:02:18.000000000 -0600
@@ -5,193 +5,192 @@
* Corey Hart @ http://www.codenothing.com
*/
-Class CSSCompression_Color
-{
- /**
- * Color Patterns
- *
- * @class Control: Compression Controller
- * @param (array) options: Reference to options array
- * @param (regex) rrgb: Checks for rgb notation
- * @param (regex) rhex: Checks for hex code
- * @param (regex) rfullhex: Checks for full 6 character hex code
- * @static (array) color2hex: Long color name to hex code conversions
- * @static (array) hex2short: Hex code to short color name conversions
- * @static (array) hex2short_safe: CSS Level 1 safe color names that are shorter than hex codes
- * @static (array) files: List of static helpers with their class vars
- */
- private $Control;
- private $options = array();
- private $rrgb = "/^rgb\((\d{1,3}\%?(,\d{1,3}\%?,\d{1,3}\%?)?)\)$/i";
- private $rhex = "/^#([0-9a-f]{3}|[0-9a-f]{6})$/i";
- private $rfullhex = "/^#([0-9a-f]{6})$/i";
- private static $color2hex = array();
- private static $hex2short = array();
- private static $hex2short_safe = array();
- private static $files = array(
- 'color2hex' => 'long2hex-colors.json',
- 'hex2short' => 'hex2short-colors.json',
- 'hex2short_safe' => 'hex2short-safe.json',
- );
-
- /**
- * Stash a reference to the controller on each instantiation
- * and install conversion helpers
- *
- * @param (class) control: CSSCompression Controller
- */
- public function __construct( CSSCompression_Control $control ) {
- $this->Control = $control;
- $this->options = &$control->Option->options;
-
- if ( ! self::$color2hex ) {
- foreach ( self::$files as $v => $file ) {
- self::$$v = CSSCompression::getJSON( $file );
- }
- }
- }
-
- /**
- * Central handler for all color conversions.
- *
- * @param (string) val: Color to be parsed
- */
- public function color( $val ) {
- // Converts rgb values to hex codes
- if ( $this->options['color-rgb2hex'] ) {
- $val = $this->rgb2hex( $val );
- }
-
- // Convert long color names to hex codes
- if ( $this->options['color-long2hex'] ) {
- $val = $this->color2hex( $val );
- }
-
- // Ensure all hex codes are lowercase
- if ( preg_match( $this->rhex, $val ) ) {
- $val = strtolower( $val );
- }
-
- // Convert large hex codes to small codes
- if ( $this->options['color-hex2shorthex'] ) {
- $val = $this->hex2short( $val );
- }
-
- // Convert 6 digit hex codes to short color names
- if ( $this->options['color-hex2shortcolor'] ) {
- $val = $this->hex2color( $val );
- }
-
- // Convert safe css level1 color names
- if ( $this->options['color-hex2safe'] ) {
- $val = $this->hex2safe( $val );
- }
-
- return $val;
- }
-
- /**
- * Converts rgb values to hex codes
- *
- * @param (string) val: Color to be converted
- */
- private function rgb2hex( $val ) {
- if ( ! preg_match( $this->rrgb, $val, $match ) ) {
- return $val;
- }
-
- // locals
- $hex = '0123456789abcdef';
- $str = explode( ',', $match[ 1 ] );
- $new = '';
-
- // Incase rgb was defined with single val
- if ( ! $str ) {
- $str = array( $match[ 1 ] );
- }
-
- foreach ( $str as $x ) {
- $x = strpos( $x, '%' ) !== false ? intval( ( intval( $x ) / 100 ) * 255 ) : intval( $x );
-
- if ( $x > 255 ) {
- $x = 255;
- }
-
- if ( $x < 0 ) {
- $x = 0;
- }
-
- $new .= $hex[ ( $x - $x % 16 ) / 16 ];
- $new .= $hex[ $x % 16 ];
- }
-
- // Repeat hex code to complete 6 digit hex requirement for single definitions
- if ( count( $str ) == 1 ) {
- $new .= $new . $new;
- }
-
- // Replace with hex value
- return "#$new";
- }
-
- /**
- * Convert long color names to hex codes
- *
- * @param (string) val: Color to be converted
- */
- private function color2hex( $val ) {
- return isset( self::$color2hex[ $val ] ) ? self::$color2hex[ $val ] : $val;
- }
-
- /**
- * Convert large hex codes to small codes
- *
- * @param (string) val: Hex to be shortened
- */
- private function hex2short( $val ) {
- if ( ! preg_match( $this->rfullhex, $val, $match ) ) {
- return $val;
- }
-
- // See if we can convert to 3 char hex
- $hex = $match[ 1 ];
- if ( $hex[ 0 ] == $hex[ 1 ] && $hex[ 2 ] == $hex[ 3 ] && $hex[ 4 ] == $hex[ 5 ] ) {
- $val = '#' . $hex[ 0 ] . $hex[ 2 ] . $hex[ 4 ];
- }
-
- return $val;
- }
-
- /**
- * Convert large hex codes to small codes
- *
- * @param (string) val: Color to be converted
- */
- private function hex2color( $val ) {
- return isset( self::$hex2short[ $val ] ) ? self::$hex2short[ $val ] : $val;
- }
-
- /**
- * Convert large hex codes to small codes
- *
- * @param (string) val: Color to be converted
- */
- private function hex2safe( $val ) {
- return isset( self::$hex2short_safe[ $val ] ) ? self::$hex2short_safe[ $val ] : $val;
- }
-
- /**
- * Access to private methods for testing
- *
- * @param (string) method: Method to be called
- * @param (array) args: Array of paramters to be passed in
- */
- public function access( $method, $args ) {
- if ( method_exists( $this, $method ) ) {
- return call_user_func_array( array( $this, $method ), $args );
- }
- else {
- throw new CSSCompression_Exception( "Unknown method in Color Class - " . $method );
- }
- }
-};
+class CSSCompression_Color {
+ /**
+ * Color Patterns
+ *
+ * @class Control: Compression Controller
+ * @param (array) options: Reference to options array
+ * @param (regex) rrgb: Checks for rgb notation
+ * @param (regex) rhex: Checks for hex code
+ * @param (regex) rfullhex: Checks for full 6 character hex code
+ * @static (array) color2hex: Long color name to hex code conversions
+ * @static (array) hex2short: Hex code to short color name conversions
+ * @static (array) hex2short_safe: CSS Level 1 safe color names that are shorter than hex codes
+ * @static (array) files: List of static helpers with their class vars
+ */
+ private $Control;
+ private $options = array();
+ private $rrgb = "/^rgb\((\d{1,3}\%?(,\d{1,3}\%?,\d{1,3}\%?)?)\)$/i";
+ private $rhex = "/^#([0-9a-f]{3}|[0-9a-f]{6})$/i";
+ private $rfullhex = "/^#([0-9a-f]{6})$/i";
+ private static $color2hex = array();
+ private static $hex2short = array();
+ private static $hex2short_safe = array();
+ private static $files = array(
+ 'color2hex' => 'long2hex-colors.json',
+ 'hex2short' => 'hex2short-colors.json',
+ 'hex2short_safe' => 'hex2short-safe.json',
+ );
+
+ /**
+ * Stash a reference to the controller on each instantiation
+ * and install conversion helpers
+ *
+ * @param (class) control: CSSCompression Controller
+ */
+ public function __construct( CSSCompression_Control $control ) {
+ $this->Control = $control;
+ $this->options = &$control->Option->options;
+
+ if ( ! self::$color2hex ) {
+ foreach ( self::$files as $v => $file ) {
+ self::$$v = CSSCompression::getJSON( $file );
+ }
+ }
+ }
+
+ /**
+ * Central handler for all color conversions.
+ *
+ * @param (string) val: Color to be parsed
+ */
+ public function color( $val ) {
+ // Converts rgb values to hex codes
+ if ( $this->options['color-rgb2hex'] ) {
+ $val = $this->rgb2hex( $val );
+ }
+
+ // Convert long color names to hex codes
+ if ( $this->options['color-long2hex'] ) {
+ $val = $this->color2hex( $val );
+ }
+
+ // Ensure all hex codes are lowercase
+ if ( preg_match( $this->rhex, $val ) ) {
+ $val = strtolower( $val );
+ }
+
+ // Convert large hex codes to small codes
+ if ( $this->options['color-hex2shorthex'] ) {
+ $val = $this->hex2short( $val );
+ }
+
+ // Convert 6 digit hex codes to short color names
+ if ( $this->options['color-hex2shortcolor'] ) {
+ $val = $this->hex2color( $val );
+ }
+
+ // Convert safe css level1 color names
+ if ( $this->options['color-hex2safe'] ) {
+ $val = $this->hex2safe( $val );
+ }
+
+ return $val;
+ }
+
+ /**
+ * Converts rgb values to hex codes
+ *
+ * @param (string) val: Color to be converted
+ */
+ private function rgb2hex( $val ) {
+ if ( ! preg_match( $this->rrgb, $val, $match ) ) {
+ return $val;
+ }
+
+ // locals
+ $hex = '0123456789abcdef';
+ $str = explode( ',', $match[1] );
+ $new = '';
+
+ // Incase rgb was defined with single val
+ if ( ! $str ) {
+ $str = array($match[1]);
+ }
+
+ foreach ( $str as $x ) {
+ $x = strpos( $x, '%' ) !== false ? intval( ( intval( $x ) / 100 ) * 255 ) : intval( $x );
+
+ if ( $x > 255 ) {
+ $x = 255;
+ }
+
+ if ( $x < 0 ) {
+ $x = 0;
+ }
+
+ $new .= $hex[( $x - $x % 16 ) / 16];
+ $new .= $hex[$x % 16];
+ }
+
+ // Repeat hex code to complete 6 digit hex requirement for single definitions
+ if ( count( $str ) == 1 ) {
+ $new .= $new . $new;
+ }
+
+ // Replace with hex value
+ return "#$new";
+ }
+
+ /**
+ * Convert long color names to hex codes
+ *
+ * @param (string) val: Color to be converted
+ */
+ private function color2hex( $val ) {
+ return isset( self::$color2hex[$val] ) ? self::$color2hex[$val] : $val;
+ }
+
+ /**
+ * Convert large hex codes to small codes
+ *
+ * @param (string) val: Hex to be shortened
+ */
+ private function hex2short( $val ) {
+ if ( ! preg_match( $this->rfullhex, $val, $match ) ) {
+ return $val;
+ }
+
+ // See if we can convert to 3 char hex
+ $hex = $match[1];
+ if ( $hex[0] == $hex[1] && $hex[2] == $hex[3] && $hex[4] == $hex[5] ) {
+ $val = '#' . $hex[0] . $hex[2] . $hex[4];
+ }
+
+ return $val;
+ }
+
+ /**
+ * Convert large hex codes to small codes
+ *
+ * @param (string) val: Color to be converted
+ */
+ private function hex2color( $val ) {
+ return isset( self::$hex2short[$val] ) ? self::$hex2short[$val] : $val;
+ }
+
+ /**
+ * Convert large hex codes to small codes
+ *
+ * @param (string) val: Color to be converted
+ */
+ private function hex2safe( $val ) {
+ return isset( self::$hex2short_safe[$val] ) ? self::$hex2short_safe[$val] : $val;
+ }
+
+ /**
+ * Access to private methods for testing
+ *
+ * @param (string) method: Method to be called
+ * @param (array) args: Array of paramters to be passed in
+ */
+ public function access( $method, $args ) {
+ if ( method_exists( $this, $method ) ) {
+ return call_user_func_array( array($this, $method), $args );
+ }
+ else {
+ throw new CSSCompression_Exception( "Unknown method in Color Class - " . $method );
+ }
+ }
+}
diff -up -r advagg_css_compress/css-compressor-3.x/src/lib/Combine/Aural.inc advagg_css_compress/css-compressor-3.x/src/lib/Combine/Aural.inc
--- advagg_css_compress/css-compressor-3.x/src/lib/Combine/Aural.inc 2012-03-23 12:08:13.000000000 -0600
+++ advagg_css_compress/css-compressor-3.x/src/lib/Combine/Aural.inc 2012-03-23 13:02:18.000000000 -0600
@@ -5,103 +5,102 @@
* Corey Hart @ http://www.codenothing.com
*/
-Class CSSCompression_Combine_Aural
-{
- /**
- * Combine Patterns
- *
- * @class Control: Compression Controller
- * @class Combine: Combine Controller
- * @param (regex) raural: Aurual matching
- */
- private $Control;
- private $Combine;
- private $raural = "/(^|(?<!\\\);)(cue|pause)-(before|after):(.*?)((?<!\\\);|$)/";
-
- /**
- * Stash a reference to the controller & combiner
- *
- * @param (class) control: CSSCompression Controller
- * @param (class) combine: CSSCompression Combiner
- */
- public function __construct( CSSCompression_Control $control, CSSCompression_Combine $combine ) {
- $this->Control = $control;
- $this->Combine = $combine;
- }
-
- /**
- * Combines Aural properties (currently being depreciated in W3C Standards)
- *
- * @param (string) val: Rule Set
- */
- public function combine( $val ) {
- $storage = $this->storage( $val );
- $pos = 0;
-
- // Replace first occurance with it's prop, and remove all following occurances
- while ( preg_match( $this->raural, $val, $match, PREG_OFFSET_CAPTURE, $pos ) ) {
- $prop = $match[ 2 ][ 0 ];
- if ( isset( $storage[ $prop ] ) ) {
- $colon = strlen( $match[ 1 ][ 0 ] );
- $val = substr_replace( $val, $storage[ $prop ], $match[ 0 ][ 1 ] + $colon, strlen( $match[ 0 ][ 0 ] ) - $colon );
- $pos = $match[ 0 ][ 1 ] + strlen( $storage[ $prop ] ) - $colon - 1;
- $storage[ $prop ] = '';
- }
- else {
- $pos = $match[ 0 ][ 1 ] + strlen( $match[ 0 ][ 0 ] ) - 1;
- }
- }
-
- // Return converted val
- return $val;
- }
-
- /**
- * Builds a storage object for iteration
- *
- * @param (string) val: Rule Set
- */
- private function storage( $val ) {
- $storage = array();
-
- // Find all possible occurences and build the replacement
- $pos = 0;
- while ( preg_match( $this->raural, $val, $match, PREG_OFFSET_CAPTURE, $pos ) ) {
- if ( ! isset( $storage[ $match[ 2 ][ 0 ] ] ) ) {
- $storage[ $match[ 2 ][ 0 ] ] = array( $match[ 3 ][ 0 ] => $match[ 4 ][ 0 ] );
- }
-
- // Override double written properties
- $storage[ $match[ 2 ][ 0 ] ][ $match[ 3 ][ 0 ] ] = $match[ 4 ][ 0 ];
- $pos = $match[ 0 ][ 1 ] + strlen( $match[ 0 ][ 0 ] ) - 1;
- }
-
- // Go through each tag for possible combination
- foreach ( $storage as $tag => $arr ) {
- // All three have to be defined
- if ( count( $arr ) == 2 && ! $this->Combine->checkUncombinables( $arr ) ) {
- $storage[ $tag ] = "$tag:" . $arr['before'] . ' ' . $arr['after'] . ';';
- }
- else {
- unset( $storage[ $tag ] );
- }
- }
-
- return $storage;
- }
-
- /**
- * Access to private methods for testing
- *
- * @param (string) method: Method to be called
- * @param (array) args: Array of paramters to be passed in
- */
- public function access( $method, $args ) {
- if ( method_exists( $this, $method ) ) {
- return call_user_func_array( array( $this, $method ), $args );
- }
- else {
- throw new CSSCompression_Exception( "Unknown method in Aural Class - " . $method );
- }
- }
-};
+class CSSCompression_Combine_Aural {
+ /**
+ * Combine Patterns
+ *
+ * @class Control: Compression Controller
+ * @class Combine: Combine Controller
+ * @param (regex) raural: Aurual matching
+ */
+ private $Control;
+ private $Combine;
+ private $raural = "/(^|(?<!\\\);)(cue|pause)-(before|after):(.*?)((?<!\\\);|$)/";
+
+ /**
+ * Stash a reference to the controller & combiner
+ *
+ * @param (class) control: CSSCompression Controller
+ * @param (class) combine: CSSCompression Combiner
+ */
+ public function __construct( CSSCompression_Control $control, CSSCompression_Combine $combine ) {
+ $this->Control = $control;
+ $this->Combine = $combine;
+ }
+
+ /**
+ * Combines Aural properties (currently being depreciated in W3C Standards)
+ *
+ * @param (string) val: Rule Set
+ */
+ public function combine( $val ) {
+ $storage = $this->storage( $val );
+ $pos = 0;
+
+ // Replace first occurance with it's prop, and remove all following occurances
+ while ( preg_match( $this->raural, $val, $match, PREG_OFFSET_CAPTURE, $pos ) ) {
+ $prop = $match[2][0];
+ if ( isset( $storage[$prop] ) ) {
+ $colon = strlen( $match[1][0] );
+ $val = substr_replace( $val, $storage[$prop], $match[0][1] + $colon, strlen( $match[0][0] ) - $colon );
+ $pos = $match[0][1] + strlen( $storage[$prop] ) - $colon - 1;
+ $storage[$prop] = '';
+ }
+ else {
+ $pos = $match[0][1] + strlen( $match[0][0] ) - 1;
+ }
+ }
+
+ // Return converted val
+ return $val;
+ }
+
+ /**
+ * Builds a storage object for iteration
+ *
+ * @param (string) val: Rule Set
+ */
+ private function storage( $val ) {
+ $storage = array();
+
+ // Find all possible occurences and build the replacement
+ $pos = 0;
+ while ( preg_match( $this->raural, $val, $match, PREG_OFFSET_CAPTURE, $pos ) ) {
+ if ( ! isset( $storage[$match[2][0]] ) ) {
+ $storage[$match[2][0]] = array($match[3][0] => $match[4][0]);
+ }
+
+ // Override double written properties
+ $storage[$match[2][0]][$match[3][0]] = $match[4][0];
+ $pos = $match[0][1] + strlen( $match[0][0] ) - 1;
+ }
+
+ // Go through each tag for possible combination
+ foreach ( $storage as $tag => $arr ) {
+ // All three have to be defined
+ if ( count( $arr ) == 2 && ! $this->Combine->checkUncombinables( $arr ) ) {
+ $storage[$tag] = "$tag:" . $arr['before'] . ' ' . $arr['after'] . ';';
+ }
+ else {
+ unset( $storage[$tag] );
+ }
+ }
+
+ return $storage;
+ }
+
+ /**
+ * Access to private methods for testing
+ *
+ * @param (string) method: Method to be called
+ * @param (array) args: Array of paramters to be passed in
+ */
+ public function access( $method, $args ) {
+ if ( method_exists( $this, $method ) ) {
+ return call_user_func_array( array($this, $method), $args );
+ }
+ else {
+ throw new CSSCompression_Exception( "Unknown method in Aural Class - " . $method );
+ }
+ }
+}
diff -up -r advagg_css_compress/css-compressor-3.x/src/lib/Combine/Background.inc advagg_css_compress/css-compressor-3.x/src/lib/Combine/Background.inc
--- advagg_css_compress/css-compressor-3.x/src/lib/Combine/Background.inc 2012-03-23 12:08:13.000000000 -0600
+++ advagg_css_compress/css-compressor-3.x/src/lib/Combine/Background.inc 2012-03-23 13:02:18.000000000 -0600
@@ -5,101 +5,100 @@
* Corey Hart @ http://www.codenothing.com
*/
-Class CSSCompression_Combine_Background
-{
- /**
- * Combine Patterns
- *
- * @class Control: Compression Controller
- * @class Combine: Combine Controller
- * @param (regex) rbackground: Background matching
- * @param (array) groupings: List of background combinations
- */
- private $Control;
- private $Combine;
- private $rbackground = "/(^|(?<!\\\);)background-(color|image|repeat|attachment|position):(.*?)((?<!\\\);|$)/";
- private $groupings = array(
- // With color
- array( 'color', 'image', 'repeat', 'attachment', 'position' ),
- array( 'color', 'image', 'attachment', 'position' ),
- array( 'color', 'image', 'repeat', 'position' ),
- array( 'color', 'image', 'repeat', 'attachment' ),
- array( 'color', 'image', 'repeat' ),
- array( 'color', 'image', 'attachment' ),
- array( 'color', 'image', 'position' ),
- array( 'color', 'image' ),
- // Without Color
- array( 'image', 'attachment', 'position' ),
- array( 'image', 'repeat', 'position' ),
- array( 'image', 'repeat', 'attachment' ),
- array( 'image', 'repeat' ),
- array( 'image', 'attachment' ),
- array( 'image', 'position' ),
- // Just Color/Image
- array( 'image' ),
- array( 'color' ),
- );
-
- /**
- * Stash a reference to the controller & combiner
- *
- * @param (class) control: CSSCompression Controller
- * @param (class) combine: CSSCompression Combiner
- */
- public function __construct( CSSCompression_Control $control, CSSCompression_Combine $combine ) {
- $this->Control = $control;
- $this->Combine = $combine;
- }
-
- /**
- * Combines multiple background props into single definition
- *
- * @param (string) val: Rule Set
- */
- public function combine( $val ) {
- $storage = array();
-
- // Find all possible occurences and build the replacement
- $pos = 0;
- while ( preg_match( $this->rbackground, $val, $match, PREG_OFFSET_CAPTURE, $pos ) ) {
- $storage[ $match[ 2 ][ 0 ] ] = $match[ 3 ][ 0 ];
- $pos = $match[ 0 ][ 1 ] + strlen( $match[ 0 ][ 0 ] ) - 1;
- }
-
- // Run background checks and get replacement str
- foreach ( $this->groupings as $props ) {
- if ( $replace = $this->Combine->searchDefinitions( 'background', $storage, $props ) ) {
- break;
- }
- }
-
- // If replacement string found, run it on all declarations
- if ( $replace ) {
- $pos = 0;
- while ( preg_match( $this->rbackground, $val, $match, PREG_OFFSET_CAPTURE, $pos ) ) {
- $colon = strlen( $match[ 1 ][ 0 ] );
- $val = substr_replace( $val, $replace, $match[ 0 ][ 1 ] + $colon, strlen( $match[ 0 ][ 0 ] ) - $colon );
- $pos = $match[ 0 ][ 1 ] + strlen( $replace ) - $colon - 1;
- $replace = '';
- }
- }
-
- // Return converted val
- return $val;
- }
-
- /**
- * Access to private methods for testing
- *
- * @param (string) method: Method to be called
- * @param (array) args: Array of paramters to be passed in
- */
- public function access( $method, $args ) {
- if ( method_exists( $this, $method ) ) {
- return call_user_func_array( array( $this, $method ), $args );
- }
- else {
- throw new CSSCompression_Exception( "Unknown method in Background Class - " . $method );
- }
- }
-};
+class CSSCompression_Combine_Background {
+ /**
+ * Combine Patterns
+ *
+ * @class Control: Compression Controller
+ * @class Combine: Combine Controller
+ * @param (regex) rbackground: Background matching
+ * @param (array) groupings: List of background combinations
+ */
+ private $Control;
+ private $Combine;
+ private $rbackground = "/(^|(?<!\\\);)background-(color|image|repeat|attachment|position):(.*?)((?<!\\\);|$)/";
+ private $groupings = array(
+ // With color
+ array('color', 'image', 'repeat', 'attachment', 'position'),
+ array('color', 'image', 'attachment', 'position'),
+ array('color', 'image', 'repeat', 'position'),
+ array('color', 'image', 'repeat', 'attachment'),
+ array('color', 'image', 'repeat'),
+ array('color', 'image', 'attachment'),
+ array('color', 'image', 'position'),
+ array('color', 'image'),
+ // Without Color
+ array('image', 'attachment', 'position'),
+ array('image', 'repeat', 'position'),
+ array('image', 'repeat', 'attachment'),
+ array('image', 'repeat'),
+ array('image', 'attachment'),
+ array('image', 'position'),
+ // Just Color/Image
+ array('image'),
+ array('color'),
+ );
+
+ /**
+ * Stash a reference to the controller & combiner
+ *
+ * @param (class) control: CSSCompression Controller
+ * @param (class) combine: CSSCompression Combiner
+ */
+ public function __construct( CSSCompression_Control $control, CSSCompression_Combine $combine ) {
+ $this->Control = $control;
+ $this->Combine = $combine;
+ }
+
+ /**
+ * Combines multiple background props into single definition
+ *
+ * @param (string) val: Rule Set
+ */
+ public function combine( $val ) {
+ $storage = array();
+
+ // Find all possible occurences and build the replacement
+ $pos = 0;
+ while ( preg_match( $this->rbackground, $val, $match, PREG_OFFSET_CAPTURE, $pos ) ) {
+ $storage[$match[2][0]] = $match[3][0];
+ $pos = $match[0][1] + strlen( $match[0][0] ) - 1;
+ }
+
+ // Run background checks and get replacement str
+ foreach ( $this->groupings as $props ) {
+ if ( $replace = $this->Combine->searchDefinitions( 'background', $storage, $props ) ) {
+ break;
+ }
+ }
+
+ // If replacement string found, run it on all declarations
+ if ( $replace ) {
+ $pos = 0;
+ while ( preg_match( $this->rbackground, $val, $match, PREG_OFFSET_CAPTURE, $pos ) ) {
+ $colon = strlen( $match[1][0] );
+ $val = substr_replace( $val, $replace, $match[0][1] + $colon, strlen( $match[0][0] ) - $colon );
+ $pos = $match[0][1] + strlen( $replace ) - $colon - 1;
+ $replace = '';
+ }
+ }
+
+ // Return converted val
+ return $val;
+ }
+
+ /**
+ * Access to private methods for testing
+ *
+ * @param (string) method: Method to be called
+ * @param (array) args: Array of paramters to be passed in
+ */
+ public function access( $method, $args ) {
+ if ( method_exists( $this, $method ) ) {
+ return call_user_func_array( array($this, $method), $args );
+ }
+ else {
+ throw new CSSCompression_Exception( "Unknown method in Background Class - " . $method );
+ }
+ }
+}
diff -up -r advagg_css_compress/css-compressor-3.x/src/lib/Combine/Border.inc advagg_css_compress/css-compressor-3.x/src/lib/Combine/Border.inc
--- advagg_css_compress/css-compressor-3.x/src/lib/Combine/Border.inc 2012-03-23 12:08:13.000000000 -0600
+++ advagg_css_compress/css-compressor-3.x/src/lib/Combine/Border.inc 2012-03-23 13:02:18.000000000 -0600
@@ -5,92 +5,91 @@
* Corey Hart @ http://www.codenothing.com
*/
-Class CSSCompression_Combine_Border
-{
- /**
- * Combine Patterns
- *
- * @class Control: Compression Controller
- * @class Combine: Combine Controller
- * @param (regex) rborder: Border matching
- */
- private $Control;
- private $Combine;
- private $rborder = "/(^|(?<!\\\);)border-(top|right|bottom|left):(.*?)((?<!\\\);|$)/";
-
- /**
- * Stash a reference to the controller & combiner
- *
- * @param (class) control: CSSCompression Controller
- * @param (class) combine: CSSCompression Combiner
- */
- public function __construct( CSSCompression_Control $control, CSSCompression_Combine $combine ) {
- $this->Control = $control;
- $this->Combine = $combine;
- }
-
- /**
- * Combines multiple border properties into single definition
- *
- * @param (string) val: Rule Set
- */
- public function combine( $val ) {
- if ( ( $replace = $this->replace( $val ) ) === false ) {
- return $val;
- }
-
- // Rebuild the rule set with the combinations found
- $pos = 0;
- while ( preg_match( $this->rborder, $val, $match, PREG_OFFSET_CAPTURE, $pos ) ) {
- $colon = strlen( $match[ 1 ][ 0 ] );
- $val = substr_replace( $val, $replace, $match[ 0 ][ 1 ] + $colon, strlen( $match[ 0 ][ 0 ] ) - $colon );
- $pos = $match[ 0 ][ 1 ] + strlen( $replace ) - $colon - 1;
- $replace = '';
- }
-
- // Return converted val
- return $val;
- }
-
- /**
- * Builds a replacement string
- *
- * @param (string) val: Rule Set
- */
- private function replace( $val ) {
- $storage = array();
-
- // Find all possible occurences and build the replacement
- $pos = 0;
- while ( preg_match( $this->rborder, $val, $match, PREG_OFFSET_CAPTURE, $pos ) ) {
- // Override double written properties
- $storage[ $match[ 2 ][ 0 ] ] = $match[ 3 ][ 0 ];
- $pos = $match[ 0 ][ 1 ] + strlen( $match[ 0 ][ 0 ] ) - 1;
- }
+class CSSCompression_Combine_Border {
+ /**
+ * Combine Patterns
+ *
+ * @class Control: Compression Controller
+ * @class Combine: Combine Controller
+ * @param (regex) rborder: Border matching
+ */
+ private $Control;
+ private $Combine;
+ private $rborder = "/(^|(?<!\\\);)border-(top|right|bottom|left):(.*?)((?<!\\\);|$)/";
+
+ /**
+ * Stash a reference to the controller & combiner
+ *
+ * @param (class) control: CSSCompression Controller
+ * @param (class) combine: CSSCompression Combiner
+ */
+ public function __construct( CSSCompression_Control $control, CSSCompression_Combine $combine ) {
+ $this->Control = $control;
+ $this->Combine = $combine;
+ }
+
+ /**
+ * Combines multiple border properties into single definition
+ *
+ * @param (string) val: Rule Set
+ */
+ public function combine( $val ) {
+ if ( ( $replace = $this->replace( $val ) ) === false ) {
+ return $val;
+ }
+
+ // Rebuild the rule set with the combinations found
+ $pos = 0;
+ while ( preg_match( $this->rborder, $val, $match, PREG_OFFSET_CAPTURE, $pos ) ) {
+ $colon = strlen( $match[1][0] );
+ $val = substr_replace( $val, $replace, $match[0][1] + $colon, strlen( $match[0][0] ) - $colon );
+ $pos = $match[0][1] + strlen( $replace ) - $colon - 1;
+ $replace = '';
+ }
+
+ // Return converted val
+ return $val;
+ }
+
+ /**
+ * Builds a replacement string
+ *
+ * @param (string) val: Rule Set
+ */
+ private function replace( $val ) {
+ $storage = array();
+
+ // Find all possible occurences and build the replacement
+ $pos = 0;
+ while ( preg_match( $this->rborder, $val, $match, PREG_OFFSET_CAPTURE, $pos ) ) {
+ // Override double written properties
+ $storage[$match[2][0]] = $match[3][0];
+ $pos = $match[0][1] + strlen( $match[0][0] ) - 1;
+ }
- // All 4 have to be defined
- if ( count( $storage ) == 4 &&
+ // All 4 have to be defined
+ if ( count( $storage ) == 4 &&
$storage['top'] == $storage['bottom'] &&
$storage['left'] == $storage['right'] &&
$storage['top'] == $storage['right'] ) {
- return "border:" . $storage['top'] . ';';
- }
+ return "border:" . $storage['top'] . ';';
+ }
- return false;
- }
+ return false;
+ }
- /**
- * Access to private methods for testing
- *
- * @param (string) method: Method to be called
- * @param (array) args: Array of paramters to be passed in
- */
- public function access( $method, $args ) {
- if ( method_exists( $this, $method ) ) {
- return call_user_func_array( array( $this, $method ), $args );
- }
- else {
- throw new CSSCompression_Exception( "Unknown method in Border Class - " . $method );
- }
- }
-};
+ /**
+ * Access to private methods for testing
+ *
+ * @param (string) method: Method to be called
+ * @param (array) args: Array of paramters to be passed in
+ */
+ public function access( $method, $args ) {
+ if ( method_exists( $this, $method ) ) {
+ return call_user_func_array( array($this, $method), $args );
+ }
+ else {
+ throw new CSSCompression_Exception( "Unknown method in Border Class - " . $method );
+ }
+ }
+}
diff -up -r advagg_css_compress/css-compressor-3.x/src/lib/Combine/BorderOutline.inc advagg_css_compress/css-compressor-3.x/src/lib/Combine/BorderOutline.inc
--- advagg_css_compress/css-compressor-3.x/src/lib/Combine/BorderOutline.inc 2012-03-23 12:08:13.000000000 -0600
+++ advagg_css_compress/css-compressor-3.x/src/lib/Combine/BorderOutline.inc 2012-03-23 13:02:18.000000000 -0600
@@ -5,103 +5,102 @@
* Corey Hart @ http://www.codenothing.com
*/
-Class CSSCompression_Combine_BorderOutline
-{
- /**
- * Combine Patterns
- *
- * @class Control: Compression Controller
- * @class Combine: Combine Controller
- * @param (regex) rcsw: Border/Outline matching
- */
- private $Control;
- private $Combine;
- private $rcsw = "/(^|(?<!\\\);)(border|border-top|border-bottom|border-left|border-right|outline)-(color|style|width):(.*?)((?<!\\\);|$)/";
-
- /**
- * Stash a reference to the controller & combiner
- *
- * @param (class) control: CSSCompression Controller
- * @param (class) combine: CSSCompression Combiner
- */
- public function __construct( CSSCompression_Control $control, CSSCompression_Combine $combine ) {
- $this->Control = $control;
- $this->Combine = $combine;
- }
-
- /**
- * Combines color/style/width of border/outline properties
- *
- * @param (string) val: Rule Set
- */
- public function combine( $val ) {
- $storage = $this->storage( $val );
- $pos = 0;
-
- // Now rebuild the string replacing all instances
- while ( preg_match( $this->rcsw, $val, $match, PREG_OFFSET_CAPTURE, $pos ) ) {
- $prop = $match[ 2 ][ 0 ];
- if ( isset( $storage[ $prop ] ) ) {
- $colon = strlen( $match[ 1 ][ 0 ] );
- $val = substr_replace( $val, $storage[ $prop ], $match[ 0 ][ 1 ] + $colon, strlen( $match[ 0 ][ 0 ] ) - $colon );
- $pos = $match[ 0 ][ 1 ] + strlen( $storage[ $prop ] ) - $colon - 1;
- $storage[ $prop ] = '';
- }
- else {
- $pos = $match[ 0 ][ 1 ] + strlen( $match[ 0 ][ 0 ] ) - 1;
- }
- }
-
- // Return converted val
- return $val;
- }
-
- /**
- * Builds a storage object for iteration
- *
- * @param (string) val: Rule Set
- */
- private function storage( $val ) {
- $storage = array();
- $pos = 0;
-
- // Find all possible occurences and build the replacement
- while ( preg_match( $this->rcsw, $val, $match, PREG_OFFSET_CAPTURE, $pos ) ) {
- if ( ! isset( $storage[ $match[ 2 ][ 0 ] ] ) ) {
- $storage[ $match[ 2 ][ 0 ] ] = array( $match[ 3 ][ 0 ] => $match[ 4 ][ 0 ] );
- }
-
- // Override double written properties
- $storage[ $match[ 2 ][ 0 ] ][ $match[ 3 ][ 0 ] ] = $match[ 4 ][ 0 ];
- $pos = $match[ 0 ][ 1 ] + strlen( $match[ 0 ][ 0 ] ) - 1;
- }
-
- // Go through each tag for possible combination
- foreach ( $storage as $tag => $arr ) {
- // All three have to be defined
- if ( count( $arr ) == 3 && ! $this->Combine->checkUncombinables( $arr ) ) {
- $storage[ $tag ] = "$tag:" . $arr['width'] . ' ' . $arr['style'] . ' ' . $arr['color'] . ';';
- }
- else {
- unset( $storage[ $tag ] );
- }
- }
-
- return $storage;
- }
-
- /**
- * Access to private methods for testing
- *
- * @param (string) method: Method to be called
- * @param (array) args: Array of paramters to be passed in
- */
- public function access( $method, $args ) {
- if ( method_exists( $this, $method ) ) {
- return call_user_func_array( array( $this, $method ), $args );
- }
- else {
- throw new CSSCompression_Exception( "Unknown method in BorderOutline Class - " . $method );
- }
- }
-};
+class CSSCompression_Combine_BorderOutline {
+ /**
+ * Combine Patterns
+ *
+ * @class Control: Compression Controller
+ * @class Combine: Combine Controller
+ * @param (regex) rcsw: Border/Outline matching
+ */
+ private $Control;
+ private $Combine;
+ private $rcsw = "/(^|(?<!\\\);)(border|border-top|border-bottom|border-left|border-right|outline)-(color|style|width):(.*?)((?<!\\\);|$)/";
+
+ /**
+ * Stash a reference to the controller & combiner
+ *
+ * @param (class) control: CSSCompression Controller
+ * @param (class) combine: CSSCompression Combiner
+ */
+ public function __construct( CSSCompression_Control $control, CSSCompression_Combine $combine ) {
+ $this->Control = $control;
+ $this->Combine = $combine;
+ }
+
+ /**
+ * Combines color/style/width of border/outline properties
+ *
+ * @param (string) val: Rule Set
+ */
+ public function combine( $val ) {
+ $storage = $this->storage( $val );
+ $pos = 0;
+
+ // Now rebuild the string replacing all instances
+ while ( preg_match( $this->rcsw, $val, $match, PREG_OFFSET_CAPTURE, $pos ) ) {
+ $prop = $match[2][0];
+ if ( isset( $storage[$prop] ) ) {
+ $colon = strlen( $match[1][0] );
+ $val = substr_replace( $val, $storage[$prop], $match[0][1] + $colon, strlen( $match[0][0] ) - $colon );
+ $pos = $match[0][1] + strlen( $storage[$prop] ) - $colon - 1;
+ $storage[$prop] = '';
+ }
+ else {
+ $pos = $match[0][1] + strlen( $match[0][0] ) - 1;
+ }
+ }
+
+ // Return converted val
+ return $val;
+ }
+
+ /**
+ * Builds a storage object for iteration
+ *
+ * @param (string) val: Rule Set
+ */
+ private function storage( $val ) {
+ $storage = array();
+ $pos = 0;
+
+ // Find all possible occurences and build the replacement
+ while ( preg_match( $this->rcsw, $val, $match, PREG_OFFSET_CAPTURE, $pos ) ) {
+ if ( ! isset( $storage[$match[2][0]] ) ) {
+ $storage[$match[2][0]] = array($match[3][0] => $match[4][0]);
+ }
+
+ // Override double written properties
+ $storage[$match[2][0]][$match[3][0]] = $match[4][0];
+ $pos = $match[0][1] + strlen( $match[0][0] ) - 1;
+ }
+
+ // Go through each tag for possible combination
+ foreach ( $storage as $tag => $arr ) {
+ // All three have to be defined
+ if ( count( $arr ) == 3 && ! $this->Combine->checkUncombinables( $arr ) ) {
+ $storage[$tag] = "$tag:" . $arr['width'] . ' ' . $arr['style'] . ' ' . $arr['color'] . ';';
+ }
+ else {
+ unset( $storage[$tag] );
+ }
+ }
+
+ return $storage;
+ }
+
+ /**
+ * Access to private methods for testing
+ *
+ * @param (string) method: Method to be called
+ * @param (array) args: Array of paramters to be passed in
+ */
+ public function access( $method, $args ) {
+ if ( method_exists( $this, $method ) ) {
+ return call_user_func_array( array($this, $method), $args );
+ }
+ else {
+ throw new CSSCompression_Exception( "Unknown method in BorderOutline Class - " . $method );
+ }
+ }
+}
diff -up -r advagg_css_compress/css-compressor-3.x/src/lib/Combine/BorderRadius.inc advagg_css_compress/css-compressor-3.x/src/lib/Combine/BorderRadius.inc
--- advagg_css_compress/css-compressor-3.x/src/lib/Combine/BorderRadius.inc 2012-03-23 12:08:13.000000000 -0600
+++ advagg_css_compress/css-compressor-3.x/src/lib/Combine/BorderRadius.inc 2012-03-23 13:02:18.000000000 -0600
@@ -5,257 +5,259 @@
* Corey Hart @ http://www.codenothing.com
*/
-Class CSSCompression_Combine_BorderRadius
-{
- /**
- * Combine Patterns
- *
- * @class Control: Compression Controller
- * @class Combine: Combine Controller
- * @param (regex) rspace: Checks for space without an escape '\' character before it
- * @param (regex) rslash: Checks for unescaped slash character
- * @param (array) borderRadius: Various border radii components
- */
- private $Control;
- private $Combine;
- private $rspace = "/(?<!\\\)\s/";
- private $rslash = "/(?<!\\\)\//";
- private $borderRadius = array(
- 'css3' => array(
- 'mod' => '',
- 'base' => "/(^|(?<!\\\);)border-radius:(.*?)((?<!\\\);|$)/",
- 'full' => "/(^|(?<!\\\);)border-(top|bottom)-(left|right)-radius:(.*?)((?<!\\\);|$)/",
- ),
- 'moz' => array(
- 'mod' => '-moz-',
- 'base' => "/(^|(?<!\\\);)-moz-border-radius:(.*?)((?<!\\\);|$)/",
- 'full' => "/(^|(?<!\\\);)-moz-border-radius-(top|bottom)(left|right):(.*?)((?<!\\\);|$)/"
- ),
- 'webkit' => array(
- 'mod' => '-webkit-',
- 'base' => "/(^|(?<!\\\);)-webkit-border-radius:(.*?)((?<!\\\);|$)/",
- 'full' => "/(^|(?<!\\\);)-webkit-border-(top|bottom)-(left|right)-radius:(.*?)((?<!\\\);|$)/"
- ),
- );
-
- /**
- * Stash a reference to the controller & combiner
- *
- * @param (class) control: CSSCompression Controller
- * @param (class) combine: CSSCompression Combiner
- */
- public function __construct( CSSCompression_Control $control, CSSCompression_Combine $combine ) {
- $this->Control = $control;
- $this->Combine = $combine;
- }
-
-
- /**
- * Main handler to combine border-radii into a single rule
- *
- * @param (string) val: Rule Set
- */
- public function combine( $val ) {
- foreach ( $this->borderRadius as $regex ) {
- $val = $this->fix( $val, $regex );
- }
-
- return $val;
- }
-
- /**
- * Does the actual combining
- *
- * @param (string) val: Rule Set
- */
- private function fix( $val, $regex ) {
- $val = $this->base( $val, $regex );
- $replace = $regex['mod'];
-
- // Storage builder
- if ( ( $storage = $this->storage( $val, $regex ) ) === false ) {
- return $val;
- }
-
- // Setup horizontal/vertical radii
- foreach ( $storage as $dir => &$config ) {
- // Verticals are optional
- if ( $dir == 'vertical' && ! $config['keep'] ) {
- break;
- }
- // All 4 are the same
- else if ( $config['top-left'] == $config['top-right'] &&
+class CSSCompression_Combine_BorderRadius {
+ /**
+ * Combine Patterns
+ *
+ * @class Control: Compression Controller
+ * @class Combine: Combine Controller
+ * @param (regex) rspace: Checks for space without an escape '\' character before it
+ * @param (regex) rslash: Checks for unescaped slash character
+ * @param (array) borderRadius: Various border radii components
+ */
+ private $Control;
+ private $Combine;
+ private $rspace = "/(?<!\\\)\s/";
+ private $rslash = "/(?<!\\\)\//";
+ private $borderRadius = array(
+ 'css3' => array(
+ 'mod' => '',
+ 'base' => "/(^|(?<!\\\);)border-radius:(.*?)((?<!\\\);|$)/",
+ 'full' => "/(^|(?<!\\\);)border-(top|bottom)-(left|right)-radius:(.*?)((?<!\\\);|$)/",
+ ),
+ 'moz' => array(
+ 'mod' => '-moz-',
+ 'base' => "/(^|(?<!\\\);)-moz-border-radius:(.*?)((?<!\\\);|$)/",
+ 'full' => "/(^|(?<!\\\);)-moz-border-radius-(top|bottom)(left|right):(.*?)((?<!\\\);|$)/",
+ ),
+ 'webkit' => array(
+ 'mod' => '-webkit-',
+ 'base' => "/(^|(?<!\\\);)-webkit-border-radius:(.*?)((?<!\\\);|$)/",
+ 'full' => "/(^|(?<!\\\);)-webkit-border-(top|bottom)-(left|right)-radius:(.*?)((?<!\\\);|$)/",
+ ),
+ );
+
+ /**
+ * Stash a reference to the controller & combiner
+ *
+ * @param (class) control: CSSCompression Controller
+ * @param (class) combine: CSSCompression Combiner
+ */
+ public function __construct( CSSCompression_Control $control, CSSCompression_Combine $combine ) {
+ $this->Control = $control;
+ $this->Combine = $combine;
+ }
+
+
+ /**
+ * Main handler to combine border-radii into a single rule
+ *
+ * @param (string) val: Rule Set
+ */
+ public function combine( $val ) {
+ foreach ( $this->borderRadius as $regex ) {
+ $val = $this->fix( $val, $regex );
+ }
+
+ return $val;
+ }
+
+ /**
+ * Does the actual combining
+ *
+ * @param (string) val: Rule Set
+ */
+ private function fix( $val, $regex ) {
+ $val = $this->base( $val, $regex );
+ $replace = $regex['mod'];
+
+ // Storage builder
+ if ( ( $storage = $this->storage( $val, $regex ) ) === false ) {
+ return $val;
+ }
+
+ // Setup horizontal/vertical radii
+ foreach ( $storage as $dir => &$config ) {
+ // Verticals are optional
+ if ( $dir == 'vertical' && ! $config['keep'] ) {
+ break;
+ }
+ // All 4 are the same
+ else if ( $config['top-left'] == $config['top-right'] &&
$config['top-right'] == $config['bottom-right'] &&
$config['bottom-right'] == $config['bottom-left'] ) {
- $config['replace'] .= $config['top-left'];
- }
- // Opposites are the same
- else if ( $config['top-left'] == $config['bottom-right'] && $config['top-right'] == $config['bottom-left'] ) {
- $config['replace'] .= $config['top-left'] . ' ' . $config['top-right'];
- }
- // 3-point directional
- else if ( $config['top-right'] == $config['bottom-left'] ) {
- $config['replace'] .= $config['top-left'] . ' ' . $config['top-right'] . ' ' . $config['bottom-right'];
- }
- // none are the same, but can still use shorthand notation
- else {
- $config['replace'] .= $config['top-left'] . ' ' . $config['top-right'] . ' '
+ $config['replace'] .= $config['top-left'];
+ }
+ // Opposites are the same
+ else if ( $config['top-left'] == $config['bottom-right'] && $config['top-right'] == $config['bottom-left'] ) {
+ $config['replace'] .= $config['top-left'] . ' ' . $config['top-right'];
+ }
+ // 3-point directional
+ else if ( $config['top-right'] == $config['bottom-left'] ) {
+ $config['replace'] .= $config['top-left'] . ' ' . $config['top-right'] . ' ' . $config['bottom-right'];
+ }
+ // none are the same, but can still use shorthand notation
+ else {
+ $config['replace'] .= $config['top-left'] . ' ' . $config['top-right'] . ' '
. $config['bottom-right'] . ' ' . $config['bottom-left'];
- }
- }
+ }
+ }
- // Now rebuild the string replacing all instances of margin/padding if shorthand exists
- $pos = 0;
- $replace = $regex['mod'] . "border-radius:" . $storage['horizontal']['replace'] . $storage['vertical']['replace'] . ';';
- while ( preg_match( $regex['full'], $val, $match, PREG_OFFSET_CAPTURE, $pos ) ) {
- $colon = strlen( $match[ 1 ][ 0 ] );
- $val = substr_replace( $val, $replace, $match[ 0 ][ 1 ] + $colon, strlen( $match[ 0 ][ 0 ] ) - $colon );
- $pos = $match[ 0 ][ 1 ] + strlen( $replace ) - $colon - 1;
- $replace = '';
- }
-
- // Return converted val
- return $val;
- }
-
- /**
- * Expands short handed border radius props for combination
- *
- * @param (string) val: Rule Set
- */
- private function base( $val, $regex ) {
- $pos = 0;
- while ( preg_match( $regex['base'], $val, $match, PREG_OFFSET_CAPTURE, $pos ) ) {
- $replace = '';
- $colon = strlen( $match[ 1 ][ 0 ] );
- $parts = preg_split( $this->rslash, trim( $match[ 2 ][ 0 ] ), 2 );
- $positions = array(
- 'top-left' => 0,
- 'top-right' => 0,
- 'bottom-right' => 0,
- 'bottom-left' => 0,
- );
- $base = array(
- 'horizontal' => array(
- 'parts' => preg_split( $this->rspace, trim( $parts[ 0 ] ) ),
- 'pos' => $positions,
- ),
- 'vertical' => array(
- 'parts' => isset( $parts[ 1 ] ) ? preg_split( $this->rspace, trim( $parts[ 1 ] ) ) : '',
- 'pos' => $positions,
- ),
- );
-
- foreach ( $base as &$config ) {
- // Skip uncombinables
- if ( $this->Combine->checkUncombinables( $config['parts'] ) ) {
- $pos = $match[ 0 ][ 1 ] + strlen( $match[ 0 ][ 0 ] ) - 1;
- continue 2;
- }
- // Might not have verticals
- else if ( $config['parts'] === '' ) {
- continue;
- }
-
- // Each position needs a value
- switch ( count( $config['parts'] ) ) {
- case 1:
- $config['pos']['top-left'] = $config['pos']['top-right'] = $config['parts'][ 0 ];
- $config['pos']['bottom-left'] = $config['pos']['bottom-right'] = $config['parts'][ 0 ];
- break;
- case 2:
- $config['pos']['top-left'] = $config['pos']['bottom-right'] = $config['parts'][ 0 ];
- $config['pos']['bottom-left'] = $config['pos']['top-right'] = $config['parts'][ 1 ];
- break;
- case 3:
- $config['pos']['top-left'] = $config['parts'][ 0 ];
- $config['pos']['bottom-left'] = $config['pos']['top-right'] = $config['parts'][ 1 ];
- $config['pos']['bottom-right'] = $config['parts'][ 2 ];
- break;
- case 4:
- $config['pos']['top-left'] = $config['parts'][ 0 ];
- $config['pos']['top-right'] = $config['parts'][ 1 ];
- $config['pos']['bottom-right'] = $config['parts'][ 2 ];
- $config['pos']['bottom-left'] = $config['parts'][ 3 ];
- break;
- default:
- continue 2;
- }
-
- }
-
- // Build the replacement
- foreach ( $positions as $p => $v ) {
- if ( $regex['mod'] == '-moz-' ) {
- $replace .= "-moz-border-radius-" . preg_replace( "/-/", '', $p ) . ":"
- . $base['horizontal']['pos'][ $p ]
- . ( $base['vertical']['parts'] === '' ? '' : ' ' . $base['vertical']['pos'][ $p ] )
+ // Now rebuild the string replacing all instances of margin/padding if shorthand exists
+ $pos = 0;
+ $replace = $regex['mod'] . "border-radius:" . $storage['horizontal']['replace'] . $storage['vertical']['replace'] . ';';
+ while ( preg_match( $regex['full'], $val, $match, PREG_OFFSET_CAPTURE, $pos ) ) {
+ $colon = strlen( $match[1][0] );
+ $val = substr_replace( $val, $replace, $match[0][1] + $colon, strlen( $match[0][0] ) - $colon );
+ $pos = $match[0][1] + strlen( $replace ) - $colon - 1;
+ $replace = '';
+ }
+
+ // Return converted val
+ return $val;
+ }
+
+ /**
+ * Expands short handed border radius props for combination
+ *
+ * @param (string) val: Rule Set
+ */
+ private function base( $val, $regex ) {
+ $pos = 0;
+ while ( preg_match( $regex['base'], $val, $match, PREG_OFFSET_CAPTURE, $pos ) ) {
+ $replace = '';
+ $colon = strlen( $match[1][0] );
+ $parts = preg_split( $this->rslash, trim( $match[2][0] ), 2 );
+ $positions = array(
+ 'top-left' => 0,
+ 'top-right' => 0,
+ 'bottom-right' => 0,
+ 'bottom-left' => 0,
+ );
+ $base = array(
+ 'horizontal' => array(
+ 'parts' => preg_split( $this->rspace, trim( $parts[0] ) ),
+ 'pos' => $positions,
+ ),
+ 'vertical' => array(
+ 'parts' => isset( $parts[1] ) ? preg_split( $this->rspace, trim( $parts[1] ) ) : '',
+ 'pos' => $positions,
+ ),
+ );
+
+ foreach ( $base as &$config ) {
+ // Skip uncombinables
+ if ( $this->Combine->checkUncombinables( $config['parts'] ) ) {
+ $pos = $match[0][1] + strlen( $match[0][0] ) - 1;
+ continue 2;
+ }
+ // Might not have verticals
+ else if ( $config['parts'] === '' ) {
+ continue;
+ }
+
+ // Each position needs a value
+ switch ( count( $config['parts'] ) ) {
+ case 1:
+ $config['pos']['top-left'] = $config['pos']['top-right'] = $config['parts'][0];
+ $config['pos']['bottom-left'] = $config['pos']['bottom-right'] = $config['parts'][0];
+ break;
+ case 2:
+ $config['pos']['top-left'] = $config['pos']['bottom-right'] = $config['parts'][0];
+ $config['pos']['bottom-left'] = $config['pos']['top-right'] = $config['parts'][1];
+ break;
+ case 3:
+ $config['pos']['top-left'] = $config['parts'][0];
+ $config['pos']['bottom-left'] = $config['pos']['top-right'] = $config['parts'][1];
+ $config['pos']['bottom-right'] = $config['parts'][2];
+ break;
+ case 4:
+ $config['pos']['top-left'] = $config['parts'][0];
+ $config['pos']['top-right'] = $config['parts'][1];
+ $config['pos']['bottom-right'] = $config['parts'][2];
+ $config['pos']['bottom-left'] = $config['parts'][3];
+ break;
+ default:
+ continue 2;
+ }
+
+ }
+
+ // Build the replacement
+ foreach ( $positions as $p => $v ) {
+ if ( $regex['mod'] == '-moz-' ) {
+ $replace .= "-moz-border-radius-" . preg_replace( "/-/", '', $p ) . ":"
+ . $base['horizontal']['pos'][$p]
+ . ( $base['vertical']['parts'] === '' ? '' : ' ' . $base['vertical']['pos'][$p] )
. ';';
- }
- else {
- $replace .= $regex['mod'] . "border-$p-radius:"
- . $base['horizontal']['pos'][ $p ]
- . ( $base['vertical']['parts'] === '' ? '' : ' ' . $base['vertical']['pos'][ $p ] )
+ }
+ else {
+ $replace .= $regex['mod'] . "border-$p-radius:"
+ . $base['horizontal']['pos'][$p]
+ . ( $base['vertical']['parts'] === '' ? '' : ' ' . $base['vertical']['pos'][$p] )
. ';';
- }
- }
- $pos += strlen( $replace );
- $val = substr_replace( $val, $replace, $match[ 0 ][ 1 ] + $colon, strlen( $match[ 0 ][ 0 ] ) - $colon );
- }
-
- return $val;
- }
-
- /**
- * Builds the storage object for border radius props
- *
- * @param (string) val: Rule Set
- * @param (array) regex: Current border radius type checking props
- */
- private function storage( $val, $regex ) {
- $storage = array(
- 'horizontal' => array( 'replace' => '' ),
- 'vertical' => array( 'replace' => '', 'keep' => false ),
- );
-
- // Find all possible occurences of this border-radius type and mark their directional value
- $pos = 0;
- while ( preg_match( $regex['full'], $val, $match, PREG_OFFSET_CAPTURE, $pos ) ) {
- $pos = $match[ 0 ][ 1 ] + strlen( $match[ 0 ][ 0 ] ) - 1;
- $parts = preg_split( $this->rspace, $match[ 4 ][ 0 ], 2 );
- $storage['horizontal'][ $match[ 2 ][ 0 ] . '-' . $match[ 3 ][ 0 ] ] = trim( $parts[ 0 ] );
- if ( isset( $parts[ 1 ] ) ) {
- $storage['vertical'][ $match[ 2 ][ 0 ] . '-' . $match[ 3 ][ 0 ] ] = trim( $parts[ 1 ] );
- $storage['vertical']['keep'] = true;
- $storage['vertical']['replace'] = '/';
- }
- else {
- $storage['vertical'][ $match[ 2 ][ 0 ] . '-' . $match[ 3 ][ 0 ] ] = '0';
- }
- }
+ }
+ }
+ $pos += strlen( $replace );
+ $val = substr_replace( $val, $replace, $match[0][1] + $colon, strlen( $match[0][0] ) - $colon );
+ }
+
+ return $val;
+ }
+
+ /**
+ * Builds the storage object for border radius props
+ *
+ * @param (string) val: Rule Set
+ * @param (array) regex: Current border radius type checking props
+ */
+ private function storage( $val, $regex ) {
+ $storage = array(
+ 'horizontal' => array('replace' => ''),
+ 'vertical' => array(
+ 'replace' => '',
+ 'keep' => false,
+ ),
+ );
+
+ // Find all possible occurences of this border-radius type and mark their directional value
+ $pos = 0;
+ while ( preg_match( $regex['full'], $val, $match, PREG_OFFSET_CAPTURE, $pos ) ) {
+ $pos = $match[0][1] + strlen( $match[0][0] ) - 1;
+ $parts = preg_split( $this->rspace, $match[4][0], 2 );
+ $storage['horizontal'][$match[2][0] . '-' . $match[3][0]] = trim( $parts[0] );
+ if ( isset( $parts[1] ) ) {
+ $storage['vertical'][$match[2][0] . '-' . $match[3][0]] = trim( $parts[1] );
+ $storage['vertical']['keep'] = true;
+ $storage['vertical']['replace'] = '/';
+ }
+ else {
+ $storage['vertical'][$match[2][0] . '-' . $match[3][0]] = '0';
+ }
+ }
- // Only combine if all 4 definitions are found (5 including replace)
- if ( count( $storage['horizontal'] ) != 5 ||
+ // Only combine if all 4 definitions are found (5 including replace)
+ if ( count( $storage['horizontal'] ) != 5 ||
$this->Combine->checkUncombinables( $storage['horizontal'] ) ||
$this->Combine->checkUncombinables( $storage['vertical'] ) ) {
- return false;
- }
+ return false;
+ }
- return $storage;
- }
+ return $storage;
+ }
- /**
- * Access to private methods for testing
- *
- * @param (string) method: Method to be called
- * @param (array) args: Array of paramters to be passed in
- */
- public function access( $method, $args ) {
- if ( method_exists( $this, $method ) ) {
- return call_user_func_array( array( $this, $method ), $args );
- }
- else {
- throw new CSSCompression_Exception( "Unknown method in BorderRadius Class - " . $method );
- }
- }
-};
+ /**
+ * Access to private methods for testing
+ *
+ * @param (string) method: Method to be called
+ * @param (array) args: Array of paramters to be passed in
+ */
+ public function access( $method, $args ) {
+ if ( method_exists( $this, $method ) ) {
+ return call_user_func_array( array($this, $method), $args );
+ }
+ else {
+ throw new CSSCompression_Exception( "Unknown method in BorderRadius Class - " . $method );
+ }
+ }
+}
diff -up -r advagg_css_compress/css-compressor-3.x/src/lib/Combine/Font.inc advagg_css_compress/css-compressor-3.x/src/lib/Combine/Font.inc
--- advagg_css_compress/css-compressor-3.x/src/lib/Combine/Font.inc 2012-03-23 12:08:13.000000000 -0600
+++ advagg_css_compress/css-compressor-3.x/src/lib/Combine/Font.inc 2012-03-23 13:02:18.000000000 -0600
@@ -5,119 +5,118 @@
* Corey Hart @ http://www.codenothing.com
*/
-Class CSSCompression_Combine_Font
-{
- /**
- * Combine Patterns
- *
- * @class Control: Compression Controller
- * @class Combine: Combine Controller
- * @param (regex) rfont: Font matching
- * @param (array) groupings: Set of font combinationals
- */
- private $Control;
- private $Combine;
- private $rfont = "/(^|(?<!\\\);)(font|line)-(style|variant|weight|size|height|family):(.*?)((?<!\\\);|$)/";
- private $groupings = array(
- array( 'font-style', 'font-variant', 'font-weight', 'size/height', 'font-family' ),
- array( 'font-style', 'font-variant', 'font-weight', 'font-size', 'font-family' ),
- array( 'font-style', 'font-variant', 'size/height', 'font-family' ),
- array( 'font-style', 'font-variant', 'font-size', 'font-family' ),
- array( 'font-style', 'font-weight', 'size/height', 'font-family' ),
- array( 'font-style', 'font-weight', 'font-size', 'font-family' ),
- array( 'font-variant', 'font-weight', 'size/height', 'font-family' ),
- array( 'font-variant', 'font-weight', 'font-size', 'font-family' ),
- array( 'font-weight', 'size/height', 'font-family' ),
- array( 'font-weight', 'font-size', 'font-family' ),
- array( 'font-variant', 'size/height', 'font-family' ),
- array( 'font-variant', 'font-size', 'font-family' ),
- array( 'font-style', 'size/height', 'font-family' ),
- array( 'font-style', 'font-size', 'font-family' ),
- array( 'size/height', 'font-family' ),
- array( 'font-size', 'font-family' ),
- );
-
- /**
- * Stash a reference to the controller & combiner
- *
- * @param (class) control: CSSCompression Controller
- * @param (class) combine: CSSCompression Combiner
- */
- public function __construct( CSSCompression_Control $control, CSSCompression_Combine $combine ) {
- $this->Control = $control;
- $this->Combine = $combine;
- }
-
- /**
- * Combines multiple font-definitions into single definition
- *
- * @param (string) val: Rule Set
- */
- public function combine( $val ) {
- $storage = $this->storage( $val );
-
- // Loop through each property check and see if they can be replaced
- foreach ( $this->groupings as $props ) {
- if ( $replace = $this->Combine->searchDefinitions( 'font', $storage, $props ) ) {
- break;
- }
- }
-
- // If replacement string found, run it on all declarations
- if ( $replace ) {
- $pos = 0;
- while ( preg_match( $this->rfont, $val, $match, PREG_OFFSET_CAPTURE, $pos ) ) {
- if ( ! isset( $storage['line-height'] ) && stripos( $match[ 0 ][ 0 ], 'line-height') === 0 ) {
- $pos = $match[ 0 ][ 1 ] + strlen( $match[ 0 ][ 0 ] ) - 1;
- continue;
- }
- $colon = strlen( $match[ 1 ][ 0 ] );
- $val = substr_replace( $val, $replace, $match[ 0 ][ 1 ] + $colon, strlen( $match[ 0 ][ 0 ] ) - $colon );
- $pos = $match[ 0 ][ 1 ] + strlen( $replace ) - $colon - 1;
- $replace = '';
- }
- }
-
- // Return converted val
- return $val;
- }
-
- /**
- * Builds a storage object for iteration
- *
- * @param (string) val: Rule Set
- */
- private function storage( $val ) {
- $storage = array();
-
- // Find all possible occurences and build the replacement
- $pos = 0;
- while ( preg_match( $this->rfont, $val, $match, PREG_OFFSET_CAPTURE, $pos ) ) {
- $storage[ $match[ 2 ][ 0 ] . '-' . $match[ 3 ][ 0 ] ] = $match[ 4 ][ 0 ];
- $pos = $match[ 0 ][ 1 ] + strlen( $match[ 0 ][ 0 ] ) - 1;
- }
-
- // Combine font-size & line-height if possible
- if ( isset( $storage['font-size'] ) && isset( $storage['line-height'] ) ) {
- $storage['size/height'] = $storage['font-size'] . '/' . $storage['line-height'];
- unset( $storage['font-size'], $storage['line-height'] );
- }
-
- return $storage;
- }
-
- /**
- * Access to private methods for testing
- *
- * @param (string) method: Method to be called
- * @param (array) args: Array of paramters to be passed in
- */
- public function access( $method, $args ) {
- if ( method_exists( $this, $method ) ) {
- return call_user_func_array( array( $this, $method ), $args );
- }
- else {
- throw new CSSCompression_Exception( "Unknown method in Font Class - " . $method );
- }
- }
-};
+class CSSCompression_Combine_Font {
+ /**
+ * Combine Patterns
+ *
+ * @class Control: Compression Controller
+ * @class Combine: Combine Controller
+ * @param (regex) rfont: Font matching
+ * @param (array) groupings: Set of font combinationals
+ */
+ private $Control;
+ private $Combine;
+ private $rfont = "/(^|(?<!\\\);)(font|line)-(style|variant|weight|size|height|family):(.*?)((?<!\\\);|$)/";
+ private $groupings = array(
+ array('font-style', 'font-variant', 'font-weight', 'size/height', 'font-family'),
+ array('font-style', 'font-variant', 'font-weight', 'font-size', 'font-family'),
+ array('font-style', 'font-variant', 'size/height', 'font-family'),
+ array('font-style', 'font-variant', 'font-size', 'font-family'),
+ array('font-style', 'font-weight', 'size/height', 'font-family'),
+ array('font-style', 'font-weight', 'font-size', 'font-family'),
+ array('font-variant', 'font-weight', 'size/height', 'font-family'),
+ array('font-variant', 'font-weight', 'font-size', 'font-family'),
+ array('font-weight', 'size/height', 'font-family'),
+ array('font-weight', 'font-size', 'font-family'),
+ array('font-variant', 'size/height', 'font-family'),
+ array('font-variant', 'font-size', 'font-family'),
+ array('font-style', 'size/height', 'font-family'),
+ array('font-style', 'font-size', 'font-family'),
+ array('size/height', 'font-family'),
+ array('font-size', 'font-family'),
+ );
+
+ /**
+ * Stash a reference to the controller & combiner
+ *
+ * @param (class) control: CSSCompression Controller
+ * @param (class) combine: CSSCompression Combiner
+ */
+ public function __construct( CSSCompression_Control $control, CSSCompression_Combine $combine ) {
+ $this->Control = $control;
+ $this->Combine = $combine;
+ }
+
+ /**
+ * Combines multiple font-definitions into single definition
+ *
+ * @param (string) val: Rule Set
+ */
+ public function combine( $val ) {
+ $storage = $this->storage( $val );
+
+ // Loop through each property check and see if they can be replaced
+ foreach ( $this->groupings as $props ) {
+ if ( $replace = $this->Combine->searchDefinitions( 'font', $storage, $props ) ) {
+ break;
+ }
+ }
+
+ // If replacement string found, run it on all declarations
+ if ( $replace ) {
+ $pos = 0;
+ while ( preg_match( $this->rfont, $val, $match, PREG_OFFSET_CAPTURE, $pos ) ) {
+ if ( ! isset( $storage['line-height'] ) && stripos( $match[0][0], 'line-height') === 0 ) {
+ $pos = $match[0][1] + strlen( $match[0][0] ) - 1;
+ continue;
+ }
+ $colon = strlen( $match[1][0] );
+ $val = substr_replace( $val, $replace, $match[0][1] + $colon, strlen( $match[0][0] ) - $colon );
+ $pos = $match[0][1] + strlen( $replace ) - $colon - 1;
+ $replace = '';
+ }
+ }
+
+ // Return converted val
+ return $val;
+ }
+
+ /**
+ * Builds a storage object for iteration
+ *
+ * @param (string) val: Rule Set
+ */
+ private function storage( $val ) {
+ $storage = array();
+
+ // Find all possible occurences and build the replacement
+ $pos = 0;
+ while ( preg_match( $this->rfont, $val, $match, PREG_OFFSET_CAPTURE, $pos ) ) {
+ $storage[$match[2][0] . '-' . $match[3][0]] = $match[4][0];
+ $pos = $match[0][1] + strlen( $match[0][0] ) - 1;
+ }
+
+ // Combine font-size & line-height if possible
+ if ( isset( $storage['font-size'] ) && isset( $storage['line-height'] ) ) {
+ $storage['size/height'] = $storage['font-size'] . '/' . $storage['line-height'];
+ unset( $storage['font-size'], $storage['line-height'] );
+ }
+
+ return $storage;
+ }
+
+ /**
+ * Access to private methods for testing
+ *
+ * @param (string) method: Method to be called
+ * @param (array) args: Array of paramters to be passed in
+ */
+ public function access( $method, $args ) {
+ if ( method_exists( $this, $method ) ) {
+ return call_user_func_array( array($this, $method), $args );
+ }
+ else {
+ throw new CSSCompression_Exception( "Unknown method in Font Class - " . $method );
+ }
+ }
+}
diff -up -r advagg_css_compress/css-compressor-3.x/src/lib/Combine/List.inc advagg_css_compress/css-compressor-3.x/src/lib/Combine/List.inc
--- advagg_css_compress/css-compressor-3.x/src/lib/Combine/List.inc 2012-03-23 12:08:13.000000000 -0600
+++ advagg_css_compress/css-compressor-3.x/src/lib/Combine/List.inc 2012-03-23 13:02:18.000000000 -0600
@@ -5,98 +5,97 @@
* Corey Hart @ http://www.codenothing.com
*/
-Class CSSCompression_Combine_List
-{
- /**
- * Combine Patterns
- *
- * @class Control: Compression Controller
- * @class Combine: Combine Controller
- * @param (regex) rlist: List style matching
- * @param (array) groupings: Group of list combinationals
- */
- private $Control;
- private $Combine;
- private $rlist = "/(^|(?<!\\\);)list-style-(type|position|image):(.*?)((?<!\\\);|$)/";
- private $groupings = array(
- array( 'type', 'position', 'image' ),
- array( 'type', 'position' ),
- array( 'type', 'image' ),
- array( 'position', 'image' ),
- array( 'type' ),
- array( 'position' ),
- array( 'image' ),
- );
-
- /**
- * Stash a reference to the controller & combiner
- *
- * @param (class) control: CSSCompression Controller
- * @param (class) combine: CSSCompression Combiner
- */
- public function __construct( CSSCompression_Control $control, CSSCompression_Combine $combine ) {
- $this->Control = $control;
- $this->Combine = $combine;
- }
-
- /**
- * Combines multiple list style props into single definition
- *
- * @param (string) val: Rule Set
- */
- public function combine( $val ) {
- // If replacement string found, run it on all declarations
- if ( ( $replace = $this->replace( $val ) ) !== false ) {
- $pos = 0;
- while ( preg_match( $this->rlist, $val, $match, PREG_OFFSET_CAPTURE, $pos ) ) {
- $colon = strlen( $match[ 1 ][ 0 ] );
- $val = substr_replace( $val, $replace, $match[ 0 ][ 1 ] + $colon, strlen( $match[ 0 ][ 0 ] ) - $colon );
- $pos = $match[ 0 ][ 1 ] + strlen( $replace ) - $colon - 1;
- $replace = '';
- }
- }
-
- // Return converted val
- return $val;
- }
-
- /**
- * Build the replacement string for list props
- *
- * @param (string) val: Rule Set
- */
- private function replace( $val ) {
- $storage = array();
- $pos = 0;
-
- // Find all possible occurences and build the replacement
- while ( preg_match( $this->rlist, $val, $match, PREG_OFFSET_CAPTURE, $pos ) ) {
- $storage[ $match[ 2 ][ 0 ] ] = $match[ 3 ][ 0 ];
- $pos = $match[ 0 ][ 1 ] + strlen( $match[ 0 ][ 0 ] ) - 1;
- }
-
- // Run background checks and get replacement str
- foreach ( $this->groupings as $props ) {
- if ( $replace = $this->Combine->searchDefinitions( 'list-style', $storage, $props ) ) {
- return $replace;
- }
- }
-
- return false;
- }
-
- /**
- * Access to private methods for testing
- *
- * @param (string) method: Method to be called
- * @param (array) args: Array of paramters to be passed in
- */
- public function access( $method, $args ) {
- if ( method_exists( $this, $method ) ) {
- return call_user_func_array( array( $this, $method ), $args );
- }
- else {
- throw new CSSCompression_Exception( "Unknown method in List Class - " . $method );
- }
- }
-};
+class CSSCompression_Combine_List {
+ /**
+ * Combine Patterns
+ *
+ * @class Control: Compression Controller
+ * @class Combine: Combine Controller
+ * @param (regex) rlist: List style matching
+ * @param (array) groupings: Group of list combinationals
+ */
+ private $Control;
+ private $Combine;
+ private $rlist = "/(^|(?<!\\\);)list-style-(type|position|image):(.*?)((?<!\\\);|$)/";
+ private $groupings = array(
+ array('type', 'position', 'image'),
+ array('type', 'position'),
+ array('type', 'image'),
+ array('position', 'image'),
+ array('type'),
+ array('position'),
+ array('image'),
+ );
+
+ /**
+ * Stash a reference to the controller & combiner
+ *
+ * @param (class) control: CSSCompression Controller
+ * @param (class) combine: CSSCompression Combiner
+ */
+ public function __construct( CSSCompression_Control $control, CSSCompression_Combine $combine ) {
+ $this->Control = $control;
+ $this->Combine = $combine;
+ }
+
+ /**
+ * Combines multiple list style props into single definition
+ *
+ * @param (string) val: Rule Set
+ */
+ public function combine( $val ) {
+ // If replacement string found, run it on all declarations
+ if ( ( $replace = $this->replace( $val ) ) !== false ) {
+ $pos = 0;
+ while ( preg_match( $this->rlist, $val, $match, PREG_OFFSET_CAPTURE, $pos ) ) {
+ $colon = strlen( $match[1][0] );
+ $val = substr_replace( $val, $replace, $match[0][1] + $colon, strlen( $match[0][0] ) - $colon );
+ $pos = $match[0][1] + strlen( $replace ) - $colon - 1;
+ $replace = '';
+ }
+ }
+
+ // Return converted val
+ return $val;
+ }
+
+ /**
+ * Build the replacement string for list props
+ *
+ * @param (string) val: Rule Set
+ */
+ private function replace( $val ) {
+ $storage = array();
+ $pos = 0;
+
+ // Find all possible occurences and build the replacement
+ while ( preg_match( $this->rlist, $val, $match, PREG_OFFSET_CAPTURE, $pos ) ) {
+ $storage[$match[2][0]] = $match[3][0];
+ $pos = $match[0][1] + strlen( $match[0][0] ) - 1;
+ }
+
+ // Run background checks and get replacement str
+ foreach ( $this->groupings as $props ) {
+ if ( $replace = $this->Combine->searchDefinitions( 'list-style', $storage, $props ) ) {
+ return $replace;
+ }
+ }
+
+ return false;
+ }
+
+ /**
+ * Access to private methods for testing
+ *
+ * @param (string) method: Method to be called
+ * @param (array) args: Array of paramters to be passed in
+ */
+ public function access( $method, $args ) {
+ if ( method_exists( $this, $method ) ) {
+ return call_user_func_array( array($this, $method), $args );
+ }
+ else {
+ throw new CSSCompression_Exception( "Unknown method in List Class - " . $method );
+ }
+ }
+}
diff -up -r advagg_css_compress/css-compressor-3.x/src/lib/Combine/MarginPadding.inc advagg_css_compress/css-compressor-3.x/src/lib/Combine/MarginPadding.inc
--- advagg_css_compress/css-compressor-3.x/src/lib/Combine/MarginPadding.inc 2012-03-23 12:08:13.000000000 -0600
+++ advagg_css_compress/css-compressor-3.x/src/lib/Combine/MarginPadding.inc 2012-03-23 13:02:19.000000000 -0600
@@ -5,184 +5,183 @@
* Corey Hart @ http://www.codenothing.com
*/
-Class CSSCompression_Combine_MarginPadding
-{
- /**
- * Combine Patterns
- *
- * @class Control: Compression Controller
- * @class Combine: Combine Controller
- * @param (regex) rspace: Checks for space without an escape '\' character before it
- * @param (regex) rmp: Margin/Padding matching
- * @param (regex) rmpbase: Margin/Padding base match
- */
- private $Control;
- private $Combine;
- private $rspace = "/(?<!\\\)\s/";
- private $rmp = "/(^|(?<!\\\);)(margin|padding)-(top|right|bottom|left):(.*?)((?<!\\\);|$)/";
- private $rmpbase = "/(^|(?<!\\\);)(margin|padding):(.*?)((?<!\\\);|$)/";
-
- /**
- * Stash a reference to the controller & combiner
- *
- * @param (class) control: CSSCompression Controller
- * @param (class) combine: CSSCompression Combiner
- */
- public function __construct( CSSCompression_Control $control, CSSCompression_Combine $combine ) {
- $this->Control = $control;
- $this->Combine = $combine;
- }
-
- /**
- * Combines multiple directional properties of
- * margin/padding into single definition.
- *
- * @param (string) val: Rule Set
- */
- public function combine( $val ) {
- $val = $this->expand( $val );
- $storage = $this->storage( $val );
- $pos = 0;
-
- // Now rebuild the string replacing all instances of margin/padding if shorthand exists
- while ( preg_match( $this->rmp, $val, $match, PREG_OFFSET_CAPTURE, $pos ) ) {
- $prop = $match[ 2 ][ 0 ];
- if ( isset( $storage[ $prop ] ) ) {
- $colon = strlen( $match[ 1 ][ 0 ] );
- $val = substr_replace( $val, $storage[ $prop ], $match[ 0 ][ 1 ] + $colon, strlen( $match[ 0 ][ 0 ] ) - $colon );
- $pos = $match[ 0 ][ 1 ] + strlen( $storage[ $prop ] ) - $colon - 1;
- $storage[ $prop ] = '';
- }
- else {
- $pos = $match[ 0 ][ 1 ] + strlen( $match[ 0 ][ 0 ] ) - 1;
- }
- }
-
- // Return converted val
- return $val;
- }
-
- /**
- * Build the storage object for iteration
- *
- * @param (string) val: Rule Set
- */
- private function storage( $val ) {
- $storage = array();
- $pos = 0;
-
- // Find all possible occurences of margin/padding and mark their directional value
- while ( preg_match( $this->rmp, $val, $match, PREG_OFFSET_CAPTURE, $pos ) ) {
- if ( ! isset( $storage[ $match[ 2 ][ 0 ] ] ) ) {
- $storage[ $match[ 2 ][ 0 ] ] = array( $match[ 3 ][ 0 ] => $match[ 4 ][ 0 ] );
- }
-
- // Override double written properties
- $storage[ $match[ 2 ][ 0 ] ][ $match[ 3 ][ 0 ] ] = $match[ 4 ][ 0 ];
- $pos = $match[ 0 ][ 1 ] + strlen( $match[ 0 ][ 0 ] ) - 1;
- }
-
- // Go through each tag for possible combination
- foreach ( $storage as $tag => $arr ) {
- // Only combine if all 4 definitions are found
- if ( count( $arr ) == 4 && ! $this->Combine->checkUncombinables( $arr ) ) {
- // All 4 are the same
- if ( $arr['top'] == $arr['bottom'] && $arr['left'] == $arr['right'] && $arr['top'] == $arr['left'] ) {
- $storage[ $tag ] = "$tag:" . $arr['top'] . ';';
- }
- // Opposites are the same
- else if ( $arr['top'] == $arr['bottom'] && $arr['left'] == $arr['right'] ) {
- $storage[ $tag ] = "$tag:" . $arr['top'] . ' ' . $arr['left'] . ';';
- }
- // 3-point directional
- else if ( $arr['right'] == $arr['left'] ) {
- $storage[ $tag ] = "$tag:" . $arr['top'] . ' ' . $arr['right'] . ' ' . $arr['bottom'] . ';';
- }
- // none are the same, but can still use shorthand notation
- else {
- $storage[ $tag ] = "$tag:" . $arr['top'] . ' ' . $arr['right'] . ' ' . $arr['bottom'] . ' ' . $arr['left'] . ';';
- }
- }
- else {
- unset( $storage[ $tag ] );
- }
- }
-
- return $storage;
- }
-
- /**
- * Explodes shorthanded margin/padding properties for later combination
- *
- * @param (string) val: Rule set
- */
- private function expand( $val ) {
- $pos = 0;
- while ( preg_match( $this->rmpbase, $val, $match, PREG_OFFSET_CAPTURE, $pos ) ) {
- $replace = '';
- $prop = $match[ 2 ][ 0 ];
- $value = preg_split( $this->rspace, trim( $match[ 3 ][ 0 ] ) );
- $positions = array(
- 'top' => 0,
- 'right' => 0,
- 'bottom' => 0,
- 'left' => 0
- );
-
- // Skip uncombinables
- if ( $this->Combine->checkUncombinables( $value ) ) {
- $pos = $match[ 0 ][ 1 ] + strlen( $match[ 0 ][ 0 ] );
- continue;
- }
-
- // Each position needs a value
- switch ( count( $value ) ) {
- case 1:
- $positions['top'] = $positions['right'] = $positions['bottom'] = $positions['left'] = $value[ 0 ];
- break;
- case 2:
- $positions['top'] = $positions['bottom'] = $value[ 0 ];
- $positions['right'] = $positions['left'] = $value[ 1 ];
- break;
- case 3:
- $positions['top'] = $value[ 0 ];
- $positions['right'] = $positions['left'] = $value[ 1 ];
- $positions['bottom'] = $value[ 2 ];
- break;
- case 4:
- $positions['top'] = $value[ 0 ];
- $positions['right'] = $value[ 1 ];
- $positions['bottom'] = $value[ 2 ];
- $positions['left'] = $value[ 3 ];
- break;
- default:
- continue;
- }
-
- // Build the replacement
- foreach ( $positions as $p => $v ) {
- $replace .= "$prop-$p:$v;";
- }
- $colon = strlen( $match[ 1 ][ 0 ] );
- $val = substr_replace( $val, $replace, $match[ 0 ][ 1 ] + $colon, strlen( $match[ 0 ][ 0 ] ) - $colon );
- $pos = $match[ 0 ][ 1 ] + strlen( $replace ) - $colon - 1;
- }
-
- return $val;
- }
-
- /**
- * Access to private methods for testing
- *
- * @param (string) method: Method to be called
- * @param (array) args: Array of paramters to be passed in
- */
- public function access( $method, $args ) {
- if ( method_exists( $this, $method ) ) {
- return call_user_func_array( array( $this, $method ), $args );
- }
- else {
- throw new CSSCompression_Exception( "Unknown method in MarginPadding Class - " . $method );
- }
- }
-};
+class CSSCompression_Combine_MarginPadding {
+ /**
+ * Combine Patterns
+ *
+ * @class Control: Compression Controller
+ * @class Combine: Combine Controller
+ * @param (regex) rspace: Checks for space without an escape '\' character before it
+ * @param (regex) rmp: Margin/Padding matching
+ * @param (regex) rmpbase: Margin/Padding base match
+ */
+ private $Control;
+ private $Combine;
+ private $rspace = "/(?<!\\\)\s/";
+ private $rmp = "/(^|(?<!\\\);)(margin|padding)-(top|right|bottom|left):(.*?)((?<!\\\);|$)/";
+ private $rmpbase = "/(^|(?<!\\\);)(margin|padding):(.*?)((?<!\\\);|$)/";
+
+ /**
+ * Stash a reference to the controller & combiner
+ *
+ * @param (class) control: CSSCompression Controller
+ * @param (class) combine: CSSCompression Combiner
+ */
+ public function __construct( CSSCompression_Control $control, CSSCompression_Combine $combine ) {
+ $this->Control = $control;
+ $this->Combine = $combine;
+ }
+
+ /**
+ * Combines multiple directional properties of
+ * margin/padding into single definition.
+ *
+ * @param (string) val: Rule Set
+ */
+ public function combine( $val ) {
+ $val = $this->expand( $val );
+ $storage = $this->storage( $val );
+ $pos = 0;
+
+ // Now rebuild the string replacing all instances of margin/padding if shorthand exists
+ while ( preg_match( $this->rmp, $val, $match, PREG_OFFSET_CAPTURE, $pos ) ) {
+ $prop = $match[2][0];
+ if ( isset( $storage[$prop] ) ) {
+ $colon = strlen( $match[1][0] );
+ $val = substr_replace( $val, $storage[$prop], $match[0][1] + $colon, strlen( $match[0][0] ) - $colon );
+ $pos = $match[0][1] + strlen( $storage[$prop] ) - $colon - 1;
+ $storage[$prop] = '';
+ }
+ else {
+ $pos = $match[0][1] + strlen( $match[0][0] ) - 1;
+ }
+ }
+
+ // Return converted val
+ return $val;
+ }
+
+ /**
+ * Build the storage object for iteration
+ *
+ * @param (string) val: Rule Set
+ */
+ private function storage( $val ) {
+ $storage = array();
+ $pos = 0;
+
+ // Find all possible occurences of margin/padding and mark their directional value
+ while ( preg_match( $this->rmp, $val, $match, PREG_OFFSET_CAPTURE, $pos ) ) {
+ if ( ! isset( $storage[$match[2][0]] ) ) {
+ $storage[$match[2][0]] = array($match[3][0] => $match[4][0]);
+ }
+
+ // Override double written properties
+ $storage[$match[2][0]][$match[3][0]] = $match[4][0];
+ $pos = $match[0][1] + strlen( $match[0][0] ) - 1;
+ }
+
+ // Go through each tag for possible combination
+ foreach ( $storage as $tag => $arr ) {
+ // Only combine if all 4 definitions are found
+ if ( count( $arr ) == 4 && ! $this->Combine->checkUncombinables( $arr ) ) {
+ // All 4 are the same
+ if ( $arr['top'] == $arr['bottom'] && $arr['left'] == $arr['right'] && $arr['top'] == $arr['left'] ) {
+ $storage[$tag] = "$tag:" . $arr['top'] . ';';
+ }
+ // Opposites are the same
+ else if ( $arr['top'] == $arr['bottom'] && $arr['left'] == $arr['right'] ) {
+ $storage[$tag] = "$tag:" . $arr['top'] . ' ' . $arr['left'] . ';';
+ }
+ // 3-point directional
+ else if ( $arr['right'] == $arr['left'] ) {
+ $storage[$tag] = "$tag:" . $arr['top'] . ' ' . $arr['right'] . ' ' . $arr['bottom'] . ';';
+ }
+ // none are the same, but can still use shorthand notation
+ else {
+ $storage[$tag] = "$tag:" . $arr['top'] . ' ' . $arr['right'] . ' ' . $arr['bottom'] . ' ' . $arr['left'] . ';';
+ }
+ }
+ else {
+ unset( $storage[$tag] );
+ }
+ }
+
+ return $storage;
+ }
+
+ /**
+ * Explodes shorthanded margin/padding properties for later combination
+ *
+ * @param (string) val: Rule set
+ */
+ private function expand( $val ) {
+ $pos = 0;
+ while ( preg_match( $this->rmpbase, $val, $match, PREG_OFFSET_CAPTURE, $pos ) ) {
+ $replace = '';
+ $prop = $match[2][0];
+ $value = preg_split( $this->rspace, trim( $match[3][0] ) );
+ $positions = array(
+ 'top' => 0,
+ 'right' => 0,
+ 'bottom' => 0,
+ 'left' => 0,
+ );
+
+ // Skip uncombinables
+ if ( $this->Combine->checkUncombinables( $value ) ) {
+ $pos = $match[0][1] + strlen( $match[0][0] );
+ continue;
+ }
+
+ // Each position needs a value
+ switch ( count( $value ) ) {
+ case 1:
+ $positions['top'] = $positions['right'] = $positions['bottom'] = $positions['left'] = $value[0];
+ break;
+ case 2:
+ $positions['top'] = $positions['bottom'] = $value[0];
+ $positions['right'] = $positions['left'] = $value[1];
+ break;
+ case 3:
+ $positions['top'] = $value[0];
+ $positions['right'] = $positions['left'] = $value[1];
+ $positions['bottom'] = $value[2];
+ break;
+ case 4:
+ $positions['top'] = $value[0];
+ $positions['right'] = $value[1];
+ $positions['bottom'] = $value[2];
+ $positions['left'] = $value[3];
+ break;
+ default:
+ continue;
+ }
+
+ // Build the replacement
+ foreach ( $positions as $p => $v ) {
+ $replace .= "$prop-$p:$v;";
+ }
+ $colon = strlen( $match[1][0] );
+ $val = substr_replace( $val, $replace, $match[0][1] + $colon, strlen( $match[0][0] ) - $colon );
+ $pos = $match[0][1] + strlen( $replace ) - $colon - 1;
+ }
+
+ return $val;
+ }
+
+ /**
+ * Access to private methods for testing
+ *
+ * @param (string) method: Method to be called
+ * @param (array) args: Array of paramters to be passed in
+ */
+ public function access( $method, $args ) {
+ if ( method_exists( $this, $method ) ) {
+ return call_user_func_array( array($this, $method), $args );
+ }
+ else {
+ throw new CSSCompression_Exception( "Unknown method in MarginPadding Class - " . $method );
+ }
+ }
+}
diff -up -r advagg_css_compress/css-compressor-3.x/src/lib/Combine.inc advagg_css_compress/css-compressor-3.x/src/lib/Combine.inc
--- advagg_css_compress/css-compressor-3.x/src/lib/Combine.inc 2012-03-23 12:08:13.000000000 -0600
+++ advagg_css_compress/css-compressor-3.x/src/lib/Combine.inc 2012-03-23 13:02:19.000000000 -0600
@@ -5,185 +5,184 @@
* Corey Hart @ http://www.codenothing.com
*/
-Class CSSCompression_Combine
-{
- /**
- * Combine Patterns
- *
- * @class Control: Compression Controller
- * @param (string) token: Copy of the injection token
- * @param (array) options: Reference to options
- * @param (regex) rspace: Checks for space without an escape '\' character before it
- * @param (regex) rslash: Checks for unescaped slash character
- * @param (regex) rimportant: Checking props for uncombinables
- * @param (array) methods: List of options with their corresponding class
- */
- private $Control;
- private $token = '';
- private $options = array();
- private $rspace = "/(?<!\\\)\s/";
- private $rslash = "/(?<!\\\)\//";
- private $rimportant = "/inherit|\!important|\!ie|(?<!\\\)\s/i";
- private $methods = array(
- 'csw-combine' => 'BorderOutline',
- 'border-radius-combine' => 'BorderRadius',
- 'border-combine' => 'Border',
- 'mp-combine' => 'MarginPadding',
- 'background-combine' => 'Background',
- 'auralcp-combine' => 'Aural',
- 'font-combine' => 'Font',
- 'list-combine' => 'List',
- );
-
- /**
- * Sub Comination Classes
- *
- * @class BorderOutline: Handles Color/Style/With combinations of border/outline properties
- * @class BorderRadius: Handles border-radius combinations
- * @class Border: Handles normal border combinations
- * @class MarginPadding: Handles margin/padding combinations
- * @class Background: Handles background combinations
- * @class Aural: Handles aural combinations
- * @class Font: Handles font combinations
- * @class List: Handles list combinations
- * @param (array) subcombines: Array holding all subcombination classes
- */
- public $BorderOutline;
- public $BorderRadius;
- public $Border;
- public $MarginPadding;
- public $Background;
- public $Aural;
- public $Font;
- public $List;
- private $subcombines = array(
- 'BorderOutline',
- 'BorderRadius',
- 'Border',
- 'MarginPadding',
- 'Background',
- 'Aural',
- 'Font',
- 'List',
- );
-
- /**
- * Stash a reference to the controller on each instantiation
- *
- * @param (class) control: CSSCompression Controller
- */
- public function __construct( CSSCompression_Control $control ) {
- $this->Control = $control;
- $this->token = CSSCompression::TOKEN;
- $this->options = &$control->Option->options;
-
- // Include classes if not already done so
- if ( ! class_exists( "CSSCompression_Combine_Border", false ) ) {
- $path = dirname(__FILE__) . '/Combine/';
- foreach ( $this->subcombines as $class ) {
- require( $path . $class . '.inc' );
- }
- }
-
- // Instantiate each sub combine
- foreach ( $this->subcombines as $class ) {
- $full = "CSSCompression_Combine_$class";
- $this->$class = new $full( $control, $this );
- }
- }
-
- /**
- * Reads through each detailed package and checks for cross defn combinations
- *
- * @param (array) selectors: Array of selectors
- * @param (array) details: Array of details
- */
- public function combine( &$selectors = array(), &$details = array() ) {
- foreach ( $details as $i => &$value ) {
- if ( isset( $selectors[ $i ] ) && strpos( $selectors[ $i ], $this->token ) === 0 ) {
- continue;
- }
-
- foreach ( $this->methods as $option => $class ) {
- if ( $this->options[ $option ] ) {
- $value = $this->$class->combine( $value );
- }
- }
- }
-
- return array( $selectors, $details );
- }
-
- /**
- * Helper function to ensure flagged words don't get
- * overridden
- *
- * @param (mixed) obj: Array/String of definitions to be checked
- */
- public function checkUncombinables( $obj ) {
- if ( is_array( $obj ) ) {
- foreach ( $obj as $item ) {
- if ( preg_match( $this->rimportant, $item ) ) {
- return true;
- }
- }
- return false;
- }
- else {
- return preg_match( $this->rimportant, $obj );
- }
- }
-
- /**
- * Helper function to ensure all values of search array
- * exist within the storage array
- *
- * @param (string) prop: CSS Property
- * @param (array) storage: Array of definitions found
- * @param (array) search: Array of definitions requred
- */
- public function searchDefinitions( $prop, $storage, $search ) {
- // Return if storage & search don't match
- if ( count( $storage ) != count( $search ) ) {
- return false;
- }
-
- $str = "$prop:";
- foreach ( $search as $value ) {
- if ( ! isset( $storage[ $value ] ) || $this->checkUncombinables( $storage[ $value ] ) ) {
- return false;
- }
- $str .= $storage[ $value ] . ' ';
- }
- return trim( $str ) . ';';
- }
-
- /**
- * Access to private methods for testing
- *
- * @param (string) subclass: Name of subclass to focus on
- * @param (string) method: Method to be called
- * @param (array) args: Array of paramters to be passed in
- */
- public function access( $subclass, $method, $args ) {
- if ( $subclass == 'Combine' ) {
- if ( method_exists( $this, $method ) ) {
- if ( $method == 'combine' ) {
- return $this->combine( $args[ 0 ], $args[ 1 ] );
- }
- else {
- return call_user_func_array( array( $this, $method ), $args );
- }
- }
- else {
- throw new CSSCompression_Exception( "Unknown method in Combine Class - " . $method );
- }
- }
- else if ( in_array( $subclass, $this->subcombines ) ) {
- return $this->$subclass->access( $method, $args );
- }
- else {
- throw new CSSCompression_Exception( "Unknown Sub Combine Class - " . $subclass );
- }
- }
-};
+class CSSCompression_Combine {
+ /**
+ * Combine Patterns
+ *
+ * @class Control: Compression Controller
+ * @param (string) token: Copy of the injection token
+ * @param (array) options: Reference to options
+ * @param (regex) rspace: Checks for space without an escape '\' character before it
+ * @param (regex) rslash: Checks for unescaped slash character
+ * @param (regex) rimportant: Checking props for uncombinables
+ * @param (array) methods: List of options with their corresponding class
+ */
+ private $Control;
+ private $token = '';
+ private $options = array();
+ private $rspace = "/(?<!\\\)\s/";
+ private $rslash = "/(?<!\\\)\//";
+ private $rimportant = "/inherit|\!important|\!ie|(?<!\\\)\s/i";
+ private $methods = array(
+ 'csw-combine' => 'BorderOutline',
+ 'border-radius-combine' => 'BorderRadius',
+ 'border-combine' => 'Border',
+ 'mp-combine' => 'MarginPadding',
+ 'background-combine' => 'Background',
+ 'auralcp-combine' => 'Aural',
+ 'font-combine' => 'Font',
+ 'list-combine' => 'List',
+ );
+
+ /**
+ * Sub Comination Classes
+ *
+ * @class BorderOutline: Handles Color/Style/With combinations of border/outline properties
+ * @class BorderRadius: Handles border-radius combinations
+ * @class Border: Handles normal border combinations
+ * @class MarginPadding: Handles margin/padding combinations
+ * @class Background: Handles background combinations
+ * @class Aural: Handles aural combinations
+ * @class Font: Handles font combinations
+ * @class List: Handles list combinations
+ * @param (array) subcombines: Array holding all subcombination classes
+ */
+ public $BorderOutline;
+ public $BorderRadius;
+ public $Border;
+ public $MarginPadding;
+ public $Background;
+ public $Aural;
+ public $Font;
+ public $List;
+ private $subcombines = array(
+ 'BorderOutline',
+ 'BorderRadius',
+ 'Border',
+ 'MarginPadding',
+ 'Background',
+ 'Aural',
+ 'Font',
+ 'List',
+ );
+
+ /**
+ * Stash a reference to the controller on each instantiation
+ *
+ * @param (class) control: CSSCompression Controller
+ */
+ public function __construct( CSSCompression_Control $control ) {
+ $this->Control = $control;
+ $this->token = CSSCompression::TOKEN;
+ $this->options = &$control->Option->options;
+
+ // Include classes if not already done so
+ if ( ! class_exists( "CSSCompression_Combine_Border", false ) ) {
+ $path = dirname(__FILE__) . '/Combine/';
+ foreach ( $this->subcombines as $class ) {
+ require( $path . $class . '.inc' );
+ }
+ }
+
+ // Instantiate each sub combine
+ foreach ( $this->subcombines as $class ) {
+ $full = "CSSCompression_Combine_$class";
+ $this->$class = new $full( $control, $this );
+ }
+ }
+
+ /**
+ * Reads through each detailed package and checks for cross defn combinations
+ *
+ * @param (array) selectors: Array of selectors
+ * @param (array) details: Array of details
+ */
+ public function combine( &$selectors = array(), &$details = array() ) {
+ foreach ( $details as $i => &$value ) {
+ if ( isset( $selectors[$i] ) && strpos( $selectors[$i], $this->token ) === 0 ) {
+ continue;
+ }
+
+ foreach ( $this->methods as $option => $class ) {
+ if ( $this->options[$option] ) {
+ $value = $this->$class->combine( $value );
+ }
+ }
+ }
+
+ return array($selectors, $details);
+ }
+
+ /**
+ * Helper function to ensure flagged words don't get
+ * overridden
+ *
+ * @param (mixed) obj: Array/String of definitions to be checked
+ */
+ public function checkUncombinables( $obj ) {
+ if ( is_array( $obj ) ) {
+ foreach ( $obj as $item ) {
+ if ( preg_match( $this->rimportant, $item ) ) {
+ return true;
+ }
+ }
+ return false;
+ }
+ else {
+ return preg_match( $this->rimportant, $obj );
+ }
+ }
+
+ /**
+ * Helper function to ensure all values of search array
+ * exist within the storage array
+ *
+ * @param (string) prop: CSS Property
+ * @param (array) storage: Array of definitions found
+ * @param (array) search: Array of definitions requred
+ */
+ public function searchDefinitions( $prop, $storage, $search ) {
+ // Return if storage & search don't match
+ if ( count( $storage ) != count( $search ) ) {
+ return false;
+ }
+
+ $str = "$prop:";
+ foreach ( $search as $value ) {
+ if ( ! isset( $storage[$value] ) || $this->checkUncombinables( $storage[$value] ) ) {
+ return false;
+ }
+ $str .= $storage[$value] . ' ';
+ }
+ return trim( $str ) . ';';
+ }
+
+ /**
+ * Access to private methods for testing
+ *
+ * @param (string) subclass: Name of subclass to focus on
+ * @param (string) method: Method to be called
+ * @param (array) args: Array of paramters to be passed in
+ */
+ public function access( $subclass, $method, $args ) {
+ if ( $subclass == 'Combine' ) {
+ if ( method_exists( $this, $method ) ) {
+ if ( $method == 'combine' ) {
+ return $this->combine( $args[0], $args[1] );
+ }
+ else {
+ return call_user_func_array( array($this, $method), $args );
+ }
+ }
+ else {
+ throw new CSSCompression_Exception( "Unknown method in Combine Class - " . $method );
+ }
+ }
+ else if ( in_array( $subclass, $this->subcombines ) ) {
+ return $this->$subclass->access( $method, $args );
+ }
+ else {
+ throw new CSSCompression_Exception( "Unknown Sub Combine Class - " . $subclass );
+ }
+ }
+}
diff -up -r advagg_css_compress/css-compressor-3.x/src/lib/Compress.inc advagg_css_compress/css-compressor-3.x/src/lib/Compress.inc
--- advagg_css_compress/css-compressor-3.x/src/lib/Compress.inc 2012-03-23 12:08:13.000000000 -0600
+++ advagg_css_compress/css-compressor-3.x/src/lib/Compress.inc 2012-03-23 13:02:19.000000000 -0600
@@ -5,206 +5,205 @@
* Corey Hart @ http://www.codenothing.com
*/
-Class CSSCompression_Compress
-{
- /**
- * Trim Patterns
- *
- * @param (array) options: Reference to options
- * @param (array) stats: Reference to stats
- * @param (regex) rsemicolon: Checks for semicolon without an escape '\' character before it
- * @param (regex) rcolon: Checks for colon without an escape '\' character before it
- * @param (regex) rspace: Checks for space without an escape '\' character before it
- */
- private $options = array();
- private $stats = array();
- private $rsemicolon = "/(?<!\\\);/";
- private $rcolon = "/(?<!\\\):/";
- private $rspace = "/(?<!\\\)\s/";
-
- /**
- * Other inner classes that get used within compression
- *
- * @class Control: Compression Controller
- * @class Trim: Trim Instance
- * @class Setup: Setup Instance
- * @class Format: Formatting Instance
- * @class Combine: Combine Instance
- * @class Cleanup: Cleanup Instance
- * @class Organize: Organize Instance
- * @class Selectors: Selectors Instance
- * @param (array) others: List of above classes for copying
- */
- private $Control;
- private $Trim;
- private $Setup;
- private $Format;
- private $Combine;
- private $Cleanup;
- private $Organize;
- private $Selectors;
- private $others = array(
- 'Trim',
- 'Setup',
- 'Format',
- 'Combine',
- 'Cleanup',
- 'Organize',
- 'Selectors',
- );
-
- /**
- * Stash a reference to the controller on each instantiation
- *
- * @param (class) control: CSSCompression Controller
- */
- public function __construct( CSSCompression_Control $control ) {
- $this->Control = $control;
- $this->options = &$control->Option->options;
- $this->stats = &$control->stats;
-
- foreach ( $this->others as $class ) {
- $this->$class = $control->$class;
- }
- }
-
- /**
- * Centralized function to run css compression.
- *
- * @param (string) css: Stylesheet to compresss
- */
- public function compress( $css ) {
- $setup = $this->setup( $css );
- $setup = $this->rulesets( $setup );
- $css = $this->readability( $setup );
-
- // Attach plea to top of page with unknown blocks
- if ( $this->options['add-unknown'] && count( $setup['unknown'] ) ) {
- $css = "/*\nThere are unknown blocks in the sheet, please please please open an issue with your sheet attached to it:\n"
+class CSSCompression_Compress {
+ /**
+ * Trim Patterns
+ *
+ * @param (array) options: Reference to options
+ * @param (array) stats: Reference to stats
+ * @param (regex) rsemicolon: Checks for semicolon without an escape '\' character before it
+ * @param (regex) rcolon: Checks for colon without an escape '\' character before it
+ * @param (regex) rspace: Checks for space without an escape '\' character before it
+ */
+ private $options = array();
+ private $stats = array();
+ private $rsemicolon = "/(?<!\\\);/";
+ private $rcolon = "/(?<!\\\):/";
+ private $rspace = "/(?<!\\\)\s/";
+
+ /**
+ * Other inner classes that get used within compression
+ *
+ * @class Control: Compression Controller
+ * @class Trim: Trim Instance
+ * @class Setup: Setup Instance
+ * @class Format: Formatting Instance
+ * @class Combine: Combine Instance
+ * @class Cleanup: Cleanup Instance
+ * @class Organize: Organize Instance
+ * @class Selectors: Selectors Instance
+ * @param (array) others: List of above classes for copying
+ */
+ private $Control;
+ private $Trim;
+ private $Setup;
+ private $Format;
+ private $Combine;
+ private $Cleanup;
+ private $Organize;
+ private $Selectors;
+ private $others = array(
+ 'Trim',
+ 'Setup',
+ 'Format',
+ 'Combine',
+ 'Cleanup',
+ 'Organize',
+ 'Selectors',
+ );
+
+ /**
+ * Stash a reference to the controller on each instantiation
+ *
+ * @param (class) control: CSSCompression Controller
+ */
+ public function __construct( CSSCompression_Control $control ) {
+ $this->Control = $control;
+ $this->options = &$control->Option->options;
+ $this->stats = &$control->stats;
+
+ foreach ( $this->others as $class ) {
+ $this->$class = $control->$class;
+ }
+ }
+
+ /**
+ * Centralized function to run css compression.
+ *
+ * @param (string) css: Stylesheet to compresss
+ */
+ public function compress( $css ) {
+ $setup = $this->setup( $css );
+ $setup = $this->rulesets( $setup );
+ $css = $this->readability( $setup );
+
+ // Attach plea to top of page with unknown blocks
+ if ( $this->options['add-unknown'] && count( $setup['unknown'] ) ) {
+ $css = "/*\nThere are unknown blocks in the sheet, please please please open an issue with your sheet attached to it:\n"
. "https://github.com/codenothing/css-compressor/issues\n"
. "Thank You --\n\n"
. implode( "\n", $setup['unknown'] )
. "\n*/\n"
. $css;
- }
+ }
- // Mark final file size
- $this->stats['after']['size'] = strlen( $css = trim( $css ) );
+ // Mark final file size
+ $this->stats['after']['size'] = strlen( $css = trim( $css ) );
- // Return compressed css
- return $css;
- }
-
- /**
- * Runs css through initial setup handlers
- *
- * @param (string) css: Sheet to compress
- */
- private function setup( $css ) {
- // Initial stats
- $this->stats['before']['time'] = microtime( true );
- $this->stats['before']['size'] = strlen( $css );
-
- // Initial trimming
- $css = $this->Trim->trim( $css );
-
- // Do a little tokenizing, compress each property individually
- $setup = $this->Setup->setup( $css );
-
- // Mark number of selectors pre-combine
- $this->stats['before']['selectors'] = count( $setup['selectors'] );
-
- return $setup;
- }
-
- /**
- * Focus compressions on each rule set
- *
- * @param (array) setup: Array containing selectors and rule sets
- */
- private function rulesets( $setup ) {
- // Do selector specific compressions
- $this->Selectors->selectors( $setup['selectors'] );
-
- // Look at each group of properties as a whole, and compress/combine similiar definitions
- $this->Combine->combine( $setup['selectors'], $setup['details'] );
-
- // If order isn't important, run comination functions before and after compressions to catch all instances
- // Be sure to prune before hand for higher chance of matching
- if ( $this->options['organize'] ) {
- $this->Cleanup->cleanup( $setup['selectors'], $setup['details'] );
- $this->Organize->organize( $setup['selectors'], $setup['details'] );
- $this->Combine->combine( $setup['selectors'], $setup['details'] );
- }
-
- // Do final maintenace work, remove injected property/values
- $this->Cleanup->cleanup( $setup['selectors'], $setup['details'] );
-
- // Run final counters before full cleanup
- $this->finalCount( $setup['selectors'], $setup['details'] );
-
- return $setup;
- }
-
- /**
- * Runs final counts on selectors and props
- *
- * @param (array) selectors: Selector rules
- * @param (array) details: Rule sets
- */
- private function finalCount( $selectors, $details ) {
- // Selectors and props
- $this->stats['after']['selectors'] = count( $selectors );
- foreach ( $details as $item ) {
- $props = preg_split( $this->rsemicolon, $item );
-
- // Make sure count is true
- foreach ( $props as $k => $v ) {
- if ( ! isset( $v ) || $v == '' ) {
- unset( $props[ $k ] );
- }
- }
- $this->stats['after']['props'] += count( $props );
- }
-
- // Final count for stats
- $this->stats['after']['time'] = microtime( true );
- }
-
- /**
- * Formats the compressed rule sets into a stylesheet
- *
- * @param (array) setup: Array containing selectors and rule sets
- */
- private function readability( $setup ) {
- // Format css to users preference
- $css = $this->Format->readability( $this->options['readability'], $setup['selectors'], $setup['details'] );
-
- // Intros
- foreach ( $setup as $value ) {
- if ( $value && is_string( $value ) ) {
- $css = $value . $css;
- }
- }
-
- // Remove escapables
- $css = $this->Cleanup->removeInjections( $css );
-
- return $css;
- }
-
- /**
- * Access to private methods for testing
- *
- * @param (string) method: Method to be called
- * @param (array) args: Array of paramters to be passed in
- */
- public function access( $method, $args ) {
- if ( method_exists( $this, $method ) ) {
- return call_user_func_array( array( $this, $method ), $args );
- }
- else {
- throw new CSSCompression_Exception( "Unknown method in Compress Class - " . $method );
- }
- }
-};
+ // Return compressed css
+ return $css;
+ }
+
+ /**
+ * Runs css through initial setup handlers
+ *
+ * @param (string) css: Sheet to compress
+ */
+ private function setup( $css ) {
+ // Initial stats
+ $this->stats['before']['time'] = microtime( true );
+ $this->stats['before']['size'] = strlen( $css );
+
+ // Initial trimming
+ $css = $this->Trim->trim( $css );
+
+ // Do a little tokenizing, compress each property individually
+ $setup = $this->Setup->setup( $css );
+
+ // Mark number of selectors pre-combine
+ $this->stats['before']['selectors'] = count( $setup['selectors'] );
+
+ return $setup;
+ }
+
+ /**
+ * Focus compressions on each rule set
+ *
+ * @param (array) setup: Array containing selectors and rule sets
+ */
+ private function rulesets( $setup ) {
+ // Do selector specific compressions
+ $this->Selectors->selectors( $setup['selectors'] );
+
+ // Look at each group of properties as a whole, and compress/combine similiar definitions
+ $this->Combine->combine( $setup['selectors'], $setup['details'] );
+
+ // If order isn't important, run comination functions before and after compressions to catch all instances
+ // Be sure to prune before hand for higher chance of matching
+ if ( $this->options['organize'] ) {
+ $this->Cleanup->cleanup( $setup['selectors'], $setup['details'] );
+ $this->Organize->organize( $setup['selectors'], $setup['details'] );
+ $this->Combine->combine( $setup['selectors'], $setup['details'] );
+ }
+
+ // Do final maintenace work, remove injected property/values
+ $this->Cleanup->cleanup( $setup['selectors'], $setup['details'] );
+
+ // Run final counters before full cleanup
+ $this->finalCount( $setup['selectors'], $setup['details'] );
+
+ return $setup;
+ }
+
+ /**
+ * Runs final counts on selectors and props
+ *
+ * @param (array) selectors: Selector rules
+ * @param (array) details: Rule sets
+ */
+ private function finalCount( $selectors, $details ) {
+ // Selectors and props
+ $this->stats['after']['selectors'] = count( $selectors );
+ foreach ( $details as $item ) {
+ $props = preg_split( $this->rsemicolon, $item );
+
+ // Make sure count is true
+ foreach ( $props as $k => $v ) {
+ if ( ! isset( $v ) || $v == '' ) {
+ unset( $props[$k] );
+ }
+ }
+ $this->stats['after']['props'] += count( $props );
+ }
+
+ // Final count for stats
+ $this->stats['after']['time'] = microtime( true );
+ }
+
+ /**
+ * Formats the compressed rule sets into a stylesheet
+ *
+ * @param (array) setup: Array containing selectors and rule sets
+ */
+ private function readability( $setup ) {
+ // Format css to users preference
+ $css = $this->Format->readability( $this->options['readability'], $setup['selectors'], $setup['details'] );
+
+ // Intros
+ foreach ( $setup as $value ) {
+ if ( $value && is_string( $value ) ) {
+ $css = $value . $css;
+ }
+ }
+
+ // Remove escapables
+ $css = $this->Cleanup->removeInjections( $css );
+
+ return $css;
+ }
+
+ /**
+ * Access to private methods for testing
+ *
+ * @param (string) method: Method to be called
+ * @param (array) args: Array of paramters to be passed in
+ */
+ public function access( $method, $args ) {
+ if ( method_exists( $this, $method ) ) {
+ return call_user_func_array( array($this, $method), $args );
+ }
+ else {
+ throw new CSSCompression_Exception( "Unknown method in Compress Class - " . $method );
+ }
+ }
+}
diff -up -r advagg_css_compress/css-compressor-3.x/src/lib/Control.inc advagg_css_compress/css-compressor-3.x/src/lib/Control.inc
--- advagg_css_compress/css-compressor-3.x/src/lib/Control.inc 2012-03-23 12:08:13.000000000 -0600
+++ advagg_css_compress/css-compressor-3.x/src/lib/Control.inc 2012-03-23 13:02:19.000000000 -0600
@@ -5,230 +5,229 @@
* Corey Hart @ http://www.codenothing.com
*/
-Class CSSCompression_Control
-{
- /**
- * Control Patterns
- *
- * @param (string) css: Holds compressed css string
- * @param (string) mode: Current compression mode state
- * @param (array) stats: Holds compression stats
- * @param (array) getters: Array of accessible getters
- */
- public $css = '';
- public $mode = '';
- public $stats = array();
- private $getters = array(
- 'css',
- 'mode',
- 'stats',
- );
-
- /**
- * Subclasses that do the ground work for this compressor
- *
- * @class CSSCompression: Public facing compression class
- * @class Option: Option handling
- * @class Trim: Does the initial trimming for the css
- * @class Format: Formats the output
- * @class Numeric: Handles numeric compression
- * @class Color: Handles color compression
- * @class Individuals: Runs compression algorithms on individual properties and values
- * @class Selectors: Runs selector specific compressions
- * @class Combine: Handles combining of various properties
- * @class Organize: Reorganizes the sheet for futher compression
- * @class Cleanup: Cleans out all injected characters during compression
- * @class Compress: Central compression unit.
- * @param (array) subclasses: Array holding all the subclasses for inlusion
- */
- public $CSSCompression;
- public $Option;
- public $Trim;
- public $Format;
- public $Numeric;
- public $Color;
- public $Individuals;
- public $Selectors;
- public $Combine;
- public $Organize;
- public $Cleanup;
- public $Setup;
- public $Compress;
- private $subclasses = array(
- 'Option',
- 'Trim',
- 'Format',
- 'Numeric',
- 'Color',
- 'Individuals',
- 'Selectors',
- 'Combine',
- 'Organize',
- 'Cleanup',
- 'Setup',
- 'Compress',
- );
-
- /**
- * Pull in the Compression instance and build the subclasses
- *
- * @param (class) CSSCompression: CSSCompression Instance
- */
- public function __construct( CSSCompression $CSSCompression ) {
- $this->CSSCompression = $CSSCompression;
-
- // Load all subclasses on demand
- if ( ! class_exists( "CSSCompression_Option", false ) ) {
- $path = dirname(__FILE__) . '/';
- foreach ( $this->subclasses as $class ) {
- require( $path . $class . '.inc' );
- }
- }
-
- // Initialize each subclass
- foreach ( $this->subclasses as $class ) {
- $full = "CSSCompression_$class";
- $this->$class = new $full( $this );
- }
- }
-
- /**
- * Control access to properties
- *
- * - Getting stats/mode/css returns the current value of that property
- * - Getting options will return the current full options array
- * - Getting anything else returns that current value in the options array or NULL
- *
- * @param (string) name: Name of property that you want to access
- */
- public function get( $name ) {
- if ( in_array( $name, $this->getters ) ) {
- return $this->$name;
- }
- else if ( $name == 'options' ) {
- return $this->Option->options;
- }
- else {
- return $this->Option->option( $name );
- }
- }
-
- /**
- * The setter method only allows access to setting values in the options array
- *
- * @param (string) name: Key name of the option you want to set
- * @param (mixed) value: Value of the option you want to set
- */
- public function set( $name, $value ) {
- // Allow for passing array of options to merge into current ones
- if ( $name === 'options' && is_array( $value ) ) {
- return $this->Option->merge( $value );
- }
- else if ( isset( CSSCompression::$defaults[ $name ] ) ) {
- return $this->Option->option( $name, $value );
- }
- else {
- throw new CSSCompression_Exception( "Invalid Private Access to $name in CSSCompression." );
- }
- }
-
- /**
- * Merges a predefined set options
- *
- * @param (string) mode: Name of mode to use.
- */
- public function mode( $mode = NULL ) {
- return $this->Options->merge( $mode );
- }
-
- /**
- * Resets options to their defaults, and flushes out variables
- *
- * @params none
- */
- public function reset(){
- $this->Option->reset();
- return $this->flush();
- }
-
- /**
- * Cleans out class variables for next run
- *
- * @params none
- */
- public function flush(){
- $this->css = '';
- $this->stats = array(
- 'before' => array(
- 'props' => 0,
- 'selectors' => 0,
- 'size' => 0,
- 'time' => 0,
- ),
- 'after' => array(
- 'props' => 0,
- 'selectors' => 0,
- 'size' => 0,
- 'time' => 0,
- ),
- );
-
- return true;
- }
-
- /**
- * Proxy to run Compression on the sheet passed. Handle options here.
- *
- * @param (string) css: Stylesheet to be compressed
- * @param (mixed) options: Array of options or mode to use.
- */
- public function compress( $css = NULL, $options = NULL ) {
- // Flush out old stats and variables
- $this->flush();
-
- // If no additional options, just run compression
- if ( $options === NULL ) {
- return $this->css = $this->Compress->compress( $css );
- }
-
- // Store old params
- $old = $this->mode == '__custom' ? $this->Option->option() : $this->mode;
- $readability = $this->Option->option( 'readability' );
-
- // Compress with new set of options
- $this->Option->merge( $options );
- $css = $this->Compress->compress( $css );
-
- // Reset original options
- $this->reset();
- $this->Option->merge( $old );
-
- // Return the compressed css
- return $this->css = $css;
- }
-
- /**
- * Backdoor access to subclasses
- * ONLY FOR DEVELOPMENT/TESTING.
- *
- * @param (string) class: Name of the focus class
- * @param (array) config: Contains name reference and test arguments
- */
- public function access( $class, $method, $args ) {
- if ( $class == 'Control' ) {
- return call_user_func_array( array( $class, $method ), $args );
- }
- else if ( strpos( $class, '.' ) !== false ) {
- $parts = explode( '.', $class );
- $class = $parts[ 0 ];
- $subclass = $parts[ 1 ];
- return $this->$class->access( $subclass, $method, $args );
- }
- else if ( in_array( $class, $this->subclasses ) ) {
- return $this->$class->access( $method, $args );
- }
- else {
- throw new CSSCompression_Exception( "Unknown Class Access - " . $class );
- }
- }
-};
+class CSSCompression_Control {
+ /**
+ * Control Patterns
+ *
+ * @param (string) css: Holds compressed css string
+ * @param (string) mode: Current compression mode state
+ * @param (array) stats: Holds compression stats
+ * @param (array) getters: Array of accessible getters
+ */
+ public $css = '';
+ public $mode = '';
+ public $stats = array();
+ private $getters = array(
+ 'css',
+ 'mode',
+ 'stats',
+ );
+
+ /**
+ * Subclasses that do the ground work for this compressor
+ *
+ * @class CSSCompression: Public facing compression class
+ * @class Option: Option handling
+ * @class Trim: Does the initial trimming for the css
+ * @class Format: Formats the output
+ * @class Numeric: Handles numeric compression
+ * @class Color: Handles color compression
+ * @class Individuals: Runs compression algorithms on individual properties and values
+ * @class Selectors: Runs selector specific compressions
+ * @class Combine: Handles combining of various properties
+ * @class Organize: Reorganizes the sheet for futher compression
+ * @class Cleanup: Cleans out all injected characters during compression
+ * @class Compress: Central compression unit.
+ * @param (array) subclasses: Array holding all the subclasses for inlusion
+ */
+ public $CSSCompression;
+ public $Option;
+ public $Trim;
+ public $Format;
+ public $Numeric;
+ public $Color;
+ public $Individuals;
+ public $Selectors;
+ public $Combine;
+ public $Organize;
+ public $Cleanup;
+ public $Setup;
+ public $Compress;
+ private $subclasses = array(
+ 'Option',
+ 'Trim',
+ 'Format',
+ 'Numeric',
+ 'Color',
+ 'Individuals',
+ 'Selectors',
+ 'Combine',
+ 'Organize',
+ 'Cleanup',
+ 'Setup',
+ 'Compress',
+ );
+
+ /**
+ * Pull in the Compression instance and build the subclasses
+ *
+ * @param (class) CSSCompression: CSSCompression Instance
+ */
+ public function __construct( CSSCompression $CSSCompression ) {
+ $this->CSSCompression = $CSSCompression;
+
+ // Load all subclasses on demand
+ if ( ! class_exists( "CSSCompression_Option", false ) ) {
+ $path = dirname(__FILE__) . '/';
+ foreach ( $this->subclasses as $class ) {
+ require( $path . $class . '.inc' );
+ }
+ }
+
+ // Initialize each subclass
+ foreach ( $this->subclasses as $class ) {
+ $full = "CSSCompression_$class";
+ $this->$class = new $full( $this );
+ }
+ }
+
+ /**
+ * Control access to properties
+ *
+ * - Getting stats/mode/css returns the current value of that property
+ * - Getting options will return the current full options array
+ * - Getting anything else returns that current value in the options array or NULL
+ *
+ * @param (string) name: Name of property that you want to access
+ */
+ public function get( $name ) {
+ if ( in_array( $name, $this->getters ) ) {
+ return $this->$name;
+ }
+ else if ( $name == 'options' ) {
+ return $this->Option->options;
+ }
+ else {
+ return $this->Option->option( $name );
+ }
+ }
+
+ /**
+ * The setter method only allows access to setting values in the options array
+ *
+ * @param (string) name: Key name of the option you want to set
+ * @param (mixed) value: Value of the option you want to set
+ */
+ public function set( $name, $value ) {
+ // Allow for passing array of options to merge into current ones
+ if ( $name === 'options' && is_array( $value ) ) {
+ return $this->Option->merge( $value );
+ }
+ else if ( isset( CSSCompression::$defaults[$name] ) ) {
+ return $this->Option->option( $name, $value );
+ }
+ else {
+ throw new CSSCompression_Exception( "Invalid Private Access to $name in CSSCompression." );
+ }
+ }
+
+ /**
+ * Merges a predefined set options
+ *
+ * @param (string) mode: Name of mode to use.
+ */
+ public function mode( $mode = NULL ) {
+ return $this->Options->merge( $mode );
+ }
+
+ /**
+ * Resets options to their defaults, and flushes out variables
+ *
+ * @params none
+ */
+ public function reset() {
+ $this->Option->reset();
+ return $this->flush();
+ }
+
+ /**
+ * Cleans out class variables for next run
+ *
+ * @params none
+ */
+ public function flush() {
+ $this->css = '';
+ $this->stats = array(
+ 'before' => array(
+ 'props' => 0,
+ 'selectors' => 0,
+ 'size' => 0,
+ 'time' => 0,
+ ),
+ 'after' => array(
+ 'props' => 0,
+ 'selectors' => 0,
+ 'size' => 0,
+ 'time' => 0,
+ ),
+ );
+
+ return true;
+ }
+
+ /**
+ * Proxy to run Compression on the sheet passed. Handle options here.
+ *
+ * @param (string) css: Stylesheet to be compressed
+ * @param (mixed) options: Array of options or mode to use.
+ */
+ public function compress( $css = NULL, $options = NULL ) {
+ // Flush out old stats and variables
+ $this->flush();
+
+ // If no additional options, just run compression
+ if ( $options === NULL ) {
+ return $this->css = $this->Compress->compress( $css );
+ }
+
+ // Store old params
+ $old = $this->mode == '__custom' ? $this->Option->option() : $this->mode;
+ $readability = $this->Option->option( 'readability' );
+
+ // Compress with new set of options
+ $this->Option->merge( $options );
+ $css = $this->Compress->compress( $css );
+
+ // Reset original options
+ $this->reset();
+ $this->Option->merge( $old );
+
+ // Return the compressed css
+ return $this->css = $css;
+ }
+
+ /**
+ * Backdoor access to subclasses
+ * ONLY FOR DEVELOPMENT/TESTING.
+ *
+ * @param (string) class: Name of the focus class
+ * @param (array) config: Contains name reference and test arguments
+ */
+ public function access( $class, $method, $args ) {
+ if ( $class == 'Control' ) {
+ return call_user_func_array( array($class, $method), $args );
+ }
+ else if ( strpos( $class, '.' ) !== false ) {
+ $parts = explode( '.', $class );
+ $class = $parts[0];
+ $subclass = $parts[1];
+ return $this->$class->access( $subclass, $method, $args );
+ }
+ else if ( in_array( $class, $this->subclasses ) ) {
+ return $this->$class->access( $method, $args );
+ }
+ else {
+ throw new CSSCompression_Exception( "Unknown Class Access - " . $class );
+ }
+ }
+}
diff -up -r advagg_css_compress/css-compressor-3.x/src/lib/Exception.inc advagg_css_compress/css-compressor-3.x/src/lib/Exception.inc
--- advagg_css_compress/css-compressor-3.x/src/lib/Exception.inc 2012-03-23 12:08:13.000000000 -0600
+++ advagg_css_compress/css-compressor-3.x/src/lib/Exception.inc 2012-03-23 13:02:19.000000000 -0600
@@ -6,25 +6,24 @@
*/
-Class CSSCompression_Exception extends Exception
-{
- /**
- * Custom exception handler
- *
- * @param (string) message: Error message
- * @param (int) code: Error code
- * @instance (Exception Instance) previous: Previous exception
- */
- public function __construct( $message = 'Unknown Exception', $code = 0, Exception $previous = NULL ) {
- parent::__construct( $message, $code, $previous );
- }
+class CSSCompression_Exception extends Exception {
+ /**
+ * Custom exception handler
+ *
+ * @param (string) message: Error message
+ * @param (int) code: Error code
+ * @instance (Exception Instance) previous: Previous exception
+ */
+ public function __construct( $message = 'Unknown Exception', $code = 0, Exception $previous = NULL ) {
+ parent::__construct( $message, $code, $previous );
+ }
- /**
- * String version of this custom exception
- *
- * @params none
- */
- public function __toString(){
- return "CSSCompression Exception: [" . $this->code . "] " . $this->message . "\n";
- }
-};
+ /**
+ * String version of this custom exception
+ *
+ * @params none
+ */
+ public function __toString() {
+ return "CSSCompression Exception: [" . $this->code . "] " . $this->message . "\n";
+ }
+}
diff -up -r advagg_css_compress/css-compressor-3.x/src/lib/Format.inc advagg_css_compress/css-compressor-3.x/src/lib/Format.inc
--- advagg_css_compress/css-compressor-3.x/src/lib/Format.inc 2012-03-23 12:08:13.000000000 -0600
+++ advagg_css_compress/css-compressor-3.x/src/lib/Format.inc 2012-03-23 13:02:19.000000000 -0600
@@ -5,181 +5,180 @@
* Corey Hart @ http://www.codenothing.com
*/
-Class CSSCompression_Format
-{
- /**
- * Format Patterns
- *
- * @class Control: Compression Controller
- * @param (string) token: Copy of the injection token
- * @param (array) options: Reference to options
- * @param (regex) rsemicolon: Checks for semicolon without an escape '\' character before it
- * @param (regex) rcolon: Checks for colon without an escape '\' character before it
- * @param (array) readability: Mapping to readability functions
- */
- private $Control;
- private $token = '';
- private $options = array();
- private $rsemicolon = "/(?<!\\\);/";
- private $rcolon = "/(?<!\\\):/";
- private $readability = array(
- CSSCompression::READ_MAX => 'maximum',
- CSSCompression::READ_MED => 'medium',
- CSSCompression::READ_MIN => 'minimum',
- CSSCompression::READ_NONE => 'none',
- );
-
- /**
- * Stash a reference to the controller on each instantiation
- *
- * @param (class) control: CSSCompression Controller
- */
- public function __construct( CSSCompression_Control $control ) {
- $this->Control = $control;
- $this->token = CSSCompression::TOKEN;
- $this->options = &$control->Option->options;
- }
-
-
- /**
- * Reformats compressed CSS into specified format
- *
- * @param (int) readability: Readability level of compressed output
- * @param (array) selectors: Array of selectors
- * @param (array) details: Array of declarations
- */
- public function readability( $readability = CSSCompression::READ_NONE, $selectors = array(), $details = array() ) {
- if ( isset( $this->readability[ $readability ] ) ) {
- $fn = $this->readability[ $readability ];
- return trim( $this->$fn( $selectors, $details ) );
- }
- else {
- return 'Invalid Readability Value';
- }
- }
-
- /**
- * Returns maxium readability, breaking on every selector, brace, and property
- *
- * @param (array) selectors: Array of selectors
- * @param (array) details: Array of declarations
- */
- private function maximum( $selectors, $details ) {
- $css = '';
- foreach ( $selectors as $k => $v ) {
- if ( strpos( $v, $this->token ) === 0 ) {
- $css .= substr( $v, strlen( $this->token ) );
- $css .= $details[ $k ];
- continue;
- }
- else if ( ! $details[ $k ] || trim( $details[ $k ] ) == '' ) {
- continue;
- }
-
- $v = str_replace( '>', ' > ', $v );
- $v = str_replace( '+', ' + ', $v );
- $v = str_replace( ',', ', ', $v );
- $css .= "$v {\n";
- $arr = preg_split( $this->rsemicolon, $details[ $k ] );
-
- foreach ( $arr as $item ) {
- if ( ! $item ) {
- continue;
- }
-
- list( $prop, $val ) = preg_split( $this->rcolon, $item, 2 );
- $css .= "\t$prop: $val;\n";
- }
-
- // Kill that last semicolon at users request
- if ( $this->options['unnecessary-semicolons'] ) {
- $css = preg_replace( "/;\n$/", "\n", $css );
- }
-
- $css .= "}\n\n";
- }
-
- return $css;
- }
-
- /**
- * Returns medium readability, putting selectors and rule sets on new lines
- *
- * @param (array) selectors: Array of selectors
- * @param (array) details: Array of declarations
- */
- private function medium( $selectors, $details ) {
- $css = '';
- foreach ( $selectors as $k => $v ) {
- if ( strpos( $v, $this->token ) === 0 ) {
- $css .= substr( $v, strlen( $this->token ) );
- $css .= $details[ $k ];
- continue;
- }
- else if ( $details[ $k ] && $details[ $k ] != '' ) {
- $css .= "$v {\n\t" . $details[ $k ] . "\n}\n";
- }
- }
-
- return $css;
- }
-
- /**
- * Returns minimum readability, breaking after every selector and it's rule set
- *
- * @param (array) selectors: Array of selectors
- * @param (array) details: Array of declarations
- */
- private function minimum( $selectors, $details ) {
- $css = '';
- foreach ( $selectors as $k => $v ) {
- if ( strpos( $v, $this->token ) === 0 ) {
- $css .= substr( $v, strlen( $this->token ) );
- $css .= $details[ $k ];
- continue;
- }
- else if ( $details[ $k ] && $details[ $k ] != '' ) {
- $css .= "$v{" . $details[ $k ] . "}\n";
- }
- }
-
- return $css;
- }
-
- /**
- * Returns an unreadable, but fully compressed script
- *
- * @param (array) selectors: Array of selectors
- * @param (array) details: Array of declarations
- */
- private function none( $selectors, $details ) {
- $css = '';
- foreach ( $selectors as $k => $v ) {
- if ( strpos( $v, $this->token ) === 0 ) {
- $css .= substr( $v, strlen( $this->token ) );
- $css .= $details[ $k ];
- continue;
- }
- else if ( $details[ $k ] && $details[ $k ] != '' ) {
- $css .= trim( "$v{" . $details[ $k ] . "}" );
- }
- }
-
- return $css;
- }
-
- /**
- * Access to private methods for testing
- *
- * @param (string) method: Method to be called
- * @param (array) args: Array of paramters to be passed in
- */
- public function access( $method, $args ) {
- if ( method_exists( $this, $method ) ) {
- return call_user_func_array( array( $this, $method ), $args );
- }
- else {
- throw new CSSCompression_Exception( "Unknown method in Format Class - " . $method );
- }
- }
-};
+class CSSCompression_Format {
+ /**
+ * Format Patterns
+ *
+ * @class Control: Compression Controller
+ * @param (string) token: Copy of the injection token
+ * @param (array) options: Reference to options
+ * @param (regex) rsemicolon: Checks for semicolon without an escape '\' character before it
+ * @param (regex) rcolon: Checks for colon without an escape '\' character before it
+ * @param (array) readability: Mapping to readability functions
+ */
+ private $Control;
+ private $token = '';
+ private $options = array();
+ private $rsemicolon = "/(?<!\\\);/";
+ private $rcolon = "/(?<!\\\):/";
+ private $readability = array(
+ CSSCompression::READ_MAX => 'maximum',
+ CSSCompression::READ_MED => 'medium',
+ CSSCompression::READ_MIN => 'minimum',
+ CSSCompression::READ_NONE => 'none',
+ );
+
+ /**
+ * Stash a reference to the controller on each instantiation
+ *
+ * @param (class) control: CSSCompression Controller
+ */
+ public function __construct( CSSCompression_Control $control ) {
+ $this->Control = $control;
+ $this->token = CSSCompression::TOKEN;
+ $this->options = &$control->Option->options;
+ }
+
+
+ /**
+ * Reformats compressed CSS into specified format
+ *
+ * @param (int) readability: Readability level of compressed output
+ * @param (array) selectors: Array of selectors
+ * @param (array) details: Array of declarations
+ */
+ public function readability( $readability = CSSCompression::READ_NONE, $selectors = array(), $details = array() ) {
+ if ( isset( $this->readability[$readability] ) ) {
+ $fn = $this->readability[$readability];
+ return trim( $this->$fn( $selectors, $details ) );
+ }
+ else {
+ return 'Invalid Readability Value';
+ }
+ }
+
+ /**
+ * Returns maxium readability, breaking on every selector, brace, and property
+ *
+ * @param (array) selectors: Array of selectors
+ * @param (array) details: Array of declarations
+ */
+ private function maximum( $selectors, $details ) {
+ $css = '';
+ foreach ( $selectors as $k => $v ) {
+ if ( strpos( $v, $this->token ) === 0 ) {
+ $css .= substr( $v, strlen( $this->token ) );
+ $css .= $details[$k];
+ continue;
+ }
+ else if ( ! $details[$k] || trim( $details[$k] ) == '' ) {
+ continue;
+ }
+
+ $v = str_replace( '>', ' > ', $v );
+ $v = str_replace( '+', ' + ', $v );
+ $v = str_replace( ',', ', ', $v );
+ $css .= "$v {\n";
+ $arr = preg_split( $this->rsemicolon, $details[$k] );
+
+ foreach ( $arr as $item ) {
+ if ( ! $item ) {
+ continue;
+ }
+
+ list( $prop, $val ) = preg_split( $this->rcolon, $item, 2 );
+ $css .= "\t$prop: $val;\n";
+ }
+
+ // Kill that last semicolon at users request
+ if ( $this->options['unnecessary-semicolons'] ) {
+ $css = preg_replace( "/;\n$/", "\n", $css );
+ }
+
+ $css .= "}\n\n";
+ }
+
+ return $css;
+ }
+
+ /**
+ * Returns medium readability, putting selectors and rule sets on new lines
+ *
+ * @param (array) selectors: Array of selectors
+ * @param (array) details: Array of declarations
+ */
+ private function medium( $selectors, $details ) {
+ $css = '';
+ foreach ( $selectors as $k => $v ) {
+ if ( strpos( $v, $this->token ) === 0 ) {
+ $css .= substr( $v, strlen( $this->token ) );
+ $css .= $details[$k];
+ continue;
+ }
+ else if ( $details[$k] && $details[$k] != '' ) {
+ $css .= "$v {\n\t" . $details[$k] . "\n}\n";
+ }
+ }
+
+ return $css;
+ }
+
+ /**
+ * Returns minimum readability, breaking after every selector and it's rule set
+ *
+ * @param (array) selectors: Array of selectors
+ * @param (array) details: Array of declarations
+ */
+ private function minimum( $selectors, $details ) {
+ $css = '';
+ foreach ( $selectors as $k => $v ) {
+ if ( strpos( $v, $this->token ) === 0 ) {
+ $css .= substr( $v, strlen( $this->token ) );
+ $css .= $details[$k];
+ continue;
+ }
+ else if ( $details[$k] && $details[$k] != '' ) {
+ $css .= "$v{" . $details[$k] . "}\n";
+ }
+ }
+
+ return $css;
+ }
+
+ /**
+ * Returns an unreadable, but fully compressed script
+ *
+ * @param (array) selectors: Array of selectors
+ * @param (array) details: Array of declarations
+ */
+ private function none( $selectors, $details ) {
+ $css = '';
+ foreach ( $selectors as $k => $v ) {
+ if ( strpos( $v, $this->token ) === 0 ) {
+ $css .= substr( $v, strlen( $this->token ) );
+ $css .= $details[$k];
+ continue;
+ }
+ else if ( $details[$k] && $details[$k] != '' ) {
+ $css .= trim( "$v{" . $details[$k] . "}" );
+ }
+ }
+
+ return $css;
+ }
+
+ /**
+ * Access to private methods for testing
+ *
+ * @param (string) method: Method to be called
+ * @param (array) args: Array of paramters to be passed in
+ */
+ public function access( $method, $args ) {
+ if ( method_exists( $this, $method ) ) {
+ return call_user_func_array( array($this, $method), $args );
+ }
+ else {
+ throw new CSSCompression_Exception( "Unknown method in Format Class - " . $method );
+ }
+ }
+}
diff -up -r advagg_css_compress/css-compressor-3.x/src/lib/Individuals.inc advagg_css_compress/css-compressor-3.x/src/lib/Individuals.inc
--- advagg_css_compress/css-compressor-3.x/src/lib/Individuals.inc 2012-03-23 12:08:13.000000000 -0600
+++ advagg_css_compress/css-compressor-3.x/src/lib/Individuals.inc 2012-03-23 13:02:19.000000000 -0600
@@ -5,301 +5,300 @@
* Corey Hart @ http://www.codenothing.com
*/
-Class CSSCompression_Individuals
-{
- /**
- * Individual patterns
- *
- * @class Control: Compression Controller
- * @class Numeric: Numeric handler
- * @class Color: Color Handler
- * @param (array) options: Reference to options
- * @param (regex) rdirectional: Properties that may have multiple directions
- * @param (regex) rborderradius: Checks property for border-radius declaration
- * @param (regex) rnoneprop: Properties that can have none as their value(will be converted to 0)
- * @param (regex) rclip: Looks for rect grouping in clip declaration
- * @param (regex) rsplitter: Checks font properties for font-size/line-height split
- * @param (regex) rfilter: Special alpha filter for msie
- * @param (regex) rspace: Checks for unescaped space
- * @param (regex) rspace: Checks for unescaped slash
- * @param (array) weights: Array of font-weight name conversions to their numeric counterpart
- */
- private $Control;
- private $Numeric;
- private $Color;
- private $options = array();
- private $rdirectional = "/^(margin|padding|border-spacing)$/";
- private $rborderradius = "/border[a-z-]*radius/";
- private $rradiusfull = "/^(-moz-|-webkit-)?border-radius$/";
- private $rnoneprop = "/^(border|background|border-(top|right|bottom|left))$/";
- private $rclip = "/^rect\(\s*(\-?\d*\.?\d*?\w*)(,|\s)(\-?\d*\.?\d*?\w*)(,|\s)(\-?\d*\.?\d*?\w*)(,|\s)(\-?\d*\.?\d*?\w*)\s*\)$/";
- private $rsplitter = "/(^|(?<!\\\)\s)([^\/ ]+)\/([^\/ ]+)((?<!\\\)\s|$)/";
- private $rfilter = "/[\"']?PROGID\\\?:DXImageTransform\\\?.Microsoft\\\?.Alpha\(Opacity\\\?=(\d+\\\?\.?\d*)\)[\"']?/i";
- private $rspace = "/(?<!\\\)\s/";
- private $rslash = "/(?<!\\\)\//";
- private $weights = array(
- "normal" => 400,
- "bold" => 700,
- );
-
- /**
- * Stash a reference to the controller on each instantiation
- *
- * @param (class) control: CSSCompression Controller
- */
- public function __construct( CSSCompression_Control $control ) {
- $this->Control = $control;
- $this->Numeric = $control->Numeric;
- $this->Color = $control->Color;
- $this->options = &$control->Option->options;
- }
-
- /**
- * Runs special unit/directional compressions
- *
- * @param (string) prop: CSS Property
- * @param (string) val: Value of CSS Property
- */
- public function individuals( $prop, $val ) {
- // Properties should always be lowercase
- $prop = strtolower( $prop );
-
- // Split up each definiton for color and numeric compressions
- $parts = preg_split( $this->rspace, $val );
- foreach ( $parts as &$v ) {
- if ( ! $v || $v == '' ) {
- continue;
- }
-
- // Remove uneeded decimals/units
- if ( $this->options['format-units'] ) {
- $v = $this->Numeric->numeric( $v );
- }
-
- // Color compression
- $v = $this->Color->color( $v );
- }
- $val = trim( implode( ' ', $parts ) );
-
- // Special border radius handling
- if ( preg_match( $this->rborderradius, $prop ) ) {
- $val = $this->borderRadius( $prop, $val );
- }
- // Remove uneeded side definitions if possible
- else if ( $this->options['directional-compress'] && count( $parts ) > 1 && preg_match( $this->rdirectional, $prop ) ) {
- $val = $this->directionals( strtolower( $val ) );
- }
-
- // Font-weight converter
- if ( $this->options['fontweight2num'] && ( $prop == 'font-weight' || $prop == 'font' ) ) {
- $val = $this->fontweight( $val );
- }
-
- // Special font value conversions
- if ( $prop == 'font' ) {
- $val = $this->font( $val );
- }
-
- // Special clip value compressions
- if ( $prop == 'clip' ) {
- $val = $this->clip( $val );
- }
-
- // None to 0 converter
- $val = $this->none( $prop, $val );
-
- // MSIE Filters
- $val = $this->filter( $prop, $val );
-
- // Return for list retrival
- return array( $prop, $val );
- }
-
- /**
- * Preps border radius for directional compression
- *
- * @param (string) prop: Property Declaration
- * @param (string) val: Declaration Value
- */
- private function borderRadius( $prop, $val ) {
- if ( preg_match( $this->rslash, $val ) ) {
- $parts = preg_split( $this->rslash, $val, 2 );
- // We have to redo numeric compression because the slash may hav intruded
- foreach ( $parts as &$row ) {
- $p = preg_split( $this->rspace, $row );
- foreach ( $p as &$v ) {
- if ( ! $v || $v == '' ) {
- continue;
- }
-
- // Remove uneeded decimals/units
- if ( $this->options['format-units'] ) {
- $v = $this->Numeric->numeric( $v );
- }
- }
- $row = implode( ' ', $p );
- if ( $this->options['directional-compress'] ) {
- $row = $this->directionals( strtolower( $row ) );
- }
- }
- $val = implode( '/', $parts );
- }
- else if ( $this->options['directional-compress'] && preg_match( $this->rradiusfull, $prop ) ) {
- $val = $this->directionals( strtolower( $val ) );
- }
-
- return $val;
- }
-
- /**
- * Finds directional compression on methods like margin/padding
- *
- * @param (string) val: Value of CSS Property
- */
- private function directionals( $val ) {
- // Split up each definiton
- $direction = preg_split( $this->rspace, $val );
-
- // 4 Direction reduction
- $count = count( $direction );
- if ( $count == 4 ) {
- // All 4 sides are the same, combine into 1 definition
- if ( $direction[ 0 ] == $direction[ 1 ] && $direction[ 2 ] == $direction[ 3 ] && $direction[ 0 ] == $direction[ 3 ] ) {
- $direction = array( $direction[ 0 ] );
- }
- // top-bottom/left-right are the same, reduce definition
- else if ( $direction[ 0 ] == $direction[ 2 ] && $direction[ 1 ] == $direction[ 3 ] ) {
- $direction = array( $direction[ 0 ], $direction[ 1 ] );
- }
- // Only left-right are the same
- else if ( $direction[ 1 ] == $direction[ 3 ] ) {
- $direction = array( $direction[ 0 ], $direction[ 1 ], $direction[ 2 ] );
- }
- }
- // 3 Direction reduction
- else if ( $count == 3 ) {
- // All directions are the same
- if ( $direction[ 0 ] == $direction[ 1 ] && $direction[ 1 ] == $direction[ 2 ] ) {
- $direction = array( $direction[ 0 ] );
- }
- // Only top(first) and bottom(last) are the same
- else if ( $direction[ 0 ] == $direction[ 2 ] ) {
- $direction = array( $direction[ 0 ], $direction[ 1 ] );
- }
- }
- // 2 Direction reduction
- // Both directions are the same, combine into single definition
- else if ( $count == 2 && $direction[ 0 ] == $direction[ 1 ] ) {
- $direction = array( $direction[ 0 ] );
- }
-
- // Return the combined version of the directions
- // Single entries will just return
- return implode( ' ', $direction );
- }
-
- /**
- * Converts font-weight names to numbers
- *
- * @param (string) val: font-weight prop value
- */
- private function fontweight( $val ) {
- if ( preg_match( $this->rspace, $val ) ) {
- $parts = preg_split( $this->rspace, $val );
- foreach ( $parts as &$item ) {
- $lower = strtolower( $item );
- if ( isset( $this->weights[ $lower ] ) && $lower != 'normal' ) {
- $item = $this->weights[ $lower ];
- }
- }
- $val = implode( ' ', $parts );
- }
- else if ( isset( $this->weights[ strtolower( $val ) ] ) ) {
- $val = $this->weights[ strtolower( $val ) ];
- }
-
- return $val;
- }
-
- /**
- * Special font conversions
- *
- * @param (string) val: property value
- */
- private function font( $val ) {
- // Split out the font-size/line-height split and run through numerical handlers
- if ( preg_match( $this->rsplitter, $val, $match, PREG_OFFSET_CAPTURE ) ) {
- $size = $this->Numeric->numeric( $match[ 2 ][ 0 ] );
- $height = $this->Numeric->numeric( $match[ 3 ][ 0 ] );
- $concat = $match[ 1 ][ 0 ] . $size . '/' . $height . $match[ 4 ][ 0 ];
- $val = substr_replace( $val, $concat, $match[ 0 ][ 1 ], strlen( $match[ 0 ][ 0 ] ) );
- }
-
- return $val;
- }
-
- /**
- * Special clip conversions
- *
- * @param (string) val: property value
- */
- private function clip( $val ) {
- if ( preg_match( $this->rclip, $val, $match ) ) {
- $positions = array( 1, 3, 5, 7 );
- $clean = 'rect(';
- foreach ( $positions as $pos ) {
- if ( ! isset( $match[ $pos ] ) ) {
- return $val;
- }
-
- $clean .= $this->Numeric->numeric( $match[ $pos ] ) . ( isset( $match[ $pos + 1 ] ) ? $match[ $pos + 1 ] : '' );
- }
- $val = $clean . ')';
- }
-
- return $val;
- }
-
- /**
- * Convert none vals to 0
- *
- * @param (string) prop: Current Property
- * @param (string) val: property value
- */
- private function none( $prop, $val ) {
- if ( preg_match( $this->rnoneprop, $prop ) && $val == 'none' ) {
- $val = '0';
- }
-
- return $val;
- }
-
- /**
- * MSIE Filter Conversion
- *
- * @param (string) prop: Current Property
- * @param (string) val: property value
- */
- private function filter( $prop, $val ) {
- if ( preg_match( "/filter/", $prop ) ) {
- $val = preg_replace( $this->rfilter, "alpha(opacity=$1)", $val );
- }
-
- return $val;
- }
-
- /**
- * Access to private methods for testing
- *
- * @param (string) method: Method to be called
- * @param (array) args: Array of paramters to be passed in
- */
- public function access( $method, $args ) {
- if ( method_exists( $this, $method ) ) {
- return call_user_func_array( array( $this, $method ), $args );
- }
- else {
- throw new CSSCompression_Exception( "Unknown method in Individuals Class - " . $method );
- }
- }
-};
+class CSSCompression_Individuals {
+ /**
+ * Individual patterns
+ *
+ * @class Control: Compression Controller
+ * @class Numeric: Numeric handler
+ * @class Color: Color Handler
+ * @param (array) options: Reference to options
+ * @param (regex) rdirectional: Properties that may have multiple directions
+ * @param (regex) rborderradius: Checks property for border-radius declaration
+ * @param (regex) rnoneprop: Properties that can have none as their value(will be converted to 0)
+ * @param (regex) rclip: Looks for rect grouping in clip declaration
+ * @param (regex) rsplitter: Checks font properties for font-size/line-height split
+ * @param (regex) rfilter: Special alpha filter for msie
+ * @param (regex) rspace: Checks for unescaped space
+ * @param (regex) rspace: Checks for unescaped slash
+ * @param (array) weights: Array of font-weight name conversions to their numeric counterpart
+ */
+ private $Control;
+ private $Numeric;
+ private $Color;
+ private $options = array();
+ private $rdirectional = "/^(margin|padding|border-spacing)$/";
+ private $rborderradius = "/border[a-z-]*radius/";
+ private $rradiusfull = "/^(-moz-|-webkit-)?border-radius$/";
+ private $rnoneprop = "/^(border|background|border-(top|right|bottom|left))$/";
+ private $rclip = "/^rect\(\s*(\-?\d*\.?\d*?\w*)(,|\s)(\-?\d*\.?\d*?\w*)(,|\s)(\-?\d*\.?\d*?\w*)(,|\s)(\-?\d*\.?\d*?\w*)\s*\)$/";
+ private $rsplitter = "/(^|(?<!\\\)\s)([^\/ ]+)\/([^\/ ]+)((?<!\\\)\s|$)/";
+ private $rfilter = "/[\"']?PROGID\\\?:DXImageTransform\\\?.Microsoft\\\?.Alpha\(Opacity\\\?=(\d+\\\?\.?\d*)\)[\"']?/i";
+ private $rspace = "/(?<!\\\)\s/";
+ private $rslash = "/(?<!\\\)\//";
+ private $weights = array(
+ "normal" => 400,
+ "bold" => 700,
+ );
+
+ /**
+ * Stash a reference to the controller on each instantiation
+ *
+ * @param (class) control: CSSCompression Controller
+ */
+ public function __construct( CSSCompression_Control $control ) {
+ $this->Control = $control;
+ $this->Numeric = $control->Numeric;
+ $this->Color = $control->Color;
+ $this->options = &$control->Option->options;
+ }
+
+ /**
+ * Runs special unit/directional compressions
+ *
+ * @param (string) prop: CSS Property
+ * @param (string) val: Value of CSS Property
+ */
+ public function individuals( $prop, $val ) {
+ // Properties should always be lowercase
+ $prop = strtolower( $prop );
+
+ // Split up each definiton for color and numeric compressions
+ $parts = preg_split( $this->rspace, $val );
+ foreach ( $parts as &$v ) {
+ if ( ! $v || $v == '' ) {
+ continue;
+ }
+
+ // Remove uneeded decimals/units
+ if ( $this->options['format-units'] ) {
+ $v = $this->Numeric->numeric( $v );
+ }
+
+ // Color compression
+ $v = $this->Color->color( $v );
+ }
+ $val = trim( implode( ' ', $parts ) );
+
+ // Special border radius handling
+ if ( preg_match( $this->rborderradius, $prop ) ) {
+ $val = $this->borderRadius( $prop, $val );
+ }
+ // Remove uneeded side definitions if possible
+ else if ( $this->options['directional-compress'] && count( $parts ) > 1 && preg_match( $this->rdirectional, $prop ) ) {
+ $val = $this->directionals( strtolower( $val ) );
+ }
+
+ // Font-weight converter
+ if ( $this->options['fontweight2num'] && ( $prop == 'font-weight' || $prop == 'font' ) ) {
+ $val = $this->fontweight( $val );
+ }
+
+ // Special font value conversions
+ if ( $prop == 'font' ) {
+ $val = $this->font( $val );
+ }
+
+ // Special clip value compressions
+ if ( $prop == 'clip' ) {
+ $val = $this->clip( $val );
+ }
+
+ // None to 0 converter
+ $val = $this->none( $prop, $val );
+
+ // MSIE Filters
+ $val = $this->filter( $prop, $val );
+
+ // Return for list retrival
+ return array($prop, $val);
+ }
+
+ /**
+ * Preps border radius for directional compression
+ *
+ * @param (string) prop: Property Declaration
+ * @param (string) val: Declaration Value
+ */
+ private function borderRadius( $prop, $val ) {
+ if ( preg_match( $this->rslash, $val ) ) {
+ $parts = preg_split( $this->rslash, $val, 2 );
+ // We have to redo numeric compression because the slash may hav intruded
+ foreach ( $parts as &$row ) {
+ $p = preg_split( $this->rspace, $row );
+ foreach ( $p as &$v ) {
+ if ( ! $v || $v == '' ) {
+ continue;
+ }
+
+ // Remove uneeded decimals/units
+ if ( $this->options['format-units'] ) {
+ $v = $this->Numeric->numeric( $v );
+ }
+ }
+ $row = implode( ' ', $p );
+ if ( $this->options['directional-compress'] ) {
+ $row = $this->directionals( strtolower( $row ) );
+ }
+ }
+ $val = implode( '/', $parts );
+ }
+ else if ( $this->options['directional-compress'] && preg_match( $this->rradiusfull, $prop ) ) {
+ $val = $this->directionals( strtolower( $val ) );
+ }
+
+ return $val;
+ }
+
+ /**
+ * Finds directional compression on methods like margin/padding
+ *
+ * @param (string) val: Value of CSS Property
+ */
+ private function directionals( $val ) {
+ // Split up each definiton
+ $direction = preg_split( $this->rspace, $val );
+
+ // 4 Direction reduction
+ $count = count( $direction );
+ if ( $count == 4 ) {
+ // All 4 sides are the same, combine into 1 definition
+ if ( $direction[0] == $direction[1] && $direction[2] == $direction[3] && $direction[0] == $direction[3] ) {
+ $direction = array($direction[0]);
+ }
+ // top-bottom/left-right are the same, reduce definition
+ else if ( $direction[0] == $direction[2] && $direction[1] == $direction[3] ) {
+ $direction = array($direction[0], $direction[1]);
+ }
+ // Only left-right are the same
+ else if ( $direction[1] == $direction[3] ) {
+ $direction = array($direction[0], $direction[1], $direction[2]);
+ }
+ }
+ // 3 Direction reduction
+ else if ( $count == 3 ) {
+ // All directions are the same
+ if ( $direction[0] == $direction[1] && $direction[1] == $direction[2] ) {
+ $direction = array($direction[0]);
+ }
+ // Only top(first) and bottom(last) are the same
+ else if ( $direction[0] == $direction[2] ) {
+ $direction = array($direction[0], $direction[1]);
+ }
+ }
+ // 2 Direction reduction
+ // Both directions are the same, combine into single definition
+ else if ( $count == 2 && $direction[0] == $direction[1] ) {
+ $direction = array($direction[0]);
+ }
+
+ // Return the combined version of the directions
+ // Single entries will just return
+ return implode( ' ', $direction );
+ }
+
+ /**
+ * Converts font-weight names to numbers
+ *
+ * @param (string) val: font-weight prop value
+ */
+ private function fontweight( $val ) {
+ if ( preg_match( $this->rspace, $val ) ) {
+ $parts = preg_split( $this->rspace, $val );
+ foreach ( $parts as &$item ) {
+ $lower = strtolower( $item );
+ if ( isset( $this->weights[$lower] ) && $lower != 'normal' ) {
+ $item = $this->weights[$lower];
+ }
+ }
+ $val = implode( ' ', $parts );
+ }
+ else if ( isset( $this->weights[strtolower( $val )] ) ) {
+ $val = $this->weights[strtolower( $val )];
+ }
+
+ return $val;
+ }
+
+ /**
+ * Special font conversions
+ *
+ * @param (string) val: property value
+ */
+ private function font( $val ) {
+ // Split out the font-size/line-height split and run through numerical handlers
+ if ( preg_match( $this->rsplitter, $val, $match, PREG_OFFSET_CAPTURE ) ) {
+ $size = $this->Numeric->numeric( $match[2][0] );
+ $height = $this->Numeric->numeric( $match[3][0] );
+ $concat = $match[1][0] . $size . '/' . $height . $match[4][0];
+ $val = substr_replace( $val, $concat, $match[0][1], strlen( $match[0][0] ) );
+ }
+
+ return $val;
+ }
+
+ /**
+ * Special clip conversions
+ *
+ * @param (string) val: property value
+ */
+ private function clip( $val ) {
+ if ( preg_match( $this->rclip, $val, $match ) ) {
+ $positions = array(1, 3, 5, 7);
+ $clean = 'rect(';
+ foreach ( $positions as $pos ) {
+ if ( ! isset( $match[$pos] ) ) {
+ return $val;
+ }
+
+ $clean .= $this->Numeric->numeric( $match[$pos] ) . ( isset( $match[$pos + 1] ) ? $match[$pos + 1] : '' );
+ }
+ $val = $clean . ')';
+ }
+
+ return $val;
+ }
+
+ /**
+ * Convert none vals to 0
+ *
+ * @param (string) prop: Current Property
+ * @param (string) val: property value
+ */
+ private function none( $prop, $val ) {
+ if ( preg_match( $this->rnoneprop, $prop ) && $val == 'none' ) {
+ $val = '0';
+ }
+
+ return $val;
+ }
+
+ /**
+ * MSIE Filter Conversion
+ *
+ * @param (string) prop: Current Property
+ * @param (string) val: property value
+ */
+ private function filter( $prop, $val ) {
+ if ( preg_match( "/filter/", $prop ) ) {
+ $val = preg_replace( $this->rfilter, "alpha(opacity=$1)", $val );
+ }
+
+ return $val;
+ }
+
+ /**
+ * Access to private methods for testing
+ *
+ * @param (string) method: Method to be called
+ * @param (array) args: Array of paramters to be passed in
+ */
+ public function access( $method, $args ) {
+ if ( method_exists( $this, $method ) ) {
+ return call_user_func_array( array($this, $method), $args );
+ }
+ else {
+ throw new CSSCompression_Exception( "Unknown method in Individuals Class - " . $method );
+ }
+ }
+}
diff -up -r advagg_css_compress/css-compressor-3.x/src/lib/Numeric.inc advagg_css_compress/css-compressor-3.x/src/lib/Numeric.inc
--- advagg_css_compress/css-compressor-3.x/src/lib/Numeric.inc 2012-03-23 12:08:13.000000000 -0600
+++ advagg_css_compress/css-compressor-3.x/src/lib/Numeric.inc 2012-03-23 13:02:19.000000000 -0600
@@ -5,97 +5,96 @@
* Corey Hart @ http://www.codenothing.com
*/
-Class CSSCompression_Numeric
-{
- /**
- * Numeric Patterns
- *
- * @class Control: Compression Controller
- * @param (array) options: Reference to options
- * @param (regex) rdecimal: Checks for zero decimal
- * @param (regex) rzero: Checks for preceding 0 to decimal unit
- * @param (regex) runit: Checks for suffix on 0 unit
- */
- private $Control;
- private $options = array();
- private $rdecimal = "/^(\+|\-)?(\d*\.[1-9]*0*)(\%|[a-z]{2})$/i";
- private $rzero = "/^(\+|\-)?0(\.\d+)(\%|[a-z]{2})?$/i";
- private $runit = "/^0(\%|[a-z]{2})$/i";
-
- /**
- * Stash a reference to the controller on each instantiation
- *
- * @param (class) control: CSSCompression Controller
- */
- public function __construct( CSSCompression_Control $control ) {
- $this->Control = $control;
- $this->options = &$control->Option->options;
- }
-
- /**
- * Runs all numeric operations
- *
- * @param (string) str: Unit string
- */
- public function numeric( $str ) {
- $str = $this->decimal( $str );
- $str = $this->zeroes( $str );
- $str = $this->units( $str );
- return $str;
- }
-
- /**
- * Remove's unecessary decimal, ie 13.0px => 13px
- *
- * @param (string) str: Unit string
- */
- private function decimal( $str ) {
- if ( preg_match( $this->rdecimal, $str, $match ) ) {
- $str = ( $match[ 1 ] == '-' ? '-' : '' ) . floatval( $match[ 2 ] ) . $match[ 3 ];
- }
-
- return $str;
- }
-
- /**
- * Removes suffix from 0 unit, ie 0px; => 0;
- *
- * @param (string) str: Unit string
- */
- private function units( $str ) {
- if ( preg_match( $this->runit, $str, $match ) ) {
- $str = '0';
- }
-
- return $str;
- }
-
-
- /**
- * Removes leading zero in decimal, ie 0.33px => .33px
- *
- * @param (string) str: Unit string
- */
- private function zeroes( $str ) {
- if ( preg_match( $this->rzero, $str, $match ) ) {
- $str = ( isset( $match[ 1 ] ) && $match[ 1 ] == '-' ? '-' : '' ) . $match[ 2 ] . ( isset( $match[ 3 ] ) ? $match[ 3 ] : '' );
- }
-
- return $str;
- }
-
- /**
- * Access to private methods for testing
- *
- * @param (string) method: Method to be called
- * @param (array) args: Array of paramters to be passed in
- */
- public function access( $method, $args ) {
- if ( method_exists( $this, $method ) ) {
- return call_user_func_array( array( $this, $method ), $args );
- }
- else {
- throw new CSSCompression_Exception( "Unknown method in Numeric Class - " . $method );
- }
- }
-};
+class CSSCompression_Numeric {
+ /**
+ * Numeric Patterns
+ *
+ * @class Control: Compression Controller
+ * @param (array) options: Reference to options
+ * @param (regex) rdecimal: Checks for zero decimal
+ * @param (regex) rzero: Checks for preceding 0 to decimal unit
+ * @param (regex) runit: Checks for suffix on 0 unit
+ */
+ private $Control;
+ private $options = array();
+ private $rdecimal = "/^(\+|\-)?(\d*\.[1-9]*0*)(\%|[a-z]{2})$/i";
+ private $rzero = "/^(\+|\-)?0(\.\d+)(\%|[a-z]{2})?$/i";
+ private $runit = "/^0(\%|[a-z]{2})$/i";
+
+ /**
+ * Stash a reference to the controller on each instantiation
+ *
+ * @param (class) control: CSSCompression Controller
+ */
+ public function __construct( CSSCompression_Control $control ) {
+ $this->Control = $control;
+ $this->options = &$control->Option->options;
+ }
+
+ /**
+ * Runs all numeric operations
+ *
+ * @param (string) str: Unit string
+ */
+ public function numeric( $str ) {
+ $str = $this->decimal( $str );
+ $str = $this->zeroes( $str );
+ $str = $this->units( $str );
+ return $str;
+ }
+
+ /**
+ * Remove's unecessary decimal, ie 13.0px => 13px
+ *
+ * @param (string) str: Unit string
+ */
+ private function decimal( $str ) {
+ if ( preg_match( $this->rdecimal, $str, $match ) ) {
+ $str = ( $match[1] == '-' ? '-' : '' ) . floatval( $match[2] ) . $match[3];
+ }
+
+ return $str;
+ }
+
+ /**
+ * Removes suffix from 0 unit, ie 0px; => 0;
+ *
+ * @param (string) str: Unit string
+ */
+ private function units( $str ) {
+ if ( preg_match( $this->runit, $str, $match ) ) {
+ $str = '0';
+ }
+
+ return $str;
+ }
+
+
+ /**
+ * Removes leading zero in decimal, ie 0.33px => .33px
+ *
+ * @param (string) str: Unit string
+ */
+ private function zeroes( $str ) {
+ if ( preg_match( $this->rzero, $str, $match ) ) {
+ $str = ( isset( $match[1] ) && $match[1] == '-' ? '-' : '' ) . $match[2] . ( isset( $match[3] ) ? $match[3] : '' );
+ }
+
+ return $str;
+ }
+
+ /**
+ * Access to private methods for testing
+ *
+ * @param (string) method: Method to be called
+ * @param (array) args: Array of paramters to be passed in
+ */
+ public function access( $method, $args ) {
+ if ( method_exists( $this, $method ) ) {
+ return call_user_func_array( array($this, $method), $args );
+ }
+ else {
+ throw new CSSCompression_Exception( "Unknown method in Numeric Class - " . $method );
+ }
+ }
+}
diff -up -r advagg_css_compress/css-compressor-3.x/src/lib/Option.inc advagg_css_compress/css-compressor-3.x/src/lib/Option.inc
--- advagg_css_compress/css-compressor-3.x/src/lib/Option.inc 2012-03-23 12:08:13.000000000 -0600
+++ advagg_css_compress/css-compressor-3.x/src/lib/Option.inc 2012-03-23 13:02:19.000000000 -0600
@@ -5,127 +5,126 @@
* Corey Hart @ http://www.codenothing.com
*/
-Class CSSCompression_Option
-{
- /**
- * Option Patterns
- *
- * @class Control: Compression Controller
- * @param (string) custom: Name of the custom mode
- * @param (array) options: Instance settings
- */
- private $Control;
- private $custom = '__custom';
- public $options = array();
-
- /**
- * Stash a reference to the controller on each instantiation
- *
- * @param (class) control: CSSCompression Controller
- */
- public function __construct( CSSCompression_Control $control ) {
- $this->Control = $control;
- $this->options = CSSCompression::$defaults;
- $control->mode = $this->custom;
- }
-
- /**
- * Maintainable access to the options array
- *
- * - Passing no arguments returns the entire options array
- * - Passing a single name argument returns the value for the option
- * - Passing both a name and value, sets the value to the name key, and returns the value
- * - Passing an array will merge the options with the array passed, for object like extension
- *
- * @param (mixed) name: The key name of the option
- * @param (mixed) value: Value to set the option
- */
- public function option( $name = NULL, $value = NULL ) {
- if ( $name === NULL ) {
- return $this->options;
- }
- else if ( is_array( $name ) ) {
- return $this->merge( $name );
- }
- else if ( $value === NULL ) {
- return isset( $this->options[ $name ] ) ? $this->options[ $name ] : NULL;
- }
- else {
- // Readability doesn't signify custom settings
- if ( $name != 'readability' ) {
- $this->Control->mode = $this->custom;
- }
-
- return ( $this->options[ $name ] = $value );
- }
- }
-
- /**
- * Reset's the default options
- *
- * @params none;
- */
- public function reset(){
- // Reset and return the new options
- return $this->options = CSSCompression::$defaults;
- }
-
- /**
- * Extend like function to merge an array of preferences into
- * the options array.
- *
- * @param (mixed) options: Array of preferences to merge into options
- */
- public function merge( $options = array() ) {
- $modes = CSSCompression::modes();
- if ( $options && is_array( $options ) && count( $options ) ) {
- $this->Control->mode = $this->custom;
- foreach ( $this->options as $key => $value ) {
- if ( ! isset( $options[ $key ] ) ) {
- continue;
- }
- else if ( strtolower( $options[ $key ] ) == 'on' ) {
- $this->options[ $key ] = true;
- }
- else if ( strtolower( $options[ $key ] ) == 'off' ) {
- $this->options[ $key ] = false;
- }
- else {
- $this->options[ $key ] = intval( $options[ $key ] );
- }
- }
- }
- else if ( $options && is_string( $options ) && array_key_exists( $options, $modes ) ) {
- $this->Control->mode = $options;
-
- // Default all to true, the mode has to force false
- foreach ( $this->options as $key => $value ) {
- if ( $key != 'readability' ) {
- $this->options[ $key ] = true;
- }
- }
-
- // Merge mode into options
- foreach ( $modes[ $options ] as $key => $value ) {
- $this->options[ $key ] = $value;
- }
- }
-
- return $this->options;
- }
-
- /**
- * Access to private methods for testing
- *
- * @param (string) method: Method to be called
- * @param (array) args: Array of paramters to be passed in
- */
- public function access( $method, $args ) {
- if ( method_exists( $this, $method ) ) {
- return call_user_func_array( array( $this, $method ), $args );
- }
- else {
- throw new CSSCompression_Exception( "Unknown method in Option Class - " . $method );
- }
- }
-};
+class CSSCompression_Option {
+ /**
+ * Option Patterns
+ *
+ * @class Control: Compression Controller
+ * @param (string) custom: Name of the custom mode
+ * @param (array) options: Instance settings
+ */
+ private $Control;
+ private $custom = '__custom';
+ public $options = array();
+
+ /**
+ * Stash a reference to the controller on each instantiation
+ *
+ * @param (class) control: CSSCompression Controller
+ */
+ public function __construct( CSSCompression_Control $control ) {
+ $this->Control = $control;
+ $this->options = CSSCompression::$defaults;
+ $control->mode = $this->custom;
+ }
+
+ /**
+ * Maintainable access to the options array
+ *
+ * - Passing no arguments returns the entire options array
+ * - Passing a single name argument returns the value for the option
+ * - Passing both a name and value, sets the value to the name key, and returns the value
+ * - Passing an array will merge the options with the array passed, for object like extension
+ *
+ * @param (mixed) name: The key name of the option
+ * @param (mixed) value: Value to set the option
+ */
+ public function option( $name = NULL, $value = NULL ) {
+ if ( $name === NULL ) {
+ return $this->options;
+ }
+ else if ( is_array( $name ) ) {
+ return $this->merge( $name );
+ }
+ else if ( $value === NULL ) {
+ return isset( $this->options[$name] ) ? $this->options[$name] : NULL;
+ }
+ else {
+ // Readability doesn't signify custom settings
+ if ( $name != 'readability' ) {
+ $this->Control->mode = $this->custom;
+ }
+
+ return ( $this->options[$name] = $value );
+ }
+ }
+
+ /**
+ * Reset's the default options
+ *
+ * @params none;
+ */
+ public function reset() {
+ // Reset and return the new options
+ return $this->options = CSSCompression::$defaults;
+ }
+
+ /**
+ * Extend like function to merge an array of preferences into
+ * the options array.
+ *
+ * @param (mixed) options: Array of preferences to merge into options
+ */
+ public function merge( $options = array() ) {
+ $modes = CSSCompression::modes();
+ if ( $options && is_array( $options ) && count( $options ) ) {
+ $this->Control->mode = $this->custom;
+ foreach ( $this->options as $key => $value ) {
+ if ( ! isset( $options[$key] ) ) {
+ continue;
+ }
+ else if ( strtolower( $options[$key] ) == 'on' ) {
+ $this->options[$key] = true;
+ }
+ else if ( strtolower( $options[$key] ) == 'off' ) {
+ $this->options[$key] = false;
+ }
+ else {
+ $this->options[$key] = intval( $options[$key] );
+ }
+ }
+ }
+ else if ( $options && is_string( $options ) && array_key_exists( $options, $modes ) ) {
+ $this->Control->mode = $options;
+
+ // Default all to true, the mode has to force false
+ foreach ( $this->options as $key => $value ) {
+ if ( $key != 'readability' ) {
+ $this->options[$key] = true;
+ }
+ }
+
+ // Merge mode into options
+ foreach ( $modes[$options] as $key => $value ) {
+ $this->options[$key] = $value;
+ }
+ }
+
+ return $this->options;
+ }
+
+ /**
+ * Access to private methods for testing
+ *
+ * @param (string) method: Method to be called
+ * @param (array) args: Array of paramters to be passed in
+ */
+ public function access( $method, $args ) {
+ if ( method_exists( $this, $method ) ) {
+ return call_user_func_array( array($this, $method), $args );
+ }
+ else {
+ throw new CSSCompression_Exception( "Unknown method in Option Class - " . $method );
+ }
+ }
+}
diff -up -r advagg_css_compress/css-compressor-3.x/src/lib/Organize.inc advagg_css_compress/css-compressor-3.x/src/lib/Organize.inc
--- advagg_css_compress/css-compressor-3.x/src/lib/Organize.inc 2012-03-23 12:08:13.000000000 -0600
+++ advagg_css_compress/css-compressor-3.x/src/lib/Organize.inc 2012-03-23 13:02:19.000000000 -0600
@@ -5,143 +5,142 @@
* Corey Hart @ http://www.codenothing.com
*/
-Class CSSCompression_Organize
-{
- /**
- * Organize Patterns
- *
- * @class Control: Compression Controller
- * @param (array) options: Reference to options
- * @param (regex) rsemicolon: Checks for semicolon without an escape '\' character before it
- * @param (regex) rlastsemi: Checks for semicolon at the end of the string
- */
- private $Control;
- private $options = array();
- private $rsemicolon = "/(?<!\\\);/";
- private $rlastsemi = "/(?<!\\\);$/";
-
- /**
- * Stash a reference to the controller on each instantiation
- *
- * @param (class) control: CSSCompression Controller
- */
- public function __construct( CSSCompression_Control $control ) {
- $this->Control = $control;
- $this->options = &$control->Option->options;
- }
-
- /**
- * Look to see if we can combine selectors to reduce the number
- * of definitions.
- *
- * @param (array) selectors: Array of selectors, map directly to details
- * @param (array) details: Array of rule sets, map directly to selectors
- */
- public function organize( &$selectors = array(), &$details = array() ) {
- // Combining defns based on similar selectors
- list ( $selectors, $details ) = $this->reduceSelectors( $selectors, $details );
-
- // Combining defns based on similar details
- list ( $selectors, $details ) = $this->reduceDetails( $selectors, $details );
-
- // Return in package form
- return array( $selectors, $details );
- }
-
- /**
- * Combines multiply defined selectors by merging the rule sets,
- * latter declarations overide declaratins at top of file
- *
- * @param (array) selectors: Array of selectors broken down by setup
- * @param (array) details: Array of rule sets broken down by setup
- */
- private function reduceSelectors( $selectors, $details ) {
- $keys = array_keys( $selectors );
- $max = array_pop( $keys ) + 1;
-
- for ( $i = 0; $i < $max; $i++ ) {
- if ( ! isset( $selectors[ $i ] ) ) {
- continue;
- }
-
- for ( $k = $i + 1; $k < $max; $k++ ) {
- if ( ! isset( $selectors[ $k ] ) ) {
- continue;
- }
-
- if ( $selectors[ $i ] == $selectors[ $k ] ) {
- // Prevent noticies
- if ( ! isset( $details[ $i ] ) ) {
- $details[ $i ] = '';
- }
- if ( ! isset( $details[ $k ] ) ) {
- $details[ $k ] = '';
- }
-
- // We kill the last semicolon before organization, so account for that.
- if ( $details[ $i ] != '' && $details[ $k ] != '' && ! preg_match( $this->rlastsemi, $details[ $i ] ) ) {
- $details[ $i ] .= ';' . $details[ $k ];
- }
- else {
- $details[ $i ] .= $details[ $k ];
- }
-
- // Remove the second part
- unset( $selectors[ $k ], $details[ $k ] );
- }
- }
- }
-
- return array( $selectors, $details );
- }
-
- /**
- * Combines multiply defined rule sets by merging the selectors
- * in comma seperated format
- *
- * @param (array) selectors: Array of selectors broken down by setup
- * @param (array) details: Array of rule sets broken down by setup
- */
- private function reduceDetails( $selectors, $details ) {
- $keys = array_keys( $selectors );
- $max = array_pop( $keys ) + 1;
- for ( $i = 0; $i < $max; $i++ ) {
- if ( ! isset( $selectors[ $i ] ) ) {
- continue;
- }
-
- $arr = preg_split( $this->rsemicolon, isset( $details[ $i ] ) ? $details[ $i ] : '' );
- for ( $k = $i + 1; $k < $max; $k++ ) {
- if ( ! isset( $selectors[ $k ] ) ) {
- continue;
- }
-
- $match = preg_split( $this->rsemicolon, isset( $details[ $k ] ) ? $details[ $k ] : '' );
- $x = array_diff( $arr, $match );
- $y = array_diff( $match, $arr );
-
- if ( count( $x ) < 1 && count( $y ) < 1 ) {
- $selectors[ $i ] .= ',' . $selectors[ $k ];
- unset( $details[ $k ], $selectors[ $k ] );
- }
- }
- }
-
- return array( $selectors, $details );
- }
-
- /**
- * Access to private methods for testing
- *
- * @param (string) method: Method to be called
- * @param (array) args: Array of paramters to be passed in
- */
- public function access( $method, $args ) {
- if ( method_exists( $this, $method ) ) {
- return call_user_func_array( array( $this, $method ), $args );
- }
- else {
- throw new CSSCompression_Exception( "Unknown method in Organize Class - " . $method );
- }
- }
-};
+class CSSCompression_Organize {
+ /**
+ * Organize Patterns
+ *
+ * @class Control: Compression Controller
+ * @param (array) options: Reference to options
+ * @param (regex) rsemicolon: Checks for semicolon without an escape '\' character before it
+ * @param (regex) rlastsemi: Checks for semicolon at the end of the string
+ */
+ private $Control;
+ private $options = array();
+ private $rsemicolon = "/(?<!\\\);/";
+ private $rlastsemi = "/(?<!\\\);$/";
+
+ /**
+ * Stash a reference to the controller on each instantiation
+ *
+ * @param (class) control: CSSCompression Controller
+ */
+ public function __construct( CSSCompression_Control $control ) {
+ $this->Control = $control;
+ $this->options = &$control->Option->options;
+ }
+
+ /**
+ * Look to see if we can combine selectors to reduce the number
+ * of definitions.
+ *
+ * @param (array) selectors: Array of selectors, map directly to details
+ * @param (array) details: Array of rule sets, map directly to selectors
+ */
+ public function organize( &$selectors = array(), &$details = array() ) {
+ // Combining defns based on similar selectors
+ list( $selectors, $details ) = $this->reduceSelectors( $selectors, $details );
+
+ // Combining defns based on similar details
+ list( $selectors, $details ) = $this->reduceDetails( $selectors, $details );
+
+ // Return in package form
+ return array($selectors, $details);
+ }
+
+ /**
+ * Combines multiply defined selectors by merging the rule sets,
+ * latter declarations overide declaratins at top of file
+ *
+ * @param (array) selectors: Array of selectors broken down by setup
+ * @param (array) details: Array of rule sets broken down by setup
+ */
+ private function reduceSelectors( $selectors, $details ) {
+ $keys = array_keys( $selectors );
+ $max = array_pop( $keys ) + 1;
+
+ for ( $i = 0; $i < $max; $i++ ) {
+ if ( ! isset( $selectors[$i] ) ) {
+ continue;
+ }
+
+ for ( $k = $i + 1; $k < $max; $k++ ) {
+ if ( ! isset( $selectors[$k] ) ) {
+ continue;
+ }
+
+ if ( $selectors[$i] == $selectors[$k] ) {
+ // Prevent noticies
+ if ( ! isset( $details[$i] ) ) {
+ $details[$i] = '';
+ }
+ if ( ! isset( $details[$k] ) ) {
+ $details[$k] = '';
+ }
+
+ // We kill the last semicolon before organization, so account for that.
+ if ( $details[$i] != '' && $details[$k] != '' && ! preg_match( $this->rlastsemi, $details[$i] ) ) {
+ $details[$i] .= ';' . $details[$k];
+ }
+ else {
+ $details[$i] .= $details[$k];
+ }
+
+ // Remove the second part
+ unset( $selectors[$k], $details[$k] );
+ }
+ }
+ }
+
+ return array($selectors, $details);
+ }
+
+ /**
+ * Combines multiply defined rule sets by merging the selectors
+ * in comma seperated format
+ *
+ * @param (array) selectors: Array of selectors broken down by setup
+ * @param (array) details: Array of rule sets broken down by setup
+ */
+ private function reduceDetails( $selectors, $details ) {
+ $keys = array_keys( $selectors );
+ $max = array_pop( $keys ) + 1;
+ for ( $i = 0; $i < $max; $i++ ) {
+ if ( ! isset( $selectors[$i] ) ) {
+ continue;
+ }
+
+ $arr = preg_split( $this->rsemicolon, isset( $details[$i] ) ? $details[$i] : '' );
+ for ( $k = $i + 1; $k < $max; $k++ ) {
+ if ( ! isset( $selectors[$k] ) ) {
+ continue;
+ }
+
+ $match = preg_split( $this->rsemicolon, isset( $details[$k] ) ? $details[$k] : '' );
+ $x = array_diff( $arr, $match );
+ $y = array_diff( $match, $arr );
+
+ if ( count( $x ) < 1 && count( $y ) < 1 ) {
+ $selectors[$i] .= ',' . $selectors[$k];
+ unset( $details[$k], $selectors[$k] );
+ }
+ }
+ }
+
+ return array($selectors, $details);
+ }
+
+ /**
+ * Access to private methods for testing
+ *
+ * @param (string) method: Method to be called
+ * @param (array) args: Array of paramters to be passed in
+ */
+ public function access( $method, $args ) {
+ if ( method_exists( $this, $method ) ) {
+ return call_user_func_array( array($this, $method), $args );
+ }
+ else {
+ throw new CSSCompression_Exception( "Unknown method in Organize Class - " . $method );
+ }
+ }
+}
diff -up -r advagg_css_compress/css-compressor-3.x/src/lib/Selectors.inc advagg_css_compress/css-compressor-3.x/src/lib/Selectors.inc
--- advagg_css_compress/css-compressor-3.x/src/lib/Selectors.inc 2012-03-23 12:08:13.000000000 -0600
+++ advagg_css_compress/css-compressor-3.x/src/lib/Selectors.inc 2012-03-23 13:02:19.000000000 -0600
@@ -5,239 +5,238 @@
* Corey Hart @ http://www.codenothing.com
*/
-Class CSSCompression_Selectors
-{
- /**
- * Selector patterns
- *
- * @class Control: Compression Controller
- * @param (string) token: Copy of the injection token
- * @param (regex) ridattr: ID Attribute matcher (combined with token)
- * @param (regex) rclassattr: class Attribute matcher (combined with token)
- * @param (array) options: Reference to options
- * @param (regex) rmark: Stop points during selector parsing
- * @param (regex) ridclassend: End of a id/class string
- * @param (regex) rescapedspace: for replacement in class attributes
- * @param (regex) rquote: Checks for the next quote character
- * @param (regex) rcomma: looks for an unescaped comma character
- * @param (regex) rspace: looks for an unescaped space character
- * @param (regex) rid: looks for an unescaped hash character
- * @param (regex) rpseudo: Add space after first-letter|line pseudo selector
- * --- when it occurs before comma or rule set
- */
- private $Control;
- private $token = '';
- private $ridattr = "";
- private $rclassattr = "";
- private $options = array();
- private $rmark = "/(?<!\\\)(#|\.|=)/";
- private $ridclassend = "/(?<!\\\)[:#>~\[\+\*\. ]/";
- private $rquote = "/(?<!\\\)(\"|')?\]/";
- private $rescapedspace = "/\\\ /";
- private $rcomma = "/(?<!\\\),/";
- private $rspace = "/(?<!\\\)\s/";
- private $rid = "/(?<!\\\)#/";
- private $rpseudo = "/:first-(letter|line)(,|$)/i";
-
- /**
- * Stash a reference to the controller on each instantiation
- *
- * @param (class) control: CSSCompression Controller
- */
- public function __construct( CSSCompression_Control $control ) {
- $this->Control = $control;
- $this->token = CSSCompression::TOKEN;
- $this->ridattr = "/\[id=$this->token(.*?)$this->token\]/";
- $this->rclassattr = "/\[class=$this->token(.*?)$this->token\]/";
- $this->options = &$control->Option->options;
- }
-
- /**
- * Selector specific optimizations
- *
- * @param (array) selectors: Array of selectors
- */
- public function selectors( &$selectors = array() ) {
- foreach ( $selectors as &$selector ) {
- // Auto ignore sections
- if ( strpos( $selector, $this->token ) === 0 ) {
- continue;
- }
-
- // Smart casing and token injection
- $selector = $this->parse( $selector );
-
- // Converting attr to shorthanded selectors
- if ( $this->options['attr2selector'] ) {
- // Use id hash instead of id attr
- $selector = $this->idAttribute( $selector );
-
- // Use class notation instead of class attr
- $selector = $this->classAttribute( $selector );
- }
-
- // Remove everything before final id in a selector
- if ( $this->options['strict-id'] ) {
- $selector = $this->strictid( $selector );
- }
-
- // Get rid of possible repeated selectors
- $selector = $this->repeats( $selector );
-
- // Add space after pseudo selectors (so ie6 doesn't complain)
- if ( $this->options['pseudo-space'] ) {
- $selector = $this->pseudoSpace( $selector );
- }
- }
-
- return $selectors;
- }
-
- /**
- * Converts selectors like BODY => body, DIV => div
- * and injects tokens wrappers for attribute values
- *
- * @param (string) selector: CSS Selector
- */
- private function parse( $selector ) {
- $clean = '';
- $substr = '';
- $pos = 0;
-
- while ( preg_match( $this->rmark, $selector, $match, PREG_OFFSET_CAPTURE, $pos ) ) {
- $substr = substr( $selector, $pos, $match[ 0 ][ 1 ] + 1 - $pos );
- $clean .= $this->options['lowercase-selectors'] ? strtolower( $substr ) : $substr;
- $pos = $match[ 0 ][ 1 ] + strlen( $match[ 1 ][ 0 ] );
-
- // Class or id match
- if ( $match[ 1 ][ 0 ] == '#' || $match[ 1 ][ 0 ] == '.' ) {
- if ( preg_match( $this->ridclassend, $selector, $m, PREG_OFFSET_CAPTURE, $pos ) ) {
- $clean .= substr( $selector, $pos, $m[ 0 ][ 1 ] - $pos );
- $pos = $m[ 0 ][ 1 ];
- }
- else {
- $clean .= substr( $selector, $pos );
- $pos = strlen( $selector );
- break;
- }
- }
- // Start of a string
- else if ( preg_match( $this->rquote, $selector, $m, PREG_OFFSET_CAPTURE, $pos ) ) {
- if ( $selector[ $pos ] == "\"" || $selector[ $pos ] == "'" ) {
- $pos++;
- }
- $clean .= $this->token . substr( $selector, $pos, $m[ 0 ][ 1 ] - $pos ) . $this->token . ']';
- $pos = $m[ 0 ][ 1 ] + strlen( $m[ 0 ][ 0 ] );
- }
- // No break points left
- else {
- $clean .= substr( $selector, $pos );
- $pos = strlen( $selector );
- break;
- }
- }
-
- return $clean . ( $this->options['lowercase-selectors'] ? strtolower( substr( $selector, $pos ) ) : substr( $selector, $pos ) );
- }
-
- /**
- * Convert [id=blah] attribute selectors into id form selector (#blah)
- *
- * @param (string) selector: CSS Selector
- */
- private function idAttribute( $selector ) {
- $pos = 0;
- while ( preg_match( $this->ridattr, $selector, $match, PREG_OFFSET_CAPTURE, $pos ) ) {
- // Don't convert if space found (not valid hash selector)
- if ( strpos( $match[ 1 ][ 0 ], ' ' ) !== false ) {
- $pos = $match[ 0 ][ 1 ] + strlen( $match[ 0 ][ 0 ] );
- continue;
- }
-
- $selector = substr_replace( $selector, '#' . $match[ 1 ][ 0 ], $match[ 0 ][ 1 ], strlen( $match[ 0 ][ 0 ] ) );
- $pos = $match[ 0 ][ 1 ] + strlen( $match[ 1 ][ 0 ] ) + 1;
- }
-
- return $selector;
- }
-
- /**
- * Convert [class=blah] attribute selectors into class form selector (.blah)
- *
- * @param (string) selector: CSS Selector
- */
- private function classAttribute( $selector ) {
- $pos = 0;
- while ( preg_match( $this->rclassattr, $selector, $match, PREG_OFFSET_CAPTURE, $pos ) ) {
- // Don't convert if prescense of dot separator found
- if ( strpos( $match[ 1 ][ 0 ], '.' ) !== false ) {
- $pos = $match[ 0 ][ 1 ] + strlen( $match[ 0 ][ 0 ] );
- continue;
- }
-
- $replace = '.' . preg_replace( $this->rescapedspace, ".", $match[ 1 ][ 0 ] );
- $selector = substr_replace( $selector, $replace, $match[ 0 ][ 1 ], strlen( $match[ 0 ][ 0 ] ) );
- $pos = $match[ 0 ][ 1 ] + strlen( $match[ 1 ][ 0 ] ) + 1;
- }
-
- return $selector;
- }
-
- /**
- * Promotes nested id's to the front of the selector
- *
- * @param (string) selector: CSS Selector
- */
- private function strictid( $selector ) {
- $parts = preg_split( $this->rcomma, $selector );
- foreach ( $parts as &$s ) {
- if ( preg_match( $this->rid, $s ) ) {
- $p = preg_split( $this->rid, $s );
- $s = '#' . array_pop( $p );
- }
- }
-
- return implode( ',', $parts );
- }
-
- /**
- * Removes repeated selectors that have been comma separated
- *
- * @param (string) selector: CSS Selector
- */
- private function repeats( $selector ) {
- $parts = preg_split( $this->rcomma, $selector );
- $parts = array_flip( $parts );
- $parts = array_flip( $parts );
- return implode( ',', $parts );
- }
-
- /**
- * Adds space after pseudo selector for ie6 like a:first-child{ => a:first-child {
- *
- * @param (string) selector: CSS Selector
- */
- private function pseudoSpace( $selector ) {
- return preg_replace( $this->rpseudo, ":first-$1 $2", $selector );
- }
-
- /**
- * Access to private methods for testing
- *
- * @param (string) method: Method to be called
- * @param (array) args: Array of paramters to be passed in
- */
- public function access( $method, $args ) {
- if ( method_exists( $this, $method ) ) {
- if ( $method == 'selectors' ) {
- return $this->selectors( $args[ 0 ] );
- }
- else {
- return call_user_func_array( array( $this, $method ), $args );
- }
- }
- else {
- throw new CSSCompression_Exception( "Unknown method in Selectors Class - " . $method );
- }
- }
-};
+class CSSCompression_Selectors {
+ /**
+ * Selector patterns
+ *
+ * @class Control: Compression Controller
+ * @param (string) token: Copy of the injection token
+ * @param (regex) ridattr: ID Attribute matcher (combined with token)
+ * @param (regex) rclassattr: class Attribute matcher (combined with token)
+ * @param (array) options: Reference to options
+ * @param (regex) rmark: Stop points during selector parsing
+ * @param (regex) ridclassend: End of a id/class string
+ * @param (regex) rescapedspace: for replacement in class attributes
+ * @param (regex) rquote: Checks for the next quote character
+ * @param (regex) rcomma: looks for an unescaped comma character
+ * @param (regex) rspace: looks for an unescaped space character
+ * @param (regex) rid: looks for an unescaped hash character
+ * @param (regex) rpseudo: Add space after first-letter|line pseudo selector
+ * --- when it occurs before comma or rule set
+ */
+ private $Control;
+ private $token = '';
+ private $ridattr = "";
+ private $rclassattr = "";
+ private $options = array();
+ private $rmark = "/(?<!\\\)(#|\.|=)/";
+ private $ridclassend = "/(?<!\\\)[:#>~\[\+\*\. ]/";
+ private $rquote = "/(?<!\\\)(\"|')?\]/";
+ private $rescapedspace = "/\\\ /";
+ private $rcomma = "/(?<!\\\),/";
+ private $rspace = "/(?<!\\\)\s/";
+ private $rid = "/(?<!\\\)#/";
+ private $rpseudo = "/:first-(letter|line)(,|$)/i";
+
+ /**
+ * Stash a reference to the controller on each instantiation
+ *
+ * @param (class) control: CSSCompression Controller
+ */
+ public function __construct( CSSCompression_Control $control ) {
+ $this->Control = $control;
+ $this->token = CSSCompression::TOKEN;
+ $this->ridattr = "/\[id=$this->token(.*?)$this->token\]/";
+ $this->rclassattr = "/\[class=$this->token(.*?)$this->token\]/";
+ $this->options = &$control->Option->options;
+ }
+
+ /**
+ * Selector specific optimizations
+ *
+ * @param (array) selectors: Array of selectors
+ */
+ public function selectors( &$selectors = array() ) {
+ foreach ( $selectors as &$selector ) {
+ // Auto ignore sections
+ if ( strpos( $selector, $this->token ) === 0 ) {
+ continue;
+ }
+
+ // Smart casing and token injection
+ $selector = $this->parse( $selector );
+
+ // Converting attr to shorthanded selectors
+ if ( $this->options['attr2selector'] ) {
+ // Use id hash instead of id attr
+ $selector = $this->idAttribute( $selector );
+
+ // Use class notation instead of class attr
+ $selector = $this->classAttribute( $selector );
+ }
+
+ // Remove everything before final id in a selector
+ if ( $this->options['strict-id'] ) {
+ $selector = $this->strictid( $selector );
+ }
+
+ // Get rid of possible repeated selectors
+ $selector = $this->repeats( $selector );
+
+ // Add space after pseudo selectors (so ie6 doesn't complain)
+ if ( $this->options['pseudo-space'] ) {
+ $selector = $this->pseudoSpace( $selector );
+ }
+ }
+
+ return $selectors;
+ }
+
+ /**
+ * Converts selectors like BODY => body, DIV => div
+ * and injects tokens wrappers for attribute values
+ *
+ * @param (string) selector: CSS Selector
+ */
+ private function parse( $selector ) {
+ $clean = '';
+ $substr = '';
+ $pos = 0;
+
+ while ( preg_match( $this->rmark, $selector, $match, PREG_OFFSET_CAPTURE, $pos ) ) {
+ $substr = substr( $selector, $pos, $match[0][1] + 1 - $pos );
+ $clean .= $this->options['lowercase-selectors'] ? strtolower( $substr ) : $substr;
+ $pos = $match[0][1] + strlen( $match[1][0] );
+
+ // Class or id match
+ if ( $match[1][0] == '#' || $match[1][0] == '.' ) {
+ if ( preg_match( $this->ridclassend, $selector, $m, PREG_OFFSET_CAPTURE, $pos ) ) {
+ $clean .= substr( $selector, $pos, $m[0][1] - $pos );
+ $pos = $m[0][1];
+ }
+ else {
+ $clean .= substr( $selector, $pos );
+ $pos = strlen( $selector );
+ break;
+ }
+ }
+ // Start of a string
+ else if ( preg_match( $this->rquote, $selector, $m, PREG_OFFSET_CAPTURE, $pos ) ) {
+ if ( $selector[$pos] == "\"" || $selector[$pos] == "'" ) {
+ $pos++;
+ }
+ $clean .= $this->token . substr( $selector, $pos, $m[0][1] - $pos ) . $this->token . ']';
+ $pos = $m[0][1] + strlen( $m[0][0] );
+ }
+ // No break points left
+ else {
+ $clean .= substr( $selector, $pos );
+ $pos = strlen( $selector );
+ break;
+ }
+ }
+
+ return $clean . ( $this->options['lowercase-selectors'] ? strtolower( substr( $selector, $pos ) ) : substr( $selector, $pos ) );
+ }
+
+ /**
+ * Convert [id=blah] attribute selectors into id form selector (#blah)
+ *
+ * @param (string) selector: CSS Selector
+ */
+ private function idAttribute( $selector ) {
+ $pos = 0;
+ while ( preg_match( $this->ridattr, $selector, $match, PREG_OFFSET_CAPTURE, $pos ) ) {
+ // Don't convert if space found (not valid hash selector)
+ if ( strpos( $match[1][0], ' ' ) !== false ) {
+ $pos = $match[0][1] + strlen( $match[0][0] );
+ continue;
+ }
+
+ $selector = substr_replace( $selector, '#' . $match[1][0], $match[0][1], strlen( $match[0][0] ) );
+ $pos = $match[0][1] + strlen( $match[1][0] ) + 1;
+ }
+
+ return $selector;
+ }
+
+ /**
+ * Convert [class=blah] attribute selectors into class form selector (.blah)
+ *
+ * @param (string) selector: CSS Selector
+ */
+ private function classAttribute( $selector ) {
+ $pos = 0;
+ while ( preg_match( $this->rclassattr, $selector, $match, PREG_OFFSET_CAPTURE, $pos ) ) {
+ // Don't convert if prescense of dot separator found
+ if ( strpos( $match[1][0], '.' ) !== false ) {
+ $pos = $match[0][1] + strlen( $match[0][0] );
+ continue;
+ }
+
+ $replace = '.' . preg_replace( $this->rescapedspace, ".", $match[1][0] );
+ $selector = substr_replace( $selector, $replace, $match[0][1], strlen( $match[0][0] ) );
+ $pos = $match[0][1] + strlen( $match[1][0] ) + 1;
+ }
+
+ return $selector;
+ }
+
+ /**
+ * Promotes nested id's to the front of the selector
+ *
+ * @param (string) selector: CSS Selector
+ */
+ private function strictid( $selector ) {
+ $parts = preg_split( $this->rcomma, $selector );
+ foreach ( $parts as &$s ) {
+ if ( preg_match( $this->rid, $s ) ) {
+ $p = preg_split( $this->rid, $s );
+ $s = '#' . array_pop( $p );
+ }
+ }
+
+ return implode( ',', $parts );
+ }
+
+ /**
+ * Removes repeated selectors that have been comma separated
+ *
+ * @param (string) selector: CSS Selector
+ */
+ private function repeats( $selector ) {
+ $parts = preg_split( $this->rcomma, $selector );
+ $parts = array_flip( $parts );
+ $parts = array_flip( $parts );
+ return implode( ',', $parts );
+ }
+
+ /**
+ * Adds space after pseudo selector for ie6 like a:first-child{ => a:first-child {
+ *
+ * @param (string) selector: CSS Selector
+ */
+ private function pseudoSpace( $selector ) {
+ return preg_replace( $this->rpseudo, ":first-$1 $2", $selector );
+ }
+
+ /**
+ * Access to private methods for testing
+ *
+ * @param (string) method: Method to be called
+ * @param (array) args: Array of paramters to be passed in
+ */
+ public function access( $method, $args ) {
+ if ( method_exists( $this, $method ) ) {
+ if ( $method == 'selectors' ) {
+ return $this->selectors( $args[0] );
+ }
+ else {
+ return call_user_func_array( array($this, $method), $args );
+ }
+ }
+ else {
+ throw new CSSCompression_Exception( "Unknown method in Selectors Class - " . $method );
+ }
+ }
+}
diff -up -r advagg_css_compress/css-compressor-3.x/src/lib/Setup.inc advagg_css_compress/css-compressor-3.x/src/lib/Setup.inc
--- advagg_css_compress/css-compressor-3.x/src/lib/Setup.inc 2012-03-23 12:08:13.000000000 -0600
+++ advagg_css_compress/css-compressor-3.x/src/lib/Setup.inc 2012-03-23 13:02:20.000000000 -0600
@@ -5,286 +5,285 @@
* Corey Hart @ http://www.codenothing.com
*/
-Class CSSCompression_Setup
-{
- /**
- * Trim Patterns
- *
- * @class Control: Compression Controller
- * @class Individuals: Individuals Instance
- * @instance instance: CSSCompression Instance
- * @param (string) token: Copy of the injection token
- * @param (array) options: Reference to options
- * @param (array) stats: Reference to stats
- * @param (regex) rsemicolon: Checks for semicolon without an escape '\' character before it
- * @param (regex) rcolon: Checks for colon without an escape '\' character before it
- * @param (regex) rbang: Checks for '!' without an escape '\' character before it
- * @param (regex) rspacebank: Checks for an unescaped space before a bang character
- * @param (regex) rliner: Matching known 1-line intros
- * @param (regex) rnested: Matching known subsection handlers
- * @param (regex) rurl: url wrapper matching
- * @param (regex) rsinglequote: Checks for unescaped escaped single quote (mouthfull)
- * @param (array) rsetup: Expanding stylesheet for semi-tokenizing
- */
- private $Control;
- private $Individuals;
- private $instance;
- private $token = '';
- private $options = array();
- private $stats = array();
- private $rsemicolon = "/(?<!\\\);/";
- private $rcolon = "/(?<!\\\):/";
- private $rbang = "/(?<!\\\)\!/";
- private $rspacebang = "/(?<!\\\)\s\!/";
- private $rliner = "/^@(import|charset|namespace)/i";
- private $rmedia = "/^@media/i";
- private $rurl = "/url\((.*?)\)/";
- private $rsinglequote = "/(?<!\\\)\\\'/";
- private $rsetup = array(
- 'patterns' => array(
- "/(?<!\\\){/",
- "/(?<!\\\)}/",
- "/(?<!\\\)@/",
- "/(@(charset|import)[^;]*(?<!\\\);)/",
- ),
- 'replacements' => array(
- "\n{\n",
- "\n}\n",
- "\n@",
- "$1\n",
- ),
- );
-
- /**
- * Stash a reference to the controller on each instantiation
- *
- * @param (class) control: CSSCompression Controller
- */
- public function __construct( CSSCompression_Control $control ) {
- $this->Control = $control;
- $this->Individuals = $control->Individuals;
- $this->token = CSSCompression::TOKEN;
- $this->options = &$control->Option->options;
- $this->stats = &$control->stats;
- }
-
- /**
- * Setup selector and details arrays for compression methods
- *
- * @param (string) css: Trimed stylesheet
- */
- public function setup( $css ) {
- // Seperate the element from the elements details
- $css = explode( "\n", preg_replace( $this->rsetup['patterns'], $this->rsetup['replacements'], $css ) );
- $newline = $this->options['readability'] > CSSCompression::READ_NONE ? "\n" : '';
- $setup = array(
- 'selectors' => array(),
- 'details' => array(),
- 'unknown' => array(),
- 'introliner' => '',
- 'namespace' => '',
- 'import' => '',
- 'charset' => '',
- );
-
- while ( count( $css ) ) {
- $row = trim( array_shift( $css ) );
-
- if ( $row == '' ) {
- continue;
- }
- // Single block At-Rule set
- else if ( $row[ 0 ] == '@' && $css[ 0 ] == '{' && trim( $css[ 1 ] ) != '' && $css[ 2 ] == '}' ) {
- // Stash selector
- array_push( $setup['selectors'], $row );
-
- // Stash details (after the opening brace)
- array_push( $setup['details'], $this->details( trim( $css[ 1 ] ) ) );
-
- // drop the details from the stack
- $css = array_slice( $css, 3 );
- }
- // Single line At-Rules (import/charset/namespace)
- else if ( preg_match( $this->rliner, $row, $match ) ) {
- $setup[ $match[ 1 ] ] .= $this->liner( $row ) . $newline;
- }
- // Nested At-Rule declaration blocks
- else if ( $row[ 0 ] == '@' && $css[ 0 ] == '{' ) {
- // Stash atrule as selector
- array_push( $setup['selectors'], $this->token . $row );
-
- // Stash details (after the opening brace)
- array_push( $setup['details'], $this->nested( $css, preg_match( $this->rmedia, $row ) ) . $newline );
- }
- // Unknown single line At-Rules
- else if ( $row[ 0 ] == '@' && substr( $row, -1 ) == ';' ) {
- $setup[ 'introliner' ] .= $row . $newline;
- }
- // Declaration Block
- else if ( count( $css ) >= 3 && $css[ 0 ] == '{' && $css[ 2 ] == '}' ) {
- // Stash selector
- array_push( $setup['selectors'], $row );
-
- // Stash details (after the opening brace)
- array_push( $setup['details'], $this->details( trim( $css[ 1 ] ) ) );
-
- // drop the details from the stack
- $css = array_slice( $css, 3 );
- }
- // Last catch, store unknown artifacts as selectors with a token
- // and give it an empty rule set
- else {
- // Still add to unknown stack, for notification
- array_push( $setup['unknown'], $row );
-
- // Stash unknown artifacts as selectors with a token
- array_push( $setup['selectors'], $this->token . $row );
-
- // Give it an empty rule set
- array_push( $setup['details'], '' );
- }
- }
-
- return $setup;
- }
-
- /**
- * Run nested elements through a separate instance of compression
- *
- * @param (array) css: Reference to the original css array
- * @param (bool) organize: Whether or not to organize the subsection (only true for media sections)
- */
- private function nested( &$css = array(), $organize = false ) {
- $options = $this->options;
- $left = 0;
- $right = 0;
- $row = '';
- $independent = '';
- $content = '';
- $spacing = '';
- $newline = $this->options['readability'] > CSSCompression::READ_NONE ? "\n" : '';
-
- // Find the end of the nested section
- while ( count( $css ) && ( $left < 1 || $left > $right ) ) {
- $row = trim( array_shift( $css ) );
-
- if ( $row == '' ) {
- continue;
- }
- else if ( $row == '{' ) {
- $left++;
- }
- else if ( $row == '}' ) {
- $right++;
- }
- else if ( count( $css ) && substr( $row, 0, 1 ) != '@' && substr( $css[ 0 ], 0, 1 ) == '@' && substr( $row, -1 ) == ';' ) {
- $independent .= $row;
- continue;
- }
-
- $content .= $row;
- }
-
- // Ensure copy of instance exists
- if ( ! $this->instance ) {
- $this->instance = new CSSCompression();
- }
-
- // Fresh start
- $this->instance->reset();
-
- // Compress the nested section independently after removing the wrapping braces
- // Also make sure to only organize media sections
- if ( $options['organize'] == true && $organize == false ) {
- $options['organize'] = false;
- }
- // Independent sections should be prepended to the next compressed section
- $content = ( $independent == '' ? '' : $independent . $newline )
+class CSSCompression_Setup {
+ /**
+ * Trim Patterns
+ *
+ * @class Control: Compression Controller
+ * @class Individuals: Individuals Instance
+ * @instance instance: CSSCompression Instance
+ * @param (string) token: Copy of the injection token
+ * @param (array) options: Reference to options
+ * @param (array) stats: Reference to stats
+ * @param (regex) rsemicolon: Checks for semicolon without an escape '\' character before it
+ * @param (regex) rcolon: Checks for colon without an escape '\' character before it
+ * @param (regex) rbang: Checks for '!' without an escape '\' character before it
+ * @param (regex) rspacebank: Checks for an unescaped space before a bang character
+ * @param (regex) rliner: Matching known 1-line intros
+ * @param (regex) rnested: Matching known subsection handlers
+ * @param (regex) rurl: url wrapper matching
+ * @param (regex) rsinglequote: Checks for unescaped escaped single quote (mouthfull)
+ * @param (array) rsetup: Expanding stylesheet for semi-tokenizing
+ */
+ private $Control;
+ private $Individuals;
+ private $instance;
+ private $token = '';
+ private $options = array();
+ private $stats = array();
+ private $rsemicolon = "/(?<!\\\);/";
+ private $rcolon = "/(?<!\\\):/";
+ private $rbang = "/(?<!\\\)\!/";
+ private $rspacebang = "/(?<!\\\)\s\!/";
+ private $rliner = "/^@(import|charset|namespace)/i";
+ private $rmedia = "/^@media/i";
+ private $rurl = "/url\((.*?)\)/";
+ private $rsinglequote = "/(?<!\\\)\\\'/";
+ private $rsetup = array(
+ 'patterns' => array(
+ "/(?<!\\\){/",
+ "/(?<!\\\)}/",
+ "/(?<!\\\)@/",
+ "/(@(charset|import)[^;]*(?<!\\\);)/",
+ ),
+ 'replacements' => array(
+ "\n{\n",
+ "\n}\n",
+ "\n@",
+ "$1\n",
+ ),
+ );
+
+ /**
+ * Stash a reference to the controller on each instantiation
+ *
+ * @param (class) control: CSSCompression Controller
+ */
+ public function __construct( CSSCompression_Control $control ) {
+ $this->Control = $control;
+ $this->Individuals = $control->Individuals;
+ $this->token = CSSCompression::TOKEN;
+ $this->options = &$control->Option->options;
+ $this->stats = &$control->stats;
+ }
+
+ /**
+ * Setup selector and details arrays for compression methods
+ *
+ * @param (string) css: Trimed stylesheet
+ */
+ public function setup( $css ) {
+ // Seperate the element from the elements details
+ $css = explode( "\n", preg_replace( $this->rsetup['patterns'], $this->rsetup['replacements'], $css ) );
+ $newline = $this->options['readability'] > CSSCompression::READ_NONE ? "\n" : '';
+ $setup = array(
+ 'selectors' => array(),
+ 'details' => array(),
+ 'unknown' => array(),
+ 'introliner' => '',
+ 'namespace' => '',
+ 'import' => '',
+ 'charset' => '',
+ );
+
+ while ( count( $css ) ) {
+ $row = trim( array_shift( $css ) );
+
+ if ( $row == '' ) {
+ continue;
+ }
+ // Single block At-Rule set
+ else if ( $row[0] == '@' && $css[0] == '{' && trim( $css[1] ) != '' && $css[2] == '}' ) {
+ // Stash selector
+ array_push( $setup['selectors'], $row );
+
+ // Stash details (after the opening brace)
+ array_push( $setup['details'], $this->details( trim( $css[1] ) ) );
+
+ // drop the details from the stack
+ $css = array_slice( $css, 3 );
+ }
+ // Single line At-Rules (import/charset/namespace)
+ else if ( preg_match( $this->rliner, $row, $match ) ) {
+ $setup[$match[1]] .= $this->liner( $row ) . $newline;
+ }
+ // Nested At-Rule declaration blocks
+ else if ( $row[0] == '@' && $css[0] == '{' ) {
+ // Stash atrule as selector
+ array_push( $setup['selectors'], $this->token . $row );
+
+ // Stash details (after the opening brace)
+ array_push( $setup['details'], $this->nested( $css, preg_match( $this->rmedia, $row ) ) . $newline );
+ }
+ // Unknown single line At-Rules
+ else if ( $row[0] == '@' && substr( $row, -1 ) == ';' ) {
+ $setup['introliner'] .= $row . $newline;
+ }
+ // Declaration Block
+ else if ( count( $css ) >= 3 && $css[0] == '{' && $css[2] == '}' ) {
+ // Stash selector
+ array_push( $setup['selectors'], $row );
+
+ // Stash details (after the opening brace)
+ array_push( $setup['details'], $this->details( trim( $css[1] ) ) );
+
+ // drop the details from the stack
+ $css = array_slice( $css, 3 );
+ }
+ // Last catch, store unknown artifacts as selectors with a token
+ // and give it an empty rule set
+ else {
+ // Still add to unknown stack, for notification
+ array_push( $setup['unknown'], $row );
+
+ // Stash unknown artifacts as selectors with a token
+ array_push( $setup['selectors'], $this->token . $row );
+
+ // Give it an empty rule set
+ array_push( $setup['details'], '' );
+ }
+ }
+
+ return $setup;
+ }
+
+ /**
+ * Run nested elements through a separate instance of compression
+ *
+ * @param (array) css: Reference to the original css array
+ * @param (bool) organize: Whether or not to organize the subsection (only true for media sections)
+ */
+ private function nested( &$css = array(), $organize = false ) {
+ $options = $this->options;
+ $left = 0;
+ $right = 0;
+ $row = '';
+ $independent = '';
+ $content = '';
+ $spacing = '';
+ $newline = $this->options['readability'] > CSSCompression::READ_NONE ? "\n" : '';
+
+ // Find the end of the nested section
+ while ( count( $css ) && ( $left < 1 || $left > $right ) ) {
+ $row = trim( array_shift( $css ) );
+
+ if ( $row == '' ) {
+ continue;
+ }
+ else if ( $row == '{' ) {
+ $left++;
+ }
+ else if ( $row == '}' ) {
+ $right++;
+ }
+ else if ( count( $css ) && substr( $row, 0, 1 ) != '@' && substr( $css[0], 0, 1 ) == '@' && substr( $row, -1 ) == ';' ) {
+ $independent .= $row;
+ continue;
+ }
+
+ $content .= $row;
+ }
+
+ // Ensure copy of instance exists
+ if ( ! $this->instance ) {
+ $this->instance = new CSSCompression();
+ }
+
+ // Fresh start
+ $this->instance->reset();
+
+ // Compress the nested section independently after removing the wrapping braces
+ // Also make sure to only organize media sections
+ if ( $options['organize'] == true && $organize == false ) {
+ $options['organize'] = false;
+ }
+ // Independent sections should be prepended to the next compressed section
+ $content = ( $independent == '' ? '' : $independent . $newline )
. $this->instance->compress( substr( $content, 1, -1 ), $options );
- // Formatting for anything higher then 0 readability
- if ( $newline == "\n" ) {
- $content = "\n\t" . str_replace( "\n", "\n\t", $content ) . "\n";
- $spacing = $this->options['readability'] > CSSCompression::READ_MIN ? ' ' : '';
- }
-
- // Stash the compressed nested script
- return "$spacing{" . $content . "}$newline";
- }
-
- /**
- * Converts import/namespace urls into strings
- *
- * @param (string) row: At-rule
- */
- private function liner( $row ) {
- $pos = 0;
- while ( preg_match( $this->rurl, $row, $match, PREG_OFFSET_CAPTURE, $pos ) ) {
- $quote = preg_match( $this->rsinglequote, $match[ 1 ][ 0 ] ) ? '"' : "'";
- $replace = $quote . $match[ 1 ][ 0 ] . $quote;
- $row = substr_replace( $row, $replace, $match[ 0 ][ 1 ], strlen( $match[ 0 ][ 0 ] ) );
- $pos = $match[ 0 ][ 1 ] + strlen( $replace );
- }
-
- return $row;
- }
-
- /**
- * Run individual compression techniques on each property of a selector
- *
- * @param (string) row: Selector properties
- */
- private function details( $row ) {
- $row = preg_split( $this->rsemicolon, $row );
- $parts = array();
- $details = '';
-
- foreach ( $row as $line ) {
- // Set loopers
- $parts = preg_split( $this->rcolon, $line, 2 );
- $prop = '';
- $value = '';
-
- // Property
- if ( isset( $parts[ 0 ] ) && ( $parts[ 0 ] = trim( $parts[ 0 ] ) ) != '' ) {
- $prop = $parts[ 0 ];
- }
-
- // Value
- if ( isset( $parts[ 1 ] ) && ( $parts[ 1 ] = trim( $parts[ 1 ] ) ) != '' ) {
- $value = preg_replace( $this->rbang, ' !', $parts[ 1 ] );
- }
-
- // Fail safe, remove unspecified property/values
- if ( $prop == '' || $value == '' ) {
- continue;
- }
-
- // Run the tag/element through each compression
- list ( $prop, $value ) = $this->Individuals->individuals( $prop, $value );
-
- // Add counter to before stats
- $this->stats['before']['props']++;
-
- // Store the compressed element
- $details .= "$prop:" . preg_replace( $this->rspacebang, '!', $value ) . ";";
- }
-
- return $details;
- }
-
- /**
- * Access to private methods for testing
- *
- * @param (string) method: Method to be called
- * @param (array) args: Array of paramters to be passed in
- */
- public function access( $method, $args ) {
- if ( method_exists( $this, $method ) ) {
- return call_user_func_array( array( $this, $method ), $args );
- }
- else {
- throw new CSSCompression_Exception( "Unknown method in Setup Class - " . $method );
- }
- }
-};
+ // Formatting for anything higher then 0 readability
+ if ( $newline == "\n" ) {
+ $content = "\n\t" . str_replace( "\n", "\n\t", $content ) . "\n";
+ $spacing = $this->options['readability'] > CSSCompression::READ_MIN ? ' ' : '';
+ }
+
+ // Stash the compressed nested script
+ return "$spacing{" . $content . "}$newline";
+ }
+
+ /**
+ * Converts import/namespace urls into strings
+ *
+ * @param (string) row: At-rule
+ */
+ private function liner( $row ) {
+ $pos = 0;
+ while ( preg_match( $this->rurl, $row, $match, PREG_OFFSET_CAPTURE, $pos ) ) {
+ $quote = preg_match( $this->rsinglequote, $match[1][0] ) ? '"' : "'";
+ $replace = $quote . $match[1][0] . $quote;
+ $row = substr_replace( $row, $replace, $match[0][1], strlen( $match[0][0] ) );
+ $pos = $match[0][1] + strlen( $replace );
+ }
+
+ return $row;
+ }
+
+ /**
+ * Run individual compression techniques on each property of a selector
+ *
+ * @param (string) row: Selector properties
+ */
+ private function details( $row ) {
+ $row = preg_split( $this->rsemicolon, $row );
+ $parts = array();
+ $details = '';
+
+ foreach ( $row as $line ) {
+ // Set loopers
+ $parts = preg_split( $this->rcolon, $line, 2 );
+ $prop = '';
+ $value = '';
+
+ // Property
+ if ( isset( $parts[0] ) && ( $parts[0] = trim( $parts[0] ) ) != '' ) {
+ $prop = $parts[0];
+ }
+
+ // Value
+ if ( isset( $parts[1] ) && ( $parts[1] = trim( $parts[1] ) ) != '' ) {
+ $value = preg_replace( $this->rbang, ' !', $parts[1] );
+ }
+
+ // Fail safe, remove unspecified property/values
+ if ( $prop == '' || $value == '' ) {
+ continue;
+ }
+
+ // Run the tag/element through each compression
+ list( $prop, $value ) = $this->Individuals->individuals( $prop, $value );
+
+ // Add counter to before stats
+ $this->stats['before']['props']++;
+
+ // Store the compressed element
+ $details .= "$prop:" . preg_replace( $this->rspacebang, '!', $value ) . ";";
+ }
+
+ return $details;
+ }
+
+ /**
+ * Access to private methods for testing
+ *
+ * @param (string) method: Method to be called
+ * @param (array) args: Array of paramters to be passed in
+ */
+ public function access( $method, $args ) {
+ if ( method_exists( $this, $method ) ) {
+ return call_user_func_array( array($this, $method), $args );
+ }
+ else {
+ throw new CSSCompression_Exception( "Unknown method in Setup Class - " . $method );
+ }
+ }
+}
diff -up -r advagg_css_compress/css-compressor-3.x/src/lib/Trim.inc advagg_css_compress/css-compressor-3.x/src/lib/Trim.inc
--- advagg_css_compress/css-compressor-3.x/src/lib/Trim.inc 2012-03-23 12:08:13.000000000 -0600
+++ advagg_css_compress/css-compressor-3.x/src/lib/Trim.inc 2012-03-23 13:02:20.000000000 -0600
@@ -5,207 +5,206 @@
* Corey Hart @ http://www.codenothing.com
*/
-Class CSSCompression_Trim
-{
- /**
- * Trim Patterns
- *
- * @class Control: Compression Controller
- * @param (array) options: Reference to options
- * @param (regex) rcmark: Marking point when traversing through sheet for comments
- * @param (regex) rendcomment: Finds the ending comment point
- * @param (regex) rendquote: Finds the ending quote point
- * @param (regex) rendsinglequote: Finds the ending single quote point
- * @param (array) rescape: Array of patterns of groupings that should be escaped
- * @param (array) trimmings: Stylesheet trimming patterns/replacements
- * @param (array) escaped: Array of characters that need to be escaped
- */
- private $Control;
- private $options = array();
- private $rcmark = "/((?<!\\\)\/\*|(?<!\\\)\"|(?<!\\\)')/";
- private $rendcomment = "/\*\//";
- private $rendquote = "/(?<!\\\)\"/";
- private $rendsinglequote = "/(?<!\\\)'/";
- private $rescape = array(
- "/(url\()([^'\"].*?)(\))/is",
- "/((?<!\\\)\")(.*?)((?<!\\\)\")/s",
- "/((?<!\\\)')(.*?)((?<!\\\)')/s",
- );
- private $trimmings = array(
- 'patterns' => array(
- "/(?<!\\\)(\s+)?(?<!\\\)([!,{};>\~\+\/])(?<!\\\)(\s+)?/s", // Remove un-needed spaces around special characters
- "/url\((?<!\\\)\"(.*?)(?<!\\\)\"\)/is", // Remove quotes from urls
- "/url\((?<!\\\)'(.*?)(?<!\\\)'\)/is", // Remove single quotes from urls
- "/url\((.*?)\)/is", // Lowercase url wrapper
- "/(?<!\\\);{2,}/", // Remove unecessary semi-colons
- "/(?<!\\\)\s+/s", // Compress all spaces into single space
- ),
- 'replacements' => array(
- '$2',
- 'url($1)',
- 'url($1)',
- 'url($1)',
- ';',
- ' ',
- )
- );
- private $escaped = array(
- 'search' => array(
- ":",
- ";",
- "}",
- "{",
- "@",
- "!",
- ",",
- ">",
- "+",
- "~",
- "/",
- "*",
- ".",
- "=",
- "#",
- "\r",
- "\n",
- "\t",
- " ",
- ),
- 'replace' => array(
- "\\:",
- "\\;",
- "\\}",
- "\\{",
- "\\@",
- "\\!",
- "\\,",
- "\\>",
- "\\+",
- "\\~",
- "\\/",
- "\\*",
- "\\.",
- "\\=",
- "\\#",
- "\\r",
- "\\n",
- "\\t",
- "\\ ",
- ),
- );
-
- /**
- * Stash a reference to the controller on each instantiation
- *
- * @param (class) control: CSSCompression Controller
- */
- public function __construct( CSSCompression_Control $control ) {
- $this->Control = $control;
- $this->options = &$control->Option->options;
- }
-
- /**
- * Central trim handler
- *
- * @param (string) css: Stylesheet to trim
- */
- public function trim( $css ) {
- $css = $this->comments( $css );
- $css = $this->escape( $css );
- $css = $this->strip( $css );
- return $css;
- }
-
- /**
- * Does a quick run through the script to remove all comments from the sheet,
- *
- * @param (string) css: Stylesheet to trim
- */
- private function comments( $css ) {
- $pos = 0;
- while ( preg_match( $this->rcmark, $css, $match, PREG_OFFSET_CAPTURE, $pos ) ) {
- switch ( $match[ 1 ][ 0 ] ) {
- // Start of comment block
- case "/*":
- if ( preg_match( $this->rendcomment, $css, $m, PREG_OFFSET_CAPTURE, $match[ 1 ][ 1 ] + 1 ) ) {
- $end = $m[ 0 ][ 1 ] - $match[ 1 ][ 1 ] + strlen( $m[ 0 ][ 0 ] );
- $css = substr_replace( $css, '', $match[ 1 ][ 1 ], $end );
- $pos = $match[ 0 ][ 1 ];
- }
- else {
- $css = substr( $css, 0, $match[ 1 ][ 1 ] );
- break 2;
- }
- break;
- // Start of string
- case "\"":
- if ( preg_match( $this->rendquote, $css, $m, PREG_OFFSET_CAPTURE, $match[ 1 ][ 1 ] + 1 ) ) {
- $pos = $m[ 0 ][ 1 ] + strlen( $m[ 0 ][ 0 ] );
- }
- else {
- break 2;
- }
- break;
- // Start of string
- case "'":
- if ( preg_match( $this->rendsinglequote, $css, $m, PREG_OFFSET_CAPTURE, $match[ 1 ][ 1 ] + 1 ) ) {
- $pos = $m[ 0 ][ 1 ] + strlen( $m[ 0 ][ 0 ] );
- }
- else {
- break 2;
- }
- break;
- // Should have never gotten here
- default:
- break 2;
- }
- }
-
- return $css;
- }
-
- /**
- * Escape out possible splitter characters within urls
- *
- * @param (string) css: Full stylesheet
- */
- private function escape( $css ) {
- foreach ( $this->rescape as $regex ) {
- $start = 0;
- while ( preg_match( $regex, $css, $match, PREG_OFFSET_CAPTURE, $start ) ) {
- $value = $match[ 1 ][ 0 ]
- . str_replace( $this->escaped['search'], $this->escaped['replace'], $match[ 2 ][ 0 ] )
- . $match[ 3 ][ 0 ];
- $css = substr_replace( $css, $value, $match[ 0 ][ 1 ], strlen( $match[ 0 ][ 0 ] ) );
- $start = $match[ 0 ][ 1 ] + strlen( $value ) + 1;
- }
- }
-
- return $css;
- }
-
- /**
- * Runs initial formatting to setup for compression
- *
- * @param (string) css: CSS Contents
- */
- private function strip( $css ) {
- // Run replacements
- return trim( preg_replace( $this->trimmings['patterns'], $this->trimmings['replacements'], $css ) );
- }
-
- /**
- * Access to private methods for testing
- *
- * @param (string) method: Method to be called
- * @param (array) args: Array of paramters to be passed in
- */
- public function access( $method, $args ) {
- if ( method_exists( $this, $method ) ) {
- return call_user_func_array( array( $this, $method ), $args );
- }
- else {
- throw new CSSCompression_Exception( "Unknown method in Trim Class - " . $method );
- }
- }
-};
+class CSSCompression_Trim {
+ /**
+ * Trim Patterns
+ *
+ * @class Control: Compression Controller
+ * @param (array) options: Reference to options
+ * @param (regex) rcmark: Marking point when traversing through sheet for comments
+ * @param (regex) rendcomment: Finds the ending comment point
+ * @param (regex) rendquote: Finds the ending quote point
+ * @param (regex) rendsinglequote: Finds the ending single quote point
+ * @param (array) rescape: Array of patterns of groupings that should be escaped
+ * @param (array) trimmings: Stylesheet trimming patterns/replacements
+ * @param (array) escaped: Array of characters that need to be escaped
+ */
+ private $Control;
+ private $options = array();
+ private $rcmark = "/((?<!\\\)\/\*|(?<!\\\)\"|(?<!\\\)')/";
+ private $rendcomment = "/\*\//";
+ private $rendquote = "/(?<!\\\)\"/";
+ private $rendsinglequote = "/(?<!\\\)'/";
+ private $rescape = array(
+ "/(url\()([^'\"].*?)(\))/is",
+ "/((?<!\\\)\")(.*?)((?<!\\\)\")/s",
+ "/((?<!\\\)')(.*?)((?<!\\\)')/s",
+ );
+ private $trimmings = array(
+ 'patterns' => array(
+ "/(?<!\\\)(\s+)?(?<!\\\)([!,{};>\~\+\/])(?<!\\\)(\s+)?/s", // Remove un-needed spaces around special characters
+ "/url\((?<!\\\)\"(.*?)(?<!\\\)\"\)/is", // Remove quotes from urls
+ "/url\((?<!\\\)'(.*?)(?<!\\\)'\)/is", // Remove single quotes from urls
+ "/url\((.*?)\)/is", // Lowercase url wrapper
+ "/(?<!\\\);{2,}/", // Remove unecessary semi-colons
+ "/(?<!\\\)\s+/s", // Compress all spaces into single space
+ ),
+ 'replacements' => array(
+ '$2',
+ 'url($1)',
+ 'url($1)',
+ 'url($1)',
+ ';',
+ ' ',
+ ),
+ );
+ private $escaped = array(
+ 'search' => array(
+ ":",
+ ";",
+ "}",
+ "{",
+ "@",
+ "!",
+ ",",
+ ">",
+ "+",
+ "~",
+ "/",
+ "*",
+ ".",
+ "=",
+ "#",
+ "\r",
+ "\n",
+ "\t",
+ " ",
+ ),
+ 'replace' => array(
+ "\\:",
+ "\\;",
+ "\\}",
+ "\\{",
+ "\\@",
+ "\\!",
+ "\\,",
+ "\\>",
+ "\\+",
+ "\\~",
+ "\\/",
+ "\\*",
+ "\\.",
+ "\\=",
+ "\\#",
+ "\\r",
+ "\\n",
+ "\\t",
+ "\\ ",
+ ),
+ );
+
+ /**
+ * Stash a reference to the controller on each instantiation
+ *
+ * @param (class) control: CSSCompression Controller
+ */
+ public function __construct( CSSCompression_Control $control ) {
+ $this->Control = $control;
+ $this->options = &$control->Option->options;
+ }
+
+ /**
+ * Central trim handler
+ *
+ * @param (string) css: Stylesheet to trim
+ */
+ public function trim( $css ) {
+ $css = $this->comments( $css );
+ $css = $this->escape( $css );
+ $css = $this->strip( $css );
+ return $css;
+ }
+
+ /**
+ * Does a quick run through the script to remove all comments from the sheet,
+ *
+ * @param (string) css: Stylesheet to trim
+ */
+ private function comments( $css ) {
+ $pos = 0;
+ while ( preg_match( $this->rcmark, $css, $match, PREG_OFFSET_CAPTURE, $pos ) ) {
+ switch ( $match[1][0] ) {
+ // Start of comment block
+ case "/*":
+ if ( preg_match( $this->rendcomment, $css, $m, PREG_OFFSET_CAPTURE, $match[1][1] + 1 ) ) {
+ $end = $m[0][1] - $match[1][1] + strlen( $m[0][0] );
+ $css = substr_replace( $css, '', $match[1][1], $end );
+ $pos = $match[0][1];
+ }
+ else {
+ $css = substr( $css, 0, $match[1][1] );
+ break 2;
+ }
+ break;
+ // Start of string
+ case "\"":
+ if ( preg_match( $this->rendquote, $css, $m, PREG_OFFSET_CAPTURE, $match[1][1] + 1 ) ) {
+ $pos = $m[0][1] + strlen( $m[0][0] );
+ }
+ else {
+ break 2;
+ }
+ break;
+ // Start of string
+ case "'":
+ if ( preg_match( $this->rendsinglequote, $css, $m, PREG_OFFSET_CAPTURE, $match[1][1] + 1 ) ) {
+ $pos = $m[0][1] + strlen( $m[0][0] );
+ }
+ else {
+ break 2;
+ }
+ break;
+ // Should have never gotten here
+ default:
+ break 2;
+ }
+ }
+
+ return $css;
+ }
+
+ /**
+ * Escape out possible splitter characters within urls
+ *
+ * @param (string) css: Full stylesheet
+ */
+ private function escape( $css ) {
+ foreach ( $this->rescape as $regex ) {
+ $start = 0;
+ while ( preg_match( $regex, $css, $match, PREG_OFFSET_CAPTURE, $start ) ) {
+ $value = $match[1][0]
+ . str_replace( $this->escaped['search'], $this->escaped['replace'], $match[2][0] )
+ . $match[3][0];
+ $css = substr_replace( $css, $value, $match[0][1], strlen( $match[0][0] ) );
+ $start = $match[0][1] + strlen( $value ) + 1;
+ }
+ }
+
+ return $css;
+ }
+
+ /**
+ * Runs initial formatting to setup for compression
+ *
+ * @param (string) css: CSS Contents
+ */
+ private function strip( $css ) {
+ // Run replacements
+ return trim( preg_replace( $this->trimmings['patterns'], $this->trimmings['replacements'], $css ) );
+ }
+
+ /**
+ * Access to private methods for testing
+ *
+ * @param (string) method: Method to be called
+ * @param (array) args: Array of paramters to be passed in
+ */
+ public function access( $method, $args ) {
+ if ( method_exists( $this, $method ) ) {
+ return call_user_func_array( array($this, $method), $args );
+ }
+ else {
+ throw new CSSCompression_Exception( "Unknown method in Trim Class - " . $method );
+ }
+ }
+}
diff -up -r advagg_css_compress/csstidy/class.csstidy.inc advagg_css_compress/csstidy/class.csstidy.inc
--- advagg_css_compress/csstidy/class.csstidy.inc 2012-03-23 12:08:13.000000000 -0600
+++ advagg_css_compress/csstidy/class.csstidy.inc 2012-03-23 13:02:20.000000000 -0600
@@ -72,1056 +72,1108 @@ require('class.csstidy_optimise.inc');
*/
class csstidy {
- /**
- * Saves the parsed CSS. This array is empty if preserve_css is on.
- * @var array
- * @access public
- */
- var $css = array();
- /**
- * Saves the parsed CSS (raw)
- * @var array
- * @access private
- */
- var $tokens = array();
- /**
- * Printer class
- * @see csstidy_print
- * @var object
- * @access public
- */
- var $print;
- /**
- * Optimiser class
- * @see csstidy_optimise
- * @var object
- * @access private
- */
- var $optimise;
- /**
- * Saves the CSS charset (@charset)
- * @var string
- * @access private
- */
- var $charset = '';
- /**
- * Saves all @import URLs
- * @var array
- * @access private
- */
- var $import = array();
- /**
- * Saves the namespace
- * @var string
- * @access private
- */
- var $namespace = '';
- /**
- * Contains the version of csstidy
- * @var string
- * @access private
- */
- var $version = '1.3';
- /**
- * Stores the settings
- * @var array
- * @access private
- */
- var $settings = array();
- /**
- * Saves the parser-status.
- *
- * Possible values:
- * - is = in selector
- * - ip = in property
- * - iv = in value
- * - instr = in string (started at " or ' or ( )
- * - ic = in comment (ignore everything)
- * - at = in @-block
- *
- * @var string
- * @access private
- */
- var $status = 'is';
- /**
- * Saves the current at rule (@media)
- * @var string
- * @access private
- */
- var $at = '';
- /**
- * Saves the current selector
- * @var string
- * @access private
- */
- var $selector = '';
- /**
- * Saves the current property
- * @var string
- * @access private
- */
- var $property = '';
- /**
- * Saves the position of , in selectors
- * @var array
- * @access private
- */
- var $sel_separate = array();
- /**
- * Saves the current value
- * @var string
- * @access private
- */
- var $value = '';
- /**
- * Saves the current sub-value
- *
- * Example for a subvalue:
- * background:url(foo.png) red no-repeat;
- * "url(foo.png)", "red", and "no-repeat" are subvalues,
- * seperated by whitespace
- * @var string
- * @access private
- */
- var $sub_value = '';
- /**
- * Array which saves all subvalues for a property.
- * @var array
- * @see sub_value
- * @access private
- */
- var $sub_value_arr = array();
- /**
- * Saves the char which opened the last string
- * @var string
- * @access private
- */
- var $str_char = '';
- var $cur_string = '';
- /**
- * Status from which the parser switched to ic or instr
- * @var string
- * @access private
- */
- var $from = '';
- /**
- * Variable needed to manage string-in-strings, for example url("foo.png")
- * @var string
- * @access private
- */
- var $str_in_str = false;
- /**
- * =true if in invalid at-rule
- * @var bool
- * @access private
- */
- var $invalid_at = false;
- /**
- * =true if something has been added to the current selector
- * @var bool
- * @access private
- */
- var $added = false;
- /**
- * Array which saves the message log
- * @var array
- * @access private
- */
- var $log = array();
- /**
- * Saves the line number
- * @var integer
- * @access private
- */
- var $line = 1;
- /**
- * Marks if we need to leave quotes for a string
- * @var string
- * @access private
- */
- var $quoted_string = false;
-
- /**
- * List of tokens
- * @var string
- */
- var $tokens_list = "";
- /**
- * Loads standard template and sets default settings
- * @access private
- * @version 1.3
- */
- function csstidy() {
- $this->settings['remove_bslash'] = true;
- $this->settings['compress_colors'] = true;
- $this->settings['compress_font-weight'] = true;
- $this->settings['lowercase_s'] = false;
- /*
- 1 common shorthands optimization
- 2 + font property optimization
- 3 + background property optimization
- */
- $this->settings['optimise_shorthands'] = 1;
- $this->settings['remove_last_;'] = true;
- /* rewrite all properties with low case, better for later gzip OK, safe*/
- $this->settings['case_properties'] = 1;
- /* sort properties in alpabetic order, better for later gzip
- * but can cause trouble in case of overiding same propertie or using hack
- */
- $this->settings['sort_properties'] = false;
- /*
- 1, 3, 5, etc -- enable sorting selectors inside @media: a{}b{}c{}
- 2, 5, 8, etc -- enable sorting selectors inside one CSS declaration: a,b,c{}
- preserve order by default cause it can break functionnality
- */
- $this->settings['sort_selectors'] = 0;
- /* is dangeroues to be used: CSS is broken sometimes */
- $this->settings['merge_selectors'] = 0;
- /* preserve or not browser hacks */
- $this->settings['discard_invalid_selectors'] = false;
- $this->settings['discard_invalid_properties'] = false;
- $this->settings['css_level'] = 'CSS2.1';
- $this->settings['preserve_css'] = false;
- $this->settings['timestamp'] = false;
- $this->settings['template'] = ''; // say that propertie exist
- $this->set_cfg('template','default'); // call load_template
- $this->optimise = new csstidy_optimise($this);
-
- $this->tokens_list = & $GLOBALS['csstidy']['tokens'];
- }
-
- /**
- * Get the value of a setting.
- * @param string $setting
- * @access public
- * @return mixed
- * @version 1.0
- */
- function get_cfg($setting) {
- if (isset($this->settings[$setting])) {
- return $this->settings[$setting];
- }
- return false;
- }
-
- /**
- * Load a template
- * @param string $template used by set_cfg to load a template via a configuration setting
- * @access private
- * @version 1.4
- */
- function _load_template($template) {
- switch ($template) {
- case 'default':
- $this->load_template('default');
- break;
-
- case 'highest':
- $this->load_template('highest_compression');
- break;
-
- case 'high':
- $this->load_template('high_compression');
- break;
-
- case 'low':
- $this->load_template('low_compression');
- break;
-
- default:
- $this->load_template($template);
- break;
- }
- }
-
- /**
- * Set the value of a setting.
- * @param string $setting
- * @param mixed $value
- * @access public
- * @return bool
- * @version 1.0
- */
- function set_cfg($setting, $value=null) {
- if (is_array($setting) && $value === null) {
- foreach ($setting as $setprop => $setval) {
- $this->settings[$setprop] = $setval;
- }
- if (array_key_exists('template', $setting)) {
- $this->_load_template($this->settings['template']);
- }
- return true;
- } else if (isset($this->settings[$setting]) && $value !== '') {
- $this->settings[$setting] = $value;
- if ($setting === 'template') {
- $this->_load_template($this->settings['template']);
- }
- return true;
- }
- return false;
- }
-
- /**
- * Adds a token to $this->tokens
- * @param mixed $type
- * @param string $data
- * @param bool $do add a token even if preserve_css is off
- * @access private
- * @version 1.0
- */
- function _add_token($type, $data, $do = false) {
- if ($this->get_cfg('preserve_css') || $do) {
- $this->tokens[] = array($type, ($type == COMMENT) ? $data : trim($data));
- }
- }
-
- /**
- * Add a message to the message log
- * @param string $message
- * @param string $type
- * @param integer $line
- * @access private
- * @version 1.0
- */
- function log($message, $type, $line = -1) {
- if ($line === -1) {
- $line = $this->line;
- }
- $line = intval($line);
- $add = array('m' => $message, 't' => $type);
- if (!isset($this->log[$line]) || !in_array($add, $this->log[$line])) {
- $this->log[$line][] = $add;
- }
- }
-
- /**
- * Parse unicode notations and find a replacement character
- * @param string $string
- * @param integer $i
- * @access private
- * @return string
- * @version 1.2
- */
- function _unicode(&$string, &$i) {
- ++$i;
- $add = '';
- $replaced = false;
-
- while ($i < strlen($string) && (ctype_xdigit($string{$i}) || ctype_space($string{$i})) && strlen($add) < 6) {
- $add .= $string{$i};
-
- if (ctype_space($string{$i})) {
- break;
- }
- $i++;
- }
-
- if (hexdec($add) > 47 && hexdec($add) < 58 || hexdec($add) > 64 && hexdec($add) < 91 || hexdec($add) > 96 && hexdec($add) < 123) {
- $this->log('Replaced unicode notation: Changed \\' . $add . ' to ' . chr(hexdec($add)), 'Information');
- $add = chr(hexdec($add));
- $replaced = true;
- } else {
- $add = trim('\\' . $add);
- }
-
- if (@ctype_xdigit($string{$i + 1}) && ctype_space($string{$i})
- && !$replaced || !ctype_space($string{$i})) {
- $i--;
- }
-
- if ($add !== '\\' || !$this->get_cfg('remove_bslash') || strpos($this->tokens_list, $string{$i + 1}) !== false) {
- return $add;
- }
-
- if ($add === '\\') {
- $this->log('Removed unnecessary backslash', 'Information');
- }
- return '';
- }
-
- /**
- * Write formatted output to a file
- * @param string $filename
- * @param string $doctype when printing formatted, is a shorthand for the document type
- * @param bool $externalcss when printing formatted, indicates whether styles to be attached internally or as an external stylesheet
- * @param string $title when printing formatted, is the title to be added in the head of the document
- * @param string $lang when printing formatted, gives a two-letter language code to be added to the output
- * @access public
- * @version 1.4
- */
- function write_page($filename, $doctype='xhtml1.1', $externalcss=true, $title='', $lang='en') {
- $this->write($filename, true);
- }
-
- /**
- * Write plain output to a file
- * @param string $filename
- * @param bool $formatted whether to print formatted or not
- * @param string $doctype when printing formatted, is a shorthand for the document type
- * @param bool $externalcss when printing formatted, indicates whether styles to be attached internally or as an external stylesheet
- * @param string $title when printing formatted, is the title to be added in the head of the document
- * @param string $lang when printing formatted, gives a two-letter language code to be added to the output
- * @param bool $pre_code whether to add pre and code tags around the code (for light HTML formatted templates)
- * @access public
- * @version 1.4
- */
- function write($filename, $formatted=false, $doctype='xhtml1.1', $externalcss=true, $title='', $lang='en', $pre_code=true) {
- $filename .= ( $formatted) ? '.xhtml' : '.css';
-
- if (!is_dir('temp')) {
- $madedir = mkdir('temp');
- if (!$madedir) {
- print 'Could not make directory "temp" in ' . dirname(__FILE__);
- exit;
- }
- }
- $handle = fopen('temp/' . $filename, 'w');
- if ($handle) {
- if (!$formatted) {
- fwrite($handle, $this->print->plain());
- } else {
- fwrite($handle, $this->print->formatted_page($doctype, $externalcss, $title, $lang, $pre_code));
- }
- }
- fclose($handle);
- }
-
- /**
- * Loads a new template
- * @param string $content either filename (if $from_file == true), content of a template file, "high_compression", "highest_compression", "low_compression", or "default"
- * @param bool $from_file uses $content as filename if true
- * @access public
- * @version 1.1
- * @see http://csstidy.sourceforge.net/templates.php
- */
- function load_template($content, $from_file=true) {
- $predefined_templates = & $GLOBALS['csstidy']['predefined_templates'];
- if ($content === 'high_compression' || $content === 'default' || $content === 'highest_compression' || $content === 'low_compression') {
- $this->template = $predefined_templates[$content];
- return;
- }
-
-
- if ($from_file) {
- $content = strip_tags(file_get_contents($content), '<span>');
- }
- $content = str_replace("\r\n", "\n", $content); // Unify newlines (because the output also only uses \n)
- $template = explode('|', $content);
-
- for ($i = 0; $i < count($template); $i++) {
- $this->template[$i] = $template[$i];
- }
- }
-
- /**
- * Starts parsing from URL
- * @param string $url
- * @access public
- * @version 1.0
- */
- function parse_from_url($url) {
- return $this->parse(@file_get_contents($url));
- }
-
- /**
- * Checks if there is a token at the current position
- * @param string $string
- * @param integer $i
- * @access public
- * @version 1.11
- */
- function is_token(&$string, $i) {
- return (strpos($this->tokens_list, $string{$i}) !== false && !csstidy::escaped($string, $i));
- }
-
- /**
- * Parses CSS in $string. The code is saved as array in $this->css
- * @param string $string the CSS code
- * @access public
- * @return bool
- * @version 1.1
- */
- function parse($string) {
- // Temporarily set locale to en_US in order to handle floats properly
- $old = @setlocale(LC_ALL, 0);
- @setlocale(LC_ALL, 'C');
-
- // PHP bug? Settings need to be refreshed in PHP4
- $this->print = new csstidy_print($this);
- $this->optimise = new csstidy_optimise($this);
-
- $all_properties = & $GLOBALS['csstidy']['all_properties'];
- $at_rules = & $GLOBALS['csstidy']['at_rules'];
-
- $this->css = array();
- $this->print->input_css = $string;
- $string = str_replace("\r\n", "\n", $string) . ' ';
- $cur_comment = '';
-
- for ($i = 0, $size = strlen($string); $i < $size; $i++) {
- if ($string{$i} === "\n" || $string{$i} === "\r") {
- ++$this->line;
- }
-
- switch ($this->status) {
- /* Case in at-block */
- case 'at':
- if (csstidy::is_token($string, $i)) {
- if ($string{$i} === '/' && @$string{$i + 1} === '*') {
- $this->status = 'ic';
- ++$i;
- $this->from = 'at';
- } elseif ($string{$i} === '{') {
- $this->status = 'is';
- $this->at = $this->css_new_media_section($this->at);
- $this->_add_token(AT_START, $this->at);
- } elseif ($string{$i} === ',') {
- $this->at = trim($this->at) . ',';
- } elseif ($string{$i} === '\\') {
- $this->at .= $this->_unicode($string, $i);
- }
- // fix for complicated media, i.e @media screen and (-webkit-min-device-pixel-ratio:0)
- elseif (in_array($string{$i}, array('(', ')', ':'))) {
- $this->at .= $string{$i};
- }
- } else {
- $lastpos = strlen($this->at) - 1;
- if (!( (ctype_space($this->at{$lastpos}) || csstidy::is_token($this->at, $lastpos) && $this->at{$lastpos} === ',') && ctype_space($string{$i}))) {
- $this->at .= $string{$i};
- }
- }
- break;
-
- /* Case in-selector */
- case 'is':
- if (csstidy::is_token($string, $i)) {
- if ($string{$i} === '/' && @$string{$i + 1} === '*' && trim($this->selector) == '') {
- $this->status = 'ic';
- ++$i;
- $this->from = 'is';
- } elseif ($string{$i} === '@' && trim($this->selector) == '') {
- // Check for at-rule
- $this->invalid_at = true;
- foreach ($at_rules as $name => $type) {
- if (!strcasecmp(substr($string, $i + 1, strlen($name)), $name)) {
- ($type === 'at') ? $this->at = '@' . $name : $this->selector = '@' . $name;
- $this->status = $type;
- $i += strlen($name);
- $this->invalid_at = false;
- }
- }
-
- if ($this->invalid_at) {
- $this->selector = '@';
- $invalid_at_name = '';
- for ($j = $i + 1; $j < $size; ++$j) {
- if (!ctype_alpha($string{$j})) {
- break;
- }
- $invalid_at_name .= $string{$j};
- }
- $this->log('Invalid @-rule: ' . $invalid_at_name . ' (removed)', 'Warning');
- }
- } elseif (($string{$i} === '"' || $string{$i} === "'")) {
- $this->cur_string = $string{$i};
- $this->status = 'instr';
- $this->str_char = $string{$i};
- $this->from = 'is';
- /* fixing CSS3 attribute selectors, i.e. a[href$=".mp3" */
- $this->quoted_string = ($string{$i - 1} == '=' );
- } elseif ($this->invalid_at && $string{$i} === ';') {
- $this->invalid_at = false;
- $this->status = 'is';
- } elseif ($string{$i} === '{') {
- $this->status = 'ip';
- if($this->at == '') {
- $this->at = $this->css_new_media_section(DEFAULT_AT);
- }
- $this->selector = $this->css_new_selector($this->at,$this->selector);
- $this->_add_token(SEL_START, $this->selector);
- $this->added = false;
- } elseif ($string{$i} === '}') {
- $this->_add_token(AT_END, $this->at);
- $this->at = '';
- $this->selector = '';
- $this->sel_separate = array();
- } elseif ($string{$i} === ',') {
- $this->selector = trim($this->selector) . ',';
- $this->sel_separate[] = strlen($this->selector);
- } elseif ($string{$i} === '\\') {
- $this->selector .= $this->_unicode($string, $i);
- } elseif ($string{$i} === '*' && @in_array($string{$i + 1}, array('.', '#', '[', ':'))) {
- // remove unnecessary universal selector, FS#147
- } else {
- $this->selector .= $string{$i};
- }
- } else {
- $lastpos = strlen($this->selector) - 1;
- if ($lastpos == -1 || !( (ctype_space($this->selector{$lastpos}) || csstidy::is_token($this->selector, $lastpos) && $this->selector{$lastpos} === ',') && ctype_space($string{$i}))) {
- $this->selector .= $string{$i};
- }
- }
- break;
-
- /* Case in-property */
- case 'ip':
- if (csstidy::is_token($string, $i)) {
- if (($string{$i} === ':' || $string{$i} === '=') && $this->property != '') {
- $this->status = 'iv';
- if (!$this->get_cfg('discard_invalid_properties') || csstidy::property_is_valid($this->property)) {
- $this->property = $this->css_new_property($this->at,$this->selector,$this->property);
- $this->_add_token(PROPERTY, $this->property);
- }
- } elseif ($string{$i} === '/' && @$string{$i + 1} === '*' && $this->property == '') {
- $this->status = 'ic';
- ++$i;
- $this->from = 'ip';
- } elseif ($string{$i} === '}') {
- $this->explode_selectors();
- $this->status = 'is';
- $this->invalid_at = false;
- $this->_add_token(SEL_END, $this->selector);
- $this->selector = '';
- $this->property = '';
- } elseif ($string{$i} === ';') {
- $this->property = '';
- } elseif ($string{$i} === '\\') {
- $this->property .= $this->_unicode($string, $i);
- }
- // else this is dumb IE a hack, keep it
- elseif ($this->property=='' AND !ctype_space($string{$i})) {
- $this->property .= $string{$i};
- }
- }
- elseif (!ctype_space($string{$i})) {
- $this->property .= $string{$i};
- }
- break;
-
- /* Case in-value */
- case 'iv':
- $pn = (($string{$i} === "\n" || $string{$i} === "\r") && $this->property_is_next($string, $i + 1) || $i == strlen($string) - 1);
- if (csstidy::is_token($string, $i) || $pn) {
- if ($string{$i} === '/' && @$string{$i + 1} === '*') {
- $this->status = 'ic';
- ++$i;
- $this->from = 'iv';
- } elseif (($string{$i} === '"' || $string{$i} === "'" || $string{$i} === '(')) {
- $this->cur_string = $string{$i};
- $this->str_char = ($string{$i} === '(') ? ')' : $string{$i};
- $this->status = 'instr';
- $this->from = 'iv';
- } elseif ($string{$i} === ',') {
- $this->sub_value = trim($this->sub_value) . ',';
- } elseif ($string{$i} === '\\') {
- $this->sub_value .= $this->_unicode($string, $i);
- } elseif ($string{$i} === ';' || $pn) {
- if ($this->selector{0} === '@' && isset($at_rules[substr($this->selector, 1)]) && $at_rules[substr($this->selector, 1)] === 'iv') {
- /* Add quotes to charset, import, namespace */
- $this->sub_value_arr[] = '"' . trim($this->sub_value) . '"';
-
- $this->status = 'is';
-
- switch ($this->selector) {
- case '@charset': $this->charset = $this->sub_value_arr[0];
- break;
- case '@namespace': $this->namespace = implode(' ', $this->sub_value_arr);
- break;
- case '@import': $this->import[] = implode(' ', $this->sub_value_arr);
- break;
- }
-
- $this->sub_value_arr = array();
- $this->sub_value = '';
- $this->selector = '';
- $this->sel_separate = array();
- } else {
- $this->status = 'ip';
- }
- } elseif ($string{$i} !== '}') {
- $this->sub_value .= $string{$i};
- }
- if (($string{$i} === '}' || $string{$i} === ';' || $pn) && !empty($this->selector)) {
- if ($this->at == '') {
- $this->at = $this->css_new_media_section(DEFAULT_AT);
- }
-
- // case settings
- if ($this->get_cfg('lowercase_s')) {
- $this->selector = strtolower($this->selector);
- }
- $this->property = strtolower($this->property);
-
- $this->optimise->subvalue();
- if ($this->sub_value != '') {
- /* original, disabled for fix below
- if (substr($this->sub_value, 0, 6) == 'format') {
- $this->sub_value = str_replace(array('format(', ')'), array('format("', '")'), $this->sub_value);
- }//*/
- $this->sub_value_arr[] = $this->sub_value;
- // [FIX] @font-face with multiple fonts and CSSTidy
- // (http://www.pixelastic.com/blog/86:csstidy-and-the-woff-fonts)
- foreach($this->sub_value_arr as $sub_value) {
- if (substr($sub_value, 0, 6) == 'format') {
- $sub_value = str_replace(array('format(', ')'), array('format("', '")'), $sub_value);
- }
- }
- $this->sub_value = '';
- }
-
- $this->value = array_shift($this->sub_value_arr);
- while(count($this->sub_value_arr)){
- $this->value .= (substr($this->value,-1,1)==','?'':' ').array_shift($this->sub_value_arr);
- }
-
- $this->optimise->value();
-
- $valid = csstidy::property_is_valid($this->property);
- if ((!$this->invalid_at || $this->get_cfg('preserve_css')) && (!$this->get_cfg('discard_invalid_properties') || $valid)) {
- $this->css_add_property($this->at, $this->selector, $this->property, $this->value);
- $this->_add_token(VALUE, $this->value);
- $this->optimise->shorthands();
- }
- if (!$valid) {
- if ($this->get_cfg('discard_invalid_properties')) {
- $this->log('Removed invalid property: ' . $this->property, 'Warning');
- } else {
- $this->log('Invalid property in ' . strtoupper($this->get_cfg('css_level')) . ': ' . $this->property, 'Warning');
- }
- }
-
- $this->property = '';
- $this->sub_value_arr = array();
- $this->value = '';
- }
- if ($string{$i} === '}') {
- $this->explode_selectors();
- $this->_add_token(SEL_END, $this->selector);
- $this->status = 'is';
- $this->invalid_at = false;
- $this->selector = '';
- }
- } elseif (!$pn) {
- $this->sub_value .= $string{$i};
-
- if (ctype_space($string{$i})) {
- $this->optimise->subvalue();
- if ($this->sub_value != '') {
- $this->sub_value_arr[] = $this->sub_value;
- $this->sub_value = '';
- }
- }
- }
- break;
-
- /* Case in string */
- case 'instr':
- if ($this->str_char === ')' && ($string{$i} === '"' || $string{$i} === '\'') && !$this->str_in_str && !csstidy::escaped($string, $i)) {
- $this->str_in_str = true;
- } elseif ($this->str_char === ')' && ($string{$i} === '"' || $string{$i} === '\'') && $this->str_in_str && !csstidy::escaped($string, $i)) {
- $this->str_in_str = false;
- }
- $temp_add = $string{$i}; // ...and no not-escaped backslash at the previous position
- if (($string{$i} === "\n" || $string{$i} === "\r") && !($string{$i - 1} === '\\' && !csstidy::escaped($string, $i - 1))) {
- $temp_add = "\\A ";
- $this->log('Fixed incorrect newline in string', 'Warning');
- }
- // this optimisation remove space in css3 properties (see vendor-prefixed/webkit-gradient.csst)
- #if (!($this->str_char === ')' && in_array($string{$i}, $GLOBALS['csstidy']['whitespace']) && !$this->str_in_str)) {
- $this->cur_string .= $temp_add;
- #}
- if ($string{$i} == $this->str_char && !csstidy::escaped($string, $i) && !$this->str_in_str) {
- $this->status = $this->from;
- if (!preg_match('|[' . implode('', $GLOBALS['csstidy']['whitespace']) . ']|uis', $this->cur_string) && $this->property !== 'content') {
- if (!$this->quoted_string) {
- if ($this->str_char === '"' || $this->str_char === '\'') {
- // Temporarily disable this optimization to avoid problems with @charset rule, quote properties, and some attribute selectors...
- // Attribute selectors fixed, added quotes to @chartset, no problems with properties detected. Enabled
- $this->cur_string = substr($this->cur_string, 1, -1);
- } else if (strlen($this->cur_string) > 3 && ($this->cur_string[1] === '"' || $this->cur_string[1] === '\'')) /* () */ {
- $this->cur_string = $this->cur_string[0] . substr($this->cur_string, 2, -2) . substr($this->cur_string, -1);
- }
- } else {
- $this->quoted_string = false;
- }
- }
- if ($this->from === 'iv') {
- if (!$this->quoted_string){
- if (strpos($this->cur_string,',')!==false)
- // we can on only remove space next to ','
- $this->cur_string = implode(',',array_map('trim',explode(',',$this->cur_string)));
- // and multiple spaces (too expensive)
- if (strpos($this->cur_string,' ')!==false)
- $this->cur_string = preg_replace(",\s+,"," ",$this->cur_string);
- }
- $this->sub_value .= $this->cur_string;
- } elseif ($this->from === 'is') {
- $this->selector .= $this->cur_string;
- }
- }
- break;
-
- /* Case in-comment */
- case 'ic':
- if ($string{$i} === '*' && $string{$i + 1} === '/') {
- $this->status = $this->from;
- $i++;
- $this->_add_token(COMMENT, $cur_comment);
- $cur_comment = '';
- } else {
- $cur_comment .= $string{$i};
- }
- break;
- }
- }
-
- $this->optimise->postparse();
-
- $this->print->_reset();
-
- @setlocale(LC_ALL, $old); // Set locale back to original setting
-
- return!(empty($this->css) && empty($this->import) && empty($this->charset) && empty($this->tokens) && empty($this->namespace));
- }
-
- /**
- * Explodes selectors
- * @access private
- * @version 1.0
- */
- function explode_selectors() {
- // Explode multiple selectors
- if ($this->get_cfg('merge_selectors') === 1) {
- $new_sels = array();
- $lastpos = 0;
- $this->sel_separate[] = strlen($this->selector);
- foreach ($this->sel_separate as $num => $pos) {
- if ($num == count($this->sel_separate) - 1) {
- $pos += 1;
- }
-
- $new_sels[] = substr($this->selector, $lastpos, $pos - $lastpos - 1);
- $lastpos = $pos;
- }
-
- if (count($new_sels) > 1) {
- foreach ($new_sels as $selector) {
- if (isset($this->css[$this->at][$this->selector])) {
- $this->merge_css_blocks($this->at, $selector, $this->css[$this->at][$this->selector]);
- }
- }
- unset($this->css[$this->at][$this->selector]);
- }
- }
- $this->sel_separate = array();
- }
-
- /**
- * Checks if a character is escaped (and returns true if it is)
- * @param string $string
- * @param integer $pos
- * @access public
- * @return bool
- * @version 1.02
- */
- static function escaped(&$string, $pos) {
- return!(@($string{$pos - 1} !== '\\') || csstidy::escaped($string, $pos - 1));
- }
-
- /**
- * Adds a property with value to the existing CSS code
- * @param string $media
- * @param string $selector
- * @param string $property
- * @param string $new_val
- * @access private
- * @version 1.2
- */
- function css_add_property($media, $selector, $property, $new_val) {
- if ($this->get_cfg('preserve_css') || trim($new_val) == '') {
- return;
- }
-
- $this->added = true;
- if (isset($this->css[$media][$selector][$property])) {
- if ((csstidy::is_important($this->css[$media][$selector][$property]) && csstidy::is_important($new_val)) || !csstidy::is_important($this->css[$media][$selector][$property])) {
- $this->css[$media][$selector][$property] = trim($new_val);
- }
- } else {
- $this->css[$media][$selector][$property] = trim($new_val);
- }
- }
-
- /**
- * Start a new media section.
- * Check if the media is not already known,
- * else rename it with extra spaces
- * to avoid merging
- *
- * @param string $media
- * @return string
- */
- function css_new_media_section($media){
- if($this->get_cfg('preserve_css')) {
- return $media;
- }
-
- // if the last @media is the same as this
- // keep it
- if (!$this->css OR !is_array($this->css) OR empty($this->css)){
- return $media;
- }
- end($this->css);
- list($at,) = each($this->css);
- if ($at == $media){
- return $media;
- }
- while (isset($this->css[$media]))
- if (is_numeric($media))
- $media++;
- else
- $media .= " ";
- return $media;
- }
-
- /**
- * Start a new selector.
- * If already referenced in this media section,
- * rename it with extra space to avoid merging
- * except if merging is required,
- * or last selector is the same (merge siblings)
- *
- * never merge @font-face
- *
- * @param string $media
- * @param string $selector
- * @return string
- */
- function css_new_selector($media,$selector){
- if($this->get_cfg('preserve_css')) {
- return $selector;
- }
- $selector = trim($selector);
- if (strncmp($selector,"@font-face",10)!=0){
- if ($this->settings['merge_selectors'] != false)
- return $selector;
-
- if (!$this->css OR !isset($this->css[$media]) OR !$this->css[$media])
- return $selector;
-
- // if last is the same, keep it
- end($this->css[$media]);
- list($sel,) = each($this->css[$media]);
- if ($sel == $selector){
- return $selector;
- }
- }
-
- while (isset($this->css[$media][$selector]))
- $selector .= " ";
- return $selector;
- }
-
- /**
- * Start a new propertie.
- * If already references in this selector,
- * rename it with extra space to avoid override
- *
- * @param string $media
- * @param string $selector
- * @param string $property
- * @return string
- */
- function css_new_property($media, $selector, $property){
- if($this->get_cfg('preserve_css')) {
- return $property;
- }
- if (!$this->css OR !isset($this->css[$media][$selector]) OR !$this->css[$media][$selector])
- return $property;
-
- while (isset($this->css[$media][$selector][$property]))
- $property .= " ";
-
- return $property;
- }
-
- /**
- * Adds CSS to an existing media/selector
- * @param string $media
- * @param string $selector
- * @param array $css_add
- * @access private
- * @version 1.1
- */
- function merge_css_blocks($media, $selector, $css_add) {
- foreach ($css_add as $property => $value) {
- $this->css_add_property($media, $selector, $property, $value, false);
- }
- }
-
- /**
- * Checks if $value is !important.
- * @param string $value
- * @return bool
- * @access public
- * @version 1.0
- */
- static function is_important(&$value) {
- return (!strcasecmp(substr(str_replace($GLOBALS['csstidy']['whitespace'], '', $value), -10, 10), '!important'));
- }
-
- /**
- * Returns a value without !important
- * @param string $value
- * @return string
- * @access public
- * @version 1.0
- */
- static function gvw_important($value) {
- if (csstidy::is_important($value)) {
- $value = trim($value);
- $value = substr($value, 0, -9);
- $value = trim($value);
- $value = substr($value, 0, -1);
- $value = trim($value);
- return $value;
- }
- return $value;
- }
-
- /**
- * Checks if the next word in a string from pos is a CSS property
- * @param string $istring
- * @param integer $pos
- * @return bool
- * @access private
- * @version 1.2
- */
- function property_is_next($istring, $pos) {
- $all_properties = & $GLOBALS['csstidy']['all_properties'];
- $istring = substr($istring, $pos, strlen($istring) - $pos);
- $pos = strpos($istring, ':');
- if ($pos === false) {
- return false;
- }
- $istring = strtolower(trim(substr($istring, 0, $pos)));
- if (isset($all_properties[$istring])) {
- $this->log('Added semicolon to the end of declaration', 'Warning');
- return true;
- }
- return false;
- }
-
- /**
- * Checks if a property is valid
- * @param string $property
- * @return bool;
- * @access public
- * @version 1.0
- */
- function property_is_valid($property) {
- $all_properties = & $GLOBALS['csstidy']['all_properties'];
- return (isset($all_properties[$property]) && strpos($all_properties[$property], strtoupper($this->get_cfg('css_level'))) !== false );
- }
+ /**
+ * Saves the parsed CSS. This array is empty if preserve_css is on.
+ * @var array
+ * @access public
+ */
+ var $css = array();
+ /**
+ * Saves the parsed CSS (raw)
+ * @var array
+ * @access private
+ */
+ var $tokens = array();
+ /**
+ * Printer class
+ * @see csstidy_print
+ * @var object
+ * @access public
+ */
+ var $print;
+ /**
+ * Optimiser class
+ * @see csstidy_optimise
+ * @var object
+ * @access private
+ */
+ var $optimise;
+ /**
+ * Saves the CSS charset (@charset)
+ * @var string
+ * @access private
+ */
+ var $charset = '';
+ /**
+ * Saves all @import URLs
+ * @var array
+ * @access private
+ */
+ var $import = array();
+ /**
+ * Saves the namespace
+ * @var string
+ * @access private
+ */
+ var $namespace = '';
+ /**
+ * Contains the version of csstidy
+ * @var string
+ * @access private
+ */
+ var $version = '1.3';
+ /**
+ * Stores the settings
+ * @var array
+ * @access private
+ */
+ var $settings = array();
+ /**
+ * Saves the parser-status.
+ *
+ * Possible values:
+ * - is = in selector
+ * - ip = in property
+ * - iv = in value
+ * - instr = in string (started at " or ' or ( )
+ * - ic = in comment (ignore everything)
+ * - at = in @-block
+ *
+ * @var string
+ * @access private
+ */
+ var $status = 'is';
+ /**
+ * Saves the current at rule (@media)
+ * @var string
+ * @access private
+ */
+ var $at = '';
+ /**
+ * Saves the current selector
+ * @var string
+ * @access private
+ */
+ var $selector = '';
+ /**
+ * Saves the current property
+ * @var string
+ * @access private
+ */
+ var $property = '';
+ /**
+ * Saves the position of , in selectors
+ * @var array
+ * @access private
+ */
+ var $sel_separate = array();
+ /**
+ * Saves the current value
+ * @var string
+ * @access private
+ */
+ var $value = '';
+ /**
+ * Saves the current sub-value
+ *
+ * Example for a subvalue:
+ * background:url(foo.png) red no-repeat;
+ * "url(foo.png)", "red", and "no-repeat" are subvalues,
+ * seperated by whitespace
+ * @var string
+ * @access private
+ */
+ var $sub_value = '';
+ /**
+ * Array which saves all subvalues for a property.
+ * @var array
+ * @see sub_value
+ * @access private
+ */
+ var $sub_value_arr = array();
+ /**
+ * Saves the char which opened the last string
+ * @var string
+ * @access private
+ */
+ var $str_char = '';
+ var $cur_string = '';
+ /**
+ * Status from which the parser switched to ic or instr
+ * @var string
+ * @access private
+ */
+ var $from = '';
+ /**
+ * Variable needed to manage string-in-strings, for example url("foo.png")
+ * @var string
+ * @access private
+ */
+ var $str_in_str = false;
+ /**
+ * =true if in invalid at-rule
+ * @var bool
+ * @access private
+ */
+ var $invalid_at = false;
+ /**
+ * =true if something has been added to the current selector
+ * @var bool
+ * @access private
+ */
+ var $added = false;
+ /**
+ * Array which saves the message log
+ * @var array
+ * @access private
+ */
+ var $log = array();
+ /**
+ * Saves the line number
+ * @var integer
+ * @access private
+ */
+ var $line = 1;
+ /**
+ * Marks if we need to leave quotes for a string
+ * @var string
+ * @access private
+ */
+ var $quoted_string = false;
+
+ /**
+ * List of tokens
+ * @var string
+ */
+ var $tokens_list = "";
+ /**
+ * Loads standard template and sets default settings
+ * @access private
+ * @version 1.3
+ */
+ function csstidy() {
+ $this->settings['remove_bslash'] = true;
+ $this->settings['compress_colors'] = true;
+ $this->settings['compress_font-weight'] = true;
+ $this->settings['lowercase_s'] = false;
+ /*
+ 1 common shorthands optimization
+ 2 + font property optimization
+ 3 + background property optimization
+ */
+ $this->settings['optimise_shorthands'] = 1;
+ $this->settings['remove_last_;'] = true;
+ /* rewrite all properties with low case, better for later gzip OK, safe*/
+ $this->settings['case_properties'] = 1;
+ /* sort properties in alpabetic order, better for later gzip
+ * but can cause trouble in case of overiding same propertie or using hack
+ */
+ $this->settings['sort_properties'] = false;
+ /*
+ 1, 3, 5, etc -- enable sorting selectors inside @media: a{}b{}c{}
+ 2, 5, 8, etc -- enable sorting selectors inside one CSS declaration: a,b,c{}
+ preserve order by default cause it can break functionnality
+ */
+ $this->settings['sort_selectors'] = 0;
+ /* is dangeroues to be used: CSS is broken sometimes */
+ $this->settings['merge_selectors'] = 0;
+ /* preserve or not browser hacks */
+ $this->settings['discard_invalid_selectors'] = false;
+ $this->settings['discard_invalid_properties'] = false;
+ $this->settings['css_level'] = 'CSS2.1';
+ $this->settings['preserve_css'] = false;
+ $this->settings['timestamp'] = false;
+ $this->settings['template'] = ''; // say that propertie exist
+ $this->set_cfg('template', 'default'); // call load_template
+ $this->optimise = new csstidy_optimise($this);
+
+ $this->tokens_list = & $GLOBALS['csstidy']['tokens'];
+ }
+
+ /**
+ * Get the value of a setting.
+ * @param string $setting
+ * @access public
+ * @return mixed
+ * @version 1.0
+ */
+ function get_cfg($setting) {
+ if (isset($this->settings[$setting])) {
+ return $this->settings[$setting];
+ }
+ return false;
+ }
+
+ /**
+ * Load a template
+ * @param string $template used by set_cfg to load a template via a configuration setting
+ * @access private
+ * @version 1.4
+ */
+ function _load_template($template) {
+ switch ($template) {
+ case 'default':
+ $this->load_template('default');
+ break;
+
+ case 'highest':
+ $this->load_template('highest_compression');
+ break;
+
+ case 'high':
+ $this->load_template('high_compression');
+ break;
+
+ case 'low':
+ $this->load_template('low_compression');
+ break;
+
+ default:
+ $this->load_template($template);
+ break;
+ }
+ }
+
+ /**
+ * Set the value of a setting.
+ * @param string $setting
+ * @param mixed $value
+ * @access public
+ * @return bool
+ * @version 1.0
+ */
+ function set_cfg($setting, $value = null) {
+ if (is_array($setting) && $value === null) {
+ foreach ($setting as $setprop => $setval) {
+ $this->settings[$setprop] = $setval;
+ }
+ if (array_key_exists('template', $setting)) {
+ $this->_load_template($this->settings['template']);
+ }
+ return true;
+ }
+ else if (isset($this->settings[$setting]) && $value !== '') {
+ $this->settings[$setting] = $value;
+ if ($setting === 'template') {
+ $this->_load_template($this->settings['template']);
+ }
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * Adds a token to $this->tokens
+ * @param mixed $type
+ * @param string $data
+ * @param bool $do add a token even if preserve_css is off
+ * @access private
+ * @version 1.0
+ */
+ function _add_token($type, $data, $do = false) {
+ if ($this->get_cfg('preserve_css') || $do) {
+ $this->tokens[] = array($type, ($type == COMMENT) ? $data : trim($data));
+ }
+ }
+
+ /**
+ * Add a message to the message log
+ * @param string $message
+ * @param string $type
+ * @param integer $line
+ * @access private
+ * @version 1.0
+ */
+ function log($message, $type, $line = -1) {
+ if ($line === -1) {
+ $line = $this->line;
+ }
+ $line = intval($line);
+ $add = array(
+ 'm' => $message,
+ 't' => $type,
+ );
+ if (!isset($this->log[$line]) || !in_array($add, $this->log[$line])) {
+ $this->log[$line][] = $add;
+ }
+ }
+
+ /**
+ * Parse unicode notations and find a replacement character
+ * @param string $string
+ * @param integer $i
+ * @access private
+ * @return string
+ * @version 1.2
+ */
+ function _unicode(&$string, &$i) {
+ ++$i;
+ $add = '';
+ $replaced = false;
+
+ while ($i < strlen($string) && (ctype_xdigit($string{$i}) || ctype_space($string{$i})) && strlen($add) < 6) {
+ $add .= $string{$i};
+
+ if (ctype_space($string{$i})) {
+ break;
+ }
+ $i++;
+ }
+
+ if (hexdec($add) > 47 && hexdec($add) < 58 || hexdec($add) > 64 && hexdec($add) < 91 || hexdec($add) > 96 && hexdec($add) < 123) {
+ $this->log('Replaced unicode notation: Changed \\' . $add . ' to ' . chr(hexdec($add)), 'Information');
+ $add = chr(hexdec($add));
+ $replaced = true;
+ }
+ else {
+ $add = trim('\\' . $add);
+ }
+
+ if (@ctype_xdigit($string{$i + 1}) && ctype_space($string{$i})
+ && !$replaced || !ctype_space($string{$i})) {
+ $i--;
+ }
+
+ if ($add !== '\\' || !$this->get_cfg('remove_bslash') || strpos($this->tokens_list, $string{$i + 1}) !== false) {
+ return $add;
+ }
+
+ if ($add === '\\') {
+ $this->log('Removed unnecessary backslash', 'Information');
+ }
+ return '';
+ }
+
+ /**
+ * Write formatted output to a file
+ * @param string $filename
+ * @param string $doctype when printing formatted, is a shorthand for the document type
+ * @param bool $externalcss when printing formatted, indicates whether styles to be attached internally or as an external stylesheet
+ * @param string $title when printing formatted, is the title to be added in the head of the document
+ * @param string $lang when printing formatted, gives a two-letter language code to be added to the output
+ * @access public
+ * @version 1.4
+ */
+ function write_page($filename, $doctype = 'xhtml1.1', $externalcss = true, $title = '', $lang = 'en') {
+ $this->write($filename, true);
+ }
+
+ /**
+ * Write plain output to a file
+ * @param string $filename
+ * @param bool $formatted whether to print formatted or not
+ * @param string $doctype when printing formatted, is a shorthand for the document type
+ * @param bool $externalcss when printing formatted, indicates whether styles to be attached internally or as an external stylesheet
+ * @param string $title when printing formatted, is the title to be added in the head of the document
+ * @param string $lang when printing formatted, gives a two-letter language code to be added to the output
+ * @param bool $pre_code whether to add pre and code tags around the code (for light HTML formatted templates)
+ * @access public
+ * @version 1.4
+ */
+ function write($filename, $formatted = false, $doctype = 'xhtml1.1', $externalcss = true, $title = '', $lang = 'en', $pre_code = true) {
+ $filename .= ( $formatted) ? '.xhtml' : '.css';
+
+ if (!is_dir('temp')) {
+ $madedir = mkdir('temp');
+ if (!$madedir) {
+ print 'Could not make directory "temp" in ' . dirname(__FILE__);
+ exit;
+ }
+ }
+ $handle = fopen('temp/' . $filename, 'w');
+ if ($handle) {
+ if (!$formatted) {
+ fwrite($handle, $this->print->plain());
+ }
+ else {
+ fwrite($handle, $this->print->formatted_page($doctype, $externalcss, $title, $lang, $pre_code));
+ }
+ }
+ fclose($handle);
+ }
+
+ /**
+ * Loads a new template
+ * @param string $content either filename (if $from_file == true), content of a template file, "high_compression", "highest_compression", "low_compression", or "default"
+ * @param bool $from_file uses $content as filename if true
+ * @access public
+ * @version 1.1
+ * @see http://csstidy.sourceforge.net/templates.php
+ */
+ function load_template($content, $from_file = true) {
+ $predefined_templates = & $GLOBALS['csstidy']['predefined_templates'];
+ if ($content === 'high_compression' || $content === 'default' || $content === 'highest_compression' || $content === 'low_compression') {
+ $this->template = $predefined_templates[$content];
+ return;
+ }
+
+
+ if ($from_file) {
+ $content = strip_tags(file_get_contents($content), '<span>');
+ }
+ $content = str_replace("\r\n", "\n", $content); // Unify newlines (because the output also only uses \n)
+ $template = explode('|', $content);
+
+ for ($i = 0; $i < count($template); $i++) {
+ $this->template[$i] = $template[$i];
+ }
+ }
+
+ /**
+ * Starts parsing from URL
+ * @param string $url
+ * @access public
+ * @version 1.0
+ */
+ function parse_from_url($url) {
+ return $this->parse(@file_get_contents($url));
+ }
+
+ /**
+ * Checks if there is a token at the current position
+ * @param string $string
+ * @param integer $i
+ * @access public
+ * @version 1.11
+ */
+ function is_token(&$string, $i) {
+ return (strpos($this->tokens_list, $string{$i}) !== false && !csstidy::escaped($string, $i));
+ }
+
+ /**
+ * Parses CSS in $string. The code is saved as array in $this->css
+ * @param string $string the CSS code
+ * @access public
+ * @return bool
+ * @version 1.1
+ */
+ function parse($string) {
+ // Temporarily set locale to en_US in order to handle floats properly
+ $old = @setlocale(LC_ALL, 0);
+ @setlocale(LC_ALL, 'C');
+
+ // PHP bug? Settings need to be refreshed in PHP4
+ $this->print = new csstidy_print($this);
+ $this->optimise = new csstidy_optimise($this);
+
+ $all_properties = & $GLOBALS['csstidy']['all_properties'];
+ $at_rules = & $GLOBALS['csstidy']['at_rules'];
+
+ $this->css = array();
+ $this->print->input_css = $string;
+ $string = str_replace("\r\n", "\n", $string) . ' ';
+ $cur_comment = '';
+
+ for ($i = 0, $size = strlen($string); $i < $size; $i++) {
+ if ($string{$i} === "\n" || $string{$i} === "\r") {
+ ++$this->line;
+ }
+
+ switch ($this->status) {
+ /* Case in at-block */
+ case 'at':
+ if (csstidy::is_token($string, $i)) {
+ if ($string{$i} === '/' && @$string{$i + 1} === '*') {
+ $this->status = 'ic';
+ ++$i;
+ $this->from = 'at';
+ }
+ elseif ($string{$i} === '{') {
+ $this->status = 'is';
+ $this->at = $this->css_new_media_section($this->at);
+ $this->_add_token(AT_START, $this->at);
+ }
+ elseif ($string{$i} === ',') {
+ $this->at = trim($this->at) . ',';
+ }
+ elseif ($string{$i} === '\\') {
+ $this->at .= $this->_unicode($string, $i);
+ }
+ // fix for complicated media, i.e @media screen and (-webkit-min-device-pixel-ratio:0)
+ elseif (in_array($string{$i}, array('(', ')', ':'))) {
+ $this->at .= $string{$i};
+ }
+ }
+ else {
+ $lastpos = strlen($this->at) - 1;
+ if (!( (ctype_space($this->at{$lastpos}) || csstidy::is_token($this->at, $lastpos) && $this->at{$lastpos} === ',') && ctype_space($string{$i}))) {
+ $this->at .= $string{$i};
+ }
+ }
+ break;
+
+ /* Case in-selector */
+ case 'is':
+ if (csstidy::is_token($string, $i)) {
+ if ($string{$i} === '/' && @$string{$i + 1} === '*' && trim($this->selector) == '') {
+ $this->status = 'ic';
+ ++$i;
+ $this->from = 'is';
+ }
+ elseif ($string{$i} === '@' && trim($this->selector) == '') {
+ // Check for at-rule
+ $this->invalid_at = true;
+ foreach ($at_rules as $name => $type) {
+ if (!strcasecmp(substr($string, $i + 1, strlen($name)), $name)) {
+ ($type === 'at') ? $this->at = '@' . $name : $this->selector = '@' . $name;
+ $this->status = $type;
+ $i += strlen($name);
+ $this->invalid_at = false;
+ }
+ }
+
+ if ($this->invalid_at) {
+ $this->selector = '@';
+ $invalid_at_name = '';
+ for ($j = $i + 1; $j < $size; ++$j) {
+ if (!ctype_alpha($string{$j})) {
+ break;
+ }
+ $invalid_at_name .= $string{$j};
+ }
+ $this->log('Invalid @-rule: ' . $invalid_at_name . ' (removed)', 'Warning');
+ }
+ }
+ elseif (($string{$i} === '"' || $string{$i} === "'")) {
+ $this->cur_string = $string{$i};
+ $this->status = 'instr';
+ $this->str_char = $string{$i};
+ $this->from = 'is';
+ /* fixing CSS3 attribute selectors, i.e. a[href$=".mp3" */
+ $this->quoted_string = ($string{$i - 1} == '=' );
+ }
+ elseif ($this->invalid_at && $string{$i} === ';') {
+ $this->invalid_at = false;
+ $this->status = 'is';
+ }
+ elseif ($string{$i} === '{') {
+ $this->status = 'ip';
+ if ($this->at == '') {
+ $this->at = $this->css_new_media_section(DEFAULT_AT);
+ }
+ $this->selector = $this->css_new_selector($this->at, $this->selector);
+ $this->_add_token(SEL_START, $this->selector);
+ $this->added = false;
+ }
+ elseif ($string{$i} === '}') {
+ $this->_add_token(AT_END, $this->at);
+ $this->at = '';
+ $this->selector = '';
+ $this->sel_separate = array();
+ }
+ elseif ($string{$i} === ',') {
+ $this->selector = trim($this->selector) . ',';
+ $this->sel_separate[] = strlen($this->selector);
+ }
+ elseif ($string{$i} === '\\') {
+ $this->selector .= $this->_unicode($string, $i);
+ }
+ elseif ($string{$i} === '*' && @in_array($string{$i + 1}, array('.', '#', '[', ':'))) {
+ // remove unnecessary universal selector, FS#147
+ }
+ else {
+ $this->selector .= $string{$i};
+ }
+ }
+ else {
+ $lastpos = strlen($this->selector) - 1;
+ if ($lastpos == -1 || !( (ctype_space($this->selector{$lastpos}) || csstidy::is_token($this->selector, $lastpos) && $this->selector{$lastpos} === ',') && ctype_space($string{$i}))) {
+ $this->selector .= $string{$i};
+ }
+ }
+ break;
+
+ /* Case in-property */
+ case 'ip':
+ if (csstidy::is_token($string, $i)) {
+ if (($string{$i} === ':' || $string{$i} === '=') && $this->property != '') {
+ $this->status = 'iv';
+ if (!$this->get_cfg('discard_invalid_properties') || csstidy::property_is_valid($this->property)) {
+ $this->property = $this->css_new_property($this->at, $this->selector, $this->property);
+ $this->_add_token(PROPERTY, $this->property);
+ }
+ }
+ elseif ($string{$i} === '/' && @$string{$i + 1} === '*' && $this->property == '') {
+ $this->status = 'ic';
+ ++$i;
+ $this->from = 'ip';
+ }
+ elseif ($string{$i} === '}') {
+ $this->explode_selectors();
+ $this->status = 'is';
+ $this->invalid_at = false;
+ $this->_add_token(SEL_END, $this->selector);
+ $this->selector = '';
+ $this->property = '';
+ }
+ elseif ($string{$i} === ';') {
+ $this->property = '';
+ }
+ elseif ($string{$i} === '\\') {
+ $this->property .= $this->_unicode($string, $i);
+ }
+ // else this is dumb IE a hack, keep it
+ elseif ($this->property == '' AND !ctype_space($string{$i})) {
+ $this->property .= $string{$i};
+ }
+ }
+ elseif (!ctype_space($string{$i})) {
+ $this->property .= $string{$i};
+ }
+ break;
+
+ /* Case in-value */
+ case 'iv':
+ $pn = (($string{$i} === "\n" || $string{$i} === "\r") && $this->property_is_next($string, $i + 1) || $i == strlen($string) - 1);
+ if (csstidy::is_token($string, $i) || $pn) {
+ if ($string{$i} === '/' && @$string{$i + 1} === '*') {
+ $this->status = 'ic';
+ ++$i;
+ $this->from = 'iv';
+ }
+ elseif (($string{$i} === '"' || $string{$i} === "'" || $string{$i} === '(')) {
+ $this->cur_string = $string{$i};
+ $this->str_char = ($string{$i} === '(') ? ')' : $string{$i};
+ $this->status = 'instr';
+ $this->from = 'iv';
+ }
+ elseif ($string{$i} === ',') {
+ $this->sub_value = trim($this->sub_value) . ',';
+ }
+ elseif ($string{$i} === '\\') {
+ $this->sub_value .= $this->_unicode($string, $i);
+ }
+ elseif ($string{$i} === ';' || $pn) {
+ if ($this->selector{0} === '@' && isset($at_rules[substr($this->selector, 1)]) && $at_rules[substr($this->selector, 1)] === 'iv') {
+ /* Add quotes to charset, import, namespace */
+ $this->sub_value_arr[] = '"' . trim($this->sub_value) . '"';
+
+ $this->status = 'is';
+
+ switch ($this->selector) {
+ case '@charset':
+ $this->charset = $this->sub_value_arr[0];
+ break;
+ case '@namespace':
+ $this->namespace = implode(' ', $this->sub_value_arr);
+ break;
+ case '@import':
+ $this->import[] = implode(' ', $this->sub_value_arr);
+ break;
+ }
+
+ $this->sub_value_arr = array();
+ $this->sub_value = '';
+ $this->selector = '';
+ $this->sel_separate = array();
+ }
+ else {
+ $this->status = 'ip';
+ }
+ }
+ elseif ($string{$i} !== '}') {
+ $this->sub_value .= $string{$i};
+ }
+ if (($string{$i} === '}' || $string{$i} === ';' || $pn) && !empty($this->selector)) {
+ if ($this->at == '') {
+ $this->at = $this->css_new_media_section(DEFAULT_AT);
+ }
+
+ // case settings
+ if ($this->get_cfg('lowercase_s')) {
+ $this->selector = strtolower($this->selector);
+ }
+ $this->property = strtolower($this->property);
+
+ $this->optimise->subvalue();
+ if ($this->sub_value != '') {
+ /* original, disabled for fix below
+ if (substr($this->sub_value, 0, 6) == 'format') {
+ $this->sub_value = str_replace(array('format(', ')'), array('format("', '")'), $this->sub_value);
+ }//*/
+ $this->sub_value_arr[] = $this->sub_value;
+ // [FIX] @font-face with multiple fonts and CSSTidy
+ // (http://www.pixelastic.com/blog/86:csstidy-and-the-woff-fonts)
+ foreach ($this->sub_value_arr as $sub_value) {
+ if (substr($sub_value, 0, 6) == 'format') {
+ $sub_value = str_replace(array('format(', ')'), array('format("', '")'), $sub_value);
+ }
+ }
+ $this->sub_value = '';
+ }
+
+ $this->value = array_shift($this->sub_value_arr);
+ while (count($this->sub_value_arr)) {
+ $this->value .= (substr($this->value, -1, 1) == ',' ? '' : ' ') . array_shift($this->sub_value_arr);
+ }
+
+ $this->optimise->value();
+
+ $valid = csstidy::property_is_valid($this->property);
+ if ((!$this->invalid_at || $this->get_cfg('preserve_css')) && (!$this->get_cfg('discard_invalid_properties') || $valid)) {
+ $this->css_add_property($this->at, $this->selector, $this->property, $this->value);
+ $this->_add_token(VALUE, $this->value);
+ $this->optimise->shorthands();
+ }
+ if (!$valid) {
+ if ($this->get_cfg('discard_invalid_properties')) {
+ $this->log('Removed invalid property: ' . $this->property, 'Warning');
+ }
+ else {
+ $this->log('Invalid property in ' . strtoupper($this->get_cfg('css_level')) . ': ' . $this->property, 'Warning');
+ }
+ }
+
+ $this->property = '';
+ $this->sub_value_arr = array();
+ $this->value = '';
+ }
+ if ($string{$i} === '}') {
+ $this->explode_selectors();
+ $this->_add_token(SEL_END, $this->selector);
+ $this->status = 'is';
+ $this->invalid_at = false;
+ $this->selector = '';
+ }
+ }
+ elseif (!$pn) {
+ $this->sub_value .= $string{$i};
+
+ if (ctype_space($string{$i})) {
+ $this->optimise->subvalue();
+ if ($this->sub_value != '') {
+ $this->sub_value_arr[] = $this->sub_value;
+ $this->sub_value = '';
+ }
+ }
+ }
+ break;
+
+ /* Case in string */
+ case 'instr':
+ if ($this->str_char === ')' && ($string{$i} === '"' || $string{$i} === '\'') && !$this->str_in_str && !csstidy::escaped($string, $i)) {
+ $this->str_in_str = true;
+ }
+ elseif ($this->str_char === ')' && ($string{$i} === '"' || $string{$i} === '\'') && $this->str_in_str && !csstidy::escaped($string, $i)) {
+ $this->str_in_str = false;
+ }
+ $temp_add = $string{$i}; // ...and no not-escaped backslash at the previous position
+ if (($string{$i} === "\n" || $string{$i} === "\r") && !($string{$i - 1} === '\\' && !csstidy::escaped($string, $i - 1))) {
+ $temp_add = "\\A ";
+ $this->log('Fixed incorrect newline in string', 'Warning');
+ }
+ // this optimisation remove space in css3 properties (see vendor-prefixed/webkit-gradient.csst)
+ #if (!($this->str_char === ')' && in_array($string{$i}, $GLOBALS['csstidy']['whitespace']) && !$this->str_in_str)) {
+ $this->cur_string .= $temp_add;
+ #}
+ if ($string{$i} == $this->str_char && !csstidy::escaped($string, $i) && !$this->str_in_str) {
+ $this->status = $this->from;
+ if (!preg_match('|[' . implode('', $GLOBALS['csstidy']['whitespace']) . ']|uis', $this->cur_string) && $this->property !== 'content') {
+ if (!$this->quoted_string) {
+ if ($this->str_char === '"' || $this->str_char === '\'') {
+ // Temporarily disable this optimization to avoid problems with @charset rule, quote properties, and some attribute selectors...
+ // Attribute selectors fixed, added quotes to @chartset, no problems with properties detected. Enabled
+ $this->cur_string = substr($this->cur_string, 1, -1);
+ }
+ else if (strlen($this->cur_string) > 3 && ($this->cur_string[1] === '"' || $this->cur_string[1] === '\'')) {
+ $this->cur_string = $this->cur_string[0] . substr($this->cur_string, 2, -2) . substr($this->cur_string, -1);
+ }
+ }
+ else {
+ $this->quoted_string = false;
+ }
+ }
+ if ($this->from === 'iv') {
+ if (!$this->quoted_string) {
+ if (strpos($this->cur_string, ',') !== false) { // we can on only remove space next to ','
+ $this->cur_string = implode(',', array_map('trim', explode(',', $this->cur_string)));
+ }
+ // and multiple spaces (too expensive)
+ if (strpos($this->cur_string, ' ') !== false) {
+ $this->cur_string = preg_replace(",\s+,", " ", $this->cur_string);
+ }
+ }
+ $this->sub_value .= $this->cur_string;
+ }
+ elseif ($this->from === 'is') {
+ $this->selector .= $this->cur_string;
+ }
+ }
+ break;
+
+ /* Case in-comment */
+ case 'ic':
+ if ($string{$i} === '*' && $string{$i + 1} === '/') {
+ $this->status = $this->from;
+ $i++;
+ $this->_add_token(COMMENT, $cur_comment);
+ $cur_comment = '';
+ }
+ else {
+ $cur_comment .= $string{$i};
+ }
+ break;
+ }
+ }
+
+ $this->optimise->postparse();
+
+ $this->print->_reset();
+
+ @setlocale(LC_ALL, $old); // Set locale back to original setting
+
+ return;
+ (empty($this->css) && empty($this->import) && empty($this->charset) && empty($this->tokens) && empty($this->namespace));
+ }
+
+ /**
+ * Explodes selectors
+ * @access private
+ * @version 1.0
+ */
+ function explode_selectors() {
+ // Explode multiple selectors
+ if ($this->get_cfg('merge_selectors') === 1) {
+ $new_sels = array();
+ $lastpos = 0;
+ $this->sel_separate[] = strlen($this->selector);
+ foreach ($this->sel_separate as $num => $pos) {
+ if ($num == count($this->sel_separate) - 1) {
+ $pos += 1;
+ }
+
+ $new_sels[] = substr($this->selector, $lastpos, $pos - $lastpos - 1);
+ $lastpos = $pos;
+ }
+
+ if (count($new_sels) > 1) {
+ foreach ($new_sels as $selector) {
+ if (isset($this->css[$this->at][$this->selector])) {
+ $this->merge_css_blocks($this->at, $selector, $this->css[$this->at][$this->selector]);
+ }
+ }
+ unset($this->css[$this->at][$this->selector]);
+ }
+ }
+ $this->sel_separate = array();
+ }
+
+ /**
+ * Checks if a character is escaped (and returns true if it is)
+ * @param string $string
+ * @param integer $pos
+ * @access public
+ * @return bool
+ * @version 1.02
+ */
+ static function escaped(&$string, $pos) {
+ return;
+ (@($string{$pos - 1} !== '\\') || csstidy::escaped($string, $pos - 1));
+ }
+
+ /**
+ * Adds a property with value to the existing CSS code
+ * @param string $media
+ * @param string $selector
+ * @param string $property
+ * @param string $new_val
+ * @access private
+ * @version 1.2
+ */
+ function css_add_property($media, $selector, $property, $new_val) {
+ if ($this->get_cfg('preserve_css') || trim($new_val) == '') {
+ return;
+ }
+
+ $this->added = true;
+ if (isset($this->css[$media][$selector][$property])) {
+ if ((csstidy::is_important($this->css[$media][$selector][$property]) && csstidy::is_important($new_val)) || !csstidy::is_important($this->css[$media][$selector][$property])) {
+ $this->css[$media][$selector][$property] = trim($new_val);
+ }
+ }
+ else {
+ $this->css[$media][$selector][$property] = trim($new_val);
+ }
+ }
+
+ /**
+ * Start a new media section.
+ * Check if the media is not already known,
+ * else rename it with extra spaces
+ * to avoid merging
+ *
+ * @param string $media
+ * @return string
+ */
+ function css_new_media_section($media) {
+ if ($this->get_cfg('preserve_css')) {
+ return $media;
+ }
+
+ // if the last @media is the same as this
+ // keep it
+ if (!$this->css OR !is_array($this->css) OR empty($this->css)) {
+ return $media;
+ }
+ end($this->css);
+ list($at, ) = each($this->css);
+ if ($at == $media) {
+ return $media;
+ }
+ while (isset($this->css[$media])) {
+ if (is_numeric($media)) {
+ $media++;
+ }
+ }
+ else {
+ $media .= " ";
+ }
+ return $media;
+ }
+
+ /**
+ * Start a new selector.
+ * If already referenced in this media section,
+ * rename it with extra space to avoid merging
+ * except if merging is required,
+ * or last selector is the same (merge siblings)
+ *
+ * never merge @font-face
+ *
+ * @param string $media
+ * @param string $selector
+ * @return string
+ */
+ function css_new_selector($media, $selector) {
+ if ($this->get_cfg('preserve_css')) {
+ return $selector;
+ }
+ $selector = trim($selector);
+ if (strncmp($selector, "@font-face", 10) != 0) {
+ if ($this->settings['merge_selectors'] != false) {
+ return $selector;
+ }
+
+ if (!$this->css OR !isset($this->css[$media]) OR !$this->css[$media]) {
+ return $selector;
+ }
+
+ // if last is the same, keep it
+ end($this->css[$media]);
+ list($sel, ) = each($this->css[$media]);
+ if ($sel == $selector) {
+ return $selector;
+ }
+ }
+
+ while (isset($this->css[$media][$selector])) {
+ $selector .= " ";
+ }
+ return $selector;
+ }
+
+ /**
+ * Start a new propertie.
+ * If already references in this selector,
+ * rename it with extra space to avoid override
+ *
+ * @param string $media
+ * @param string $selector
+ * @param string $property
+ * @return string
+ */
+ function css_new_property($media, $selector, $property) {
+ if ($this->get_cfg('preserve_css')) {
+ return $property;
+ }
+ if (!$this->css OR !isset($this->css[$media][$selector]) OR !$this->css[$media][$selector]) {
+ return $property;
+ }
+
+ while (isset($this->css[$media][$selector][$property])) {
+ $property .= " ";
+ }
+
+ return $property;
+ }
+
+ /**
+ * Adds CSS to an existing media/selector
+ * @param string $media
+ * @param string $selector
+ * @param array $css_add
+ * @access private
+ * @version 1.1
+ */
+ function merge_css_blocks($media, $selector, $css_add) {
+ foreach ($css_add as $property => $value) {
+ $this->css_add_property($media, $selector, $property, $value, false);
+ }
+ }
+
+ /**
+ * Checks if $value is !important.
+ * @param string $value
+ * @return bool
+ * @access public
+ * @version 1.0
+ */
+ static function is_important(&$value) {
+ return (!strcasecmp(substr(str_replace($GLOBALS['csstidy']['whitespace'], '', $value), -10, 10), '!important'));
+ }
+
+ /**
+ * Returns a value without !important
+ * @param string $value
+ * @return string
+ * @access public
+ * @version 1.0
+ */
+ static function gvw_important($value) {
+ if (csstidy::is_important($value)) {
+ $value = trim($value);
+ $value = substr($value, 0, -9);
+ $value = trim($value);
+ $value = substr($value, 0, -1);
+ $value = trim($value);
+ return $value;
+ }
+ return $value;
+ }
+
+ /**
+ * Checks if the next word in a string from pos is a CSS property
+ * @param string $istring
+ * @param integer $pos
+ * @return bool
+ * @access private
+ * @version 1.2
+ */
+ function property_is_next($istring, $pos) {
+ $all_properties = & $GLOBALS['csstidy']['all_properties'];
+ $istring = substr($istring, $pos, strlen($istring) - $pos);
+ $pos = strpos($istring, ':');
+ if ($pos === false) {
+ return false;
+ }
+ $istring = strtolower(trim(substr($istring, 0, $pos)));
+ if (isset($all_properties[$istring])) {
+ $this->log('Added semicolon to the end of declaration', 'Warning');
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * Checks if a property is valid
+ * @param string $property
+ * @return bool;
+ * @access public
+ * @version 1.0
+ */
+ function property_is_valid($property) {
+ $all_properties = & $GLOBALS['csstidy']['all_properties'];
+ return (isset($all_properties[$property]) && strpos($all_properties[$property], strtoupper($this->get_cfg('css_level'))) !== false );
+ }
}
diff -up -r advagg_css_compress/csstidy/class.csstidy_ctype.inc advagg_css_compress/csstidy/class.csstidy_ctype.inc
--- advagg_css_compress/csstidy/class.csstidy_ctype.inc 2012-03-23 12:08:13.000000000 -0600
+++ advagg_css_compress/csstidy/class.csstidy_ctype.inc 2012-03-23 13:02:20.000000000 -0600
@@ -30,16 +30,17 @@
/* ctype_space Check for whitespace character(s) */
if (!function_exists('ctype_space')) {
- function ctype_space($text) {
- return!preg_match("/[^\s\r\n\t\f]/", $text);
- }
+ function ctype_space($text) {
+ return;
+ preg_match("/[^\s\r\n\t\f]/", $text);
+ }
}
/* ctype_alpha Check for alphabetic character(s) */
if (!function_exists('ctype_alpha')) {
- function ctype_alpha($text) {
- return preg_match("/[a-zA-Z]/", $text);
- }
+ function ctype_alpha($text) {
+ return preg_match("/[a-zA-Z]/", $text);
+ }
}
diff -up -r advagg_css_compress/csstidy/class.csstidy_optimise.inc advagg_css_compress/csstidy/class.csstidy_optimise.inc
--- advagg_css_compress/csstidy/class.csstidy_optimise.inc 2012-03-23 12:08:13.000000000 -0600
+++ advagg_css_compress/csstidy/class.csstidy_optimise.inc 2012-03-23 13:02:21.000000000 -0600
@@ -19,7 +19,7 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
@@ -41,891 +41,972 @@
*/
class csstidy_optimise {
- /**
- * Constructor
- * @param array $css contains the class csstidy
- * @access private
- * @version 1.0
- */
- function csstidy_optimise(&$css) {
- $this->parser = & $css;
- $this->css = & $css->css;
- $this->sub_value = & $css->sub_value;
- $this->at = & $css->at;
- $this->selector = & $css->selector;
- $this->property = & $css->property;
- $this->value = & $css->value;
- }
-
- /**
- * Optimises $css after parsing
- * @access public
- * @version 1.0
- */
- function postparse() {
- if ($this->parser->get_cfg('preserve_css')) {
- return;
- }
-
- if ($this->parser->get_cfg('merge_selectors') === 2) {
- foreach ($this->css as $medium => $value) {
- $this->merge_selectors($this->css[$medium]);
- }
- }
-
- if ($this->parser->get_cfg('discard_invalid_selectors')) {
- foreach ($this->css as $medium => $value) {
- $this->discard_invalid_selectors($this->css[$medium]);
- }
- }
-
- if ($this->parser->get_cfg('optimise_shorthands') > 0) {
- foreach ($this->css as $medium => $value) {
- foreach ($value as $selector => $value1) {
- $this->css[$medium][$selector] = csstidy_optimise::merge_4value_shorthands($this->css[$medium][$selector]);
-
- if ($this->parser->get_cfg('optimise_shorthands') < 2) {
- continue;
- }
-
- $this->css[$medium][$selector] = csstidy_optimise::merge_font($this->css[$medium][$selector]);
-
- if ($this->parser->get_cfg('optimise_shorthands') < 3) {
- continue;
- }
-
- $this->css[$medium][$selector] = csstidy_optimise::merge_bg($this->css[$medium][$selector]);
- if (empty($this->css[$medium][$selector])) {
- unset($this->css[$medium][$selector]);
- }
- }
- }
- }
- }
-
- /**
- * Optimises values
- * @access public
- * @version 1.0
- */
- function value() {
- $shorthands = & $GLOBALS['csstidy']['shorthands'];
-
- // optimise shorthand properties
- if (isset($shorthands[$this->property])) {
- $temp = csstidy_optimise::shorthand($this->value); // FIXME - move
- if ($temp != $this->value) {
- $this->parser->log('Optimised shorthand notation (' . $this->property . '): Changed "' . $this->value . '" to "' . $temp . '"', 'Information');
- }
- $this->value = $temp;
- }
-
- // Remove whitespace at ! important
- if ($this->value != $this->compress_important($this->value)) {
- $this->parser->log('Optimised !important', 'Information');
- }
- }
-
- /**
- * Optimises shorthands
- * @access public
- * @version 1.0
- */
- function shorthands() {
- $shorthands = & $GLOBALS['csstidy']['shorthands'];
-
- if (!$this->parser->get_cfg('optimise_shorthands') || $this->parser->get_cfg('preserve_css')) {
- return;
- }
-
- if ($this->property === 'font' && $this->parser->get_cfg('optimise_shorthands') > 1) {
- $this->css[$this->at][$this->selector]['font']='';
- $this->parser->merge_css_blocks($this->at, $this->selector, csstidy_optimise::dissolve_short_font($this->value));
- }
- if ($this->property === 'background' && $this->parser->get_cfg('optimise_shorthands') > 2) {
- $this->css[$this->at][$this->selector]['background']='';
- $this->parser->merge_css_blocks($this->at, $this->selector, csstidy_optimise::dissolve_short_bg($this->value));
- }
- if (isset($shorthands[$this->property])) {
- $this->parser->merge_css_blocks($this->at, $this->selector, csstidy_optimise::dissolve_4value_shorthands($this->property, $this->value));
- if (is_array($shorthands[$this->property])) {
- $this->css[$this->at][$this->selector][$this->property] = '';
- }
- }
- }
-
- /**
- * Optimises a sub-value
- * @access public
- * @version 1.0
- */
- function subvalue() {
- $replace_colors = & $GLOBALS['csstidy']['replace_colors'];
-
- $this->sub_value = trim($this->sub_value);
- if ($this->sub_value == '') { // caution : '0'
- return;
- }
-
- $important = '';
- if (csstidy::is_important($this->sub_value)) {
- $important = '!important';
- }
- $this->sub_value = csstidy::gvw_important($this->sub_value);
-
- // Compress font-weight
- if ($this->property === 'font-weight' && $this->parser->get_cfg('compress_font-weight')) {
- if ($this->sub_value === 'bold') {
- $this->sub_value = '700';
- $this->parser->log('Optimised font-weight: Changed "bold" to "700"', 'Information');
- } else if ($this->sub_value === 'normal') {
- $this->sub_value = '400';
- $this->parser->log('Optimised font-weight: Changed "normal" to "400"', 'Information');
- }
- }
-
- $temp = $this->compress_numbers($this->sub_value);
- if (strcasecmp($temp, $this->sub_value) !== 0) {
- if (strlen($temp) > strlen($this->sub_value)) {
- $this->parser->log('Fixed invalid number: Changed "' . $this->sub_value . '" to "' . $temp . '"', 'Warning');
- } else {
- $this->parser->log('Optimised number: Changed "' . $this->sub_value . '" to "' . $temp . '"', 'Information');
- }
- $this->sub_value = $temp;
- }
- if ($this->parser->get_cfg('compress_colors')) {
- $temp = $this->cut_color($this->sub_value);
- if ($temp !== $this->sub_value) {
- if (isset($replace_colors[$this->sub_value])) {
- $this->parser->log('Fixed invalid color name: Changed "' . $this->sub_value . '" to "' . $temp . '"', 'Warning');
- } else {
- $this->parser->log('Optimised color: Changed "' . $this->sub_value . '" to "' . $temp . '"', 'Information');
- }
- $this->sub_value = $temp;
- }
- }
- $this->sub_value .= $important;
- }
-
- /**
- * Compresses shorthand values. Example: margin:1px 1px 1px 1px -> margin:1px
- * @param string $value
- * @access public
- * @return string
- * @version 1.0
- */
- function shorthand($value) {
- $important = '';
- if (csstidy::is_important($value)) {
- $values = csstidy::gvw_important($value);
- $important = '!important';
- }
- else
- $values = $value;
-
- $values = explode(' ', $values);
- switch (count($values)) {
- case 4:
- if ($values[0] == $values[1] && $values[0] == $values[2] && $values[0] == $values[3]) {
- return $values[0] . $important;
- } elseif ($values[1] == $values[3] && $values[0] == $values[2]) {
- return $values[0] . ' ' . $values[1] . $important;
- } elseif ($values[1] == $values[3]) {
- return $values[0] . ' ' . $values[1] . ' ' . $values[2] . $important;
- }
- break;
-
- case 3:
- if ($values[0] == $values[1] && $values[0] == $values[2]) {
- return $values[0] . $important;
- } elseif ($values[0] == $values[2]) {
- return $values[0] . ' ' . $values[1] . $important;
- }
- break;
-
- case 2:
- if ($values[0] == $values[1]) {
- return $values[0] . $important;
- }
- break;
- }
-
- return $value;
- }
-
- /**
- * Removes unnecessary whitespace in ! important
- * @param string $string
- * @return string
- * @access public
- * @version 1.1
- */
- function compress_important(&$string) {
- if (csstidy::is_important($string)) {
- $string = csstidy::gvw_important($string) . '!important';
- }
- return $string;
- }
-
- /**
- * Color compression function. Converts all rgb() values to #-values and uses the short-form if possible. Also replaces 4 color names by #-values.
- * @param string $color
- * @return string
- * @version 1.1
- */
- function cut_color($color) {
- $replace_colors = & $GLOBALS['csstidy']['replace_colors'];
-
- // rgb(0,0,0) -> #000000 (or #000 in this case later)
- if (strtolower(substr($color, 0, 4)) === 'rgb(') {
- $color_tmp = substr($color, 4, strlen($color) - 5);
- $color_tmp = explode(',', $color_tmp);
- for ($i = 0; $i < count($color_tmp); $i++) {
- $color_tmp[$i] = trim($color_tmp[$i]);
- if (substr($color_tmp[$i], -1) === '%') {
- $color_tmp[$i] = round((255 * $color_tmp[$i]) / 100);
- }
- if ($color_tmp[$i] > 255)
- $color_tmp[$i] = 255;
- }
- $color = '#';
- for ($i = 0; $i < 3; $i++) {
- if ($color_tmp[$i] < 16) {
- $color .= '0' . dechex($color_tmp[$i]);
- } else {
- $color .= dechex($color_tmp[$i]);
- }
- }
- }
-
- // Fix bad color names
- if (isset($replace_colors[strtolower($color)])) {
- $color = $replace_colors[strtolower($color)];
- }
-
- // #aabbcc -> #abc
- if (strlen($color) == 7) {
- $color_temp = strtolower($color);
- if ($color_temp{0} === '#' && $color_temp{1} == $color_temp{2} && $color_temp{3} == $color_temp{4} && $color_temp{5} == $color_temp{6}) {
- $color = '#' . $color{1} . $color{3} . $color{5};
- }
- }
-
- switch (strtolower($color)) {
- /* color name -> hex code */
- case 'black': return '#000';
- case 'fuchsia': return '#f0f';
- case 'white': return '#fff';
- case 'yellow': return '#ff0';
-
- /* hex code -> color name */
- case '#800000': return 'maroon';
- case '#ffa500': return 'orange';
- case '#808000': return 'olive';
- case '#800080': return 'purple';
- case '#008000': return 'green';
- case '#000080': return 'navy';
- case '#008080': return 'teal';
- case '#c0c0c0': return 'silver';
- case '#808080': return 'gray';
- case '#f00': return 'red';
- }
-
- return $color;
- }
-
- /**
- * Compresses numbers (ie. 1.0 becomes 1 or 1.100 becomes 1.1 )
- * @param string $subvalue
- * @return string
- * @version 1.2
- */
- function compress_numbers($subvalue) {
- $unit_values = & $GLOBALS['csstidy']['unit_values'];
- $color_values = & $GLOBALS['csstidy']['color_values'];
-
- // for font:1em/1em sans-serif...;
- if ($this->property === 'font') {
- $temp = explode('/', $subvalue);
- } else {
- $temp = array($subvalue);
- }
- for ($l = 0; $l < count($temp); $l++) {
- // if we are not dealing with a number at this point, do not optimise anything
- $number = $this->AnalyseCssNumber($temp[$l]);
- if ($number === false) {
- return $subvalue;
- }
-
- // Fix bad colors
- if (in_array($this->property, $color_values)) {
- $temp[$l] = '#' . $temp[$l];
- continue;
- }
-
- if (abs($number[0]) > 0) {
- if ($number[1] == '' && in_array($this->property, $unit_values, true)) {
- $number[1] = 'px';
- }
- } else {
- $number[1] = '';
- }
-
- $temp[$l] = $number[0] . $number[1];
- }
-
- return ((count($temp) > 1) ? $temp[0] . '/' . $temp[1] : $temp[0]);
- }
-
- /**
- * Checks if a given string is a CSS valid number. If it is,
- * an array containing the value and unit is returned
- * @param string $string
- * @return array ('unit' if unit is found or '' if no unit exists, number value) or false if no number
- */
- function AnalyseCssNumber($string) {
- // most simple checks first
- if (strlen($string) == 0 || ctype_alpha($string{0})) {
- return false;
- }
-
- $units = & $GLOBALS['csstidy']['units'];
- $return = array(0, '');
-
- $return[0] = floatval($string);
- if (abs($return[0]) > 0 && abs($return[0]) < 1) {
- if ($return[0] < 0) {
- $return[0] = '-' . ltrim(substr($return[0], 1), '0');
- } else {
- $return[0] = ltrim($return[0], '0');
- }
- }
-
- // Look for unit and split from value if exists
- foreach ($units as $unit) {
- $expectUnitAt = strlen($string) - strlen($unit);
- if (!($unitInString = stristr($string, $unit))) { // mb_strpos() fails with "false"
- continue;
- }
- $actualPosition = strpos($string, $unitInString);
- if ($expectUnitAt === $actualPosition) {
- $return[1] = $unit;
- $string = substr($string, 0, - strlen($unit));
- break;
- }
- }
- if (!is_numeric($string)) {
- return false;
- }
- return $return;
- }
-
- /**
- * Merges selectors with same properties. Example: a{color:red} b{color:red} -> a,b{color:red}
- * Very basic and has at least one bug. Hopefully there is a replacement soon.
- * @param array $array
- * @return array
- * @access public
- * @version 1.2
- */
- function merge_selectors(&$array) {
- $css = $array;
- foreach ($css as $key => $value) {
- if (!isset($css[$key])) {
- continue;
- }
- $newsel = '';
-
- // Check if properties also exist in another selector
- $keys = array();
- // PHP bug (?) without $css = $array; here
- foreach ($css as $selector => $vali) {
- if ($selector == $key) {
- continue;
- }
-
- if ($css[$key] === $vali) {
- $keys[] = $selector;
- }
- }
-
- if (!empty($keys)) {
- $newsel = $key;
- unset($css[$key]);
- foreach ($keys as $selector) {
- unset($css[$selector]);
- $newsel .= ',' . $selector;
- }
- $css[$newsel] = $value;
- }
- }
- $array = $css;
- }
-
- /**
- * Removes invalid selectors and their corresponding rule-sets as
- * defined by 4.1.7 in REC-CSS2. This is a very rudimentary check
- * and should be replaced by a full-blown parsing algorithm or
- * regular expression
- * @version 1.4
- */
- function discard_invalid_selectors(&$array) {
- $invalid = array('+' => true, '~' => true, ',' => true, '>' => true);
- foreach ($array as $selector => $decls) {
- $ok = true;
- $selectors = array_map('trim', explode(',', $selector));
- foreach ($selectors as $s) {
- $simple_selectors = preg_split('/\s*[+>~\s]\s*/', $s);
- foreach ($simple_selectors as $ss) {
- if ($ss === '')
- $ok = false;
- // could also check $ss for internal structure,
- // but that probably would be too slow
- }
- }
- if (!$ok)
- unset($array[$selector]);
- }
- }
-
- /**
- * Dissolves properties like padding:10px 10px 10px to padding-top:10px;padding-bottom:10px;...
- * @param string $property
- * @param string $value
- * @return array
- * @version 1.0
- * @see merge_4value_shorthands()
- */
- function dissolve_4value_shorthands($property, $value) {
- $shorthands = & $GLOBALS['csstidy']['shorthands'];
- if (!is_array($shorthands[$property])) {
- $return[$property] = $value;
- return $return;
- }
-
- $important = '';
- if (csstidy::is_important($value)) {
- $value = csstidy::gvw_important($value);
- $important = '!important';
- }
- $values = explode(' ', $value);
-
-
- $return = array();
- if (count($values) == 4) {
- for ($i = 0; $i < 4; $i++) {
- $return[$shorthands[$property][$i]] = $values[$i] . $important;
- }
- } elseif (count($values) == 3) {
- $return[$shorthands[$property][0]] = $values[0] . $important;
- $return[$shorthands[$property][1]] = $values[1] . $important;
- $return[$shorthands[$property][3]] = $values[1] . $important;
- $return[$shorthands[$property][2]] = $values[2] . $important;
- } elseif (count($values) == 2) {
- for ($i = 0; $i < 4; $i++) {
- $return[$shorthands[$property][$i]] = (($i % 2 != 0)) ? $values[1] . $important : $values[0] . $important;
- }
- } else {
- for ($i = 0; $i < 4; $i++) {
- $return[$shorthands[$property][$i]] = $values[0] . $important;
- }
- }
-
- return $return;
- }
-
- /**
- * Explodes a string as explode() does, however, not if $sep is escaped or within a string.
- * @param string $sep seperator
- * @param string $string
- * @return array
- * @version 1.0
- */
- function explode_ws($sep, $string) {
- $status = 'st';
- $to = '';
-
- $output = array();
- $num = 0;
- for ($i = 0, $len = strlen($string); $i < $len; $i++) {
- switch ($status) {
- case 'st':
- if ($string{$i} == $sep && !csstidy::escaped($string, $i)) {
- ++$num;
- } elseif ($string{$i} === '"' || $string{$i} === '\'' || $string{$i} === '(' && !csstidy::escaped($string, $i)) {
- $status = 'str';
- $to = ($string{$i} === '(') ? ')' : $string{$i};
- (isset($output[$num])) ? $output[$num] .= $string{$i} : $output[$num] = $string{$i};
- } else {
- (isset($output[$num])) ? $output[$num] .= $string{$i} : $output[$num] = $string{$i};
- }
- break;
-
- case 'str':
- if ($string{$i} == $to && !csstidy::escaped($string, $i)) {
- $status = 'st';
- }
- (isset($output[$num])) ? $output[$num] .= $string{$i} : $output[$num] = $string{$i};
- break;
- }
- }
-
- if (isset($output[0])) {
- return $output;
- } else {
- return array($output);
- }
- }
-
- /**
- * Merges Shorthand properties again, the opposite of dissolve_4value_shorthands()
- * @param array $array
- * @return array
- * @version 1.2
- * @see dissolve_4value_shorthands()
- */
- function merge_4value_shorthands($array) {
- $return = $array;
- $shorthands = & $GLOBALS['csstidy']['shorthands'];
-
- foreach ($shorthands as $key => $value) {
- if (isset($array[$value[0]]) && isset($array[$value[1]])
- && isset($array[$value[2]]) && isset($array[$value[3]]) && $value !== 0) {
- $return[$key] = '';
-
- $important = '';
- for ($i = 0; $i < 4; $i++) {
- $val = $array[$value[$i]];
- if (csstidy::is_important($val)) {
- $important = '!important';
- $return[$key] .= csstidy::gvw_important($val) . ' ';
- } else {
- $return[$key] .= $val . ' ';
- }
- unset($return[$value[$i]]);
- }
- $return[$key] = csstidy_optimise::shorthand(trim($return[$key] . $important));
- }
- }
- return $return;
- }
-
- /**
- * Dissolve background property
- * @param string $str_value
- * @return array
- * @version 1.0
- * @see merge_bg()
- * @todo full CSS 3 compliance
- */
- function dissolve_short_bg($str_value) {
- // don't try to explose background gradient !
- if (stripos($str_value, "gradient(")!==FALSE)
- return array('background'=>$str_value);
-
- $background_prop_default = & $GLOBALS['csstidy']['background_prop_default'];
- $repeat = array('repeat', 'repeat-x', 'repeat-y', 'no-repeat', 'space');
- $attachment = array('scroll', 'fixed', 'local');
- $clip = array('border', 'padding');
- $origin = array('border', 'padding', 'content');
- $pos = array('top', 'center', 'bottom', 'left', 'right');
- $important = '';
- $return = array('background-image' => null, 'background-size' => null, 'background-repeat' => null, 'background-position' => null, 'background-attachment' => null, 'background-clip' => null, 'background-origin' => null, 'background-color' => null);
-
- if (csstidy::is_important($str_value)) {
- $important = ' !important';
- $str_value = csstidy::gvw_important($str_value);
- }
-
- $str_value = csstidy_optimise::explode_ws(',', $str_value);
- for ($i = 0; $i < count($str_value); $i++) {
- $have['clip'] = false;
- $have['pos'] = false;
- $have['color'] = false;
- $have['bg'] = false;
-
- if (is_array($str_value[$i])) {
- $str_value[$i] = $str_value[$i][0];
- }
- $str_value[$i] = csstidy_optimise::explode_ws(' ', trim($str_value[$i]));
-
- for ($j = 0; $j < count($str_value[$i]); $j++) {
- if ($have['bg'] === false && (substr($str_value[$i][$j], 0, 4) === 'url(' || $str_value[$i][$j] === 'none')) {
- $return['background-image'] .= $str_value[$i][$j] . ',';
- $have['bg'] = true;
- } elseif (in_array($str_value[$i][$j], $repeat, true)) {
- $return['background-repeat'] .= $str_value[$i][$j] . ',';
- } elseif (in_array($str_value[$i][$j], $attachment, true)) {
- $return['background-attachment'] .= $str_value[$i][$j] . ',';
- } elseif (in_array($str_value[$i][$j], $clip, true) && !$have['clip']) {
- $return['background-clip'] .= $str_value[$i][$j] . ',';
- $have['clip'] = true;
- } elseif (in_array($str_value[$i][$j], $origin, true)) {
- $return['background-origin'] .= $str_value[$i][$j] . ',';
- } elseif ($str_value[$i][$j]{0} === '(') {
- $return['background-size'] .= substr($str_value[$i][$j], 1, -1) . ',';
- } elseif (in_array($str_value[$i][$j], $pos, true) || is_numeric($str_value[$i][$j]{0}) || $str_value[$i][$j]{0} === null || $str_value[$i][$j]{0} === '-' || $str_value[$i][$j]{0} === '.') {
- $return['background-position'] .= $str_value[$i][$j];
- if (!$have['pos'])
- $return['background-position'] .= ' '; else
- $return['background-position'].= ',';
- $have['pos'] = true;
- }
- elseif (!$have['color']) {
- $return['background-color'] .= $str_value[$i][$j] . ',';
- $have['color'] = true;
- }
- }
- }
-
- foreach ($background_prop_default as $bg_prop => $default_value) {
- if ($return[$bg_prop] !== null) {
- $return[$bg_prop] = substr($return[$bg_prop], 0, -1) . $important;
- }
- else
- $return[$bg_prop] = $default_value . $important;
- }
- return $return;
- }
-
- /**
- * Merges all background properties
- * @param array $input_css
- * @return array
- * @version 1.0
- * @see dissolve_short_bg()
- * @todo full CSS 3 compliance
- */
- function merge_bg($input_css) {
- $background_prop_default = & $GLOBALS['csstidy']['background_prop_default'];
- // Max number of background images. CSS3 not yet fully implemented
- $number_of_values = @max(count(csstidy_optimise::explode_ws(',', $input_css['background-image'])), count(csstidy_optimise::explode_ws(',', $input_css['background-color'])), 1);
- // Array with background images to check if BG image exists
- $bg_img_array = @csstidy_optimise::explode_ws(',', csstidy::gvw_important($input_css['background-image']));
- $new_bg_value = '';
- $important = '';
-
- // if background properties is here and not empty, don't try anything
- if (isset($input_css['background']) AND $input_css['background'])
- return $input_css;
-
- for ($i = 0; $i < $number_of_values; $i++) {
- foreach ($background_prop_default as $bg_property => $default_value) {
- // Skip if property does not exist
- if (!isset($input_css[$bg_property])) {
- continue;
- }
-
- $cur_value = $input_css[$bg_property];
- // skip all optimisation if gradient() somewhere
- if (stripos($cur_value, "gradient(")!==FALSE)
- return $input_css;
-
- // Skip some properties if there is no background image
- if ((!isset($bg_img_array[$i]) || $bg_img_array[$i] === 'none')
- && ($bg_property === 'background-size' || $bg_property === 'background-position'
+ /**
+ * Constructor
+ * @param array $css contains the class csstidy
+ * @access private
+ * @version 1.0
+ */
+ function csstidy_optimise(&$css) {
+ $this->parser = & $css;
+ $this->css = & $css->css;
+ $this->sub_value = & $css->sub_value;
+ $this->at = & $css->at;
+ $this->selector = & $css->selector;
+ $this->property = & $css->property;
+ $this->value = & $css->value;
+ }
+
+ /**
+ * Optimises $css after parsing
+ * @access public
+ * @version 1.0
+ */
+ function postparse() {
+ if ($this->parser->get_cfg('preserve_css')) {
+ return;
+ }
+
+ if ($this->parser->get_cfg('merge_selectors') === 2) {
+ foreach ($this->css as $medium => $value) {
+ $this->merge_selectors($this->css[$medium]);
+ }
+ }
+
+ if ($this->parser->get_cfg('discard_invalid_selectors')) {
+ foreach ($this->css as $medium => $value) {
+ $this->discard_invalid_selectors($this->css[$medium]);
+ }
+ }
+
+ if ($this->parser->get_cfg('optimise_shorthands') > 0) {
+ foreach ($this->css as $medium => $value) {
+ foreach ($value as $selector => $value1) {
+ $this->css[$medium][$selector] = csstidy_optimise::merge_4value_shorthands($this->css[$medium][$selector]);
+
+ if ($this->parser->get_cfg('optimise_shorthands') < 2) {
+ continue;
+ }
+
+ $this->css[$medium][$selector] = csstidy_optimise::merge_font($this->css[$medium][$selector]);
+
+ if ($this->parser->get_cfg('optimise_shorthands') < 3) {
+ continue;
+ }
+
+ $this->css[$medium][$selector] = csstidy_optimise::merge_bg($this->css[$medium][$selector]);
+ if (empty($this->css[$medium][$selector])) {
+ unset($this->css[$medium][$selector]);
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * Optimises values
+ * @access public
+ * @version 1.0
+ */
+ function value() {
+ $shorthands = & $GLOBALS['csstidy']['shorthands'];
+
+ // optimise shorthand properties
+ if (isset($shorthands[$this->property])) {
+ $temp = csstidy_optimise::shorthand($this->value); // FIXME - move
+ if ($temp != $this->value) {
+ $this->parser->log('Optimised shorthand notation (' . $this->property . '): Changed "' . $this->value . '" to "' . $temp . '"', 'Information');
+ }
+ $this->value = $temp;
+ }
+
+ // Remove whitespace at ! important
+ if ($this->value != $this->compress_important($this->value)) {
+ $this->parser->log('Optimised !important', 'Information');
+ }
+ }
+
+ /**
+ * Optimises shorthands
+ * @access public
+ * @version 1.0
+ */
+ function shorthands() {
+ $shorthands = & $GLOBALS['csstidy']['shorthands'];
+
+ if (!$this->parser->get_cfg('optimise_shorthands') || $this->parser->get_cfg('preserve_css')) {
+ return;
+ }
+
+ if ($this->property === 'font' && $this->parser->get_cfg('optimise_shorthands') > 1) {
+ $this->css[$this->at][$this->selector]['font'] = '';
+ $this->parser->merge_css_blocks($this->at, $this->selector, csstidy_optimise::dissolve_short_font($this->value));
+ }
+ if ($this->property === 'background' && $this->parser->get_cfg('optimise_shorthands') > 2) {
+ $this->css[$this->at][$this->selector]['background'] = '';
+ $this->parser->merge_css_blocks($this->at, $this->selector, csstidy_optimise::dissolve_short_bg($this->value));
+ }
+ if (isset($shorthands[$this->property])) {
+ $this->parser->merge_css_blocks($this->at, $this->selector, csstidy_optimise::dissolve_4value_shorthands($this->property, $this->value));
+ if (is_array($shorthands[$this->property])) {
+ $this->css[$this->at][$this->selector][$this->property] = '';
+ }
+ }
+ }
+
+ /**
+ * Optimises a sub-value
+ * @access public
+ * @version 1.0
+ */
+ function subvalue() {
+ $replace_colors = & $GLOBALS['csstidy']['replace_colors'];
+
+ $this->sub_value = trim($this->sub_value);
+ if ($this->sub_value == '') { // caution : '0'
+ return;
+ }
+
+ $important = '';
+ if (csstidy::is_important($this->sub_value)) {
+ $important = '!important';
+ }
+ $this->sub_value = csstidy::gvw_important($this->sub_value);
+
+ // Compress font-weight
+ if ($this->property === 'font-weight' && $this->parser->get_cfg('compress_font-weight')) {
+ if ($this->sub_value === 'bold') {
+ $this->sub_value = '700';
+ $this->parser->log('Optimised font-weight: Changed "bold" to "700"', 'Information');
+ }
+ else if ($this->sub_value === 'normal') {
+ $this->sub_value = '400';
+ $this->parser->log('Optimised font-weight: Changed "normal" to "400"', 'Information');
+ }
+ }
+
+ $temp = $this->compress_numbers($this->sub_value);
+ if (strcasecmp($temp, $this->sub_value) !== 0) {
+ if (strlen($temp) > strlen($this->sub_value)) {
+ $this->parser->log('Fixed invalid number: Changed "' . $this->sub_value . '" to "' . $temp . '"', 'Warning');
+ }
+ else {
+ $this->parser->log('Optimised number: Changed "' . $this->sub_value . '" to "' . $temp . '"', 'Information');
+ }
+ $this->sub_value = $temp;
+ }
+ if ($this->parser->get_cfg('compress_colors')) {
+ $temp = $this->cut_color($this->sub_value);
+ if ($temp !== $this->sub_value) {
+ if (isset($replace_colors[$this->sub_value])) {
+ $this->parser->log('Fixed invalid color name: Changed "' . $this->sub_value . '" to "' . $temp . '"', 'Warning');
+ }
+ else {
+ $this->parser->log('Optimised color: Changed "' . $this->sub_value . '" to "' . $temp . '"', 'Information');
+ }
+ $this->sub_value = $temp;
+ }
+ }
+ $this->sub_value .= $important;
+ }
+
+ /**
+ * Compresses shorthand values. Example: margin:1px 1px 1px 1px -> margin:1px
+ * @param string $value
+ * @access public
+ * @return string
+ * @version 1.0
+ */
+ function shorthand($value) {
+ $important = '';
+ if (csstidy::is_important($value)) {
+ $values = csstidy::gvw_important($value);
+ $important = '!important';
+ }
+ else {
+ $values = $value;
+ }
+
+ $values = explode(' ', $values);
+ switch (count($values)) {
+ case 4:
+ if ($values[0] == $values[1] && $values[0] == $values[2] && $values[0] == $values[3]) {
+ return $values[0] . $important;
+ }
+ elseif ($values[1] == $values[3] && $values[0] == $values[2]) {
+ return $values[0] . ' ' . $values[1] . $important;
+ }
+ elseif ($values[1] == $values[3]) {
+ return $values[0] . ' ' . $values[1] . ' ' . $values[2] . $important;
+ }
+ break;
+
+ case 3:
+ if ($values[0] == $values[1] && $values[0] == $values[2]) {
+ return $values[0] . $important;
+ }
+ elseif ($values[0] == $values[2]) {
+ return $values[0] . ' ' . $values[1] . $important;
+ }
+ break;
+
+ case 2:
+ if ($values[0] == $values[1]) {
+ return $values[0] . $important;
+ }
+ break;
+ }
+
+ return $value;
+ }
+
+ /**
+ * Removes unnecessary whitespace in ! important
+ * @param string $string
+ * @return string
+ * @access public
+ * @version 1.1
+ */
+ function compress_important(&$string) {
+ if (csstidy::is_important($string)) {
+ $string = csstidy::gvw_important($string) . '!important';
+ }
+ return $string;
+ }
+
+ /**
+ * Color compression function. Converts all rgb() values to #-values and uses the short-form if possible. Also replaces 4 color names by #-values.
+ * @param string $color
+ * @return string
+ * @version 1.1
+ */
+ function cut_color($color) {
+ $replace_colors = & $GLOBALS['csstidy']['replace_colors'];
+
+ // rgb(0,0,0) -> #000000 (or #000 in this case later)
+ if (strtolower(substr($color, 0, 4)) === 'rgb(') {
+ $color_tmp = substr($color, 4, strlen($color) - 5);
+ $color_tmp = explode(',', $color_tmp);
+ for ($i = 0; $i < count($color_tmp); $i++) {
+ $color_tmp[$i] = trim($color_tmp[$i]);
+ if (substr($color_tmp[$i], -1) === '%') {
+ $color_tmp[$i] = round((255 * $color_tmp[$i]) / 100);
+ }
+ if ($color_tmp[$i] > 255) {
+ $color_tmp[$i] = 255;
+ }
+ }
+ $color = '#';
+ for ($i = 0; $i < 3; $i++) {
+ if ($color_tmp[$i] < 16) {
+ $color .= '0' . dechex($color_tmp[$i]);
+ }
+ else {
+ $color .= dechex($color_tmp[$i]);
+ }
+ }
+ }
+
+ // Fix bad color names
+ if (isset($replace_colors[strtolower($color)])) {
+ $color = $replace_colors[strtolower($color)];
+ }
+
+ // #aabbcc -> #abc
+ if (strlen($color) == 7) {
+ $color_temp = strtolower($color);
+ if ($color_temp{0} === '#' && $color_temp{1} == $color_temp{2} && $color_temp{3} == $color_temp{4} && $color_temp{5} == $color_temp{6}) {
+ $color = '#' . $color{1} . $color{3} . $color{5};
+ }
+ }
+
+ switch (strtolower($color)) {
+ /* color name -> hex code */
+ case 'black':
+ return '#000';
+ case 'fuchsia':
+ return '#f0f';
+ case 'white':
+ return '#fff';
+ case 'yellow':
+ return '#ff0';
+
+ /* hex code -> color name */
+ case '#800000':
+ return 'maroon';
+ case '#ffa500':
+ return 'orange';
+ case '#808000':
+ return 'olive';
+ case '#800080':
+ return 'purple';
+ case '#008000':
+ return 'green';
+ case '#000080':
+ return 'navy';
+ case '#008080':
+ return 'teal';
+ case '#c0c0c0':
+ return 'silver';
+ case '#808080':
+ return 'gray';
+ case '#f00':
+ return 'red';
+ }
+
+ return $color;
+ }
+
+ /**
+ * Compresses numbers (ie. 1.0 becomes 1 or 1.100 becomes 1.1 )
+ * @param string $subvalue
+ * @return string
+ * @version 1.2
+ */
+ function compress_numbers($subvalue) {
+ $unit_values = & $GLOBALS['csstidy']['unit_values'];
+ $color_values = & $GLOBALS['csstidy']['color_values'];
+
+ // for font:1em/1em sans-serif...;
+ if ($this->property === 'font') {
+ $temp = explode('/', $subvalue);
+ }
+ else {
+ $temp = array($subvalue);
+ }
+ for ($l = 0; $l < count($temp); $l++) {
+ // if we are not dealing with a number at this point, do not optimise anything
+ $number = $this->AnalyseCssNumber($temp[$l]);
+ if ($number === false) {
+ return $subvalue;
+ }
+
+ // Fix bad colors
+ if (in_array($this->property, $color_values)) {
+ $temp[$l] = '#' . $temp[$l];
+ continue;
+ }
+
+ if (abs($number[0]) > 0) {
+ if ($number[1] == '' && in_array($this->property, $unit_values, true)) {
+ $number[1] = 'px';
+ }
+ }
+ else {
+ $number[1] = '';
+ }
+
+ $temp[$l] = $number[0] . $number[1];
+ }
+
+ return ((count($temp) > 1) ? $temp[0] . '/' . $temp[1] : $temp[0]);
+ }
+
+ /**
+ * Checks if a given string is a CSS valid number. If it is,
+ * an array containing the value and unit is returned
+ * @param string $string
+ * @return array ('unit' if unit is found or '' if no unit exists, number value) or false if no number
+ */
+ function AnalyseCssNumber($string) {
+ // most simple checks first
+ if (strlen($string) == 0 || ctype_alpha($string{0})) {
+ return false;
+ }
+
+ $units = & $GLOBALS['csstidy']['units'];
+ $return = array(0, '');
+
+ $return[0] = floatval($string);
+ if (abs($return[0]) > 0 && abs($return[0]) < 1) {
+ if ($return[0] < 0) {
+ $return[0] = '-' . ltrim(substr($return[0], 1), '0');
+ }
+ else {
+ $return[0] = ltrim($return[0], '0');
+ }
+ }
+
+ // Look for unit and split from value if exists
+ foreach ($units as $unit) {
+ $expectUnitAt = strlen($string) - strlen($unit);
+ if (!($unitInString = stristr($string, $unit))) { // mb_strpos() fails with "false"
+ continue;
+ }
+ $actualPosition = strpos($string, $unitInString);
+ if ($expectUnitAt === $actualPosition) {
+ $return[1] = $unit;
+ $string = substr($string, 0, - strlen($unit));
+ break;
+ }
+ }
+ if (!is_numeric($string)) {
+ return false;
+ }
+ return $return;
+ }
+
+ /**
+ * Merges selectors with same properties. Example: a{color:red} b{color:red} -> a,b{color:red}
+ * Very basic and has at least one bug. Hopefully there is a replacement soon.
+ * @param array $array
+ * @return array
+ * @access public
+ * @version 1.2
+ */
+ function merge_selectors(&$array) {
+ $css = $array;
+ foreach ($css as $key => $value) {
+ if (!isset($css[$key])) {
+ continue;
+ }
+ $newsel = '';
+
+ // Check if properties also exist in another selector
+ $keys = array();
+ // PHP bug (?) without $css = $array; here
+ foreach ($css as $selector => $vali) {
+ if ($selector == $key) {
+ continue;
+ }
+
+ if ($css[$key] === $vali) {
+ $keys[] = $selector;
+ }
+ }
+
+ if (!empty($keys)) {
+ $newsel = $key;
+ unset($css[$key]);
+ foreach ($keys as $selector) {
+ unset($css[$selector]);
+ $newsel .= ',' . $selector;
+ }
+ $css[$newsel] = $value;
+ }
+ }
+ $array = $css;
+ }
+
+ /**
+ * Removes invalid selectors and their corresponding rule-sets as
+ * defined by 4.1.7 in REC-CSS2. This is a very rudimentary check
+ * and should be replaced by a full-blown parsing algorithm or
+ * regular expression
+ * @version 1.4
+ */
+ function discard_invalid_selectors(&$array) {
+ $invalid = array(
+ '+' => true,
+ '~' => true,
+ ',' => true,
+ '>' => true,
+ );
+ foreach ($array as $selector => $decls) {
+ $ok = true;
+ $selectors = array_map('trim', explode(',', $selector));
+ foreach ($selectors as $s) {
+ $simple_selectors = preg_split('/\s*[+>~\s]\s*/', $s);
+ foreach ($simple_selectors as $ss) {
+ if ($ss === '') {
+ $ok = false;
+ }
+ // could also check $ss for internal structure,
+ // but that probably would be too slow
+ }
+ }
+ if (!$ok) {
+ unset($array[$selector]);
+ }
+ }
+ }
+
+ /**
+ * Dissolves properties like padding:10px 10px 10px to padding-top:10px;padding-bottom:10px;...
+ * @param string $property
+ * @param string $value
+ * @return array
+ * @version 1.0
+ * @see merge_4value_shorthands()
+ */
+ function dissolve_4value_shorthands($property, $value) {
+ $shorthands = & $GLOBALS['csstidy']['shorthands'];
+ if (!is_array($shorthands[$property])) {
+ $return[$property] = $value;
+ return $return;
+ }
+
+ $important = '';
+ if (csstidy::is_important($value)) {
+ $value = csstidy::gvw_important($value);
+ $important = '!important';
+ }
+ $values = explode(' ', $value);
+
+
+ $return = array();
+ if (count($values) == 4) {
+ for ($i = 0; $i < 4; $i++) {
+ $return[$shorthands[$property][$i]] = $values[$i] . $important;
+ }
+ }
+ elseif (count($values) == 3) {
+ $return[$shorthands[$property][0]] = $values[0] . $important;
+ $return[$shorthands[$property][1]] = $values[1] . $important;
+ $return[$shorthands[$property][3]] = $values[1] . $important;
+ $return[$shorthands[$property][2]] = $values[2] . $important;
+ }
+ elseif (count($values) == 2) {
+ for ($i = 0; $i < 4; $i++) {
+ $return[$shorthands[$property][$i]] = (($i % 2 != 0)) ? $values[1] . $important : $values[0] . $important;
+ }
+ }
+ else {
+ for ($i = 0; $i < 4; $i++) {
+ $return[$shorthands[$property][$i]] = $values[0] . $important;
+ }
+ }
+
+ return $return;
+ }
+
+ /**
+ * Explodes a string as explode() does, however, not if $sep is escaped or within a string.
+ * @param string $sep seperator
+ * @param string $string
+ * @return array
+ * @version 1.0
+ */
+ function explode_ws($sep, $string) {
+ $status = 'st';
+ $to = '';
+
+ $output = array();
+ $num = 0;
+ for ($i = 0, $len = strlen($string); $i < $len; $i++) {
+ switch ($status) {
+ case 'st':
+ if ($string{$i} == $sep && !csstidy::escaped($string, $i)) {
+ ++$num;
+ }
+ elseif ($string{$i} === '"' || $string{$i} === '\'' || $string{$i} === '(' && !csstidy::escaped($string, $i)) {
+ $status = 'str';
+ $to = ($string{$i} === '(') ? ')' : $string{$i};
+ (isset($output[$num])) ? $output[$num] .= $string{$i} : $output[$num] = $string{$i};
+ }
+ else {
+ (isset($output[$num])) ? $output[$num] .= $string{$i} : $output[$num] = $string{$i};
+ }
+ break;
+
+ case 'str':
+ if ($string{$i} == $to && !csstidy::escaped($string, $i)) {
+ $status = 'st';
+ }
+ (isset($output[$num])) ? $output[$num] .= $string{$i} : $output[$num] = $string{$i};
+ break;
+ }
+ }
+
+ if (isset($output[0])) {
+ return $output;
+ }
+ else {
+ return array($output);
+ }
+ }
+
+ /**
+ * Merges Shorthand properties again, the opposite of dissolve_4value_shorthands()
+ * @param array $array
+ * @return array
+ * @version 1.2
+ * @see dissolve_4value_shorthands()
+ */
+ function merge_4value_shorthands($array) {
+ $return = $array;
+ $shorthands = & $GLOBALS['csstidy']['shorthands'];
+
+ foreach ($shorthands as $key => $value) {
+ if (isset($array[$value[0]]) && isset($array[$value[1]])
+ && isset($array[$value[2]]) && isset($array[$value[3]]) && $value !== 0) {
+ $return[$key] = '';
+
+ $important = '';
+ for ($i = 0; $i < 4; $i++) {
+ $val = $array[$value[$i]];
+ if (csstidy::is_important($val)) {
+ $important = '!important';
+ $return[$key] .= csstidy::gvw_important($val) . ' ';
+ }
+ else {
+ $return[$key] .= $val . ' ';
+ }
+ unset($return[$value[$i]]);
+ }
+ $return[$key] = csstidy_optimise::shorthand(trim($return[$key] . $important));
+ }
+ }
+ return $return;
+ }
+
+ /**
+ * Dissolve background property
+ * @param string $str_value
+ * @return array
+ * @version 1.0
+ * @see merge_bg()
+ * @todo full CSS 3 compliance
+ */
+ function dissolve_short_bg($str_value) {
+ // don't try to explose background gradient !
+ if (stripos($str_value, "gradient(") !== FALSE) {
+ return array('background' => $str_value);
+ }
+
+ $background_prop_default = & $GLOBALS['csstidy']['background_prop_default'];
+ $repeat = array('repeat', 'repeat-x', 'repeat-y', 'no-repeat', 'space');
+ $attachment = array('scroll', 'fixed', 'local');
+ $clip = array('border', 'padding');
+ $origin = array('border', 'padding', 'content');
+ $pos = array('top', 'center', 'bottom', 'left', 'right');
+ $important = '';
+ $return = array(
+ 'background-image' => null,
+ 'background-size' => null,
+ 'background-repeat' => null,
+ 'background-position' => null,
+ 'background-attachment' => null,
+ 'background-clip' => null,
+ 'background-origin' => null,
+ 'background-color' => null,
+ );
+
+ if (csstidy::is_important($str_value)) {
+ $important = ' !important';
+ $str_value = csstidy::gvw_important($str_value);
+ }
+
+ $str_value = csstidy_optimise::explode_ws(',', $str_value);
+ for ($i = 0; $i < count($str_value); $i++) {
+ $have['clip'] = false;
+ $have['pos'] = false;
+ $have['color'] = false;
+ $have['bg'] = false;
+
+ if (is_array($str_value[$i])) {
+ $str_value[$i] = $str_value[$i][0];
+ }
+ $str_value[$i] = csstidy_optimise::explode_ws(' ', trim($str_value[$i]));
+
+ for ($j = 0; $j < count($str_value[$i]); $j++) {
+ if ($have['bg'] === false && (substr($str_value[$i][$j], 0, 4) === 'url(' || $str_value[$i][$j] === 'none')) {
+ $return['background-image'] .= $str_value[$i][$j] . ',';
+ $have['bg'] = true;
+ }
+ elseif (in_array($str_value[$i][$j], $repeat, true)) {
+ $return['background-repeat'] .= $str_value[$i][$j] . ',';
+ }
+ elseif (in_array($str_value[$i][$j], $attachment, true)) {
+ $return['background-attachment'] .= $str_value[$i][$j] . ',';
+ }
+ elseif (in_array($str_value[$i][$j], $clip, true) && !$have['clip']) {
+ $return['background-clip'] .= $str_value[$i][$j] . ',';
+ $have['clip'] = true;
+ }
+ elseif (in_array($str_value[$i][$j], $origin, true)) {
+ $return['background-origin'] .= $str_value[$i][$j] . ',';
+ }
+ elseif ($str_value[$i][$j]{0} === '(') {
+ $return['background-size'] .= substr($str_value[$i][$j], 1, -1) . ',';
+ }
+ elseif (in_array($str_value[$i][$j], $pos, true) || is_numeric($str_value[$i][$j]{0}) || $str_value[$i][$j]{0} === null || $str_value[$i][$j]{0} === '-' || $str_value[$i][$j]{0} === '.') {
+ $return['background-position'] .= $str_value[$i][$j];
+ if (!$have['pos']) {
+ $return['background-position'] .= ' ';
+ }
+ else {
+ $return['background-position'] .= ',';
+ }
+ $have['pos'] = true;
+ }
+ elseif (!$have['color']) {
+ $return['background-color'] .= $str_value[$i][$j] . ',';
+ $have['color'] = true;
+ }
+ }
+ }
+
+ foreach ($background_prop_default as $bg_prop => $default_value) {
+ if ($return[$bg_prop] !== null) {
+ $return[$bg_prop] = substr($return[$bg_prop], 0, -1) . $important;
+ }
+ else {
+ $return[$bg_prop] = $default_value . $important;
+ }
+ }
+ return $return;
+ }
+
+ /**
+ * Merges all background properties
+ * @param array $input_css
+ * @return array
+ * @version 1.0
+ * @see dissolve_short_bg()
+ * @todo full CSS 3 compliance
+ */
+ function merge_bg($input_css) {
+ $background_prop_default = & $GLOBALS['csstidy']['background_prop_default'];
+ // Max number of background images. CSS3 not yet fully implemented
+ $number_of_values = @max(count(csstidy_optimise::explode_ws(',', $input_css['background-image'])), count(csstidy_optimise::explode_ws(',', $input_css['background-color'])), 1);
+ // Array with background images to check if BG image exists
+ $bg_img_array = @csstidy_optimise::explode_ws(',', csstidy::gvw_important($input_css['background-image']));
+ $new_bg_value = '';
+ $important = '';
+
+ // if background properties is here and not empty, don't try anything
+ if (isset($input_css['background']) AND $input_css['background']) {
+ return $input_css;
+ }
+
+ for ($i = 0; $i < $number_of_values; $i++) {
+ foreach ($background_prop_default as $bg_property => $default_value) {
+ // Skip if property does not exist
+ if (!isset($input_css[$bg_property])) {
+ continue;
+ }
+
+ $cur_value = $input_css[$bg_property];
+ // skip all optimisation if gradient() somewhere
+ if (stripos($cur_value, "gradient(") !== FALSE) {
+ return $input_css;
+ }
+
+ // Skip some properties if there is no background image
+ if ((!isset($bg_img_array[$i]) || $bg_img_array[$i] === 'none')
+ && ($bg_property === 'background-size' || $bg_property === 'background-position'
|| $bg_property === 'background-attachment' || $bg_property === 'background-repeat')) {
- continue;
- }
+ continue;
+ }
- // Remove !important
- if (csstidy::is_important($cur_value)) {
- $important = ' !important';
- $cur_value = csstidy::gvw_important($cur_value);
- }
-
- // Do not add default values
- if ($cur_value === $default_value) {
- continue;
- }
-
- $temp = csstidy_optimise::explode_ws(',', $cur_value);
-
- if (isset($temp[$i])) {
- if ($bg_property === 'background-size') {
- $new_bg_value .= '(' . $temp[$i] . ') ';
- } else {
- $new_bg_value .= $temp[$i] . ' ';
- }
- }
- }
-
- $new_bg_value = trim($new_bg_value);
- if ($i != $number_of_values - 1)
- $new_bg_value .= ',';
- }
-
- // Delete all background-properties
- foreach ($background_prop_default as $bg_property => $default_value) {
- unset($input_css[$bg_property]);
- }
-
- // Add new background property
- if ($new_bg_value !== '')
- $input_css['background'] = $new_bg_value . $important;
- elseif(isset ($input_css['background']))
- $input_css['background'] = 'none';
-
- return $input_css;
- }
-
- /**
- * Dissolve font property
- * @param string $str_value
- * @return array
- * @version 1.3
- * @see merge_font()
- */
- function dissolve_short_font($str_value) {
- $font_prop_default = & $GLOBALS['csstidy']['font_prop_default'];
- $font_weight = array('normal', 'bold', 'bolder', 'lighter', 100, 200, 300, 400, 500, 600, 700, 800, 900);
- $font_variant = array('normal', 'small-caps');
- $font_style = array('normal', 'italic', 'oblique');
- $important = '';
- $return = array('font-style' => null, 'font-variant' => null, 'font-weight' => null, 'font-size' => null, 'line-height' => null, 'font-family' => null);
-
- if (csstidy::is_important($str_value)) {
- $important = '!important';
- $str_value = csstidy::gvw_important($str_value);
- }
-
- $have['style'] = false;
- $have['variant'] = false;
- $have['weight'] = false;
- $have['size'] = false;
- // Detects if font-family consists of several words w/o quotes
- $multiwords = false;
-
- // Workaround with multiple font-family
- $str_value = csstidy_optimise::explode_ws(',', trim($str_value));
-
- $str_value[0] = csstidy_optimise::explode_ws(' ', trim($str_value[0]));
-
- for ($j = 0; $j < count($str_value[0]); $j++) {
- if ($have['weight'] === false && in_array($str_value[0][$j], $font_weight)) {
- $return['font-weight'] = $str_value[0][$j];
- $have['weight'] = true;
- } elseif ($have['variant'] === false && in_array($str_value[0][$j], $font_variant)) {
- $return['font-variant'] = $str_value[0][$j];
- $have['variant'] = true;
- } elseif ($have['style'] === false && in_array($str_value[0][$j], $font_style)) {
- $return['font-style'] = $str_value[0][$j];
- $have['style'] = true;
- } elseif ($have['size'] === false && (is_numeric($str_value[0][$j]{0}) || $str_value[0][$j]{0} === null || $str_value[0][$j]{0} === '.')) {
- $size = csstidy_optimise::explode_ws('/', trim($str_value[0][$j]));
- $return['font-size'] = $size[0];
- if (isset($size[1])) {
- $return['line-height'] = $size[1];
- } else {
- $return['line-height'] = ''; // don't add 'normal' !
- }
- $have['size'] = true;
- } else {
- if (isset($return['font-family'])) {
- $return['font-family'] .= ' ' . $str_value[0][$j];
- $multiwords = true;
- } else {
- $return['font-family'] = $str_value[0][$j];
- }
- }
- }
- // add quotes if we have several qords in font-family
- if ($multiwords !== false) {
- $return['font-family'] = '"' . $return['font-family'] . '"';
- }
- $i = 1;
- while (isset($str_value[$i])) {
- $return['font-family'] .= ',' . trim($str_value[$i]);
- $i++;
- }
+ // Remove !important
+ if (csstidy::is_important($cur_value)) {
+ $important = ' !important';
+ $cur_value = csstidy::gvw_important($cur_value);
+ }
+
+ // Do not add default values
+ if ($cur_value === $default_value) {
+ continue;
+ }
+
+ $temp = csstidy_optimise::explode_ws(',', $cur_value);
+
+ if (isset($temp[$i])) {
+ if ($bg_property === 'background-size') {
+ $new_bg_value .= '(' . $temp[$i] . ') ';
+ }
+ else {
+ $new_bg_value .= $temp[$i] . ' ';
+ }
+ }
+ }
+
+ $new_bg_value = trim($new_bg_value);
+ if ($i != $number_of_values - 1) {
+ $new_bg_value .= ',';
+ }
+ }
+
+ // Delete all background-properties
+ foreach ($background_prop_default as $bg_property => $default_value) {
+ unset($input_css[$bg_property]);
+ }
+
+ // Add new background property
+ if ($new_bg_value !== '') {
+ $input_css['background'] = $new_bg_value . $important;
+ }
+ elseif (isset($input_css['background'])) {
+ $input_css['background'] = 'none';
+ }
+
+ return $input_css;
+ }
+
+ /**
+ * Dissolve font property
+ * @param string $str_value
+ * @return array
+ * @version 1.3
+ * @see merge_font()
+ */
+ function dissolve_short_font($str_value) {
+ $font_prop_default = & $GLOBALS['csstidy']['font_prop_default'];
+ $font_weight = array('normal', 'bold', 'bolder', 'lighter', 100, 200, 300, 400, 500, 600, 700, 800, 900);
+ $font_variant = array('normal', 'small-caps');
+ $font_style = array('normal', 'italic', 'oblique');
+ $important = '';
+ $return = array(
+ 'font-style' => null,
+ 'font-variant' => null,
+ 'font-weight' => null,
+ 'font-size' => null,
+ 'line-height' => null,
+ 'font-family' => null,
+ );
+
+ if (csstidy::is_important($str_value)) {
+ $important = '!important';
+ $str_value = csstidy::gvw_important($str_value);
+ }
+
+ $have['style'] = false;
+ $have['variant'] = false;
+ $have['weight'] = false;
+ $have['size'] = false;
+ // Detects if font-family consists of several words w/o quotes
+ $multiwords = false;
+
+ // Workaround with multiple font-family
+ $str_value = csstidy_optimise::explode_ws(',', trim($str_value));
+
+ $str_value[0] = csstidy_optimise::explode_ws(' ', trim($str_value[0]));
+
+ for ($j = 0; $j < count($str_value[0]); $j++) {
+ if ($have['weight'] === false && in_array($str_value[0][$j], $font_weight)) {
+ $return['font-weight'] = $str_value[0][$j];
+ $have['weight'] = true;
+ }
+ elseif ($have['variant'] === false && in_array($str_value[0][$j], $font_variant)) {
+ $return['font-variant'] = $str_value[0][$j];
+ $have['variant'] = true;
+ }
+ elseif ($have['style'] === false && in_array($str_value[0][$j], $font_style)) {
+ $return['font-style'] = $str_value[0][$j];
+ $have['style'] = true;
+ }
+ elseif ($have['size'] === false && (is_numeric($str_value[0][$j]{0}) || $str_value[0][$j]{0} === null || $str_value[0][$j]{0} === '.')) {
+ $size = csstidy_optimise::explode_ws('/', trim($str_value[0][$j]));
+ $return['font-size'] = $size[0];
+ if (isset($size[1])) {
+ $return['line-height'] = $size[1];
+ }
+ else {
+ $return['line-height'] = ''; // don't add 'normal' !
+ }
+ $have['size'] = true;
+ }
+ else {
+ if (isset($return['font-family'])) {
+ $return['font-family'] .= ' ' . $str_value[0][$j];
+ $multiwords = true;
+ }
+ else {
+ $return['font-family'] = $str_value[0][$j];
+ }
+ }
+ }
+ // add quotes if we have several qords in font-family
+ if ($multiwords !== false) {
+ $return['font-family'] = '"' . $return['font-family'] . '"';
+ }
+ $i = 1;
+ while (isset($str_value[$i])) {
+ $return['font-family'] .= ',' . trim($str_value[$i]);
+ $i++;
+ }
- // Fix for 100 and more font-size
- if ($have['size'] === false && isset($return['font-weight']) &&
+ // Fix for 100 and more font-size
+ if ($have['size'] === false && isset($return['font-weight']) &&
is_numeric($return['font-weight']{0})) {
- $return['font-size'] = $return['font-weight'];
- unset($return['font-weight']);
- }
-
- foreach ($font_prop_default as $font_prop => $default_value) {
- if ($return[$font_prop] !== null) {
- $return[$font_prop] = $return[$font_prop] . $important;
- }
- else
- $return[$font_prop] = $default_value . $important;
- }
- return $return;
- }
-
- /**
- * Merges all fonts properties
- * @param array $input_css
- * @return array
- * @version 1.3
- * @see dissolve_short_font()
- */
- function merge_font($input_css) {
- $font_prop_default = & $GLOBALS['csstidy']['font_prop_default'];
- $new_font_value = '';
- $important = '';
- // Skip if not font-family and font-size set
- if (isset($input_css['font-family']) && isset($input_css['font-size'])) {
- // fix several words in font-family - add quotes
- if (isset($input_css['font-family'])) {
- $families = explode(",", $input_css['font-family']);
- $result_families = array();
- foreach ($families as $family) {
- $family = trim($family);
- $len = strlen($family);
- if (strpos($family, " ") &&
+ $return['font-size'] = $return['font-weight'];
+ unset($return['font-weight']);
+ }
+
+ foreach ($font_prop_default as $font_prop => $default_value) {
+ if ($return[$font_prop] !== null) {
+ $return[$font_prop] = $return[$font_prop] . $important;
+ }
+ else {
+ $return[$font_prop] = $default_value . $important;
+ }
+ }
+ return $return;
+ }
+
+ /**
+ * Merges all fonts properties
+ * @param array $input_css
+ * @return array
+ * @version 1.3
+ * @see dissolve_short_font()
+ */
+ function merge_font($input_css) {
+ $font_prop_default = & $GLOBALS['csstidy']['font_prop_default'];
+ $new_font_value = '';
+ $important = '';
+ // Skip if not font-family and font-size set
+ if (isset($input_css['font-family']) && isset($input_css['font-size'])) {
+ // fix several words in font-family - add quotes
+ if (isset($input_css['font-family'])) {
+ $families = explode(",", $input_css['font-family']);
+ $result_families = array();
+ foreach ($families as $family) {
+ $family = trim($family);
+ $len = strlen($family);
+ if (strpos($family, " ") &&
!(($family{0} == '"' && $family{$len - 1} == '"') ||
($family{0} == "'" && $family{$len - 1} == "'"))) {
- $family = '"' . $family . '"';
- }
- $result_families[] = $family;
- }
- $input_css['font-family'] = implode(",", $result_families);
- }
- foreach ($font_prop_default as $font_property => $default_value) {
-
- // Skip if property does not exist
- if (!isset($input_css[$font_property])) {
- continue;
- }
-
- $cur_value = $input_css[$font_property];
-
- // Skip if default value is used
- if ($cur_value === $default_value) {
- continue;
- }
-
- // Remove !important
- if (csstidy::is_important($cur_value)) {
- $important = '!important';
- $cur_value = csstidy::gvw_important($cur_value);
- }
-
- $new_font_value .= $cur_value;
- // Add delimiter
- $new_font_value .= ( $font_property === 'font-size' &&
+ $family = '"' . $family . '"';
+ }
+ $result_families[] = $family;
+ }
+ $input_css['font-family'] = implode(",", $result_families);
+ }
+ foreach ($font_prop_default as $font_property => $default_value) {
+
+ // Skip if property does not exist
+ if (!isset($input_css[$font_property])) {
+ continue;
+ }
+
+ $cur_value = $input_css[$font_property];
+
+ // Skip if default value is used
+ if ($cur_value === $default_value) {
+ continue;
+ }
+
+ // Remove !important
+ if (csstidy::is_important($cur_value)) {
+ $important = '!important';
+ $cur_value = csstidy::gvw_important($cur_value);
+ }
+
+ $new_font_value .= $cur_value;
+ // Add delimiter
+ $new_font_value .= ( $font_property === 'font-size' &&
isset($input_css['line-height'])) ? '/' : ' ';
- }
+ }
- $new_font_value = trim($new_font_value);
+ $new_font_value = trim($new_font_value);
- // Delete all font-properties
- foreach ($font_prop_default as $font_property => $default_value) {
- if ($font_property!=='font' OR !$new_font_value)
- unset($input_css[$font_property]);
- }
-
- // Add new font property
- if ($new_font_value !== '') {
- $input_css['font'] = $new_font_value . $important;
- }
- }
+ // Delete all font-properties
+ foreach ($font_prop_default as $font_property => $default_value) {
+ if ($font_property !== 'font' OR !$new_font_value) {
+ unset($input_css[$font_property]);
+ }
+ }
+
+ // Add new font property
+ if ($new_font_value !== '') {
+ $input_css['font'] = $new_font_value . $important;
+ }
+ }
- return $input_css;
- }
+ return $input_css;
+ }
}
diff -up -r advagg_css_compress/csstidy/class.csstidy_print.inc advagg_css_compress/csstidy/class.csstidy_print.inc
--- advagg_css_compress/csstidy/class.csstidy_print.inc 2012-03-23 12:08:13.000000000 -0600
+++ advagg_css_compress/csstidy/class.csstidy_print.inc 2012-03-23 13:02:21.000000000 -0600
@@ -19,7 +19,7 @@
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
- *
+ *
* You should have received a copy of the GNU Lesser General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
@@ -41,366 +41,376 @@
*/
class csstidy_print {
- /**
- * Saves the input CSS string
- * @var string
- * @access private
- */
- var $input_css = '';
- /**
- * Saves the formatted CSS string
- * @var string
- * @access public
- */
- var $output_css = '';
- /**
- * Saves the formatted CSS string (plain text)
- * @var string
- * @access public
- */
- var $output_css_plain = '';
-
- /**
- * Constructor
- * @param array $css contains the class csstidy
- * @access private
- * @version 1.0
- */
- function csstidy_print(&$css) {
- $this->parser = & $css;
- $this->css = & $css->css;
- $this->template = & $css->template;
- $this->tokens = & $css->tokens;
- $this->charset = & $css->charset;
- $this->import = & $css->import;
- $this->namespace = & $css->namespace;
- }
-
- /**
- * Resets output_css and output_css_plain (new css code)
- * @access private
- * @version 1.0
- */
- function _reset() {
- $this->output_css = '';
- $this->output_css_plain = '';
- }
-
- /**
- * Returns the CSS code as plain text
- * @param string $default_media default @media to add to selectors without any @media
- * @return string
- * @access public
- * @version 1.0
- */
- function plain($default_media='') {
- $this->_print(true, $default_media);
- return $this->output_css_plain;
- }
-
- /**
- * Returns the formatted CSS code
- * @param string $default_media default @media to add to selectors without any @media
- * @return string
- * @access public
- * @version 1.0
- */
- function formatted($default_media='') {
- $this->_print(false, $default_media);
- return $this->output_css;
- }
-
- /**
- * Returns the formatted CSS code to make a complete webpage
- * @param string $doctype shorthand for the document type
- * @param bool $externalcss indicates whether styles to be attached internally or as an external stylesheet
- * @param string $title title to be added in the head of the document
- * @param string $lang two-letter language code to be added to the output
- * @return string
- * @access public
- * @version 1.4
- */
- function formatted_page($doctype='xhtml1.1', $externalcss=true, $title='', $lang='en') {
- switch ($doctype) {
- case 'xhtml1.0strict':
- $doctype_output = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ /**
+ * Saves the input CSS string
+ * @var string
+ * @access private
+ */
+ var $input_css = '';
+ /**
+ * Saves the formatted CSS string
+ * @var string
+ * @access public
+ */
+ var $output_css = '';
+ /**
+ * Saves the formatted CSS string (plain text)
+ * @var string
+ * @access public
+ */
+ var $output_css_plain = '';
+
+ /**
+ * Constructor
+ * @param array $css contains the class csstidy
+ * @access private
+ * @version 1.0
+ */
+ function csstidy_print(&$css) {
+ $this->parser = & $css;
+ $this->css = & $css->css;
+ $this->template = & $css->template;
+ $this->tokens = & $css->tokens;
+ $this->charset = & $css->charset;
+ $this->import = & $css->import;
+ $this->namespace = & $css->namespace;
+ }
+
+ /**
+ * Resets output_css and output_css_plain (new css code)
+ * @access private
+ * @version 1.0
+ */
+ function _reset() {
+ $this->output_css = '';
+ $this->output_css_plain = '';
+ }
+
+ /**
+ * Returns the CSS code as plain text
+ * @param string $default_media default @media to add to selectors without any @media
+ * @return string
+ * @access public
+ * @version 1.0
+ */
+ function plain($default_media = '') {
+ $this->_print(true, $default_media);
+ return $this->output_css_plain;
+ }
+
+ /**
+ * Returns the formatted CSS code
+ * @param string $default_media default @media to add to selectors without any @media
+ * @return string
+ * @access public
+ * @version 1.0
+ */
+ function formatted($default_media = '') {
+ $this->_print(false, $default_media);
+ return $this->output_css;
+ }
+
+ /**
+ * Returns the formatted CSS code to make a complete webpage
+ * @param string $doctype shorthand for the document type
+ * @param bool $externalcss indicates whether styles to be attached internally or as an external stylesheet
+ * @param string $title title to be added in the head of the document
+ * @param string $lang two-letter language code to be added to the output
+ * @return string
+ * @access public
+ * @version 1.4
+ */
+ function formatted_page($doctype = 'xhtml1.1', $externalcss = true, $title = '', $lang = 'en') {
+ switch ($doctype) {
+ case 'xhtml1.0strict':
+ $doctype_output = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">';
- break;
- case 'xhtml1.1':
- default:
- $doctype_output = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+ break;
+ case 'xhtml1.1':
+ default:
+ $doctype_output = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">';
- break;
- }
+ break;
+ }
- $output = $cssparsed = '';
- $this->output_css_plain = & $output;
+ $output = $cssparsed = '';
+ $this->output_css_plain = & $output;
- $output .= $doctype_output . "\n" . '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="' . $lang . '"';
- $output .= ( $doctype === 'xhtml1.1') ? '>' : ' lang="' . $lang . '">';
- $output .= "\n<head>\n <title>$title</title>";
-
- if ($externalcss) {
- $output .= "\n <style type=\"text/css\">\n";
- $cssparsed = file_get_contents('cssparsed.css');
- $output .= $cssparsed; // Adds an invisible BOM or something, but not in css_optimised.php
- $output .= "\n</style>";
- } else {
- $output .= "\n" . ' <link rel="stylesheet" type="text/css" href="cssparsed.css" />';
-// }
- }
- $output .= "\n</head>\n<body><code id=\"copytext\">";
- $output .= $this->formatted();
- $output .= '</code>' . "\n" . '</body></html>';
- return $this->output_css_plain;
- }
-
- /**
- * Returns the formatted CSS Code and saves it into $this->output_css and $this->output_css_plain
- * @param bool $plain plain text or not
- * @param string $default_media default @media to add to selectors without any @media
- * @access private
- * @version 2.0
- */
- function _print($plain = false, $default_media='') {
- if ($this->output_css && $this->output_css_plain) {
- return;
- }
-
- $output = '';
- if (!$this->parser->get_cfg('preserve_css')) {
- $this->_convert_raw_css($default_media);
- }
-
- $template = & $this->template;
-
- if ($plain) {
- $template = array_map('strip_tags', $template);
- }
-
- if ($this->parser->get_cfg('timestamp')) {
- array_unshift($this->tokens, array(COMMENT, ' CSSTidy ' . $this->parser->version . ': ' . date('r') . ' '));
- }
-
- if (!empty($this->charset)) {
- $output .= $template[0] . '@charset ' . $template[5] . $this->charset . $template[6];
- }
-
- if (!empty($this->import)) {
- for ($i = 0, $size = count($this->import); $i < $size; $i++) {
- if (substr($this->import[$i], 0, 4) === 'url(' && substr($this->import[$i], -1, 1) === ')') {
- $this->import[$i] = '\'' . substr($this->import[$i], 4, -1) . '\'';
- $this->parser->log('Optimised @import : Removed "url("', 'Information');
- }
- $output .= $template[0] . '@import ' . $template[5] . $this->import[$i] . $template[6];
- }
- }
-
- if (!empty($this->namespace)) {
- if (substr($this->namespace, 0, 4) === 'url(' && substr($this->namespace, -1, 1) === ')') {
- $this->namespace = '\'' . substr($this->namespace, 4, -1) . '\'';
- $this->parser->log('Optimised @namespace : Removed "url("', 'Information');
- }
- $output .= $template[0] . '@namespace ' . $template[5] . $this->namespace . $template[6];
- }
-
- $output .= $template[13];
- $in_at_out = '';
- $out = & $output;
-
- foreach ($this->tokens as $key => $token) {
- switch ($token[0]) {
- case AT_START:
- $out .= $template[0] . $this->_htmlsp($token[1], $plain) . $template[1];
- $out = & $in_at_out;
- break;
-
- case SEL_START:
- if ($this->parser->get_cfg('lowercase_s'))
- $token[1] = strtolower($token[1]);
- $out .= ( $token[1]{0} !== '@') ? $template[2] . $this->_htmlsp($token[1], $plain) : $template[0] . $this->_htmlsp($token[1], $plain);
- $out .= $template[3];
- break;
-
- case PROPERTY:
- if ($this->parser->get_cfg('case_properties') === 2) {
- $token[1] = strtoupper($token[1]);
- } elseif ($this->parser->get_cfg('case_properties') === 1) {
- $token[1] = strtolower($token[1]);
- }
- $out .= $template[4] . $this->_htmlsp($token[1], $plain) . ':' . $template[5];
- break;
-
- case VALUE:
- $out .= $this->_htmlsp($token[1], $plain);
- if ($this->_seeknocomment($key, 1) == SEL_END && $this->parser->get_cfg('remove_last_;')) {
- $out .= str_replace(';', '', $template[6]);
- } else {
- $out .= $template[6];
- }
- break;
-
- case SEL_END:
- $out .= $template[7];
- if ($this->_seeknocomment($key, 1) != AT_END)
- $out .= $template[8];
- break;
-
- case AT_END:
- $out = & $output;
- $out .= $template[10] . str_replace("\n", "\n" . $template[10], $in_at_out);
- $in_at_out = '';
- $out .= $template[9];
- break;
-
- case COMMENT:
- $out .= $template[11] . '/*' . $this->_htmlsp($token[1], $plain) . '*/' . $template[12];
- break;
- }
- }
-
- $output = trim($output);
-
- if (!$plain) {
- $this->output_css = $output;
- $this->_print(true);
- } else {
- // If using spaces in the template, don't want these to appear in the plain output
- $this->output_css_plain = str_replace(' ', '', $output);
- }
- }
-
- /**
- * Gets the next token type which is $move away from $key, excluding comments
- * @param integer $key current position
- * @param integer $move move this far
- * @return mixed a token type
- * @access private
- * @version 1.0
- */
- function _seeknocomment($key, $move) {
- $go = ($move > 0) ? 1 : -1;
- for ($i = $key + 1; abs($key - $i) - 1 < abs($move); $i += $go) {
- if (!isset($this->tokens[$i])) {
- return;
- }
- if ($this->tokens[$i][0] == COMMENT) {
- $move += 1;
- continue;
- }
- return $this->tokens[$i][0];
- }
- }
-
- /**
- * Converts $this->css array to a raw array ($this->tokens)
- * @param string $default_media default @media to add to selectors without any @media
- * @access private
- * @version 1.0
- */
- function _convert_raw_css($default_media='') {
- $this->tokens = array();
-
- foreach ($this->css as $medium => $val) {
- if ($this->parser->get_cfg('sort_selectors'))
- ksort($val);
- if (intval($medium) < DEFAULT_AT) {
- $this->parser->_add_token(AT_START, $medium, true);
- }
- elseif ($default_media) {
- $this->parser->_add_token(AT_START, $default_media, true);
- }
-
- foreach ($val as $selector => $vali) {
- if ($this->parser->get_cfg('sort_properties'))
- ksort($vali);
- $this->parser->_add_token(SEL_START, $selector, true);
-
- foreach ($vali as $property => $valj) {
- $this->parser->_add_token(PROPERTY, $property, true);
- $this->parser->_add_token(VALUE, $valj, true);
- }
-
- $this->parser->_add_token(SEL_END, $selector, true);
- }
-
- if (intval($medium) < DEFAULT_AT) {
- $this->parser->_add_token(AT_END, $medium, true);
- }
- elseif ($default_media) {
- $this->parser->_add_token(AT_END, $default_media, true);
- }
- }
- }
-
- /**
- * Same as htmlspecialchars, only that chars are not replaced if $plain !== true. This makes print_code() cleaner.
- * @param string $string
- * @param bool $plain
- * @return string
- * @see csstidy_print::_print()
- * @access private
- * @version 1.0
- */
- function _htmlsp($string, $plain) {
- if (!$plain) {
- return htmlspecialchars($string, ENT_QUOTES, 'utf-8');
- }
- return $string;
- }
-
- /**
- * Get compression ratio
- * @access public
- * @return float
- * @version 1.2
- */
- function get_ratio() {
- if (!$this->output_css_plain) {
- $this->formatted();
- }
- return round((strlen($this->input_css) - strlen($this->output_css_plain)) / strlen($this->input_css), 3) * 100;
- }
-
- /**
- * Get difference between the old and new code in bytes and prints the code if necessary.
- * @access public
- * @return string
- * @version 1.1
- */
- function get_diff() {
- if (!$this->output_css_plain) {
- $this->formatted();
- }
-
- $diff = strlen($this->output_css_plain) - strlen($this->input_css);
-
- if ($diff > 0) {
- return '+' . $diff;
- } elseif ($diff == 0) {
- return '+-' . $diff;
- }
-
- return $diff;
- }
-
- /**
- * Get the size of either input or output CSS in KB
- * @param string $loc default is "output"
- * @access public
- * @return integer
- * @version 1.0
- */
- function size($loc = 'output') {
- if ($loc === 'output' && !$this->output_css) {
- $this->formatted();
- }
-
- if ($loc === 'input') {
- return (strlen($this->input_css) / 1000);
- } else {
- return (strlen($this->output_css_plain) / 1000);
- }
- }
+ $output .= $doctype_output . "\n" . '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="' . $lang . '"';
+ $output .= ( $doctype === 'xhtml1.1') ? '>' : ' lang="' . $lang . '">';
+ $output .= "\n<head>\n <title>$title</title>";
+
+ if ($externalcss) {
+ $output .= "\n <style type=\"text/css\">\n";
+ $cssparsed = file_get_contents('cssparsed.css');
+ $output .= $cssparsed; // Adds an invisible BOM or something, but not in css_optimised.php
+ $output .= "\n</style>";
+ }
+ else {
+ $output .= "\n" . ' <link rel="stylesheet" type="text/css" href="cssparsed.css" />';
+ // }
+ }
+ $output .= "\n</head>\n<body><code id=\"copytext\">";
+ $output .= $this->formatted();
+ $output .= '</code>' . "\n" . '</body></html>';
+ return $this->output_css_plain;
+ }
+
+ /**
+ * Returns the formatted CSS Code and saves it into $this->output_css and $this->output_css_plain
+ * @param bool $plain plain text or not
+ * @param string $default_media default @media to add to selectors without any @media
+ * @access private
+ * @version 2.0
+ */
+ function _print($plain = false, $default_media = '') {
+ if ($this->output_css && $this->output_css_plain) {
+ return;
+ }
+
+ $output = '';
+ if (!$this->parser->get_cfg('preserve_css')) {
+ $this->_convert_raw_css($default_media);
+ }
+
+ $template = & $this->template;
+
+ if ($plain) {
+ $template = array_map('strip_tags', $template);
+ }
+
+ if ($this->parser->get_cfg('timestamp')) {
+ array_unshift($this->tokens, array(COMMENT, ' CSSTidy ' . $this->parser->version . ': ' . date('r') . ' '));
+ }
+
+ if (!empty($this->charset)) {
+ $output .= $template[0] . '@charset ' . $template[5] . $this->charset . $template[6];
+ }
+
+ if (!empty($this->import)) {
+ for ($i = 0, $size = count($this->import); $i < $size; $i++) {
+ if (substr($this->import[$i], 0, 4) === 'url(' && substr($this->import[$i], -1, 1) === ')') {
+ $this->import[$i] = '\'' . substr($this->import[$i], 4, -1) . '\'';
+ $this->parser->log('Optimised @import : Removed "url("', 'Information');
+ }
+ $output .= $template[0] . '@import ' . $template[5] . $this->import[$i] . $template[6];
+ }
+ }
+
+ if (!empty($this->namespace)) {
+ if (substr($this->namespace, 0, 4) === 'url(' && substr($this->namespace, -1, 1) === ')') {
+ $this->namespace = '\'' . substr($this->namespace, 4, -1) . '\'';
+ $this->parser->log('Optimised @namespace : Removed "url("', 'Information');
+ }
+ $output .= $template[0] . '@namespace ' . $template[5] . $this->namespace . $template[6];
+ }
+
+ $output .= $template[13];
+ $in_at_out = '';
+ $out = & $output;
+
+ foreach ($this->tokens as $key => $token) {
+ switch ($token[0]) {
+ case AT_START:
+ $out .= $template[0] . $this->_htmlsp($token[1], $plain) . $template[1];
+ $out = & $in_at_out;
+ break;
+
+ case SEL_START:
+ if ($this->parser->get_cfg('lowercase_s')) {
+ $token[1] = strtolower($token[1]);
+ }
+ $out .= ( $token[1]{0} !== '@') ? $template[2] . $this->_htmlsp($token[1], $plain) : $template[0] . $this->_htmlsp($token[1], $plain);
+ $out .= $template[3];
+ break;
+
+ case PROPERTY:
+ if ($this->parser->get_cfg('case_properties') === 2) {
+ $token[1] = strtoupper($token[1]);
+ }
+ elseif ($this->parser->get_cfg('case_properties') === 1) {
+ $token[1] = strtolower($token[1]);
+ }
+ $out .= $template[4] . $this->_htmlsp($token[1], $plain) . ':' . $template[5];
+ break;
+
+ case VALUE:
+ $out .= $this->_htmlsp($token[1], $plain);
+ if ($this->_seeknocomment($key, 1) == SEL_END && $this->parser->get_cfg('remove_last_;')) {
+ $out .= str_replace(';', '', $template[6]);
+ }
+ else {
+ $out .= $template[6];
+ }
+ break;
+
+ case SEL_END:
+ $out .= $template[7];
+ if ($this->_seeknocomment($key, 1) != AT_END) {
+ $out .= $template[8];
+ }
+ break;
+
+ case AT_END:
+ $out = & $output;
+ $out .= $template[10] . str_replace("\n", "\n" . $template[10], $in_at_out);
+ $in_at_out = '';
+ $out .= $template[9];
+ break;
+
+ case COMMENT:
+ $out .= $template[11] . '/*' . $this->_htmlsp($token[1], $plain) . '*/' . $template[12];
+ break;
+ }
+ }
+
+ $output = trim($output);
+
+ if (!$plain) {
+ $this->output_css = $output;
+ $this->_print(true);
+ }
+ else {
+ // If using spaces in the template, don't want these to appear in the plain output
+ $this->output_css_plain = str_replace(' ', '', $output);
+ }
+ }
+
+ /**
+ * Gets the next token type which is $move away from $key, excluding comments
+ * @param integer $key current position
+ * @param integer $move move this far
+ * @return mixed a token type
+ * @access private
+ * @version 1.0
+ */
+ function _seeknocomment($key, $move) {
+ $go = ($move > 0) ? 1 : -1;
+ for ($i = $key + 1; abs($key - $i) - 1 < abs($move); $i += $go) {
+ if (!isset($this->tokens[$i])) {
+ return;
+ }
+ if ($this->tokens[$i][0] == COMMENT) {
+ $move += 1;
+ continue;
+ }
+ return $this->tokens[$i][0];
+ }
+ }
+
+ /**
+ * Converts $this->css array to a raw array ($this->tokens)
+ * @param string $default_media default @media to add to selectors without any @media
+ * @access private
+ * @version 1.0
+ */
+ function _convert_raw_css($default_media = '') {
+ $this->tokens = array();
+
+ foreach ($this->css as $medium => $val) {
+ if ($this->parser->get_cfg('sort_selectors')) {
+ ksort($val);
+ }
+ if (intval($medium) < DEFAULT_AT) {
+ $this->parser->_add_token(AT_START, $medium, true);
+ }
+ elseif ($default_media) {
+ $this->parser->_add_token(AT_START, $default_media, true);
+ }
+
+ foreach ($val as $selector => $vali) {
+ if ($this->parser->get_cfg('sort_properties')) {
+ ksort($vali);
+ }
+ $this->parser->_add_token(SEL_START, $selector, true);
+
+ foreach ($vali as $property => $valj) {
+ $this->parser->_add_token(PROPERTY, $property, true);
+ $this->parser->_add_token(VALUE, $valj, true);
+ }
+
+ $this->parser->_add_token(SEL_END, $selector, true);
+ }
+
+ if (intval($medium) < DEFAULT_AT) {
+ $this->parser->_add_token(AT_END, $medium, true);
+ }
+ elseif ($default_media) {
+ $this->parser->_add_token(AT_END, $default_media, true);
+ }
+ }
+ }
+
+ /**
+ * Same as htmlspecialchars, only that chars are not replaced if $plain !== true. This makes print_code() cleaner.
+ * @param string $string
+ * @param bool $plain
+ * @return string
+ * @see csstidy_print::_print()
+ * @access private
+ * @version 1.0
+ */
+ function _htmlsp($string, $plain) {
+ if (!$plain) {
+ return htmlspecialchars($string, ENT_QUOTES, 'utf-8');
+ }
+ return $string;
+ }
+
+ /**
+ * Get compression ratio
+ * @access public
+ * @return float
+ * @version 1.2
+ */
+ function get_ratio() {
+ if (!$this->output_css_plain) {
+ $this->formatted();
+ }
+ return round((strlen($this->input_css) - strlen($this->output_css_plain)) / strlen($this->input_css), 3) * 100;
+ }
+
+ /**
+ * Get difference between the old and new code in bytes and prints the code if necessary.
+ * @access public
+ * @return string
+ * @version 1.1
+ */
+ function get_diff() {
+ if (!$this->output_css_plain) {
+ $this->formatted();
+ }
+
+ $diff = strlen($this->output_css_plain) - strlen($this->input_css);
+
+ if ($diff > 0) {
+ return '+' . $diff;
+ }
+ elseif ($diff == 0) {
+ return '+-' . $diff;
+ }
+
+ return $diff;
+ }
+
+ /**
+ * Get the size of either input or output CSS in KB
+ * @param string $loc default is "output"
+ * @access public
+ * @return integer
+ * @version 1.0
+ */
+ function size($loc = 'output') {
+ if ($loc === 'output' && !$this->output_css) {
+ $this->formatted();
+ }
+
+ if ($loc === 'input') {
+ return (strlen($this->input_css) / 1000);
+ }
+ else {
+ return (strlen($this->output_css_plain) / 1000);
+ }
+ }
}
diff -up -r advagg_css_compress/csstidy/data.inc advagg_css_compress/csstidy/data.inc
--- advagg_css_compress/csstidy/data.inc 2012-03-23 12:08:13.000000000 -0600
+++ advagg_css_compress/csstidy/data.inc 2012-03-23 13:02:22.000000000 -0600
@@ -24,13 +24,13 @@
* @author Nikolay Matsievsky (speed at webo dot name) 2010
*/
-define('AT_START', 1);
-define('AT_END', 2);
-define('SEL_START', 3);
-define('SEL_END', 4);
-define('PROPERTY', 5);
-define('VALUE', 6);
-define('COMMENT', 7);
+define('AT_START', 1);
+define('AT_END', 2);
+define('SEL_START', 3);
+define('SEL_END', 4);
+define('PROPERTY', 5);
+define('VALUE', 6);
+define('COMMENT', 7);
define('DEFAULT_AT', 41);
/**
@@ -39,7 +39,7 @@ define('DEFAULT_AT', 41);
* @global array $GLOBALS['csstidy']['whitespace']
* @version 1.0
*/
-$GLOBALS['csstidy']['whitespace'] = array(' ',"\n","\t","\r","\x0B");
+$GLOBALS['csstidy']['whitespace'] = array(' ', "\n", "\t", "\r", "\x0B");
/**
* All CSS tokens used by csstidy
@@ -56,7 +56,7 @@ $GLOBALS['csstidy']['tokens'] = '/@}{;:=
* @global array $GLOBALS['csstidy']['units']
* @version 1.0
*/
-$GLOBALS['csstidy']['units'] = array('in','cm','mm','pt','pc','px','rem','em','%','ex','gd','vw','vh','vm','deg','grad','rad','ms','s','khz','hz');
+$GLOBALS['csstidy']['units'] = array('in', 'cm', 'mm', 'pt', 'pc', 'px', 'rem', 'em', '%', 'ex', 'gd', 'vw', 'vh', 'vm', 'deg', 'grad', 'rad', 'ms', 's', 'khz', 'hz');
/**
* Available at-rules
@@ -64,9 +64,16 @@ $GLOBALS['csstidy']['units'] = array('in
* @global array $GLOBALS['csstidy']['at_rules']
* @version 1.0
*/
-$GLOBALS['csstidy']['at_rules'] = array('page' => 'is','font-face' => 'is','charset' => 'iv', 'import' => 'iv','namespace' => 'iv','media' => 'at');
+$GLOBALS['csstidy']['at_rules'] = array(
+ 'page' => 'is',
+ 'font-face' => 'is',
+ 'charset' => 'iv',
+ 'import' => 'iv',
+ 'namespace' => 'iv',
+ 'media' => 'at',
+);
- /**
+/**
* Properties that need a value with unit
*
* @todo CSS3 properties
@@ -74,11 +81,47 @@ $GLOBALS['csstidy']['at_rules'] = array(
* @global array $GLOBALS['csstidy']['unit_values']
* @version 1.2
*/
-$GLOBALS['csstidy']['unit_values'] = array ('background', 'background-position', 'border', 'border-top', 'border-right', 'border-bottom', 'border-left', 'border-width',
- 'border-top-width', 'border-right-width', 'border-left-width', 'border-bottom-width', 'bottom', 'border-spacing',
- 'font-size', 'height', 'left', 'margin', 'margin-top', 'margin-right', 'margin-bottom', 'margin-left', 'max-height',
- 'max-width', 'min-height', 'min-width', 'outline', 'outline-width', 'padding', 'padding-top', 'padding-right',
- 'padding-bottom', 'padding-left', 'right', 'top', 'text-indent', 'letter-spacing', 'word-spacing', 'width');
+$GLOBALS['csstidy']['unit_values'] = array(
+ 'background',
+ 'background-position',
+ 'border',
+ 'border-top',
+ 'border-right',
+ 'border-bottom',
+ 'border-left',
+ 'border-width',
+ 'border-top-width',
+ 'border-right-width',
+ 'border-left-width',
+ 'border-bottom-width',
+ 'bottom',
+ 'border-spacing',
+ 'font-size',
+ 'height',
+ 'left',
+ 'margin',
+ 'margin-top',
+ 'margin-right',
+ 'margin-bottom',
+ 'margin-left',
+ 'max-height',
+ 'max-width',
+ 'min-height',
+ 'min-width',
+ 'outline',
+ 'outline-width',
+ 'padding',
+ 'padding-top',
+ 'padding-right',
+ 'padding-bottom',
+ 'padding-left',
+ 'right',
+ 'top',
+ 'text-indent',
+ 'letter-spacing',
+ 'word-spacing',
+ 'width',
+);
/**
* Properties that allow <color> as value
@@ -277,11 +320,11 @@ $GLOBALS['csstidy']['replace_colors']['y
* @version 1.0
*/
$GLOBALS['csstidy']['shorthands'] = array();
-$GLOBALS['csstidy']['shorthands']['border-color'] = array('border-top-color','border-right-color','border-bottom-color','border-left-color');
-$GLOBALS['csstidy']['shorthands']['border-style'] = array('border-top-style','border-right-style','border-bottom-style','border-left-style');
-$GLOBALS['csstidy']['shorthands']['border-width'] = array('border-top-width','border-right-width','border-bottom-width','border-left-width');
-$GLOBALS['csstidy']['shorthands']['margin'] = array('margin-top','margin-right','margin-bottom','margin-left');
-$GLOBALS['csstidy']['shorthands']['padding'] = array('padding-top','padding-right','padding-bottom','padding-left');
+$GLOBALS['csstidy']['shorthands']['border-color'] = array('border-top-color', 'border-right-color', 'border-bottom-color', 'border-left-color');
+$GLOBALS['csstidy']['shorthands']['border-style'] = array('border-top-style', 'border-right-style', 'border-bottom-style', 'border-left-style');
+$GLOBALS['csstidy']['shorthands']['border-width'] = array('border-top-width', 'border-right-width', 'border-bottom-width', 'border-left-width');
+$GLOBALS['csstidy']['shorthands']['margin'] = array('margin-top', 'margin-right', 'margin-bottom', 'margin-left');
+$GLOBALS['csstidy']['shorthands']['padding'] = array('padding-top', 'padding-right', 'padding-bottom', 'padding-left');
$GLOBALS['csstidy']['shorthands']['-moz-border-radius'] = 0;
/**
@@ -425,22 +468,22 @@ $GLOBALS['csstidy']['all_properties']['s
* @see csstidy::load_template()
*/
$GLOBALS['csstidy']['predefined_templates']['default'][] = '<span class="at">'; //string before @rule
-$GLOBALS['csstidy']['predefined_templates']['default'][] = '</span> <span class="format">{</span>'."\n"; //bracket after @-rule
+$GLOBALS['csstidy']['predefined_templates']['default'][] = '</span> <span class="format">{</span>' . "\n"; //bracket after @-rule
$GLOBALS['csstidy']['predefined_templates']['default'][] = '<span class="selector">'; //string before selector
-$GLOBALS['csstidy']['predefined_templates']['default'][] = '</span> <span class="format">{</span>'."\n"; //bracket after selector
+$GLOBALS['csstidy']['predefined_templates']['default'][] = '</span> <span class="format">{</span>' . "\n"; //bracket after selector
$GLOBALS['csstidy']['predefined_templates']['default'][] = '<span class="property">'; //string before property
$GLOBALS['csstidy']['predefined_templates']['default'][] = '</span><span class="value">'; //string after property+before value
-$GLOBALS['csstidy']['predefined_templates']['default'][] = '</span><span class="format">;</span>'."\n"; //string after value
+$GLOBALS['csstidy']['predefined_templates']['default'][] = '</span><span class="format">;</span>' . "\n"; //string after value
$GLOBALS['csstidy']['predefined_templates']['default'][] = '<span class="format">}</span>'; //closing bracket - selector
$GLOBALS['csstidy']['predefined_templates']['default'][] = "\n\n"; //space between blocks {...}
-$GLOBALS['csstidy']['predefined_templates']['default'][] = "\n".'<span class="format">}</span>'. "\n\n"; //closing bracket @-rule
+$GLOBALS['csstidy']['predefined_templates']['default'][] = "\n" . '<span class="format">}</span>' . "\n\n"; //closing bracket @-rule
$GLOBALS['csstidy']['predefined_templates']['default'][] = ''; //indent in @-rule
$GLOBALS['csstidy']['predefined_templates']['default'][] = '<span class="comment">'; // before comment
-$GLOBALS['csstidy']['predefined_templates']['default'][] = '</span>'."\n"; // after comment
+$GLOBALS['csstidy']['predefined_templates']['default'][] = '</span>' . "\n"; // after comment
$GLOBALS['csstidy']['predefined_templates']['default'][] = "\n"; // after last line @-rule
$GLOBALS['csstidy']['predefined_templates']['high_compression'][] = '<span class="at">';
-$GLOBALS['csstidy']['predefined_templates']['high_compression'][] = '</span> <span class="format">{</span>'."\n";
+$GLOBALS['csstidy']['predefined_templates']['high_compression'][] = '</span> <span class="format">{</span>' . "\n";
$GLOBALS['csstidy']['predefined_templates']['high_compression'][] = '<span class="selector">';
$GLOBALS['csstidy']['predefined_templates']['high_compression'][] = '</span><span class="format">{</span>';
$GLOBALS['csstidy']['predefined_templates']['high_compression'][] = '<span class="property">';
@@ -448,7 +491,7 @@ $GLOBALS['csstidy']['predefined_template
$GLOBALS['csstidy']['predefined_templates']['high_compression'][] = '</span><span class="format">;</span>';
$GLOBALS['csstidy']['predefined_templates']['high_compression'][] = '<span class="format">}</span>';
$GLOBALS['csstidy']['predefined_templates']['high_compression'][] = "\n";
-$GLOBALS['csstidy']['predefined_templates']['high_compression'][] = "\n". '<span class="format">}'."\n".'</span>';
+$GLOBALS['csstidy']['predefined_templates']['high_compression'][] = "\n" . '<span class="format">}' . "\n" . '</span>';
$GLOBALS['csstidy']['predefined_templates']['high_compression'][] = '';
$GLOBALS['csstidy']['predefined_templates']['high_compression'][] = '<span class="comment">'; // before comment
$GLOBALS['csstidy']['predefined_templates']['high_compression'][] = '</span>'; // after comment
@@ -470,16 +513,16 @@ $GLOBALS['csstidy']['predefined_template
$GLOBALS['csstidy']['predefined_templates']['highest_compression'][] = '';
$GLOBALS['csstidy']['predefined_templates']['low_compression'][] = '<span class="at">';
-$GLOBALS['csstidy']['predefined_templates']['low_compression'][] = '</span> <span class="format">{</span>'."\n";
+$GLOBALS['csstidy']['predefined_templates']['low_compression'][] = '</span> <span class="format">{</span>' . "\n";
$GLOBALS['csstidy']['predefined_templates']['low_compression'][] = '<span class="selector">';
-$GLOBALS['csstidy']['predefined_templates']['low_compression'][] = '</span>'."\n".'<span class="format">{</span>'."\n";
+$GLOBALS['csstidy']['predefined_templates']['low_compression'][] = '</span>' . "\n" . '<span class="format">{</span>' . "\n";
$GLOBALS['csstidy']['predefined_templates']['low_compression'][] = ' <span class="property">';
$GLOBALS['csstidy']['predefined_templates']['low_compression'][] = '</span><span class="value">';
-$GLOBALS['csstidy']['predefined_templates']['low_compression'][] = '</span><span class="format">;</span>'."\n";
+$GLOBALS['csstidy']['predefined_templates']['low_compression'][] = '</span><span class="format">;</span>' . "\n";
$GLOBALS['csstidy']['predefined_templates']['low_compression'][] = '<span class="format">}</span>';
$GLOBALS['csstidy']['predefined_templates']['low_compression'][] = "\n\n";
-$GLOBALS['csstidy']['predefined_templates']['low_compression'][] = "\n".'<span class="format">}</span>'."\n\n";
+$GLOBALS['csstidy']['predefined_templates']['low_compression'][] = "\n" . '<span class="format">}</span>' . "\n\n";
$GLOBALS['csstidy']['predefined_templates']['low_compression'][] = ' ';
$GLOBALS['csstidy']['predefined_templates']['low_compression'][] = '<span class="comment">'; // before comment
-$GLOBALS['csstidy']['predefined_templates']['low_compression'][] = '</span>'."\n"; // after comment
+$GLOBALS['csstidy']['predefined_templates']['low_compression'][] = '</span>' . "\n"; // after comment
$GLOBALS['csstidy']['predefined_templates']['low_compression'][] = "\n";
diff -up -r advagg_js_cdn/advagg_js_cdn.module advagg_js_cdn/advagg_js_cdn.module
--- advagg_js_cdn/advagg_js_cdn.module 2012-03-23 12:08:13.000000000 -0600
+++ advagg_js_cdn/advagg_js_cdn.module 2012-03-23 13:02:22.000000000 -0600
@@ -30,8 +30,8 @@ function advagg_js_cdn_advagg_js_pre_alt
$cdn_jquery_ui = variable_get('advagg_js_cdn_jquery_ui', ADVAGG_JS_CDN_JQUERY_UI);
$cdn_swfobject = variable_get('advagg_js_cdn_swfobject', ADVAGG_JS_CDN_SWFOBJECT);
if ( !$cdn_jquery
- && !$cdn_jquery_ui
- && !$cdn_swfobject
+ && !$cdn_jquery_ui
+ && !$cdn_swfobject
) {
return FALSE;
}
@@ -96,11 +96,11 @@ function advagg_js_cdn_advagg_js_pre_alt
// jquery-ui.js
if ($cdn_jquery_ui) {
if ( isset($jquery_ui_filepath)
- && isset($jquery_ui_version)
- && $path == $jquery_ui_filepath
+ && isset($jquery_ui_version)
+ && $path == $jquery_ui_filepath
) {
$info['preprocess'] = FALSE;
- $javascript['external'][$schema . '://ajax.googleapis.com/ajax/libs/jqueryui/' . $jquery_ui_version .'/jquery-ui.min.js'] = $info;
+ $javascript['external'][$schema . '://ajax.googleapis.com/ajax/libs/jqueryui/' . $jquery_ui_version . '/jquery-ui.min.js'] = $info;
unset($javascript[$type][$path]);
}
}
@@ -108,10 +108,10 @@ function advagg_js_cdn_advagg_js_pre_alt
// swfobject.js
if ($cdn_swfobject) {
if ( isset($swfobject_filepath)
- && $path == $swfobject_filepath
+ && $path == $swfobject_filepath
) {
$info['preprocess'] = FALSE;
- $javascript['external'][$schema . '://ajax.googleapis.com/ajax/libs/swfobject/' . $swfobject_version .'/swfobject.js'] = $info;
+ $javascript['external'][$schema . '://ajax.googleapis.com/ajax/libs/swfobject/' . $swfobject_version . '/swfobject.js'] = $info;
unset($javascript[$type][$path]);
}
}
diff -up -r advagg_js_compress/advagg_js_compress.admin.inc advagg_js_compress/advagg_js_compress.admin.inc
--- advagg_js_compress/advagg_js_compress.admin.inc 2012-03-23 12:08:13.000000000 -0600
+++ advagg_js_compress/advagg_js_compress.admin.inc 2012-03-23 13:02:22.000000000 -0600
@@ -23,14 +23,14 @@ function advagg_js_compress_admin_settin
$form = array();
$form['advagg_js_compress_agg_files'] = array(
- '#type' => 'checkbox',
- '#title' => t('Compress JS Files'),
- '#default_value' => variable_get('advagg_js_compress_agg_files', ADVAGG_JS_COMPRESS_AGG_FILES),
+ '#type' => 'checkbox',
+ '#title' => t('Compress JS Files'),
+ '#default_value' => variable_get('advagg_js_compress_agg_files', ADVAGG_JS_COMPRESS_AGG_FILES),
);
$form['advagg_js_compress_inline'] = array(
- '#type' => 'checkbox',
- '#title' => t('Compress Inline JS'),
- '#default_value' => variable_get('advagg_js_compress_inline', ADVAGG_JS_COMPRESS_INLINE),
+ '#type' => 'checkbox',
+ '#title' => t('Compress Inline JS'),
+ '#default_value' => variable_get('advagg_js_compress_inline', ADVAGG_JS_COMPRESS_INLINE),
);
$description = '';
@@ -43,18 +43,18 @@ function advagg_js_compress_admin_settin
$description .= t('You can use the much faster C version of JSMin by installing the <a href="@php_jsmin">JSMin PHP Extension</a> on this server.', array('@php_jsmin' => 'http://www.ypass.net/software/php_jsmin/'));
}
$form['advagg_js_compressor'] = array(
- '#type' => 'radios',
- '#title' => t('Select the compression program to use'),
- '#default_value' => variable_get('advagg_js_compressor', ADVAGG_JS_COMPRESSOR),
- '#options' => $options,
- '#description' => filter_xss($description),
+ '#type' => 'radios',
+ '#title' => t('Select the compression program to use'),
+ '#default_value' => variable_get('advagg_js_compressor', ADVAGG_JS_COMPRESSOR),
+ '#options' => $options,
+ '#description' => filter_xss($description),
);
$form['advagg_js_compress_packer_enable'] = array(
- '#type' => 'checkbox',
- '#title' => t('Enable Packer'),
- '#default_value' => variable_get('advagg_js_compress_packer_enable', ADVAGG_JS_COMPRESS_PACKER_ENABLE),
- '#description' => t('If enabled the non gzip version of JS files will be compressed using the JS Packer. WARNING: This has a high chance of breaking your JS. Only Enable on production after testing the non gzipped version locally.'),
+ '#type' => 'checkbox',
+ '#title' => t('Enable Packer'),
+ '#default_value' => variable_get('advagg_js_compress_packer_enable', ADVAGG_JS_COMPRESS_PACKER_ENABLE),
+ '#description' => t('If enabled the non gzip version of JS files will be compressed using the JS Packer. WARNING: This has a high chance of breaking your JS. Only Enable on production after testing the non gzipped version locally.'),
);
return system_settings_form($form);
diff -up -r advagg_js_compress/advagg_js_compress.install advagg_js_compress/advagg_js_compress.install
--- advagg_js_compress/advagg_js_compress.install 2012-03-23 12:08:13.000000000 -0600
+++ advagg_js_compress/advagg_js_compress.install 2012-03-23 13:02:22.000000000 -0600
@@ -72,9 +72,9 @@ function advagg_js_compress_requirements
$advagg_js_compress_callback = variable_get('advagg_js_compress_callback', ADVAGG_JS_COMPRESS_CALLBACK);
if (is_array($compressible)) {
$requirements['advagg_js_compress_callback'] = array(
- 'title' => $t('AdvAgg JS Compress - Callback'),
- 'severity' => REQUIREMENT_WARNING,
- 'value' => $t('The callback for testing if a JS file is compressible is not working.'),
+ 'title' => $t('AdvAgg JS Compress - Callback'),
+ 'severity' => REQUIREMENT_WARNING,
+ 'value' => $t('The callback for testing if a JS file is compressible is not working.'),
'description' => $t('As a result if jsmin+ encounters a file that it cannot compress, it will kill that PHP process.'),
);
if ($advagg_js_compress_callback != FALSE) {
@@ -83,9 +83,9 @@ function advagg_js_compress_requirements
}
else {
$requirements['advagg_js_compress_callback'] = array(
- 'title' => $t('AdvAgg JS Compress - Callback'),
- 'severity' => REQUIREMENT_OK,
- 'value' => $t('The callback is working correctly.'),
+ 'title' => $t('AdvAgg JS Compress - Callback'),
+ 'severity' => REQUIREMENT_OK,
+ 'value' => $t('The callback is working correctly.'),
);
if ($advagg_js_compress_callback == FALSE) {
variable_set('advagg_js_compress_callback', TRUE);
@@ -100,9 +100,9 @@ function advagg_js_compress_requirements
// doesn't impose a limit on memory used by PHP scripts
if ($compressor == 0 && $memory_limit && $memory_limit != -1 && parse_size($memory_limit) < parse_size('96M')) {
$requirements['advagg_js_compress_memory_limit'] = array(
- 'title' => $t('AdvAgg JS Compress - Memory Limit'),
- 'value' => $memory_limit,
- 'severity' => REQUIREMENT_WARNING,
+ 'title' => $t('AdvAgg JS Compress - Memory Limit'),
+ 'value' => $memory_limit,
+ 'severity' => REQUIREMENT_WARNING,
'description' => $t('It is highly recommended that you set your PHP memory_limit at least 96M if you are going to use JSMin+.'),
);
}
@@ -146,7 +146,10 @@ function advagg_js_compress_update_6100(
$ret = array();
cache_clear_all('*', 'cache_advagg_files_data', TRUE);
- $ret[] = array('success' => TRUE, 'query' => 'advagg files_data cache flushed.');
+ $ret[] = array(
+ 'success' => TRUE,
+ 'query' => 'advagg files_data cache flushed.',
+ );
return $ret;
}
@@ -185,7 +188,10 @@ function advagg_js_compress_update_6103(
// Clear cache_advagg_js_compress_file cache.
cache_clear_all('*', 'cache_advagg_js_compress_file', TRUE);
- $ret[] = array('success' => TRUE, 'query' => 'The cache_advagg_js_compress_file table has been cleared.');
+ $ret[] = array(
+ 'success' => TRUE,
+ 'query' => 'The cache_advagg_js_compress_file table has been cleared.',
+ );
return $ret;
}
diff -up -r advagg_js_compress/advagg_js_compress.module advagg_js_compress/advagg_js_compress.module
--- advagg_js_compress/advagg_js_compress.module 2012-03-23 12:08:13.000000000 -0600
+++ advagg_js_compress/advagg_js_compress.module 2012-03-23 13:02:22.000000000 -0600
@@ -162,7 +162,7 @@ function advagg_js_compress_advagg_js_in
$original_contents = $contents;
list($before, $after) = advagg_js_compress_jsminplus($contents);
- $ratio = ($before - $after)/$before;
+ $ratio = ($before - $after) / $before;
// Make sure the returned string is not empty or has a VERY high
// compression ratio.
if (empty($contents) || $ratio > variable_get('advagg_js_max_compress_ratio', ADVAGG_JS_MAX_COMPRESS_RATIO)) {
@@ -247,7 +247,7 @@ function advagg_js_compress_prep(&$conte
$compressor = variable_get('advagg_js_compressor', ADVAGG_JS_COMPRESSOR);
if ($compressor == 0) {
list($before, $after) = advagg_js_compress_jsminplus($data);
- $ratio = ($before - $after)/$before;
+ $ratio = ($before - $after) / $before;
// Make sure the returned string is not empty or has a VERY high
// compression ratio.
if (empty($data) || $ratio > variable_get('advagg_js_max_compress_ratio', ADVAGG_JS_MAX_COMPRESS_RATIO)) {
@@ -282,7 +282,7 @@ function advagg_js_compress_jsminplus(&$
}
// JSMin+ the contents of the aggregated file.
- require_once(drupal_get_path('module', 'advagg_js_compress') .'/jsminplus.inc');
+ require_once(drupal_get_path('module', 'advagg_js_compress') . '/jsminplus.inc');
// Strip Byte Order Marks (BOM's) from the file, JSMin+ cannot parse these.
$before = strlen($contents);
$original_contents = $contents;
@@ -429,7 +429,7 @@ function advagg_js_compress_test_file($v
list($before, $after) = advagg_js_compress_jsminplus($contents);
// Set to "-2" if compression ratio sucks.
- $ratio = ($before - $after)/$before;
+ $ratio = ($before - $after) / $before;
if ($ratio < variable_get('advagg_js_compress_ratio', ADVAGG_JS_COMPRESS_RATIO)) {
$data['advagg_js_compress']['tested']['jsminplus'] = -2;
advagg_set_file_data($md5, $data);
@@ -551,7 +551,7 @@ function advagg_js_compress_file_saver($
*/
function advagg_js_compress_jspacker(&$contents) {
// Use Packer on the contents of the aggregated file.
- require_once(drupal_get_path('module', 'advagg_js_compress') .'/jspacker.inc');
+ require_once(drupal_get_path('module', 'advagg_js_compress') . '/jspacker.inc');
// Add semicolons to the end of lines if missing.
$contents = str_replace("}\n", "};\n", $contents);
diff -up -r advagg_js_compress/jsminplus.inc advagg_js_compress/jsminplus.inc
--- advagg_js_compress/jsminplus.inc 2012-03-23 12:08:13.000000000 -0600
+++ advagg_js_compress/jsminplus.inc 2012-03-23 13:02:23.000000000 -0600
@@ -171,1916 +171,2088 @@ define('KEYWORD_WHILE', 'while');
define('KEYWORD_WITH', 'with');
-class JSMinPlus
-{
- private $parser;
- private $reserved = array(
- 'break', 'case', 'catch', 'continue', 'default', 'delete', 'do',
- 'else', 'finally', 'for', 'function', 'if', 'in', 'instanceof',
- 'new', 'return', 'switch', 'this', 'throw', 'try', 'typeof', 'var',
- 'void', 'while', 'with',
- // Words reserved for future use
- 'abstract', 'boolean', 'byte', 'char', 'class', 'const', 'debugger',
- 'double', 'enum', 'export', 'extends', 'final', 'float', 'goto',
- 'implements', 'import', 'int', 'interface', 'long', 'native',
- 'package', 'private', 'protected', 'public', 'short', 'static',
- 'super', 'synchronized', 'throws', 'transient', 'volatile',
- // These are not reserved, but should be taken into account
- // in isValidIdentifier (See jslint source code)
- 'arguments', 'eval', 'true', 'false', 'Infinity', 'NaN', 'null', 'undefined'
- );
-
- private function __construct()
- {
- $this->parser = new JSParser($this);
- }
-
- public static function minify($js, $filename='')
- {
- static $instance;
-
- // this is a singleton
- if(!$instance)
- $instance = new JSMinPlus();
-
- return $instance->min($js, $filename);
- }
-
- private function min($js, $filename)
- {
- try
- {
- $n = $this->parser->parse($js, $filename, 1);
- return $this->parseTree($n);
- }
- catch(Exception $e)
- {
- echo $e->getMessage() . "\n";
- }
-
- return false;
- }
-
- public function parseTree($n, $noBlockGrouping = false)
- {
- $s = '';
-
- switch ($n->type)
- {
- case JS_MINIFIED:
- $s = $n->value;
- break;
-
- case JS_SCRIPT:
- // we do nothing yet with funDecls or varDecls
- $noBlockGrouping = true;
- // FALL THROUGH
-
- case JS_BLOCK:
- $childs = $n->treeNodes;
- $lastType = 0;
- for ($c = 0, $i = 0, $j = count($childs); $i < $j; $i++)
- {
- $type = $childs[$i]->type;
- $t = $this->parseTree($childs[$i]);
- if (strlen($t))
- {
- if ($c)
- {
- $s = rtrim($s, ';');
-
- if ($type == KEYWORD_FUNCTION && $childs[$i]->functionForm == DECLARED_FORM)
- {
- // put declared functions on a new line
- $s .= "\n";
- }
- elseif ($type == KEYWORD_VAR && $type == $lastType)
- {
- // mutiple var-statements can go into one
- $t = ',' . substr($t, 4);
- }
- else
- {
- // add terminator
- $s .= ';';
- }
- }
-
- $s .= $t;
-
- $c++;
- $lastType = $type;
- }
- }
-
- if ($c > 1 && !$noBlockGrouping)
- {
- $s = '{' . $s . '}';
- }
- break;
-
- case KEYWORD_FUNCTION:
- $s .= 'function' . ($n->name ? ' ' . $n->name : '') . '(';
- $params = $n->params;
- for ($i = 0, $j = count($params); $i < $j; $i++)
- $s .= ($i ? ',' : '') . $params[$i];
- $s .= '){' . $this->parseTree($n->body, true) . '}';
- break;
-
- case KEYWORD_IF:
- $s = 'if(' . $this->parseTree($n->condition) . ')';
- $thenPart = $this->parseTree($n->thenPart);
- $elsePart = $n->elsePart ? $this->parseTree($n->elsePart) : null;
-
- // empty if-statement
- if ($thenPart == '')
- $thenPart = ';';
-
- if ($elsePart)
- {
- // be carefull and always make a block out of the thenPart; could be more optimized but is a lot of trouble
- if ($thenPart != ';' && $thenPart[0] != '{')
- $thenPart = '{' . $thenPart . '}';
-
- $s .= $thenPart . 'else';
-
- // we could check for more, but that hardly ever applies so go for performance
- if ($elsePart[0] != '{')
- $s .= ' ';
-
- $s .= $elsePart;
- }
- else
- {
- $s .= $thenPart;
- }
- break;
-
- case KEYWORD_SWITCH:
- $s = 'switch(' . $this->parseTree($n->discriminant) . '){';
- $cases = $n->cases;
- for ($i = 0, $j = count($cases); $i < $j; $i++)
- {
- $case = $cases[$i];
- if ($case->type == KEYWORD_CASE)
- $s .= 'case' . ($case->caseLabel->type != TOKEN_STRING ? ' ' : '') . $this->parseTree($case->caseLabel) . ':';
- else
- $s .= 'default:';
-
- $statement = $this->parseTree($case->statements, true);
- if ($statement)
- {
- $s .= $statement;
- // no terminator for last statement
- if ($i + 1 < $j)
- $s .= ';';
- }
- }
- $s .= '}';
- break;
+class JSMinPlus {
+ private $parser;
+ private $reserved = array(
+ 'break',
+ 'case',
+ 'catch',
+ 'continue',
+ 'default',
+ 'delete',
+ 'do',
+ 'else',
+ 'finally',
+ 'for',
+ 'function',
+ 'if',
+ 'in',
+ 'instanceof',
+ 'new',
+ 'return',
+ 'switch',
+ 'this',
+ 'throw',
+ 'try',
+ 'typeof',
+ 'var',
+ 'void',
+ 'while',
+ 'with',
+ // Words reserved for future use
+ 'abstract',
+ 'boolean',
+ 'byte',
+ 'char',
+ 'class',
+ 'const',
+ 'debugger',
+ 'double',
+ 'enum',
+ 'export',
+ 'extends',
+ 'final',
+ 'float',
+ 'goto',
+ 'implements',
+ 'import',
+ 'int',
+ 'interface',
+ 'long',
+ 'native',
+ 'package',
+ 'private',
+ 'protected',
+ 'public',
+ 'short',
+ 'static',
+ 'super',
+ 'synchronized',
+ 'throws',
+ 'transient',
+ 'volatile',
+ // These are not reserved, but should be taken into account
+ // in isValidIdentifier (See jslint source code)
+ 'arguments',
+ 'eval',
+ 'true',
+ 'false',
+ 'Infinity',
+ 'NaN',
+ 'null',
+ 'undefined',
+ );
+
+ private function __construct() {
+ $this->parser = new JSParser($this);
+ }
+
+ public static function minify($js, $filename = '') {
+ static $instance;
+
+ // this is a singleton
+ if (!$instance) {
+ $instance = new JSMinPlus();
+ }
+
+ return $instance->min($js, $filename);
+ }
+
+ private function min($js, $filename) {
+ try {
+ $n = $this->parser->parse($js, $filename, 1);
+ return $this->parseTree($n);
+ }
+ catch (Exception $e) {
+ echo $e->getMessage() . "\n";
+ }
+
+ return false;
+ }
+
+ public function parseTree($n, $noBlockGrouping = false) {
+ $s = '';
+
+ switch ($n->type) {
+ case JS_MINIFIED:
+ $s = $n->value;
+ break;
+
+ case JS_SCRIPT:
+ // we do nothing yet with funDecls or varDecls
+ $noBlockGrouping = true;
+ // FALL THROUGH
+
+ case JS_BLOCK:
+ $childs = $n->treeNodes;
+ $lastType = 0;
+ for ($c = 0, $i = 0, $j = count($childs); $i < $j; $i++) {
+ $type = $childs[$i]->type;
+ $t = $this->parseTree($childs[$i]);
+ if (strlen($t)) {
+ if ($c) {
+ $s = rtrim($s, ';');
+
+ if ($type == KEYWORD_FUNCTION && $childs[$i]->functionForm == DECLARED_FORM) {
+ // put declared functions on a new line
+ $s .= "\n";
+ }
+ elseif ($type == KEYWORD_VAR && $type == $lastType) {
+ // mutiple var-statements can go into one
+ $t = ',' . substr($t, 4);
+ }
+ else {
+ // add terminator
+ $s .= ';';
+ }
+ }
+
+ $s .= $t;
+
+ $c++;
+ $lastType = $type;
+ }
+ }
+
+ if ($c > 1 && !$noBlockGrouping) {
+ $s = '{' . $s . '}';
+ }
+ break;
+
+ case KEYWORD_FUNCTION:
+ $s .= 'function' . ($n->name ? ' ' . $n->name : '') . '(';
+ $params = $n->params;
+ for ($i = 0, $j = count($params); $i < $j; $i++) {
+ $s .= ($i ? ',' : '') . $params[$i];
+ }
+ $s .= '){' . $this->parseTree($n->body, true) . '}';
+ break;
+
+ case KEYWORD_IF:
+ $s = 'if(' . $this->parseTree($n->condition) . ')';
+ $thenPart = $this->parseTree($n->thenPart);
+ $elsePart = $n->elsePart ? $this->parseTree($n->elsePart) : null;
+
+ // empty if-statement
+ if ($thenPart == '') {
+ $thenPart = ';';
+ }
+
+ if ($elsePart) {
+ // be carefull and always make a block out of the thenPart; could be more optimized but is a lot of trouble
+ if ($thenPart != ';' && $thenPart[0] != '{') {
+ $thenPart = '{' . $thenPart . '}';
+ }
+
+ $s .= $thenPart . 'else';
+
+ // we could check for more, but that hardly ever applies so go for performance
+ if ($elsePart[0] != '{') {
+ $s .= ' ';
+ }
+
+ $s .= $elsePart;
+ }
+ else {
+ $s .= $thenPart;
+ }
+ break;
+
+ case KEYWORD_SWITCH:
+ $s = 'switch(' . $this->parseTree($n->discriminant) . '){';
+ $cases = $n->cases;
+ for ($i = 0, $j = count($cases); $i < $j; $i++) {
+ $case = $cases[$i];
+ if ($case->type == KEYWORD_CASE) {
+ $s .= 'case' . ($case->caseLabel->type != TOKEN_STRING ? ' ' : '') . $this->parseTree($case->caseLabel) . ':';
+ }
+ else {
+ $s .= 'default:';
+ }
+
+ $statement = $this->parseTree($case->statements, true);
+ if ($statement) {
+ $s .= $statement;
+ // no terminator for last statement
+ if ($i + 1 < $j) {
+ $s .= ';';
+ }
+ }
+ }
+ $s .= '}';
+ break;
- case KEYWORD_FOR:
- $s = 'for(' . ($n->setup ? $this->parseTree($n->setup) : '')
+ case KEYWORD_FOR:
+ $s = 'for(' . ($n->setup ? $this->parseTree($n->setup) : '')
. ';' . ($n->condition ? $this->parseTree($n->condition) : '')
. ';' . ($n->update ? $this->parseTree($n->update) : '') . ')';
- $body = $this->parseTree($n->body);
- if ($body == '')
- $body = ';';
-
- $s .= $body;
- break;
-
- case KEYWORD_WHILE:
- $s = 'while(' . $this->parseTree($n->condition) . ')';
-
- $body = $this->parseTree($n->body);
- if ($body == '')
- $body = ';';
-
- $s .= $body;
- break;
-
- case JS_FOR_IN:
- $s = 'for(' . ($n->varDecl ? $this->parseTree($n->varDecl) : $this->parseTree($n->iterator)) . ' in ' . $this->parseTree($n->object) . ')';
-
- $body = $this->parseTree($n->body);
- if ($body == '')
- $body = ';';
-
- $s .= $body;
- break;
-
- case KEYWORD_DO:
- $s = 'do{' . $this->parseTree($n->body, true) . '}while(' . $this->parseTree($n->condition) . ')';
- break;
-
- case KEYWORD_BREAK:
- case KEYWORD_CONTINUE:
- $s = $n->value . ($n->label ? ' ' . $n->label : '');
- break;
-
- case KEYWORD_TRY:
- $s = 'try{' . $this->parseTree($n->tryBlock, true) . '}';
- $catchClauses = $n->catchClauses;
- for ($i = 0, $j = count($catchClauses); $i < $j; $i++)
- {
- $t = $catchClauses[$i];
- $s .= 'catch(' . $t->varName . ($t->guard ? ' if ' . $this->parseTree($t->guard) : '') . '){' . $this->parseTree($t->block, true) . '}';
- }
- if ($n->finallyBlock)
- $s .= 'finally{' . $this->parseTree($n->finallyBlock, true) . '}';
- break;
-
- case KEYWORD_THROW:
- case KEYWORD_RETURN:
- $s = $n->type;
- if ($n->value)
- {
- $t = $this->parseTree($n->value);
- if (strlen($t))
- {
- if ($this->isWordChar($t[0]) || $t[0] == '\\')
- $s .= ' ';
-
- $s .= $t;
- }
- }
- break;
-
- case KEYWORD_WITH:
- $s = 'with(' . $this->parseTree($n->object) . ')' . $this->parseTree($n->body);
- break;
-
- case KEYWORD_VAR:
- case KEYWORD_CONST:
- $s = $n->value . ' ';
- $childs = $n->treeNodes;
- for ($i = 0, $j = count($childs); $i < $j; $i++)
- {
- $t = $childs[$i];
- $s .= ($i ? ',' : '') . $t->name;
- $u = $t->initializer;
- if ($u)
- $s .= '=' . $this->parseTree($u);
- }
- break;
-
- case KEYWORD_IN:
- case KEYWORD_INSTANCEOF:
- $left = $this->parseTree($n->treeNodes[0]);
- $right = $this->parseTree($n->treeNodes[1]);
-
- $s = $left;
-
- if ($this->isWordChar(substr($left, -1)))
- $s .= ' ';
-
- $s .= $n->type;
-
- if ($this->isWordChar($right[0]) || $right[0] == '\\')
- $s .= ' ';
-
- $s .= $right;
- break;
-
- case KEYWORD_DELETE:
- case KEYWORD_TYPEOF:
- $right = $this->parseTree($n->treeNodes[0]);
-
- $s = $n->type;
-
- if ($this->isWordChar($right[0]) || $right[0] == '\\')
- $s .= ' ';
-
- $s .= $right;
- break;
-
- case KEYWORD_VOID:
- $s = 'void(' . $this->parseTree($n->treeNodes[0]) . ')';
- break;
-
- case KEYWORD_DEBUGGER:
- throw new Exception('NOT IMPLEMENTED: DEBUGGER');
- break;
-
- case TOKEN_CONDCOMMENT_START:
- case TOKEN_CONDCOMMENT_END:
- $s = $n->value . ($n->type == TOKEN_CONDCOMMENT_START ? ' ' : '');
- $childs = $n->treeNodes;
- for ($i = 0, $j = count($childs); $i < $j; $i++)
- $s .= $this->parseTree($childs[$i]);
- break;
-
- case OP_SEMICOLON:
- if ($expression = $n->expression)
- $s = $this->parseTree($expression);
- break;
-
- case JS_LABEL:
- $s = $n->label . ':' . $this->parseTree($n->statement);
- break;
-
- case OP_COMMA:
- $childs = $n->treeNodes;
- for ($i = 0, $j = count($childs); $i < $j; $i++)
- $s .= ($i ? ',' : '') . $this->parseTree($childs[$i]);
- break;
-
- case OP_ASSIGN:
- $s = $this->parseTree($n->treeNodes[0]) . $n->value . $this->parseTree($n->treeNodes[1]);
- break;
-
- case OP_HOOK:
- $s = $this->parseTree($n->treeNodes[0]) . '?' . $this->parseTree($n->treeNodes[1]) . ':' . $this->parseTree($n->treeNodes[2]);
- break;
-
- case OP_OR: case OP_AND:
- case OP_BITWISE_OR: case OP_BITWISE_XOR: case OP_BITWISE_AND:
- case OP_EQ: case OP_NE: case OP_STRICT_EQ: case OP_STRICT_NE:
- case OP_LT: case OP_LE: case OP_GE: case OP_GT:
- case OP_LSH: case OP_RSH: case OP_URSH:
- case OP_MUL: case OP_DIV: case OP_MOD:
- $s = $this->parseTree($n->treeNodes[0]) . $n->type . $this->parseTree($n->treeNodes[1]);
- break;
-
- case OP_PLUS:
- case OP_MINUS:
- $left = $this->parseTree($n->treeNodes[0]);
- $right = $this->parseTree($n->treeNodes[1]);
-
- switch ($n->treeNodes[1]->type)
- {
- case OP_PLUS:
- case OP_MINUS:
- case OP_INCREMENT:
- case OP_DECREMENT:
- case OP_UNARY_PLUS:
- case OP_UNARY_MINUS:
- $s = $left . $n->type . ' ' . $right;
- break;
-
- case TOKEN_STRING:
- //combine concatted strings with same quotestyle
- if ($n->type == OP_PLUS && substr($left, -1) == $right[0])
- {
- $s = substr($left, 0, -1) . substr($right, 1);
- break;
- }
- // FALL THROUGH
-
- default:
- $s = $left . $n->type . $right;
- }
- break;
-
- case OP_NOT:
- case OP_BITWISE_NOT:
- case OP_UNARY_PLUS:
- case OP_UNARY_MINUS:
- $s = $n->value . $this->parseTree($n->treeNodes[0]);
- break;
-
- case OP_INCREMENT:
- case OP_DECREMENT:
- if ($n->postfix)
- $s = $this->parseTree($n->treeNodes[0]) . $n->value;
- else
- $s = $n->value . $this->parseTree($n->treeNodes[0]);
- break;
-
- case OP_DOT:
- $s = $this->parseTree($n->treeNodes[0]) . '.' . $this->parseTree($n->treeNodes[1]);
- break;
-
- case JS_INDEX:
- $s = $this->parseTree($n->treeNodes[0]);
- // See if we can replace named index with a dot saving 3 bytes
- if ( $n->treeNodes[0]->type == TOKEN_IDENTIFIER &&
+ $body = $this->parseTree($n->body);
+ if ($body == '') {
+ $body = ';';
+ }
+
+ $s .= $body;
+ break;
+
+ case KEYWORD_WHILE:
+ $s = 'while(' . $this->parseTree($n->condition) . ')';
+
+ $body = $this->parseTree($n->body);
+ if ($body == '') {
+ $body = ';';
+ }
+
+ $s .= $body;
+ break;
+
+ case JS_FOR_IN:
+ $s = 'for(' . ($n->varDecl ? $this->parseTree($n->varDecl) : $this->parseTree($n->iterator)) . ' in ' . $this->parseTree($n->object) . ')';
+
+ $body = $this->parseTree($n->body);
+ if ($body == '') {
+ $body = ';';
+ }
+
+ $s .= $body;
+ break;
+
+ case KEYWORD_DO:
+ $s = 'do{' . $this->parseTree($n->body, true) . '}while(' . $this->parseTree($n->condition) . ')';
+ break;
+
+ case KEYWORD_BREAK:
+ case KEYWORD_CONTINUE:
+ $s = $n->value . ($n->label ? ' ' . $n->label : '');
+ break;
+
+ case KEYWORD_TRY:
+ $s = 'try{' . $this->parseTree($n->tryBlock, true) . '}';
+ $catchClauses = $n->catchClauses;
+ for ($i = 0, $j = count($catchClauses); $i < $j; $i++) {
+ $t = $catchClauses[$i];
+ $s .= 'catch(' . $t->varName . ($t->guard ? ' if ' . $this->parseTree($t->guard) : '') . '){' . $this->parseTree($t->block, true) . '}';
+ }
+ if ($n->finallyBlock) {
+ $s .= 'finally{' . $this->parseTree($n->finallyBlock, true) . '}';
+ }
+ break;
+
+ case KEYWORD_THROW:
+ case KEYWORD_RETURN:
+ $s = $n->type;
+ if ($n->value) {
+ $t = $this->parseTree($n->value);
+ if (strlen($t)) {
+ if ($this->isWordChar($t[0]) || $t[0] == '\\') {
+ $s .= ' ';
+ }
+
+ $s .= $t;
+ }
+ }
+ break;
+
+ case KEYWORD_WITH:
+ $s = 'with(' . $this->parseTree($n->object) . ')' . $this->parseTree($n->body);
+ break;
+
+ case KEYWORD_VAR:
+ case KEYWORD_CONST:
+ $s = $n->value . ' ';
+ $childs = $n->treeNodes;
+ for ($i = 0, $j = count($childs); $i < $j; $i++) {
+ $t = $childs[$i];
+ $s .= ($i ? ',' : '') . $t->name;
+ $u = $t->initializer;
+ if ($u) {
+ $s .= '=' . $this->parseTree($u);
+ }
+ }
+ break;
+
+ case KEYWORD_IN:
+ case KEYWORD_INSTANCEOF:
+ $left = $this->parseTree($n->treeNodes[0]);
+ $right = $this->parseTree($n->treeNodes[1]);
+
+ $s = $left;
+
+ if ($this->isWordChar(substr($left, -1))) {
+ $s .= ' ';
+ }
+
+ $s .= $n->type;
+
+ if ($this->isWordChar($right[0]) || $right[0] == '\\') {
+ $s .= ' ';
+ }
+
+ $s .= $right;
+ break;
+
+ case KEYWORD_DELETE:
+ case KEYWORD_TYPEOF:
+ $right = $this->parseTree($n->treeNodes[0]);
+
+ $s = $n->type;
+
+ if ($this->isWordChar($right[0]) || $right[0] == '\\') {
+ $s .= ' ';
+ }
+
+ $s .= $right;
+ break;
+
+ case KEYWORD_VOID:
+ $s = 'void(' . $this->parseTree($n->treeNodes[0]) . ')';
+ break;
+
+ case KEYWORD_DEBUGGER:
+ throw new Exception('NOT IMPLEMENTED: DEBUGGER');
+ break;
+
+ case TOKEN_CONDCOMMENT_START:
+ case TOKEN_CONDCOMMENT_END:
+ $s = $n->value . ($n->type == TOKEN_CONDCOMMENT_START ? ' ' : '');
+ $childs = $n->treeNodes;
+ for ($i = 0, $j = count($childs); $i < $j; $i++) {
+ $s .= $this->parseTree($childs[$i]);
+ }
+ break;
+
+ case OP_SEMICOLON:
+ if ($expression = $n->expression) {
+ $s = $this->parseTree($expression);
+ }
+ break;
+
+ case JS_LABEL:
+ $s = $n->label . ':' . $this->parseTree($n->statement);
+ break;
+
+ case OP_COMMA:
+ $childs = $n->treeNodes;
+ for ($i = 0, $j = count($childs); $i < $j; $i++) {
+ $s .= ($i ? ',' : '') . $this->parseTree($childs[$i]);
+ }
+ break;
+
+ case OP_ASSIGN:
+ $s = $this->parseTree($n->treeNodes[0]) . $n->value . $this->parseTree($n->treeNodes[1]);
+ break;
+
+ case OP_HOOK:
+ $s = $this->parseTree($n->treeNodes[0]) . '?' . $this->parseTree($n->treeNodes[1]) . ':' . $this->parseTree($n->treeNodes[2]);
+ break;
+
+ case OP_OR:
+ case OP_AND:
+ case OP_BITWISE_OR:
+ case OP_BITWISE_XOR:
+ case OP_BITWISE_AND:
+ case OP_EQ:
+ case OP_NE:
+ case OP_STRICT_EQ:
+ case OP_STRICT_NE:
+ case OP_LT:
+ case OP_LE:
+ case OP_GE:
+ case OP_GT:
+ case OP_LSH:
+ case OP_RSH:
+ case OP_URSH:
+ case OP_MUL:
+ case OP_DIV:
+ case OP_MOD:
+ $s = $this->parseTree($n->treeNodes[0]) . $n->type . $this->parseTree($n->treeNodes[1]);
+ break;
+
+ case OP_PLUS:
+ case OP_MINUS:
+ $left = $this->parseTree($n->treeNodes[0]);
+ $right = $this->parseTree($n->treeNodes[1]);
+
+ switch ($n->treeNodes[1]->type) {
+ case OP_PLUS:
+ case OP_MINUS:
+ case OP_INCREMENT:
+ case OP_DECREMENT:
+ case OP_UNARY_PLUS:
+ case OP_UNARY_MINUS:
+ $s = $left . $n->type . ' ' . $right;
+ break;
+
+ case TOKEN_STRING:
+ //combine concatted strings with same quotestyle
+ if ($n->type == OP_PLUS && substr($left, -1) == $right[0]) {
+ $s = substr($left, 0, -1) . substr($right, 1);
+ break;
+ }
+ // FALL THROUGH
+
+ default:
+ $s = $left . $n->type . $right;
+ }
+ break;
+
+ case OP_NOT:
+ case OP_BITWISE_NOT:
+ case OP_UNARY_PLUS:
+ case OP_UNARY_MINUS:
+ $s = $n->value . $this->parseTree($n->treeNodes[0]);
+ break;
+
+ case OP_INCREMENT:
+ case OP_DECREMENT:
+ if ($n->postfix) {
+ $s = $this->parseTree($n->treeNodes[0]) . $n->value;
+ }
+ else {
+ $s = $n->value . $this->parseTree($n->treeNodes[0]);
+ }
+ break;
+
+ case OP_DOT:
+ $s = $this->parseTree($n->treeNodes[0]) . '.' . $this->parseTree($n->treeNodes[1]);
+ break;
+
+ case JS_INDEX:
+ $s = $this->parseTree($n->treeNodes[0]);
+ // See if we can replace named index with a dot saving 3 bytes
+ if ( $n->treeNodes[0]->type == TOKEN_IDENTIFIER &&
$n->treeNodes[1]->type == TOKEN_STRING &&
$this->isValidIdentifier(substr($n->treeNodes[1]->value, 1, -1))
- )
- $s .= '.' . substr($n->treeNodes[1]->value, 1, -1);
- else
- $s .= '[' . $this->parseTree($n->treeNodes[1]) . ']';
- break;
-
- case JS_LIST:
- $childs = $n->treeNodes;
- for ($i = 0, $j = count($childs); $i < $j; $i++)
- $s .= ($i ? ',' : '') . $this->parseTree($childs[$i]);
- break;
-
- case JS_CALL:
- $s = $this->parseTree($n->treeNodes[0]) . '(' . $this->parseTree($n->treeNodes[1]) . ')';
- break;
-
- case KEYWORD_NEW:
- case JS_NEW_WITH_ARGS:
- $s = 'new ' . $this->parseTree($n->treeNodes[0]) . '(' . ($n->type == JS_NEW_WITH_ARGS ? $this->parseTree($n->treeNodes[1]) : '') . ')';
- break;
-
- case JS_ARRAY_INIT:
- $s = '[';
- $childs = $n->treeNodes;
- for ($i = 0, $j = count($childs); $i < $j; $i++)
- {
- $s .= ($i ? ',' : '') . $this->parseTree($childs[$i]);
- }
- $s .= ']';
- break;
-
- case JS_OBJECT_INIT:
- $s = '{';
- $childs = $n->treeNodes;
- for ($i = 0, $j = count($childs); $i < $j; $i++)
- {
- $t = $childs[$i];
- if ($i)
- $s .= ',';
- if ($t->type == JS_PROPERTY_INIT)
- {
- // Ditch the quotes when the index is a valid identifier
- if ( $t->treeNodes[0]->type == TOKEN_STRING &&
+ ) {
+ $s .= '.' . substr($n->treeNodes[1]->value, 1, -1);
+ }
+ else {
+ $s .= '[' . $this->parseTree($n->treeNodes[1]) . ']';
+ }
+ break;
+
+ case JS_LIST:
+ $childs = $n->treeNodes;
+ for ($i = 0, $j = count($childs); $i < $j; $i++) {
+ $s .= ($i ? ',' : '') . $this->parseTree($childs[$i]);
+ }
+ break;
+
+ case JS_CALL:
+ $s = $this->parseTree($n->treeNodes[0]) . '(' . $this->parseTree($n->treeNodes[1]) . ')';
+ break;
+
+ case KEYWORD_NEW:
+ case JS_NEW_WITH_ARGS:
+ $s = 'new ' . $this->parseTree($n->treeNodes[0]) . '(' . ($n->type == JS_NEW_WITH_ARGS ? $this->parseTree($n->treeNodes[1]) : '') . ')';
+ break;
+
+ case JS_ARRAY_INIT:
+ $s = '[';
+ $childs = $n->treeNodes;
+ for ($i = 0, $j = count($childs); $i < $j; $i++) {
+ $s .= ($i ? ',' : '') . $this->parseTree($childs[$i]);
+ }
+ $s .= ']';
+ break;
+
+ case JS_OBJECT_INIT:
+ $s = '{';
+ $childs = $n->treeNodes;
+ for ($i = 0, $j = count($childs); $i < $j; $i++) {
+ $t = $childs[$i];
+ if ($i) {
+ $s .= ',';
+ }
+ if ($t->type == JS_PROPERTY_INIT) {
+ // Ditch the quotes when the index is a valid identifier
+ if ( $t->treeNodes[0]->type == TOKEN_STRING &&
$this->isValidIdentifier(substr($t->treeNodes[0]->value, 1, -1))
- )
- $s .= substr($t->treeNodes[0]->value, 1, -1);
- else
- $s .= $t->treeNodes[0]->value;
-
- $s .= ':' . $this->parseTree($t->treeNodes[1]);
- }
- else
- {
- $s .= $t->type == JS_GETTER ? 'get' : 'set';
- $s .= ' ' . $t->name . '(';
- $params = $t->params;
- for ($i = 0, $j = count($params); $i < $j; $i++)
- $s .= ($i ? ',' : '') . $params[$i];
- $s .= '){' . $this->parseTree($t->body, true) . '}';
- }
- }
- $s .= '}';
- break;
-
- case TOKEN_NUMBER:
- $s = $n->value;
- if (preg_match('/^([1-9]+)(0{3,})$/', $s, $m))
- $s = $m[1] . 'e' . strlen($m[2]);
- break;
-
- case KEYWORD_NULL: case KEYWORD_THIS: case KEYWORD_TRUE: case KEYWORD_FALSE:
- case TOKEN_IDENTIFIER: case TOKEN_STRING: case TOKEN_REGEXP:
- $s = $n->value;
- break;
+ ) {
+ $s .= substr($t->treeNodes[0]->value, 1, -1);
+ }
+ else {
+ $s .= $t->treeNodes[0]->value;
+ }
+
+ $s .= ':' . $this->parseTree($t->treeNodes[1]);
+ }
+ else {
+ $s .= $t->type == JS_GETTER ? 'get' : 'set';
+ $s .= ' ' . $t->name . '(';
+ $params = $t->params;
+ for ($i = 0, $j = count($params); $i < $j; $i++) {
+ $s .= ($i ? ',' : '') . $params[$i];
+ }
+ $s .= '){' . $this->parseTree($t->body, true) . '}';
+ }
+ }
+ $s .= '}';
+ break;
+
+ case TOKEN_NUMBER:
+ $s = $n->value;
+ if (preg_match('/^([1-9]+)(0{3,})$/', $s, $m)) {
+ $s = $m[1] . 'e' . strlen($m[2]);
+ }
+ break;
+
+ case KEYWORD_NULL:
+ case KEYWORD_THIS:
+ case KEYWORD_TRUE:
+ case KEYWORD_FALSE:
+ case TOKEN_IDENTIFIER:
+ case TOKEN_STRING:
+ case TOKEN_REGEXP:
+ $s = $n->value;
+ break;
- case JS_GROUP:
- if (in_array(
+ case JS_GROUP:
+ if (in_array(
$n->treeNodes[0]->type,
array(
- JS_ARRAY_INIT, JS_OBJECT_INIT, JS_GROUP,
- TOKEN_NUMBER, TOKEN_STRING, TOKEN_REGEXP, TOKEN_IDENTIFIER,
- KEYWORD_NULL, KEYWORD_THIS, KEYWORD_TRUE, KEYWORD_FALSE
- )
- ))
- {
- $s = $this->parseTree($n->treeNodes[0]);
- }
- else
- {
- $s = '(' . $this->parseTree($n->treeNodes[0]) . ')';
- }
- break;
-
- default:
- throw new Exception('UNKNOWN TOKEN TYPE: ' . $n->type);
- }
-
- return $s;
- }
-
- private function isValidIdentifier($string)
- {
- return preg_match('/^[a-zA-Z_][a-zA-Z0-9_]*$/', $string) && !in_array($string, $this->reserved);
- }
-
- private function isWordChar($char)
- {
- return $char == '_' || $char == '$' || ctype_alnum($char);
- }
+ JS_ARRAY_INIT,
+ JS_OBJECT_INIT,
+ JS_GROUP,
+ TOKEN_NUMBER,
+ TOKEN_STRING,
+ TOKEN_REGEXP,
+ TOKEN_IDENTIFIER,
+ KEYWORD_NULL,
+ KEYWORD_THIS,
+ KEYWORD_TRUE,
+ KEYWORD_FALSE,
+ )
+ )) {
+ $s = $this->parseTree($n->treeNodes[0]);
+ }
+ else {
+ $s = '(' . $this->parseTree($n->treeNodes[0]) . ')';
+ }
+ break;
+
+ default:
+ throw new Exception('UNKNOWN TOKEN TYPE: ' . $n->type);
+ }
+
+ return $s;
+ }
+
+ private function isValidIdentifier($string) {
+ return preg_match('/^[a-zA-Z_][a-zA-Z0-9_]*$/', $string) && !in_array($string, $this->reserved);
+ }
+
+ private function isWordChar($char) {
+ return $char == '_' || $char == '$' || ctype_alnum($char);
+ }
}
-class JSParser
-{
- private $t;
- private $minifier;
-
- private $opPrecedence = array(
- ';' => 0,
- ',' => 1,
- '=' => 2, '?' => 2, ':' => 2,
- // The above all have to have the same precedence, see bug 330975
- '||' => 4,
- '&&' => 5,
- '|' => 6,
- '^' => 7,
- '&' => 8,
- '==' => 9, '!=' => 9, '===' => 9, '!==' => 9,
- '<' => 10, '<=' => 10, '>=' => 10, '>' => 10, 'in' => 10, 'instanceof' => 10,
- '<<' => 11, '>>' => 11, '>>>' => 11,
- '+' => 12, '-' => 12,
- '*' => 13, '/' => 13, '%' => 13,
- 'delete' => 14, 'void' => 14, 'typeof' => 14,
- '!' => 14, '~' => 14, 'U+' => 14, 'U-' => 14,
- '++' => 15, '--' => 15,
- 'new' => 16,
- '.' => 17,
- JS_NEW_WITH_ARGS => 0, JS_INDEX => 0, JS_CALL => 0,
- JS_ARRAY_INIT => 0, JS_OBJECT_INIT => 0, JS_GROUP => 0
- );
-
- private $opArity = array(
- ',' => -2,
- '=' => 2,
- '?' => 3,
- '||' => 2,
- '&&' => 2,
- '|' => 2,
- '^' => 2,
- '&' => 2,
- '==' => 2, '!=' => 2, '===' => 2, '!==' => 2,
- '<' => 2, '<=' => 2, '>=' => 2, '>' => 2, 'in' => 2, 'instanceof' => 2,
- '<<' => 2, '>>' => 2, '>>>' => 2,
- '+' => 2, '-' => 2,
- '*' => 2, '/' => 2, '%' => 2,
- 'delete' => 1, 'void' => 1, 'typeof' => 1,
- '!' => 1, '~' => 1, 'U+' => 1, 'U-' => 1,
- '++' => 1, '--' => 1,
- 'new' => 1,
- '.' => 2,
- JS_NEW_WITH_ARGS => 2, JS_INDEX => 2, JS_CALL => 2,
- JS_ARRAY_INIT => 1, JS_OBJECT_INIT => 1, JS_GROUP => 1,
- TOKEN_CONDCOMMENT_START => 1, TOKEN_CONDCOMMENT_END => 1
- );
-
- public function __construct($minifier=null)
- {
- $this->minifier = $minifier;
- $this->t = new JSTokenizer();
- }
-
- public function parse($s, $f, $l)
- {
- // initialize tokenizer
- $this->t->init($s, $f, $l);
-
- $x = new JSCompilerContext(false);
- $n = $this->Script($x);
- if (!$this->t->isDone())
- throw $this->t->newSyntaxError('Syntax error');
-
- return $n;
- }
-
- private function Script($x)
- {
- $n = $this->Statements($x);
- $n->type = JS_SCRIPT;
- $n->funDecls = $x->funDecls;
- $n->varDecls = $x->varDecls;
-
- // minify by scope
- if ($this->minifier)
- {
- $n->value = $this->minifier->parseTree($n);
-
- // clear tree from node to save memory
- $n->treeNodes = null;
- $n->funDecls = null;
- $n->varDecls = null;
-
- $n->type = JS_MINIFIED;
- }
-
- return $n;
- }
-
- private function Statements($x)
- {
- $n = new JSNode($this->t, JS_BLOCK);
- array_push($x->stmtStack, $n);
-
- while (!$this->t->isDone() && $this->t->peek() != OP_RIGHT_CURLY)
- $n->addNode($this->Statement($x));
-
- array_pop($x->stmtStack);
-
- return $n;
- }
-
- private function Block($x)
- {
- $this->t->mustMatch(OP_LEFT_CURLY);
- $n = $this->Statements($x);
- $this->t->mustMatch(OP_RIGHT_CURLY);
-
- return $n;
- }
-
- private function Statement($x)
- {
- $tt = $this->t->get();
- $n2 = null;
-
- // Cases for statements ending in a right curly return early, avoiding the
- // common semicolon insertion magic after this switch.
- switch ($tt)
- {
- case KEYWORD_FUNCTION:
- return $this->FunctionDefinition(
+class JSParser {
+ private $t;
+ private $minifier;
+
+ private $opPrecedence = array(
+ ';' => 0,
+ ',' => 1,
+ '=' => 2,
+ '?' => 2,
+ ':' => 2,
+ // The above all have to have the same precedence, see bug 330975
+ '||' => 4,
+ '&&' => 5,
+ '|' => 6,
+ '^' => 7,
+ '&' => 8,
+ '==' => 9,
+ '!=' => 9,
+ '===' => 9,
+ '!==' => 9,
+ '<' => 10,
+ '<=' => 10,
+ '>=' => 10,
+ '>' => 10,
+ 'in' => 10,
+ 'instanceof' => 10,
+ '<<' => 11,
+ '>>' => 11,
+ '>>>' => 11,
+ '+' => 12,
+ '-' => 12,
+ '*' => 13,
+ '/' => 13,
+ '%' => 13,
+ 'delete' => 14,
+ 'void' => 14,
+ 'typeof' => 14,
+ '!' => 14,
+ '~' => 14,
+ 'U+' => 14,
+ 'U-' => 14,
+ '++' => 15,
+ '--' => 15,
+ 'new' => 16,
+ '.' => 17,
+ JS_NEW_WITH_ARGS => 0,
+ JS_INDEX => 0,
+ JS_CALL => 0,
+ JS_ARRAY_INIT => 0,
+ JS_OBJECT_INIT => 0,
+ JS_GROUP => 0,
+ );
+
+ private $opArity = array(
+ ',' => -2,
+ '=' => 2,
+ '?' => 3,
+ '||' => 2,
+ '&&' => 2,
+ '|' => 2,
+ '^' => 2,
+ '&' => 2,
+ '==' => 2,
+ '!=' => 2,
+ '===' => 2,
+ '!==' => 2,
+ '<' => 2,
+ '<=' => 2,
+ '>=' => 2,
+ '>' => 2,
+ 'in' => 2,
+ 'instanceof' => 2,
+ '<<' => 2,
+ '>>' => 2,
+ '>>>' => 2,
+ '+' => 2,
+ '-' => 2,
+ '*' => 2,
+ '/' => 2,
+ '%' => 2,
+ 'delete' => 1,
+ 'void' => 1,
+ 'typeof' => 1,
+ '!' => 1,
+ '~' => 1,
+ 'U+' => 1,
+ 'U-' => 1,
+ '++' => 1,
+ '--' => 1,
+ 'new' => 1,
+ '.' => 2,
+ JS_NEW_WITH_ARGS => 2,
+ JS_INDEX => 2,
+ JS_CALL => 2,
+ JS_ARRAY_INIT => 1,
+ JS_OBJECT_INIT => 1,
+ JS_GROUP => 1,
+ TOKEN_CONDCOMMENT_START => 1,
+ TOKEN_CONDCOMMENT_END => 1,
+ );
+
+ public function __construct($minifier = null) {
+ $this->minifier = $minifier;
+ $this->t = new JSTokenizer();
+ }
+
+ public function parse($s, $f, $l) {
+ // initialize tokenizer
+ $this->t->init($s, $f, $l);
+
+ $x = new JSCompilerContext(false);
+ $n = $this->Script($x);
+ if (!$this->t->isDone()) {
+ throw $this->t->newSyntaxError('Syntax error');
+ }
+
+ return $n;
+ }
+
+ private function Script($x) {
+ $n = $this->Statements($x);
+ $n->type = JS_SCRIPT;
+ $n->funDecls = $x->funDecls;
+ $n->varDecls = $x->varDecls;
+
+ // minify by scope
+ if ($this->minifier) {
+ $n->value = $this->minifier->parseTree($n);
+
+ // clear tree from node to save memory
+ $n->treeNodes = null;
+ $n->funDecls = null;
+ $n->varDecls = null;
+
+ $n->type = JS_MINIFIED;
+ }
+
+ return $n;
+ }
+
+ private function Statements($x) {
+ $n = new JSNode($this->t, JS_BLOCK);
+ array_push($x->stmtStack, $n);
+
+ while (!$this->t->isDone() && $this->t->peek() != OP_RIGHT_CURLY) {
+ $n->addNode($this->Statement($x));
+ }
+
+ array_pop($x->stmtStack);
+
+ return $n;
+ }
+
+ private function Block($x) {
+ $this->t->mustMatch(OP_LEFT_CURLY);
+ $n = $this->Statements($x);
+ $this->t->mustMatch(OP_RIGHT_CURLY);
+
+ return $n;
+ }
+
+ private function Statement($x) {
+ $tt = $this->t->get();
+ $n2 = null;
+
+ // Cases for statements ending in a right curly return early, avoiding the
+ // common semicolon insertion magic after this switch.
+ switch ($tt) {
+ case KEYWORD_FUNCTION:
+ return $this->FunctionDefinition(
$x,
true,
count($x->stmtStack) > 1 ? STATEMENT_FORM : DECLARED_FORM
);
- break;
+ break;
- case OP_LEFT_CURLY:
- $n = $this->Statements($x);
- $this->t->mustMatch(OP_RIGHT_CURLY);
- return $n;
-
- case KEYWORD_IF:
- $n = new JSNode($this->t);
- $n->condition = $this->ParenExpression($x);
- array_push($x->stmtStack, $n);
- $n->thenPart = $this->Statement($x);
- $n->elsePart = $this->t->match(KEYWORD_ELSE) ? $this->Statement($x) : null;
- array_pop($x->stmtStack);
- return $n;
-
- case KEYWORD_SWITCH:
- $n = new JSNode($this->t);
- $this->t->mustMatch(OP_LEFT_PAREN);
- $n->discriminant = $this->Expression($x);
- $this->t->mustMatch(OP_RIGHT_PAREN);
- $n->cases = array();
- $n->defaultIndex = -1;
-
- array_push($x->stmtStack, $n);
-
- $this->t->mustMatch(OP_LEFT_CURLY);
-
- while (($tt = $this->t->get()) != OP_RIGHT_CURLY)
- {
- switch ($tt)
- {
- case KEYWORD_DEFAULT:
- if ($n->defaultIndex >= 0)
- throw $this->t->newSyntaxError('More than one switch default');
- // FALL THROUGH
- case KEYWORD_CASE:
- $n2 = new JSNode($this->t);
- if ($tt == KEYWORD_DEFAULT)
- $n->defaultIndex = count($n->cases);
- else
- $n2->caseLabel = $this->Expression($x, OP_COLON);
- break;
- default:
- throw $this->t->newSyntaxError('Invalid switch case');
- }
-
- $this->t->mustMatch(OP_COLON);
- $n2->statements = new JSNode($this->t, JS_BLOCK);
- while (($tt = $this->t->peek()) != KEYWORD_CASE && $tt != KEYWORD_DEFAULT && $tt != OP_RIGHT_CURLY)
- $n2->statements->addNode($this->Statement($x));
-
- array_push($n->cases, $n2);
- }
-
- array_pop($x->stmtStack);
- return $n;
-
- case KEYWORD_FOR:
- $n = new JSNode($this->t);
- $n->isLoop = true;
- $this->t->mustMatch(OP_LEFT_PAREN);
-
- if (($tt = $this->t->peek()) != OP_SEMICOLON)
- {
- $x->inForLoopInit = true;
- if ($tt == KEYWORD_VAR || $tt == KEYWORD_CONST)
- {
- $this->t->get();
- $n2 = $this->Variables($x);
- }
- else
- {
- $n2 = $this->Expression($x);
- }
- $x->inForLoopInit = false;
- }
-
- if ($n2 && $this->t->match(KEYWORD_IN))
- {
- $n->type = JS_FOR_IN;
- if ($n2->type == KEYWORD_VAR)
- {
- if (count($n2->treeNodes) != 1)
- {
- throw $this->t->SyntaxError(
+ case OP_LEFT_CURLY:
+ $n = $this->Statements($x);
+ $this->t->mustMatch(OP_RIGHT_CURLY);
+ return $n;
+
+ case KEYWORD_IF:
+ $n = new JSNode($this->t);
+ $n->condition = $this->ParenExpression($x);
+ array_push($x->stmtStack, $n);
+ $n->thenPart = $this->Statement($x);
+ $n->elsePart = $this->t->match(KEYWORD_ELSE) ? $this->Statement($x) : null;
+ array_pop($x->stmtStack);
+ return $n;
+
+ case KEYWORD_SWITCH:
+ $n = new JSNode($this->t);
+ $this->t->mustMatch(OP_LEFT_PAREN);
+ $n->discriminant = $this->Expression($x);
+ $this->t->mustMatch(OP_RIGHT_PAREN);
+ $n->cases = array();
+ $n->defaultIndex = -1;
+
+ array_push($x->stmtStack, $n);
+
+ $this->t->mustMatch(OP_LEFT_CURLY);
+
+ while (($tt = $this->t->get()) != OP_RIGHT_CURLY) {
+ switch ($tt) {
+ case KEYWORD_DEFAULT:
+ if ($n->defaultIndex >= 0) {
+ throw $this->t->newSyntaxError('More than one switch default');
+ }
+ // FALL THROUGH
+ case KEYWORD_CASE:
+ $n2 = new JSNode($this->t);
+ if ($tt == KEYWORD_DEFAULT) {
+ $n->defaultIndex = count($n->cases);
+ }
+ else {
+ $n2->caseLabel = $this->Expression($x, OP_COLON);
+ }
+ break;
+ default:
+ throw $this->t->newSyntaxError('Invalid switch case');
+ }
+
+ $this->t->mustMatch(OP_COLON);
+ $n2->statements = new JSNode($this->t, JS_BLOCK);
+ while (($tt = $this->t->peek()) != KEYWORD_CASE && $tt != KEYWORD_DEFAULT && $tt != OP_RIGHT_CURLY) {
+ $n2->statements->addNode($this->Statement($x));
+ }
+
+ array_push($n->cases, $n2);
+ }
+
+ array_pop($x->stmtStack);
+ return $n;
+
+ case KEYWORD_FOR:
+ $n = new JSNode($this->t);
+ $n->isLoop = true;
+ $this->t->mustMatch(OP_LEFT_PAREN);
+
+ if (($tt = $this->t->peek()) != OP_SEMICOLON) {
+ $x->inForLoopInit = true;
+ if ($tt == KEYWORD_VAR || $tt == KEYWORD_CONST) {
+ $this->t->get();
+ $n2 = $this->Variables($x);
+ }
+ else {
+ $n2 = $this->Expression($x);
+ }
+ $x->inForLoopInit = false;
+ }
+
+ if ($n2 && $this->t->match(KEYWORD_IN)) {
+ $n->type = JS_FOR_IN;
+ if ($n2->type == KEYWORD_VAR) {
+ if (count($n2->treeNodes) != 1) {
+ throw $this->t->SyntaxError(
'Invalid for..in left-hand side',
$this->t->filename,
$n2->lineno
);
- }
+ }
- // NB: n2[0].type == IDENTIFIER and n2[0].value == n2[0].name.
- $n->iterator = $n2->treeNodes[0];
- $n->varDecl = $n2;
- }
- else
- {
- $n->iterator = $n2;
- $n->varDecl = null;
- }
-
- $n->object = $this->Expression($x);
- }
- else
- {
- $n->setup = $n2 ? $n2 : null;
- $this->t->mustMatch(OP_SEMICOLON);
- $n->condition = $this->t->peek() == OP_SEMICOLON ? null : $this->Expression($x);
- $this->t->mustMatch(OP_SEMICOLON);
- $n->update = $this->t->peek() == OP_RIGHT_PAREN ? null : $this->Expression($x);
- }
-
- $this->t->mustMatch(OP_RIGHT_PAREN);
- $n->body = $this->nest($x, $n);
- return $n;
-
- case KEYWORD_WHILE:
- $n = new JSNode($this->t);
- $n->isLoop = true;
- $n->condition = $this->ParenExpression($x);
- $n->body = $this->nest($x, $n);
- return $n;
-
- case KEYWORD_DO:
- $n = new JSNode($this->t);
- $n->isLoop = true;
- $n->body = $this->nest($x, $n, KEYWORD_WHILE);
- $n->condition = $this->ParenExpression($x);
- if (!$x->ecmaStrictMode)
- {
- // <script language="JavaScript"> (without version hints) may need
- // automatic semicolon insertion without a newline after do-while.
- // See http://bugzilla.mozilla.org/show_bug.cgi?id=238945.
- $this->t->match(OP_SEMICOLON);
- return $n;
- }
- break;
-
- case KEYWORD_BREAK:
- case KEYWORD_CONTINUE:
- $n = new JSNode($this->t);
-
- if ($this->t->peekOnSameLine() == TOKEN_IDENTIFIER)
- {
- $this->t->get();
- $n->label = $this->t->currentToken()->value;
- }
-
- $ss = $x->stmtStack;
- $i = count($ss);
- $label = $n->label;
- if ($label)
- {
- do
- {
- if (--$i < 0)
- throw $this->t->newSyntaxError('Label not found');
- }
- while ($ss[$i]->label != $label);
- }
- else
- {
- do
- {
- if (--$i < 0)
- throw $this->t->newSyntaxError('Invalid ' . $tt);
- }
- while (!$ss[$i]->isLoop && ($tt != KEYWORD_BREAK || $ss[$i]->type != KEYWORD_SWITCH));
- }
-
- $n->target = $ss[$i];
- break;
-
- case KEYWORD_TRY:
- $n = new JSNode($this->t);
- $n->tryBlock = $this->Block($x);
- $n->catchClauses = array();
-
- while ($this->t->match(KEYWORD_CATCH))
- {
- $n2 = new JSNode($this->t);
- $this->t->mustMatch(OP_LEFT_PAREN);
- $n2->varName = $this->t->mustMatch(TOKEN_IDENTIFIER)->value;
-
- if ($this->t->match(KEYWORD_IF))
- {
- if ($x->ecmaStrictMode)
- throw $this->t->newSyntaxError('Illegal catch guard');
-
- if (count($n->catchClauses) && !end($n->catchClauses)->guard)
- throw $this->t->newSyntaxError('Guarded catch after unguarded');
-
- $n2->guard = $this->Expression($x);
- }
- else
- {
- $n2->guard = null;
- }
-
- $this->t->mustMatch(OP_RIGHT_PAREN);
- $n2->block = $this->Block($x);
- array_push($n->catchClauses, $n2);
- }
-
- if ($this->t->match(KEYWORD_FINALLY))
- $n->finallyBlock = $this->Block($x);
-
- if (!count($n->catchClauses) && !$n->finallyBlock)
- throw $this->t->newSyntaxError('Invalid try statement');
- return $n;
-
- case KEYWORD_CATCH:
- case KEYWORD_FINALLY:
- throw $this->t->newSyntaxError($tt + ' without preceding try');
-
- case KEYWORD_THROW:
- $n = new JSNode($this->t);
- $n->value = $this->Expression($x);
- break;
-
- case KEYWORD_RETURN:
- if (!$x->inFunction)
- throw $this->t->newSyntaxError('Invalid return');
-
- $n = new JSNode($this->t);
- $tt = $this->t->peekOnSameLine();
- if ($tt != TOKEN_END && $tt != TOKEN_NEWLINE && $tt != OP_SEMICOLON && $tt != OP_RIGHT_CURLY)
- $n->value = $this->Expression($x);
- else
- $n->value = null;
- break;
-
- case KEYWORD_WITH:
- $n = new JSNode($this->t);
- $n->object = $this->ParenExpression($x);
- $n->body = $this->nest($x, $n);
- return $n;
-
- case KEYWORD_VAR:
- case KEYWORD_CONST:
- $n = $this->Variables($x);
- break;
-
- case TOKEN_CONDCOMMENT_START:
- case TOKEN_CONDCOMMENT_END:
- $n = new JSNode($this->t);
- return $n;
-
- case KEYWORD_DEBUGGER:
- $n = new JSNode($this->t);
- break;
-
- case TOKEN_NEWLINE:
- case OP_SEMICOLON:
- $n = new JSNode($this->t, OP_SEMICOLON);
- $n->expression = null;
- return $n;
-
- default:
- if ($tt == TOKEN_IDENTIFIER)
- {
- $this->t->scanOperand = false;
- $tt = $this->t->peek();
- $this->t->scanOperand = true;
- if ($tt == OP_COLON)
- {
- $label = $this->t->currentToken()->value;
- $ss = $x->stmtStack;
- for ($i = count($ss) - 1; $i >= 0; --$i)
- {
- if ($ss[$i]->label == $label)
- throw $this->t->newSyntaxError('Duplicate label');
- }
-
- $this->t->get();
- $n = new JSNode($this->t, JS_LABEL);
- $n->label = $label;
- $n->statement = $this->nest($x, $n);
-
- return $n;
- }
- }
-
- $n = new JSNode($this->t, OP_SEMICOLON);
- $this->t->unget();
- $n->expression = $this->Expression($x);
- $n->end = $n->expression->end;
- break;
- }
-
- if ($this->t->lineno == $this->t->currentToken()->lineno)
- {
- $tt = $this->t->peekOnSameLine();
- if ($tt != TOKEN_END && $tt != TOKEN_NEWLINE && $tt != OP_SEMICOLON && $tt != OP_RIGHT_CURLY)
- throw $this->t->newSyntaxError('Missing ; before statement');
- }
-
- $this->t->match(OP_SEMICOLON);
-
- return $n;
- }
-
- private function FunctionDefinition($x, $requireName, $functionForm)
- {
- $f = new JSNode($this->t);
-
- if ($f->type != KEYWORD_FUNCTION)
- $f->type = ($f->value == 'get') ? JS_GETTER : JS_SETTER;
-
- if ($this->t->match(TOKEN_IDENTIFIER))
- $f->name = $this->t->currentToken()->value;
- elseif ($requireName)
- throw $this->t->newSyntaxError('Missing function identifier');
-
- $this->t->mustMatch(OP_LEFT_PAREN);
- $f->params = array();
-
- while (($tt = $this->t->get()) != OP_RIGHT_PAREN)
- {
- if ($tt != TOKEN_IDENTIFIER)
- throw $this->t->newSyntaxError('Missing formal parameter');
-
- array_push($f->params, $this->t->currentToken()->value);
-
- if ($this->t->peek() != OP_RIGHT_PAREN)
- $this->t->mustMatch(OP_COMMA);
- }
-
- $this->t->mustMatch(OP_LEFT_CURLY);
-
- $x2 = new JSCompilerContext(true);
- $f->body = $this->Script($x2);
-
- $this->t->mustMatch(OP_RIGHT_CURLY);
- $f->end = $this->t->currentToken()->end;
-
- $f->functionForm = $functionForm;
- if ($functionForm == DECLARED_FORM)
- array_push($x->funDecls, $f);
-
- return $f;
- }
-
- private function Variables($x)
- {
- $n = new JSNode($this->t);
-
- do
- {
- $this->t->mustMatch(TOKEN_IDENTIFIER);
-
- $n2 = new JSNode($this->t);
- $n2->name = $n2->value;
-
- if ($this->t->match(OP_ASSIGN))
- {
- if ($this->t->currentToken()->assignOp)
- throw $this->t->newSyntaxError('Invalid variable initialization');
-
- $n2->initializer = $this->Expression($x, OP_COMMA);
- }
-
- $n2->readOnly = $n->type == KEYWORD_CONST;
-
- $n->addNode($n2);
- array_push($x->varDecls, $n2);
- }
- while ($this->t->match(OP_COMMA));
-
- return $n;
- }
-
- private function Expression($x, $stop=false)
- {
- $operators = array();
- $operands = array();
- $n = false;
-
- $bl = $x->bracketLevel;
- $cl = $x->curlyLevel;
- $pl = $x->parenLevel;
- $hl = $x->hookLevel;
-
- while (($tt = $this->t->get()) != TOKEN_END)
- {
- if ($tt == $stop &&
+ // NB: n2[0].type == IDENTIFIER and n2[0].value == n2[0].name.
+ $n->iterator = $n2->treeNodes[0];
+ $n->varDecl = $n2;
+ }
+ else {
+ $n->iterator = $n2;
+ $n->varDecl = null;
+ }
+
+ $n->object = $this->Expression($x);
+ }
+ else {
+ $n->setup = $n2 ? $n2 : null;
+ $this->t->mustMatch(OP_SEMICOLON);
+ $n->condition = $this->t->peek() == OP_SEMICOLON ? null : $this->Expression($x);
+ $this->t->mustMatch(OP_SEMICOLON);
+ $n->update = $this->t->peek() == OP_RIGHT_PAREN ? null : $this->Expression($x);
+ }
+
+ $this->t->mustMatch(OP_RIGHT_PAREN);
+ $n->body = $this->nest($x, $n);
+ return $n;
+
+ case KEYWORD_WHILE:
+ $n = new JSNode($this->t);
+ $n->isLoop = true;
+ $n->condition = $this->ParenExpression($x);
+ $n->body = $this->nest($x, $n);
+ return $n;
+
+ case KEYWORD_DO:
+ $n = new JSNode($this->t);
+ $n->isLoop = true;
+ $n->body = $this->nest($x, $n, KEYWORD_WHILE);
+ $n->condition = $this->ParenExpression($x);
+ if (!$x->ecmaStrictMode) {
+ // <script language="JavaScript"> (without version hints) may need
+ // automatic semicolon insertion without a newline after do-while.
+ // See http://bugzilla.mozilla.org/show_bug.cgi?id=238945.
+ $this->t->match(OP_SEMICOLON);
+ return $n;
+ }
+ break;
+
+ case KEYWORD_BREAK:
+ case KEYWORD_CONTINUE:
+ $n = new JSNode($this->t);
+
+ if ($this->t->peekOnSameLine() == TOKEN_IDENTIFIER) {
+ $this->t->get();
+ $n->label = $this->t->currentToken()->value;
+ }
+
+ $ss = $x->stmtStack;
+ $i = count($ss);
+ $label = $n->label;
+ if ($label) {
+ do {
+ if (--$i < 0) {
+ throw $this->t->newSyntaxError('Label not found');
+ }
+ } while ($ss[$i]->label != $label);
+ }
+ else {
+ do {
+ if (--$i < 0) {
+ throw $this->t->newSyntaxError('Invalid ' . $tt);
+ }
+ } while (!$ss[$i]->isLoop && ($tt != KEYWORD_BREAK || $ss[$i]->type != KEYWORD_SWITCH));
+ }
+
+ $n->target = $ss[$i];
+ break;
+
+ case KEYWORD_TRY:
+ $n = new JSNode($this->t);
+ $n->tryBlock = $this->Block($x);
+ $n->catchClauses = array();
+
+ while ($this->t->match(KEYWORD_CATCH)) {
+ $n2 = new JSNode($this->t);
+ $this->t->mustMatch(OP_LEFT_PAREN);
+ $n2->varName = $this->t->mustMatch(TOKEN_IDENTIFIER)->value;
+
+ if ($this->t->match(KEYWORD_IF)) {
+ if ($x->ecmaStrictMode) {
+ throw $this->t->newSyntaxError('Illegal catch guard');
+ }
+
+ if (count($n->catchClauses) && !end($n->catchClauses)->guard) {
+ throw $this->t->newSyntaxError('Guarded catch after unguarded');
+ }
+
+ $n2->guard = $this->Expression($x);
+ }
+ else {
+ $n2->guard = null;
+ }
+
+ $this->t->mustMatch(OP_RIGHT_PAREN);
+ $n2->block = $this->Block($x);
+ array_push($n->catchClauses, $n2);
+ }
+
+ if ($this->t->match(KEYWORD_FINALLY)) {
+ $n->finallyBlock = $this->Block($x);
+ }
+
+ if (!count($n->catchClauses) && !$n->finallyBlock) {
+ throw $this->t->newSyntaxError('Invalid try statement');
+ }
+ return $n;
+
+ case KEYWORD_CATCH:
+ case KEYWORD_FINALLY:
+ throw $this->t->newSyntaxError($tt + ' without preceding try');
+
+ case KEYWORD_THROW:
+ $n = new JSNode($this->t);
+ $n->value = $this->Expression($x);
+ break;
+
+ case KEYWORD_RETURN:
+ if (!$x->inFunction) {
+ throw $this->t->newSyntaxError('Invalid return');
+ }
+
+ $n = new JSNode($this->t);
+ $tt = $this->t->peekOnSameLine();
+ if ($tt != TOKEN_END && $tt != TOKEN_NEWLINE && $tt != OP_SEMICOLON && $tt != OP_RIGHT_CURLY) {
+ $n->value = $this->Expression($x);
+ }
+ else {
+ $n->value = null;
+ }
+ break;
+
+ case KEYWORD_WITH:
+ $n = new JSNode($this->t);
+ $n->object = $this->ParenExpression($x);
+ $n->body = $this->nest($x, $n);
+ return $n;
+
+ case KEYWORD_VAR:
+ case KEYWORD_CONST:
+ $n = $this->Variables($x);
+ break;
+
+ case TOKEN_CONDCOMMENT_START:
+ case TOKEN_CONDCOMMENT_END:
+ $n = new JSNode($this->t);
+ return $n;
+
+ case KEYWORD_DEBUGGER:
+ $n = new JSNode($this->t);
+ break;
+
+ case TOKEN_NEWLINE:
+ case OP_SEMICOLON:
+ $n = new JSNode($this->t, OP_SEMICOLON);
+ $n->expression = null;
+ return $n;
+
+ default:
+ if ($tt == TOKEN_IDENTIFIER) {
+ $this->t->scanOperand = false;
+ $tt = $this->t->peek();
+ $this->t->scanOperand = true;
+ if ($tt == OP_COLON) {
+ $label = $this->t->currentToken()->value;
+ $ss = $x->stmtStack;
+ for ($i = count($ss) - 1; $i >= 0; --$i) {
+ if ($ss[$i]->label == $label) {
+ throw $this->t->newSyntaxError('Duplicate label');
+ }
+ }
+
+ $this->t->get();
+ $n = new JSNode($this->t, JS_LABEL);
+ $n->label = $label;
+ $n->statement = $this->nest($x, $n);
+
+ return $n;
+ }
+ }
+
+ $n = new JSNode($this->t, OP_SEMICOLON);
+ $this->t->unget();
+ $n->expression = $this->Expression($x);
+ $n->end = $n->expression->end;
+ break;
+ }
+
+ if ($this->t->lineno == $this->t->currentToken()->lineno) {
+ $tt = $this->t->peekOnSameLine();
+ if ($tt != TOKEN_END && $tt != TOKEN_NEWLINE && $tt != OP_SEMICOLON && $tt != OP_RIGHT_CURLY) {
+ throw $this->t->newSyntaxError('Missing ; before statement');
+ }
+ }
+
+ $this->t->match(OP_SEMICOLON);
+
+ return $n;
+ }
+
+ private function FunctionDefinition($x, $requireName, $functionForm) {
+ $f = new JSNode($this->t);
+
+ if ($f->type != KEYWORD_FUNCTION) {
+ $f->type = ($f->value == 'get') ? JS_GETTER : JS_SETTER;
+ }
+
+ if ($this->t->match(TOKEN_IDENTIFIER)) {
+ $f->name = $this->t->currentToken()->value;
+ }
+ elseif ($requireName) {
+ throw $this->t->newSyntaxError('Missing function identifier');
+ }
+
+ $this->t->mustMatch(OP_LEFT_PAREN);
+ $f->params = array();
+
+ while (($tt = $this->t->get()) != OP_RIGHT_PAREN) {
+ if ($tt != TOKEN_IDENTIFIER) {
+ throw $this->t->newSyntaxError('Missing formal parameter');
+ }
+
+ array_push($f->params, $this->t->currentToken()->value);
+
+ if ($this->t->peek() != OP_RIGHT_PAREN) {
+ $this->t->mustMatch(OP_COMMA);
+ }
+ }
+
+ $this->t->mustMatch(OP_LEFT_CURLY);
+
+ $x2 = new JSCompilerContext(true);
+ $f->body = $this->Script($x2);
+
+ $this->t->mustMatch(OP_RIGHT_CURLY);
+ $f->end = $this->t->currentToken()->end;
+
+ $f->functionForm = $functionForm;
+ if ($functionForm == DECLARED_FORM) {
+ array_push($x->funDecls, $f);
+ }
+
+ return $f;
+ }
+
+ private function Variables($x) {
+ $n = new JSNode($this->t);
+
+ do {
+ $this->t->mustMatch(TOKEN_IDENTIFIER);
+
+ $n2 = new JSNode($this->t);
+ $n2->name = $n2->value;
+
+ if ($this->t->match(OP_ASSIGN)) {
+ if ($this->t->currentToken()->assignOp) {
+ throw $this->t->newSyntaxError('Invalid variable initialization');
+ }
+
+ $n2->initializer = $this->Expression($x, OP_COMMA);
+ }
+
+ $n2->readOnly = $n->type == KEYWORD_CONST;
+
+ $n->addNode($n2);
+ array_push($x->varDecls, $n2);
+ } while ($this->t->match(OP_COMMA));
+
+ return $n;
+ }
+
+ private function Expression($x, $stop = false) {
+ $operators = array();
+ $operands = array();
+ $n = false;
+
+ $bl = $x->bracketLevel;
+ $cl = $x->curlyLevel;
+ $pl = $x->parenLevel;
+ $hl = $x->hookLevel;
+
+ while (($tt = $this->t->get()) != TOKEN_END) {
+ if ($tt == $stop &&
$x->bracketLevel == $bl &&
$x->curlyLevel == $cl &&
$x->parenLevel == $pl &&
$x->hookLevel == $hl
- )
- {
- // Stop only if tt matches the optional stop parameter, and that
- // token is not quoted by some kind of bracket.
- break;
- }
-
- switch ($tt)
- {
- case OP_SEMICOLON:
- // NB: cannot be empty, Statement handled that.
- break 2;
-
- case OP_HOOK:
- if ($this->t->scanOperand)
- break 2;
+ ) {
+ // Stop only if tt matches the optional stop parameter, and that
+ // token is not quoted by some kind of bracket.
+ break;
+ }
+
+ switch ($tt) {
+ case OP_SEMICOLON:
+ // NB: cannot be empty, Statement handled that.
+ break 2;
+
+ case OP_HOOK:
+ if ($this->t->scanOperand) {
+ break 2;
+ }
- while ( !empty($operators) &&
+ while ( !empty($operators) &&
$this->opPrecedence[end($operators)->type] > $this->opPrecedence[$tt]
- )
- $this->reduce($operators, $operands);
-
- array_push($operators, new JSNode($this->t));
-
- ++$x->hookLevel;
- $this->t->scanOperand = true;
- $n = $this->Expression($x);
-
- if (!$this->t->match(OP_COLON))
- break 2;
-
- --$x->hookLevel;
- array_push($operands, $n);
- break;
-
- case OP_COLON:
- if ($x->hookLevel)
- break 2;
+ ) {
+ $this->reduce($operators, $operands);
+ }
+
+ array_push($operators, new JSNode($this->t));
+
+ ++$x->hookLevel;
+ $this->t->scanOperand = true;
+ $n = $this->Expression($x);
+
+ if (!$this->t->match(OP_COLON)) {
+ break 2;
+ }
+
+ --$x->hookLevel;
+ array_push($operands, $n);
+ break;
+
+ case OP_COLON:
+ if ($x->hookLevel) {
+ break 2;
+ }
+
+ throw $this->t->newSyntaxError('Invalid label');
+ break;
+
+ case OP_ASSIGN:
+ if ($this->t->scanOperand) {
+ break 2;
+ }
- throw $this->t->newSyntaxError('Invalid label');
- break;
-
- case OP_ASSIGN:
- if ($this->t->scanOperand)
- break 2;
-
- // Use >, not >=, for right-associative ASSIGN
- while ( !empty($operators) &&
+ // Use >, not >=, for right-associative ASSIGN
+ while ( !empty($operators) &&
$this->opPrecedence[end($operators)->type] > $this->opPrecedence[$tt]
- )
- $this->reduce($operators, $operands);
-
- array_push($operators, new JSNode($this->t));
- end($operands)->assignOp = $this->t->currentToken()->assignOp;
- $this->t->scanOperand = true;
- break;
-
- case KEYWORD_IN:
- // An in operator should not be parsed if we're parsing the head of
- // a for (...) loop, unless it is in the then part of a conditional
- // expression, or parenthesized somehow.
- if ($x->inForLoopInit && !$x->hookLevel &&
+ ) {
+ $this->reduce($operators, $operands);
+ }
+
+ array_push($operators, new JSNode($this->t));
+ end($operands)->assignOp = $this->t->currentToken()->assignOp;
+ $this->t->scanOperand = true;
+ break;
+
+ case KEYWORD_IN:
+ // An in operator should not be parsed if we're parsing the head of
+ // a for (...) loop, unless it is in the then part of a conditional
+ // expression, or parenthesized somehow.
+ if ($x->inForLoopInit && !$x->hookLevel &&
!$x->bracketLevel && !$x->curlyLevel &&
!$x->parenLevel
- )
- break 2;
- // FALL THROUGH
- case OP_COMMA:
- // A comma operator should not be parsed if we're parsing the then part
- // of a conditional expression unless it's parenthesized somehow.
- if ($tt == OP_COMMA && $x->hookLevel &&
+ ) {
+ break 2;
+ }
+ // FALL THROUGH
+ case OP_COMMA:
+ // A comma operator should not be parsed if we're parsing the then part
+ // of a conditional expression unless it's parenthesized somehow.
+ if ($tt == OP_COMMA && $x->hookLevel &&
!$x->bracketLevel && !$x->curlyLevel &&
!$x->parenLevel
- )
- break 2;
- // Treat comma as left-associative so reduce can fold left-heavy
- // COMMA trees into a single array.
- // FALL THROUGH
- case OP_OR:
- case OP_AND:
- case OP_BITWISE_OR:
- case OP_BITWISE_XOR:
- case OP_BITWISE_AND:
- case OP_EQ: case OP_NE: case OP_STRICT_EQ: case OP_STRICT_NE:
- case OP_LT: case OP_LE: case OP_GE: case OP_GT:
- case KEYWORD_INSTANCEOF:
- case OP_LSH: case OP_RSH: case OP_URSH:
- case OP_PLUS: case OP_MINUS:
- case OP_MUL: case OP_DIV: case OP_MOD:
- case OP_DOT:
- if ($this->t->scanOperand)
- break 2;
+ ) {
+ break 2;
+ }
+ // Treat comma as left-associative so reduce can fold left-heavy
+ // COMMA trees into a single array.
+ // FALL THROUGH
+ case OP_OR:
+ case OP_AND:
+ case OP_BITWISE_OR:
+ case OP_BITWISE_XOR:
+ case OP_BITWISE_AND:
+ case OP_EQ:
+ case OP_NE:
+ case OP_STRICT_EQ:
+ case OP_STRICT_NE:
+ case OP_LT:
+ case OP_LE:
+ case OP_GE:
+ case OP_GT:
+ case KEYWORD_INSTANCEOF:
+ case OP_LSH:
+ case OP_RSH:
+ case OP_URSH:
+ case OP_PLUS:
+ case OP_MINUS:
+ case OP_MUL:
+ case OP_DIV:
+ case OP_MOD:
+ case OP_DOT:
+ if ($this->t->scanOperand) {
+ break 2;
+ }
- while ( !empty($operators) &&
+ while ( !empty($operators) &&
$this->opPrecedence[end($operators)->type] >= $this->opPrecedence[$tt]
- )
- $this->reduce($operators, $operands);
-
- if ($tt == OP_DOT)
- {
- $this->t->mustMatch(TOKEN_IDENTIFIER);
- array_push($operands, new JSNode($this->t, OP_DOT, array_pop($operands), new JSNode($this->t)));
- }
- else
- {
- array_push($operators, new JSNode($this->t));
- $this->t->scanOperand = true;
- }
- break;
-
- case KEYWORD_DELETE: case KEYWORD_VOID: case KEYWORD_TYPEOF:
- case OP_NOT: case OP_BITWISE_NOT: case OP_UNARY_PLUS: case OP_UNARY_MINUS:
- case KEYWORD_NEW:
- if (!$this->t->scanOperand)
- break 2;
-
- array_push($operators, new JSNode($this->t));
- break;
-
- case OP_INCREMENT: case OP_DECREMENT:
- if ($this->t->scanOperand)
- {
- array_push($operators, new JSNode($this->t)); // prefix increment or decrement
- }
- else
- {
- // Don't cross a line boundary for postfix {in,de}crement.
- $t = $this->t->tokens[($this->t->tokenIndex + $this->t->lookahead - 1) & 3];
- if ($t && $t->lineno != $this->t->lineno)
- break 2;
-
- if (!empty($operators))
- {
- // Use >, not >=, so postfix has higher precedence than prefix.
- while ($this->opPrecedence[end($operators)->type] > $this->opPrecedence[$tt])
- $this->reduce($operators, $operands);
- }
-
- $n = new JSNode($this->t, $tt, array_pop($operands));
- $n->postfix = true;
- array_push($operands, $n);
- }
- break;
-
- case KEYWORD_FUNCTION:
- if (!$this->t->scanOperand)
- break 2;
-
- array_push($operands, $this->FunctionDefinition($x, false, EXPRESSED_FORM));
- $this->t->scanOperand = false;
- break;
-
- case KEYWORD_NULL: case KEYWORD_THIS: case KEYWORD_TRUE: case KEYWORD_FALSE:
- case TOKEN_IDENTIFIER: case TOKEN_NUMBER: case TOKEN_STRING: case TOKEN_REGEXP:
- if (!$this->t->scanOperand)
- break 2;
-
- array_push($operands, new JSNode($this->t));
- $this->t->scanOperand = false;
- break;
-
- case TOKEN_CONDCOMMENT_START:
- case TOKEN_CONDCOMMENT_END:
- if ($this->t->scanOperand)
- array_push($operators, new JSNode($this->t));
- else
- array_push($operands, new JSNode($this->t));
- break;
-
- case OP_LEFT_BRACKET:
- if ($this->t->scanOperand)
- {
- // Array initialiser. Parse using recursive descent, as the
- // sub-grammar here is not an operator grammar.
- $n = new JSNode($this->t, JS_ARRAY_INIT);
- while (($tt = $this->t->peek()) != OP_RIGHT_BRACKET)
- {
- if ($tt == OP_COMMA)
- {
- $this->t->get();
- $n->addNode(null);
- continue;
- }
-
- $n->addNode($this->Expression($x, OP_COMMA));
- if (!$this->t->match(OP_COMMA))
- break;
- }
-
- $this->t->mustMatch(OP_RIGHT_BRACKET);
- array_push($operands, $n);
- $this->t->scanOperand = false;
- }
- else
- {
- // Property indexing operator.
- array_push($operators, new JSNode($this->t, JS_INDEX));
- $this->t->scanOperand = true;
- ++$x->bracketLevel;
- }
- break;
-
- case OP_RIGHT_BRACKET:
- if ($this->t->scanOperand || $x->bracketLevel == $bl)
- break 2;
-
- while ($this->reduce($operators, $operands)->type != JS_INDEX)
- continue;
-
- --$x->bracketLevel;
- break;
-
- case OP_LEFT_CURLY:
- if (!$this->t->scanOperand)
- break 2;
-
- // Object initialiser. As for array initialisers (see above),
- // parse using recursive descent.
- ++$x->curlyLevel;
- $n = new JSNode($this->t, JS_OBJECT_INIT);
- while (!$this->t->match(OP_RIGHT_CURLY))
- {
- do
- {
- $tt = $this->t->get();
- $tv = $this->t->currentToken()->value;
- if (($tv == 'get' || $tv == 'set') && $this->t->peek() == TOKEN_IDENTIFIER)
- {
- if ($x->ecmaStrictMode)
- throw $this->t->newSyntaxError('Illegal property accessor');
-
- $n->addNode($this->FunctionDefinition($x, true, EXPRESSED_FORM));
- }
- else
- {
- switch ($tt)
- {
- case TOKEN_IDENTIFIER:
- case TOKEN_NUMBER:
- case TOKEN_STRING:
- $id = new JSNode($this->t);
- break;
-
- case OP_RIGHT_CURLY:
- if ($x->ecmaStrictMode)
- throw $this->t->newSyntaxError('Illegal trailing ,');
- break 3;
-
- default:
- throw $this->t->newSyntaxError('Invalid property name');
- }
-
- $this->t->mustMatch(OP_COLON);
- $n->addNode(new JSNode($this->t, JS_PROPERTY_INIT, $id, $this->Expression($x, OP_COMMA)));
- }
- }
- while ($this->t->match(OP_COMMA));
-
- $this->t->mustMatch(OP_RIGHT_CURLY);
- break;
- }
-
- array_push($operands, $n);
- $this->t->scanOperand = false;
- --$x->curlyLevel;
- break;
-
- case OP_RIGHT_CURLY:
- if (!$this->t->scanOperand && $x->curlyLevel != $cl)
- throw new Exception('PANIC: right curly botch');
- break 2;
-
- case OP_LEFT_PAREN:
- if ($this->t->scanOperand)
- {
- array_push($operators, new JSNode($this->t, JS_GROUP));
- }
- else
- {
- while ( !empty($operators) &&
+ ) {
+ $this->reduce($operators, $operands);
+ }
+
+ if ($tt == OP_DOT) {
+ $this->t->mustMatch(TOKEN_IDENTIFIER);
+ array_push($operands, new JSNode($this->t, OP_DOT, array_pop($operands), new JSNode($this->t)));
+ }
+ else {
+ array_push($operators, new JSNode($this->t));
+ $this->t->scanOperand = true;
+ }
+ break;
+
+ case KEYWORD_DELETE:
+ case KEYWORD_VOID:
+ case KEYWORD_TYPEOF:
+ case OP_NOT:
+ case OP_BITWISE_NOT:
+ case OP_UNARY_PLUS:
+ case OP_UNARY_MINUS:
+ case KEYWORD_NEW:
+ if (!$this->t->scanOperand) {
+ break 2;
+ }
+
+ array_push($operators, new JSNode($this->t));
+ break;
+
+ case OP_INCREMENT:
+ case OP_DECREMENT:
+ if ($this->t->scanOperand) {
+ array_push($operators, new JSNode($this->t)); // prefix increment or decrement
+ }
+ else {
+ // Don't cross a line boundary for postfix {in,de}crement.
+ $t = $this->t->tokens[($this->t->tokenIndex + $this->t->lookahead - 1) & 3];
+ if ($t && $t->lineno != $this->t->lineno) {
+ break 2;
+ }
+
+ if (!empty($operators)) {
+ // Use >, not >=, so postfix has higher precedence than prefix.
+ while ($this->opPrecedence[end($operators)->type] > $this->opPrecedence[$tt]) {
+ $this->reduce($operators, $operands);
+ }
+ }
+
+ $n = new JSNode($this->t, $tt, array_pop($operands));
+ $n->postfix = true;
+ array_push($operands, $n);
+ }
+ break;
+
+ case KEYWORD_FUNCTION:
+ if (!$this->t->scanOperand) {
+ break 2;
+ }
+
+ array_push($operands, $this->FunctionDefinition($x, false, EXPRESSED_FORM));
+ $this->t->scanOperand = false;
+ break;
+
+ case KEYWORD_NULL:
+ case KEYWORD_THIS:
+ case KEYWORD_TRUE:
+ case KEYWORD_FALSE:
+ case TOKEN_IDENTIFIER:
+ case TOKEN_NUMBER:
+ case TOKEN_STRING:
+ case TOKEN_REGEXP:
+ if (!$this->t->scanOperand) {
+ break 2;
+ }
+
+ array_push($operands, new JSNode($this->t));
+ $this->t->scanOperand = false;
+ break;
+
+ case TOKEN_CONDCOMMENT_START:
+ case TOKEN_CONDCOMMENT_END:
+ if ($this->t->scanOperand) {
+ array_push($operators, new JSNode($this->t));
+ }
+ else {
+ array_push($operands, new JSNode($this->t));
+ }
+ break;
+
+ case OP_LEFT_BRACKET:
+ if ($this->t->scanOperand) {
+ // Array initialiser. Parse using recursive descent, as the
+ // sub-grammar here is not an operator grammar.
+ $n = new JSNode($this->t, JS_ARRAY_INIT);
+ while (($tt = $this->t->peek()) != OP_RIGHT_BRACKET) {
+ if ($tt == OP_COMMA) {
+ $this->t->get();
+ $n->addNode(null);
+ continue;
+ }
+
+ $n->addNode($this->Expression($x, OP_COMMA));
+ if (!$this->t->match(OP_COMMA)) {
+ break;
+ }
+ }
+
+ $this->t->mustMatch(OP_RIGHT_BRACKET);
+ array_push($operands, $n);
+ $this->t->scanOperand = false;
+ }
+ else {
+ // Property indexing operator.
+ array_push($operators, new JSNode($this->t, JS_INDEX));
+ $this->t->scanOperand = true;
+ ++$x->bracketLevel;
+ }
+ break;
+
+ case OP_RIGHT_BRACKET:
+ if ($this->t->scanOperand || $x->bracketLevel == $bl) {
+ break 2;
+ }
+
+ while ($this->reduce($operators, $operands)->type != JS_INDEX) {
+ continue;
+ }
+
+ --$x->bracketLevel;
+ break;
+
+ case OP_LEFT_CURLY:
+ if (!$this->t->scanOperand) {
+ break 2;
+ }
+
+ // Object initialiser. As for array initialisers (see above),
+ // parse using recursive descent.
+ ++$x->curlyLevel;
+ $n = new JSNode($this->t, JS_OBJECT_INIT);
+ while (!$this->t->match(OP_RIGHT_CURLY)) {
+ do {
+ $tt = $this->t->get();
+ $tv = $this->t->currentToken()->value;
+ if (($tv == 'get' || $tv == 'set') && $this->t->peek() == TOKEN_IDENTIFIER) {
+ if ($x->ecmaStrictMode) {
+ throw $this->t->newSyntaxError('Illegal property accessor');
+ }
+
+ $n->addNode($this->FunctionDefinition($x, true, EXPRESSED_FORM));
+ }
+ else {
+ switch ($tt) {
+ case TOKEN_IDENTIFIER:
+ case TOKEN_NUMBER:
+ case TOKEN_STRING:
+ $id = new JSNode($this->t);
+ break;
+
+ case OP_RIGHT_CURLY:
+ if ($x->ecmaStrictMode) {
+ throw $this->t->newSyntaxError('Illegal trailing ,');
+ }
+ break 3;
+
+ default:
+ throw $this->t->newSyntaxError('Invalid property name');
+ }
+
+ $this->t->mustMatch(OP_COLON);
+ $n->addNode(new JSNode($this->t, JS_PROPERTY_INIT, $id, $this->Expression($x, OP_COMMA)));
+ }
+ } while ($this->t->match(OP_COMMA));
+
+ $this->t->mustMatch(OP_RIGHT_CURLY);
+ break;
+ }
+
+ array_push($operands, $n);
+ $this->t->scanOperand = false;
+ --$x->curlyLevel;
+ break;
+
+ case OP_RIGHT_CURLY:
+ if (!$this->t->scanOperand && $x->curlyLevel != $cl) {
+ throw new Exception('PANIC: right curly botch');
+ }
+ break 2;
+
+ case OP_LEFT_PAREN:
+ if ($this->t->scanOperand) {
+ array_push($operators, new JSNode($this->t, JS_GROUP));
+ }
+ else {
+ while ( !empty($operators) &&
$this->opPrecedence[end($operators)->type] > $this->opPrecedence[KEYWORD_NEW]
- )
- $this->reduce($operators, $operands);
-
- // Handle () now, to regularize the n-ary case for n > 0.
- // We must set scanOperand in case there are arguments and
- // the first one is a regexp or unary+/-.
- $n = end($operators);
- $this->t->scanOperand = true;
- if ($this->t->match(OP_RIGHT_PAREN))
- {
- if ($n && $n->type == KEYWORD_NEW)
- {
- array_pop($operators);
- $n->addNode(array_pop($operands));
- }
- else
- {
- $n = new JSNode($this->t, JS_CALL, array_pop($operands), new JSNode($this->t, JS_LIST));
- }
-
- array_push($operands, $n);
- $this->t->scanOperand = false;
- break;
- }
-
- if ($n && $n->type == KEYWORD_NEW)
- $n->type = JS_NEW_WITH_ARGS;
- else
- array_push($operators, new JSNode($this->t, JS_CALL));
- }
-
- ++$x->parenLevel;
- break;
-
- case OP_RIGHT_PAREN:
- if ($this->t->scanOperand || $x->parenLevel == $pl)
- break 2;
+ ) {
+ $this->reduce($operators, $operands);
+ }
+
+ // Handle () now, to regularize the n-ary case for n > 0.
+ // We must set scanOperand in case there are arguments and
+ // the first one is a regexp or unary+/-.
+ $n = end($operators);
+ $this->t->scanOperand = true;
+ if ($this->t->match(OP_RIGHT_PAREN)) {
+ if ($n && $n->type == KEYWORD_NEW) {
+ array_pop($operators);
+ $n->addNode(array_pop($operands));
+ }
+ else {
+ $n = new JSNode($this->t, JS_CALL, array_pop($operands), new JSNode($this->t, JS_LIST));
+ }
+
+ array_push($operands, $n);
+ $this->t->scanOperand = false;
+ break;
+ }
+
+ if ($n && $n->type == KEYWORD_NEW) {
+ $n->type = JS_NEW_WITH_ARGS;
+ }
+ else {
+ array_push($operators, new JSNode($this->t, JS_CALL));
+ }
+ }
+
+ ++$x->parenLevel;
+ break;
+
+ case OP_RIGHT_PAREN:
+ if ($this->t->scanOperand || $x->parenLevel == $pl) {
+ break 2;
+ }
- while (($tt = $this->reduce($operators, $operands)->type) != JS_GROUP &&
+ while (($tt = $this->reduce($operators, $operands)->type) != JS_GROUP &&
$tt != JS_CALL && $tt != JS_NEW_WITH_ARGS
- )
- {
- continue;
- }
-
- if ($tt != JS_GROUP)
- {
- $n = end($operands);
- if ($n->treeNodes[1]->type != OP_COMMA)
- $n->treeNodes[1] = new JSNode($this->t, JS_LIST, $n->treeNodes[1]);
- else
- $n->treeNodes[1]->type = JS_LIST;
- }
-
- --$x->parenLevel;
- break;
-
- // Automatic semicolon insertion means we may scan across a newline
- // and into the beginning of another statement. If so, break out of
- // the while loop and let the t.scanOperand logic handle errors.
- default:
- break 2;
- }
- }
-
- if ($x->hookLevel != $hl)
- throw $this->t->newSyntaxError('Missing : in conditional expression');
-
- if ($x->parenLevel != $pl)
- throw $this->t->newSyntaxError('Missing ) in parenthetical');
-
- if ($x->bracketLevel != $bl)
- throw $this->t->newSyntaxError('Missing ] in index expression');
-
- if ($this->t->scanOperand)
- throw $this->t->newSyntaxError('Missing operand');
-
- // Resume default mode, scanning for operands, not operators.
- $this->t->scanOperand = true;
- $this->t->unget();
-
- while (count($operators))
- $this->reduce($operators, $operands);
-
- return array_pop($operands);
- }
-
- private function ParenExpression($x)
- {
- $this->t->mustMatch(OP_LEFT_PAREN);
- $n = $this->Expression($x);
- $this->t->mustMatch(OP_RIGHT_PAREN);
-
- return $n;
- }
-
- // Statement stack and nested statement handler.
- private function nest($x, $node, $end = false)
- {
- array_push($x->stmtStack, $node);
- $n = $this->statement($x);
- array_pop($x->stmtStack);
-
- if ($end)
- $this->t->mustMatch($end);
-
- return $n;
- }
-
- private function reduce(&$operators, &$operands)
- {
- $n = array_pop($operators);
- $op = $n->type;
- $arity = $this->opArity[$op];
- $c = count($operands);
- if ($arity == -2)
- {
- // Flatten left-associative trees
- if ($c >= 2)
- {
- $left = $operands[$c - 2];
- if ($left->type == $op)
- {
- $right = array_pop($operands);
- $left->addNode($right);
- return $left;
- }
- }
- $arity = 2;
- }
-
- // Always use push to add operands to n, to update start and end
- $a = array_splice($operands, $c - $arity);
- for ($i = 0; $i < $arity; $i++)
- $n->addNode($a[$i]);
-
- // Include closing bracket or postfix operator in [start,end]
- $te = $this->t->currentToken()->end;
- if ($n->end < $te)
- $n->end = $te;
+ ) {
+ continue;
+ }
+
+ if ($tt != JS_GROUP) {
+ $n = end($operands);
+ if ($n->treeNodes[1]->type != OP_COMMA) {
+ $n->treeNodes[1] = new JSNode($this->t, JS_LIST, $n->treeNodes[1]);
+ }
+ else {
+ $n->treeNodes[1]->type = JS_LIST;
+ }
+ }
+
+ --$x->parenLevel;
+ break;
+
+ // Automatic semicolon insertion means we may scan across a newline
+ // and into the beginning of another statement. If so, break out of
+ // the while loop and let the t.scanOperand logic handle errors.
+ default:
+ break 2;
+ }
+ }
+
+ if ($x->hookLevel != $hl) {
+ throw $this->t->newSyntaxError('Missing : in conditional expression');
+ }
+
+ if ($x->parenLevel != $pl) {
+ throw $this->t->newSyntaxError('Missing ) in parenthetical');
+ }
+
+ if ($x->bracketLevel != $bl) {
+ throw $this->t->newSyntaxError('Missing ] in index expression');
+ }
+
+ if ($this->t->scanOperand) {
+ throw $this->t->newSyntaxError('Missing operand');
+ }
+
+ // Resume default mode, scanning for operands, not operators.
+ $this->t->scanOperand = true;
+ $this->t->unget();
+
+ while (count($operators)) {
+ $this->reduce($operators, $operands);
+ }
+
+ return array_pop($operands);
+ }
+
+ private function ParenExpression($x) {
+ $this->t->mustMatch(OP_LEFT_PAREN);
+ $n = $this->Expression($x);
+ $this->t->mustMatch(OP_RIGHT_PAREN);
+
+ return $n;
+ }
+
+ // Statement stack and nested statement handler.
+ private function nest($x, $node, $end = false) {
+ array_push($x->stmtStack, $node);
+ $n = $this->statement($x);
+ array_pop($x->stmtStack);
+
+ if ($end) {
+ $this->t->mustMatch($end);
+ }
+
+ return $n;
+ }
+
+ private function reduce(&$operators, &$operands) {
+ $n = array_pop($operators);
+ $op = $n->type;
+ $arity = $this->opArity[$op];
+ $c = count($operands);
+ if ($arity == -2) {
+ // Flatten left-associative trees
+ if ($c >= 2) {
+ $left = $operands[$c - 2];
+ if ($left->type == $op) {
+ $right = array_pop($operands);
+ $left->addNode($right);
+ return $left;
+ }
+ }
+ $arity = 2;
+ }
+
+ // Always use push to add operands to n, to update start and end
+ $a = array_splice($operands, $c - $arity);
+ for ($i = 0; $i < $arity; $i++) {
+ $n->addNode($a[$i]);
+ }
+
+ // Include closing bracket or postfix operator in [start,end]
+ $te = $this->t->currentToken()->end;
+ if ($n->end < $te) {
+ $n->end = $te;
+ }
- array_push($operands, $n);
+ array_push($operands, $n);
- return $n;
- }
+ return $n;
+ }
}
-class JSCompilerContext
-{
- public $inFunction = false;
- public $inForLoopInit = false;
- public $ecmaStrictMode = false;
- public $bracketLevel = 0;
- public $curlyLevel = 0;
- public $parenLevel = 0;
- public $hookLevel = 0;
-
- public $stmtStack = array();
- public $funDecls = array();
- public $varDecls = array();
-
- public function __construct($inFunction)
- {
- $this->inFunction = $inFunction;
- }
+class JSCompilerContext {
+ public $inFunction = false;
+ public $inForLoopInit = false;
+ public $ecmaStrictMode = false;
+ public $bracketLevel = 0;
+ public $curlyLevel = 0;
+ public $parenLevel = 0;
+ public $hookLevel = 0;
+
+ public $stmtStack = array();
+ public $funDecls = array();
+ public $varDecls = array();
+
+ public function __construct($inFunction) {
+ $this->inFunction = $inFunction;
+ }
}
-class JSNode
-{
- private $type;
- private $value;
- private $lineno;
- private $start;
- private $end;
-
- public $treeNodes = array();
- public $funDecls = array();
- public $varDecls = array();
-
- public function __construct($t, $type=0)
- {
- if ($token = $t->currentToken())
- {
- $this->type = $type ? $type : $token->type;
- $this->value = $token->value;
- $this->lineno = $token->lineno;
- $this->start = $token->start;
- $this->end = $token->end;
- }
- else
- {
- $this->type = $type;
- $this->lineno = $t->lineno;
- }
-
- if (($numargs = func_num_args()) > 2)
- {
- $args = func_get_args();
- for ($i = 2; $i < $numargs; $i++)
- $this->addNode($args[$i]);
- }
- }
-
- // we don't want to bloat our object with all kind of specific properties, so we use overloading
- public function __set($name, $value)
- {
- $this->$name = $value;
- }
-
- public function __get($name)
- {
- if (isset($this->$name))
- return $this->$name;
-
- return null;
- }
-
- public function addNode($node)
- {
- if ($node !== null)
- {
- if ($node->start < $this->start)
- $this->start = $node->start;
- if ($this->end < $node->end)
- $this->end = $node->end;
- }
+class JSNode {
+ private $type;
+ private $value;
+ private $lineno;
+ private $start;
+ private $end;
+
+ public $treeNodes = array();
+ public $funDecls = array();
+ public $varDecls = array();
+
+ public function __construct($t, $type = 0) {
+ if ($token = $t->currentToken()) {
+ $this->type = $type ? $type : $token->type;
+ $this->value = $token->value;
+ $this->lineno = $token->lineno;
+ $this->start = $token->start;
+ $this->end = $token->end;
+ }
+ else {
+ $this->type = $type;
+ $this->lineno = $t->lineno;
+ }
+
+ if (($numargs = func_num_args()) > 2) {
+ $args = func_get_args();
+ for ($i = 2; $i < $numargs; $i++) {
+ $this->addNode($args[$i]);
+ }
+ }
+ }
+
+ // we don't want to bloat our object with all kind of specific properties, so we use overloading
+ public function __set($name, $value) {
+ $this->$name = $value;
+ }
+
+ public function __get($name) {
+ if (isset($this->$name)) {
+ return $this->$name;
+ }
+
+ return null;
+ }
+
+ public function addNode($node) {
+ if ($node !== null) {
+ if ($node->start < $this->start) {
+ $this->start = $node->start;
+ }
+ if ($this->end < $node->end) {
+ $this->end = $node->end;
+ }
+ }
- $this->treeNodes[] = $node;
- }
+ $this->treeNodes[] = $node;
+ }
}
-class JSTokenizer
-{
- private $cursor = 0;
- private $source;
-
- public $tokens = array();
- public $tokenIndex = 0;
- public $lookahead = 0;
- public $scanNewlines = false;
- public $scanOperand = true;
-
- public $filename;
- public $lineno;
-
- private $keywords = array(
- 'break',
- 'case', 'catch', 'const', 'continue',
- 'debugger', 'default', 'delete', 'do',
- 'else', 'enum',
- 'false', 'finally', 'for', 'function',
- 'if', 'in', 'instanceof',
- 'new', 'null',
- 'return',
- 'switch',
- 'this', 'throw', 'true', 'try', 'typeof',
- 'var', 'void',
- 'while', 'with'
- );
-
- private $opTypeNames = array(
- ';', ',', '?', ':', '||', '&&', '|', '^',
- '&', '===', '==', '=', '!==', '!=', '<<', '<=',
- '<', '>>>', '>>', '>=', '>', '++', '--', '+',
- '-', '*', '/', '%', '!', '~', '.', '[',
- ']', '{', '}', '(', ')', '@*/'
- );
-
- private $assignOps = array('|', '^', '&', '<<', '>>', '>>>', '+', '-', '*', '/', '%');
- private $opRegExp;
-
- public function __construct()
- {
- $this->opRegExp = '#^(' . implode('|', array_map('preg_quote', $this->opTypeNames)) . ')#';
- }
-
- public function init($source, $filename = '', $lineno = 1)
- {
- $this->source = $source;
- $this->filename = $filename ? $filename : '[inline]';
- $this->lineno = $lineno;
-
- $this->cursor = 0;
- $this->tokens = array();
- $this->tokenIndex = 0;
- $this->lookahead = 0;
- $this->scanNewlines = false;
- $this->scanOperand = true;
- }
-
- public function getInput($chunksize)
- {
- if ($chunksize)
- return substr($this->source, $this->cursor, $chunksize);
-
- return substr($this->source, $this->cursor);
- }
-
- public function isDone()
- {
- return $this->peek() == TOKEN_END;
- }
-
- public function match($tt)
- {
- return $this->get() == $tt || $this->unget();
- }
-
- public function mustMatch($tt)
- {
- if (!$this->match($tt))
- throw $this->newSyntaxError('Unexpected token; token ' . $tt . ' expected');
-
- return $this->currentToken();
- }
-
- public function peek()
- {
- if ($this->lookahead)
- {
- $next = $this->tokens[($this->tokenIndex + $this->lookahead) & 3];
- if ($this->scanNewlines && $next->lineno != $this->lineno)
- $tt = TOKEN_NEWLINE;
- else
- $tt = $next->type;
- }
- else
- {
- $tt = $this->get();
- $this->unget();
- }
-
- return $tt;
- }
-
- public function peekOnSameLine()
- {
- $this->scanNewlines = true;
- $tt = $this->peek();
- $this->scanNewlines = false;
-
- return $tt;
- }
-
- public function currentToken()
- {
- if (!empty($this->tokens))
- return $this->tokens[$this->tokenIndex];
- }
-
- public function get($chunksize = 1000)
- {
- while($this->lookahead)
- {
- $this->lookahead--;
- $this->tokenIndex = ($this->tokenIndex + 1) & 3;
- $token = $this->tokens[$this->tokenIndex];
- if ($token->type != TOKEN_NEWLINE || $this->scanNewlines)
- return $token->type;
- }
-
- $conditional_comment = false;
-
- // strip whitespace and comments
- while(true)
- {
- $input = $this->getInput($chunksize);
-
- // whitespace handling; gobble up \r as well (effectively we don't have support for MAC newlines!)
- $re = $this->scanNewlines ? '/^[ \r\t]+/' : '/^\s+/';
- if (preg_match($re, $input, $match))
- {
- $spaces = $match[0];
- $spacelen = strlen($spaces);
- $this->cursor += $spacelen;
- if (!$this->scanNewlines)
- $this->lineno += substr_count($spaces, "\n");
-
- if ($spacelen == $chunksize)
- continue; // complete chunk contained whitespace
-
- $input = $this->getInput($chunksize);
- if ($input == '' || $input[0] != '/')
- break;
- }
-
- // Comments
- if (!preg_match('/^\/(?:\*(@(?:cc_on|if|elif|else|end))?.*?\*\/|\/[^\n]*)/s', $input, $match))
- {
- if (!$chunksize)
- break;
-
- // retry with a full chunk fetch; this also prevents breakage of long regular expressions (which will never match a comment)
- $chunksize = null;
- continue;
- }
-
- // check if this is a conditional (JScript) comment
- if (!empty($match[1]))
- {
- $match[0] = '/*' . $match[1];
- $conditional_comment = true;
- break;
- }
- else
- {
- $this->cursor += strlen($match[0]);
- $this->lineno += substr_count($match[0], "\n");
- }
- }
-
- if ($input == '')
- {
- $tt = TOKEN_END;
- $match = array('');
- }
- elseif ($conditional_comment)
- {
- $tt = TOKEN_CONDCOMMENT_START;
- }
- else
- {
- switch ($input[0])
- {
- case '0':
- // hexadecimal
- if (($input[1] == 'x' || $input[1] == 'X') && preg_match('/^0x[0-9a-f]+/i', $input, $match))
- {
- $tt = TOKEN_NUMBER;
- break;
- }
- // FALL THROUGH
-
- case '1': case '2': case '3': case '4': case '5':
- case '6': case '7': case '8': case '9':
- // should always match
- preg_match('/^\d+(?:\.\d*)?(?:[eE][-+]?\d+)?/', $input, $match);
- $tt = TOKEN_NUMBER;
- break;
-
- case "'":
- if (preg_match('/^\'(?:[^\\\\\'\r\n]++|\\\\(?:.|\r?\n))*\'/', $input, $match))
- {
- $tt = TOKEN_STRING;
- }
- else
- {
- if ($chunksize)
- return $this->get(null); // retry with a full chunk fetch
-
- throw $this->newSyntaxError('Unterminated string literal');
- }
- break;
-
- case '"':
- if (preg_match('/^"(?:[^\\\\"\r\n]++|\\\\(?:.|\r?\n))*"/', $input, $match))
- {
- $tt = TOKEN_STRING;
- }
- else
- {
- if ($chunksize)
- return $this->get(null); // retry with a full chunk fetch
-
- throw $this->newSyntaxError('Unterminated string literal');
- }
- break;
-
- case '/':
- if ($this->scanOperand && preg_match('/^\/((?:\\\\.|\[(?:\\\\.|[^\]])*\]|[^\/])+)\/([gimy]*)/', $input, $match))
- {
- $tt = TOKEN_REGEXP;
- break;
- }
- // FALL THROUGH
-
- case '|':
- case '^':
- case '&':
- case '<':
- case '>':
- case '+':
- case '-':
- case '*':
- case '%':
- case '=':
- case '!':
- // should always match
- preg_match($this->opRegExp, $input, $match);
- $op = $match[0];
- if (in_array($op, $this->assignOps) && $input[strlen($op)] == '=')
- {
- $tt = OP_ASSIGN;
- $match[0] .= '=';
- }
- else
- {
- $tt = $op;
- if ($this->scanOperand)
- {
- if ($op == OP_PLUS)
- $tt = OP_UNARY_PLUS;
- elseif ($op == OP_MINUS)
- $tt = OP_UNARY_MINUS;
- }
- $op = null;
- }
- break;
-
- case '.':
- if (preg_match('/^\.\d+(?:[eE][-+]?\d+)?/', $input, $match))
- {
- $tt = TOKEN_NUMBER;
- break;
- }
- // FALL THROUGH
-
- case ';':
- case ',':
- case '?':
- case ':':
- case '~':
- case '[':
- case ']':
- case '{':
- case '}':
- case '(':
- case ')':
- // these are all single
- $match = array($input[0]);
- $tt = $input[0];
- break;
-
- case '@':
- // check end of conditional comment
- if (substr($input, 0, 3) == '@*/')
- {
- $match = array('@*/');
- $tt = TOKEN_CONDCOMMENT_END;
- }
- else
- throw $this->newSyntaxError('Illegal token');
- break;
-
- case "\n":
- if ($this->scanNewlines)
- {
- $match = array("\n");
- $tt = TOKEN_NEWLINE;
- }
- else
- throw $this->newSyntaxError('Illegal token');
- break;
-
- default:
- // FIXME: add support for unicode and unicode escape sequence \uHHHH
- if (preg_match('/^[$\w]+/', $input, $match))
- {
- $tt = in_array($match[0], $this->keywords) ? $match[0] : TOKEN_IDENTIFIER;
- }
- else
- throw $this->newSyntaxError('Illegal token');
- }
- }
-
- $this->tokenIndex = ($this->tokenIndex + 1) & 3;
-
- if (!isset($this->tokens[$this->tokenIndex]))
- $this->tokens[$this->tokenIndex] = new JSToken();
-
- $token = $this->tokens[$this->tokenIndex];
- $token->type = $tt;
-
- if ($tt == OP_ASSIGN)
- $token->assignOp = $op;
-
- $token->start = $this->cursor;
-
- $token->value = $match[0];
- $this->cursor += strlen($match[0]);
-
- $token->end = $this->cursor;
- $token->lineno = $this->lineno;
-
- return $tt;
- }
-
- public function unget()
- {
- if (++$this->lookahead == 4)
- throw $this->newSyntaxError('PANIC: too much lookahead!');
-
- $this->tokenIndex = ($this->tokenIndex - 1) & 3;
- }
-
- public function newSyntaxError($m)
- {
- return new Exception('Parse error: ' . $m . ' in file \'' . $this->filename . '\' on line ' . $this->lineno);
- }
+class JSTokenizer {
+ private $cursor = 0;
+ private $source;
+
+ public $tokens = array();
+ public $tokenIndex = 0;
+ public $lookahead = 0;
+ public $scanNewlines = false;
+ public $scanOperand = true;
+
+ public $filename;
+ public $lineno;
+
+ private $keywords = array(
+ 'break',
+ 'case',
+ 'catch',
+ 'const',
+ 'continue',
+ 'debugger',
+ 'default',
+ 'delete',
+ 'do',
+ 'else',
+ 'enum',
+ 'false',
+ 'finally',
+ 'for',
+ 'function',
+ 'if',
+ 'in',
+ 'instanceof',
+ 'new',
+ 'null',
+ 'return',
+ 'switch',
+ 'this',
+ 'throw',
+ 'true',
+ 'try',
+ 'typeof',
+ 'var',
+ 'void',
+ 'while',
+ 'with',
+ );
+
+ private $opTypeNames = array(
+ ';',
+ ',',
+ '?',
+ ':',
+ '||',
+ '&&',
+ '|',
+ '^',
+ '&',
+ '===',
+ '==',
+ '=',
+ '!==',
+ '!=',
+ '<<',
+ '<=',
+ '<',
+ '>>>',
+ '>>',
+ '>=',
+ '>',
+ '++',
+ '--',
+ '+',
+ '-',
+ '*',
+ '/',
+ '%',
+ '!',
+ '~',
+ '.',
+ '[',
+ ']',
+ '{',
+ '}',
+ '(',
+ ')',
+ '@*/',
+ );
+
+ private $assignOps = array('|', '^', '&', '<<', '>>', '>>>', '+', '-', '*', '/', '%');
+ private $opRegExp;
+
+ public function __construct() {
+ $this->opRegExp = '#^(' . implode('|', array_map('preg_quote', $this->opTypeNames)) . ')#';
+ }
+
+ public function init($source, $filename = '', $lineno = 1) {
+ $this->source = $source;
+ $this->filename = $filename ? $filename : '[inline]';
+ $this->lineno = $lineno;
+
+ $this->cursor = 0;
+ $this->tokens = array();
+ $this->tokenIndex = 0;
+ $this->lookahead = 0;
+ $this->scanNewlines = false;
+ $this->scanOperand = true;
+ }
+
+ public function getInput($chunksize) {
+ if ($chunksize) {
+ return substr($this->source, $this->cursor, $chunksize);
+ }
+
+ return substr($this->source, $this->cursor);
+ }
+
+ public function isDone() {
+ return $this->peek() == TOKEN_END;
+ }
+
+ public function match($tt) {
+ return $this->get() == $tt || $this->unget();
+ }
+
+ public function mustMatch($tt) {
+ if (!$this->match($tt)) {
+ throw $this->newSyntaxError('Unexpected token; token ' . $tt . ' expected');
+ }
+
+ return $this->currentToken();
+ }
+
+ public function peek() {
+ if ($this->lookahead) {
+ $next = $this->tokens[($this->tokenIndex + $this->lookahead) & 3];
+ if ($this->scanNewlines && $next->lineno != $this->lineno) {
+ $tt = TOKEN_NEWLINE;
+ }
+ else {
+ $tt = $next->type;
+ }
+ }
+ else {
+ $tt = $this->get();
+ $this->unget();
+ }
+
+ return $tt;
+ }
+
+ public function peekOnSameLine() {
+ $this->scanNewlines = true;
+ $tt = $this->peek();
+ $this->scanNewlines = false;
+
+ return $tt;
+ }
+
+ public function currentToken() {
+ if (!empty($this->tokens)) {
+ return $this->tokens[$this->tokenIndex];
+ }
+ }
+
+ public function get($chunksize = 1000) {
+ while ($this->lookahead) {
+ $this->lookahead--;
+ $this->tokenIndex = ($this->tokenIndex + 1) & 3;
+ $token = $this->tokens[$this->tokenIndex];
+ if ($token->type != TOKEN_NEWLINE || $this->scanNewlines) {
+ return $token->type;
+ }
+ }
+
+ $conditional_comment = false;
+
+ // strip whitespace and comments
+ while (true) {
+ $input = $this->getInput($chunksize);
+
+ // whitespace handling; gobble up \r as well (effectively we don't have support for MAC newlines!)
+ $re = $this->scanNewlines ? '/^[ \r\t]+/' : '/^\s+/';
+ if (preg_match($re, $input, $match)) {
+ $spaces = $match[0];
+ $spacelen = strlen($spaces);
+ $this->cursor += $spacelen;
+ if (!$this->scanNewlines) {
+ $this->lineno += substr_count($spaces, "\n");
+ }
+
+ if ($spacelen == $chunksize) {
+ continue; // complete chunk contained whitespace
+ }
+
+ $input = $this->getInput($chunksize);
+ if ($input == '' || $input[0] != '/') {
+ break;
+ }
+ }
+
+ // Comments
+ if (!preg_match('/^\/(?:\*(@(?:cc_on|if|elif|else|end))?.*?\*\/|\/[^\n]*)/s', $input, $match)) {
+ if (!$chunksize) {
+ break;
+ }
+
+ // retry with a full chunk fetch; this also prevents breakage of long regular expressions (which will never match a comment)
+ $chunksize = null;
+ continue;
+ }
+
+ // check if this is a conditional (JScript) comment
+ if (!empty($match[1])) {
+ $match[0] = '/*' . $match[1];
+ $conditional_comment = true;
+ break;
+ }
+ else {
+ $this->cursor += strlen($match[0]);
+ $this->lineno += substr_count($match[0], "\n");
+ }
+ }
+
+ if ($input == '') {
+ $tt = TOKEN_END;
+ $match = array('');
+ }
+ elseif ($conditional_comment) {
+ $tt = TOKEN_CONDCOMMENT_START;
+ }
+ else {
+ switch ($input[0]) {
+ case '0':
+ // hexadecimal
+ if (($input[1] == 'x' || $input[1] == 'X') && preg_match('/^0x[0-9a-f]+/i', $input, $match)) {
+ $tt = TOKEN_NUMBER;
+ break;
+ }
+ // FALL THROUGH
+
+ case '1':
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9':
+ // should always match
+ preg_match('/^\d+(?:\.\d*)?(?:[eE][-+]?\d+)?/', $input, $match);
+ $tt = TOKEN_NUMBER;
+ break;
+
+ case "'":
+ if (preg_match('/^\'(?:[^\\\\\'\r\n]++|\\\\(?:.|\r?\n))*\'/', $input, $match)) {
+ $tt = TOKEN_STRING;
+ }
+ else {
+ if ($chunksize) {
+ return $this->get(null); // retry with a full chunk fetch
+ }
+
+ throw $this->newSyntaxError('Unterminated string literal');
+ }
+ break;
+
+ case '"':
+ if (preg_match('/^"(?:[^\\\\"\r\n]++|\\\\(?:.|\r?\n))*"/', $input, $match)) {
+ $tt = TOKEN_STRING;
+ }
+ else {
+ if ($chunksize) {
+ return $this->get(null); // retry with a full chunk fetch
+ }
+
+ throw $this->newSyntaxError('Unterminated string literal');
+ }
+ break;
+
+ case '/':
+ if ($this->scanOperand && preg_match('/^\/((?:\\\\.|\[(?:\\\\.|[^\]])*\]|[^\/])+)\/([gimy]*)/', $input, $match)) {
+ $tt = TOKEN_REGEXP;
+ break;
+ }
+ // FALL THROUGH
+
+ case '|':
+ case '^':
+ case '&':
+ case '<':
+ case '>':
+ case '+':
+ case '-':
+ case '*':
+ case '%':
+ case '=':
+ case '!':
+ // should always match
+ preg_match($this->opRegExp, $input, $match);
+ $op = $match[0];
+ if (in_array($op, $this->assignOps) && $input[strlen($op)] == '=') {
+ $tt = OP_ASSIGN;
+ $match[0] .= '=';
+ }
+ else {
+ $tt = $op;
+ if ($this->scanOperand) {
+ if ($op == OP_PLUS) {
+ $tt = OP_UNARY_PLUS;
+ }
+ elseif ($op == OP_MINUS) {
+ $tt = OP_UNARY_MINUS;
+ }
+ }
+ $op = null;
+ }
+ break;
+
+ case '.':
+ if (preg_match('/^\.\d+(?:[eE][-+]?\d+)?/', $input, $match)) {
+ $tt = TOKEN_NUMBER;
+ break;
+ }
+ // FALL THROUGH
+
+ case ';':
+ case ',':
+ case '?':
+ case ':':
+ case '~':
+ case '[':
+ case ']':
+ case '{':
+ case '}':
+ case '(':
+ case ')':
+ // these are all single
+ $match = array($input[0]);
+ $tt = $input[0];
+ break;
+
+ case '@':
+ // check end of conditional comment
+ if (substr($input, 0, 3) == '@*/') {
+ $match = array('@*/');
+ $tt = TOKEN_CONDCOMMENT_END;
+ }
+ else {
+ throw $this->newSyntaxError('Illegal token');
+ }
+ break;
+
+ case "\n":
+ if ($this->scanNewlines) {
+ $match = array("\n");
+ $tt = TOKEN_NEWLINE;
+ }
+ else {
+ throw $this->newSyntaxError('Illegal token');
+ }
+ break;
+
+ default:
+ // FIXME: add support for unicode and unicode escape sequence \uHHHH
+ if (preg_match('/^[$\w]+/', $input, $match)) {
+ $tt = in_array($match[0], $this->keywords) ? $match[0] : TOKEN_IDENTIFIER;
+ }
+ else {
+ throw $this->newSyntaxError('Illegal token');
+ }
+ }
+ }
+
+ $this->tokenIndex = ($this->tokenIndex + 1) & 3;
+
+ if (!isset($this->tokens[$this->tokenIndex])) {
+ $this->tokens[$this->tokenIndex] = new JSToken();
+ }
+
+ $token = $this->tokens[$this->tokenIndex];
+ $token->type = $tt;
+
+ if ($tt == OP_ASSIGN) {
+ $token->assignOp = $op;
+ }
+
+ $token->start = $this->cursor;
+
+ $token->value = $match[0];
+ $this->cursor += strlen($match[0]);
+
+ $token->end = $this->cursor;
+ $token->lineno = $this->lineno;
+
+ return $tt;
+ }
+
+ public function unget() {
+ if (++$this->lookahead == 4) {
+ throw $this->newSyntaxError('PANIC: too much lookahead!');
+ }
+
+ $this->tokenIndex = ($this->tokenIndex - 1) & 3;
+ }
+
+ public function newSyntaxError($m) {
+ return new Exception('Parse error: ' . $m . ' in file \'' . $this->filename . '\' on line ' . $this->lineno);
+ }
}
-class JSToken
-{
- public $type;
- public $value;
- public $start;
- public $end;
- public $lineno;
- public $assignOp;
+class JSToken {
+ public $type;
+ public $value;
+ public $start;
+ public $end;
+ public $lineno;
+ public $assignOp;
}
diff -up -r advagg_js_compress/jspacker.inc advagg_js_compress/jspacker.inc
--- advagg_js_compress/jspacker.inc 2012-03-23 12:08:13.000000000 -0600
+++ advagg_js_compress/jspacker.inc 2012-03-23 13:02:24.000000000 -0600
@@ -67,392 +67,413 @@
class JavaScriptPacker {
- // constants
- const IGNORE = '$1';
+ // constants
+ const IGNORE = '$1';
- // validate parameters
- private $_script = '';
- private $_encoding = 62;
- private $_fastDecode = true;
- private $_specialChars = false;
-
- private $LITERAL_ENCODING = array(
- 'None' => 0,
- 'Numeric' => 10,
- 'Normal' => 62,
- 'High ASCII' => 95
- );
-
- public function __construct($_script, $_encoding = 62, $_fastDecode = true, $_specialChars = false)
- {
- $this->_script = $_script . "\n";
- if (array_key_exists($_encoding, $this->LITERAL_ENCODING))
- $_encoding = $this->LITERAL_ENCODING[$_encoding];
- $this->_encoding = min((int)$_encoding, 95);
- $this->_fastDecode = $_fastDecode;
- $this->_specialChars = $_specialChars;
- }
-
- public function pack() {
- $this->_addParser('_basicCompression');
- if ($this->_specialChars)
- $this->_addParser('_encodeSpecialChars');
- if ($this->_encoding)
- $this->_addParser('_encodeKeywords');
-
- // go!
- return $this->_pack($this->_script);
- }
-
- // apply all parsing routines
- private function _pack($script) {
- for ($i = 0; isset($this->_parsers[$i]); $i++) {
- $script = call_user_func(array(&$this,$this->_parsers[$i]), $script);
- }
- return $script;
- }
-
- // keep a list of parsing functions, they'll be executed all at once
- private $_parsers = array();
- private function _addParser($parser) {
- $this->_parsers[] = $parser;
- }
-
- // zero encoding - just removal of white space and comments
- private function _basicCompression($script) {
- $parser = new ParseMaster();
- // make safe
- $parser->escapeChar = '\\';
- // protect strings
- $parser->add('/\'[^\'\\n\\r]*\'/', self::IGNORE);
- $parser->add('/"[^"\\n\\r]*"/', self::IGNORE);
- // remove comments
- $parser->add('/\\/\\/[^\\n\\r]*[\\n\\r]/', ' ');
- $parser->add('/\\/\\*[^*]*\\*+([^\\/][^*]*\\*+)*\\//', ' ');
- // protect regular expressions
- $parser->add('/\\s+(\\/[^\\/\\n\\r\\*][^\\/\\n\\r]*\\/g?i?)/', '$2'); // IGNORE
- $parser->add('/[^\\w\\x24\\/\'"*)\\?:]\\/[^\\/\\n\\r\\*][^\\/\\n\\r]*\\/g?i?/', self::IGNORE);
- // remove: ;;; doSomething();
- if ($this->_specialChars) $parser->add('/;;;[^\\n\\r]+[\\n\\r]/');
- // remove redundant semi-colons
- $parser->add('/\\(;;\\)/', self::IGNORE); // protect for (;;) loops
- $parser->add('/;+\\s*([};])/', '$2');
- // apply the above
- $script = $parser->exec($script);
-
- // remove white-space
- $parser->add('/(\\b|\\x24)\\s+(\\b|\\x24)/', '$2 $3');
- $parser->add('/([+\\-])\\s+([+\\-])/', '$2 $3');
- $parser->add('/\\s+/', '');
- // done
- return $parser->exec($script);
- }
-
- private function _encodeSpecialChars($script) {
- $parser = new ParseMaster();
- // replace: $name -> n, $$name -> na
- $parser->add('/((\\x24+)([a-zA-Z$_]+))(\\d*)/',
+ // validate parameters
+ private $_script = '';
+ private $_encoding = 62;
+ private $_fastDecode = true;
+ private $_specialChars = false;
+
+ private $LITERAL_ENCODING = array(
+ 'None' => 0,
+ 'Numeric' => 10,
+ 'Normal' => 62,
+ 'High ASCII' => 95,
+ );
+
+ public function __construct($_script, $_encoding = 62, $_fastDecode = true, $_specialChars = false) {
+ $this->_script = $_script . "\n";
+ if (array_key_exists($_encoding, $this->LITERAL_ENCODING)) {
+ $_encoding = $this->LITERAL_ENCODING[$_encoding];
+ }
+ $this->_encoding = min((int) $_encoding, 95);
+ $this->_fastDecode = $_fastDecode;
+ $this->_specialChars = $_specialChars;
+ }
+
+ public function pack() {
+ $this->_addParser('_basicCompression');
+ if ($this->_specialChars) {
+ $this->_addParser('_encodeSpecialChars');
+ }
+ if ($this->_encoding) {
+ $this->_addParser('_encodeKeywords');
+ }
+
+ // go!
+ return $this->_pack($this->_script);
+ }
+
+ // apply all parsing routines
+ private function _pack($script) {
+ for ($i = 0; isset($this->_parsers[$i]); $i++) {
+ $script = call_user_func(array(&$this, $this->_parsers[$i]), $script);
+ }
+ return $script;
+ }
+
+ // keep a list of parsing functions, they'll be executed all at once
+ private $_parsers = array();
+ private function _addParser($parser) {
+ $this->_parsers[] = $parser;
+ }
+
+ // zero encoding - just removal of white space and comments
+ private function _basicCompression($script) {
+ $parser = new ParseMaster();
+ // make safe
+ $parser->escapeChar = '\\';
+ // protect strings
+ $parser->add('/\'[^\'\\n\\r]*\'/', self::IGNORE);
+ $parser->add('/"[^"\\n\\r]*"/', self::IGNORE);
+ // remove comments
+ $parser->add('/\\/\\/[^\\n\\r]*[\\n\\r]/', ' ');
+ $parser->add('/\\/\\*[^*]*\\*+([^\\/][^*]*\\*+)*\\//', ' ');
+ // protect regular expressions
+ $parser->add('/\\s+(\\/[^\\/\\n\\r\\*][^\\/\\n\\r]*\\/g?i?)/', '$2'); // IGNORE
+ $parser->add('/[^\\w\\x24\\/\'"*)\\?:]\\/[^\\/\\n\\r\\*][^\\/\\n\\r]*\\/g?i?/', self::IGNORE);
+ // remove: ;;; doSomething();
+ if ($this->_specialChars) {
+ $parser->add('/;;;[^\\n\\r]+[\\n\\r]/');
+ }
+ // remove redundant semi-colons
+ $parser->add('/\\(;;\\)/', self::IGNORE); // protect for (;;) loops
+ $parser->add('/;+\\s*([};])/', '$2');
+ // apply the above
+ $script = $parser->exec($script);
+
+ // remove white-space
+ $parser->add('/(\\b|\\x24)\\s+(\\b|\\x24)/', '$2 $3');
+ $parser->add('/([+\\-])\\s+([+\\-])/', '$2 $3');
+ $parser->add('/\\s+/', '');
+ // done
+ return $parser->exec($script);
+ }
+
+ private function _encodeSpecialChars($script) {
+ $parser = new ParseMaster();
+ // replace: $name -> n, $$name -> na
+ $parser->add('/((\\x24+)([a-zA-Z$_]+))(\\d*)/',
array('fn' => '_replace_name')
);
- // replace: _name -> _0, double-underscore (__name) is ignored
- $regexp = '/\\b_[A-Za-z\\d]\\w*/';
- // build the word list
- $keywords = $this->_analyze($script, $regexp, '_encodePrivate');
- // quick ref
- $encoded = $keywords['encoded'];
+ // replace: _name -> _0, double-underscore (__name) is ignored
+ $regexp = '/\\b_[A-Za-z\\d]\\w*/';
+ // build the word list
+ $keywords = $this->_analyze($script, $regexp, '_encodePrivate');
+ // quick ref
+ $encoded = $keywords['encoded'];
- $parser->add($regexp,
+ $parser->add($regexp,
array(
- 'fn' => '_replace_encoded',
- 'data' => $encoded
- )
+ 'fn' => '_replace_encoded',
+ 'data' => $encoded,
+ )
);
- return $parser->exec($script);
- }
+ return $parser->exec($script);
+ }
- private function _encodeKeywords($script) {
- // escape high-ascii values already in the script (i.e. in strings)
- if ($this->_encoding > 62)
- $script = $this->_escape95($script);
- // create the parser
- $parser = new ParseMaster();
- $encode = $this->_getEncoder($this->_encoding);
- // for high-ascii, don't encode single character low-ascii
- $regexp = ($this->_encoding > 62) ? '/\\w\\w+/' : '/\\w+/';
- // build the word list
- $keywords = $this->_analyze($script, $regexp, $encode);
- $encoded = $keywords['encoded'];
+ private function _encodeKeywords($script) {
+ // escape high-ascii values already in the script (i.e. in strings)
+ if ($this->_encoding > 62) {
+ $script = $this->_escape95($script);
+ }
+ // create the parser
+ $parser = new ParseMaster();
+ $encode = $this->_getEncoder($this->_encoding);
+ // for high-ascii, don't encode single character low-ascii
+ $regexp = ($this->_encoding > 62) ? '/\\w\\w+/' : '/\\w+/';
+ // build the word list
+ $keywords = $this->_analyze($script, $regexp, $encode);
+ $encoded = $keywords['encoded'];
- // encode
- $parser->add($regexp,
+ // encode
+ $parser->add($regexp,
array(
- 'fn' => '_replace_encoded',
- 'data' => $encoded
- )
+ 'fn' => '_replace_encoded',
+ 'data' => $encoded,
+ )
);
- if (empty($script)) return $script;
- else {
- //$res = $parser->exec($script);
- //$res = $this->_bootStrap($res, $keywords);
- //return $res;
- return $this->_bootStrap($parser->exec($script), $keywords);
- }
- }
-
- private function _analyze($script, $regexp, $encode) {
- // analyse
- // retreive all words in the script
- $all = array();
- preg_match_all($regexp, $script, $all);
- $_sorted = array(); // list of words sorted by frequency
- $_encoded = array(); // dictionary of word->encoding
- $_protected = array(); // instances of "protected" words
- $all = $all[0]; // simulate the javascript comportement of global match
- if (!empty($all)) {
- $unsorted = array(); // same list, not sorted
- $protected = array(); // "protected" words (dictionary of word->"word")
- $value = array(); // dictionary of charCode->encoding (eg. 256->ff)
- $this->_count = array(); // word->count
- $i = count($all); $j = 0; //$word = null;
- // count the occurrences - used for sorting later
- do {
- --$i;
- $word = '$' . $all[$i];
- if (!isset($this->_count[$word])) {
- $this->_count[$word] = 0;
- $unsorted[$j] = $word;
- // make a dictionary of all of the protected words in this script
- // these are words that might be mistaken for encoding
- //if (is_string($encode) && method_exists($this, $encode))
- $values[$j] = call_user_func(array(&$this, $encode), $j);
- $protected['$' . $values[$j]] = $j++;
- }
- // increment the word counter
- $this->_count[$word]++;
- } while ($i > 0);
- // prepare to sort the word list, first we must protect
- // words that are also used as codes. we assign them a code
- // equivalent to the word itself.
- // e.g. if "do" falls within our encoding range
- // then we store keywords["do"] = "do";
- // this avoids problems when decoding
- $i = count($unsorted);
- do {
- $word = $unsorted[--$i];
- if (isset($protected[$word]) /*!= null*/) {
- $_sorted[$protected[$word]] = substr($word, 1);
- $_protected[$protected[$word]] = true;
- $this->_count[$word] = 0;
- }
- } while ($i);
-
- // sort the words by frequency
- // Note: the javascript and php version of sort can be different :
- // in php manual, usort :
- // " If two members compare as equal,
- // their order in the sorted array is undefined."
- // so the final packed script is different of the Dean's javascript version
- // but equivalent.
- // the ECMAscript standard does not guarantee this behaviour,
- // and thus not all browsers (e.g. Mozilla versions dating back to at
- // least 2003) respect this.
- usort($unsorted, array(&$this, '_sortWords'));
- $j = 0;
- // because there are "protected" words in the list
- // we must add the sorted words around them
- do {
- if (!isset($_sorted[$i]))
- $_sorted[$i] = substr($unsorted[$j++], 1);
- $_encoded[$_sorted[$i]] = $values[$i];
- } while (++$i < count($unsorted));
- }
- return array(
- 'sorted' => $_sorted,
- 'encoded' => $_encoded,
- 'protected' => $_protected);
- }
-
- private $_count = array();
- private function _sortWords($match1, $match2) {
- return $this->_count[$match2] - $this->_count[$match1];
- }
-
- // build the boot function used for loading and decoding
- private function _bootStrap($packed, $keywords) {
- $ENCODE = $this->_safeRegExp('$encode\\($count\\)');
-
- // $packed: the packed script
- $packed = "'" . $this->_escape($packed) . "'";
-
- // $ascii: base for encoding
- $ascii = min(count($keywords['sorted']), $this->_encoding);
- if ($ascii == 0) $ascii = 1;
-
- // $count: number of words contained in the script
- $count = count($keywords['sorted']);
-
- // $keywords: list of words contained in the script
- foreach ($keywords['protected'] as $i=>$value) {
- $keywords['sorted'][$i] = '';
- }
- // convert from a string to an array
- ksort($keywords['sorted']);
- $keywords = "'" . implode('|',$keywords['sorted']) . "'.split('|')";
-
- $encode = ($this->_encoding > 62) ? '_encode95' : $this->_getEncoder($ascii);
- $encode = $this->_getJSFunction($encode);
- $encode = preg_replace('/_encoding/','$ascii', $encode);
- $encode = preg_replace('/arguments\\.callee/','$encode', $encode);
- $inline = '\\$count' . ($ascii > 10 ? '.toString(\\$ascii)' : '');
-
- // $decode: code snippet to speed up decoding
- if ($this->_fastDecode) {
- // create the decoder
- $decode = $this->_getJSFunction('_decodeBody');
- if ($this->_encoding > 62)
- $decode = preg_replace('/\\\\w/', '[\\xa1-\\xff]', $decode);
- // perform the encoding inline for lower ascii values
- elseif ($ascii < 36)
- $decode = preg_replace($ENCODE, $inline, $decode);
- // special case: when $count==0 there are no keywords. I want to keep
- // the basic shape of the unpacking funcion so i'll frig the code...
- if ($count == 0)
- $decode = preg_replace($this->_safeRegExp('($count)\\s*=\\s*1'), '$1=0', $decode, 1);
- }
-
- // boot function
- $unpack = $this->_getJSFunction('_unpack');
- if ($this->_fastDecode) {
- // insert the decoder
- $this->buffer = $decode;
- $unpack = preg_replace_callback('/\\{/', array(&$this, '_insertFastDecode'), $unpack, 1);
- }
- $unpack = preg_replace('/"/', "'", $unpack);
- if ($this->_encoding > 62) { // high-ascii
- // get rid of the word-boundaries for regexp matches
- $unpack = preg_replace('/\'\\\\\\\\b\'\s*\\+|\\+\s*\'\\\\\\\\b\'/', '', $unpack);
- }
- if ($ascii > 36 || $this->_encoding > 62 || $this->_fastDecode) {
- // insert the encode function
- $this->buffer = $encode;
- $unpack = preg_replace_callback('/\\{/', array(&$this, '_insertFastEncode'), $unpack, 1);
- } else {
- // perform the encoding inline
- $unpack = preg_replace($ENCODE, $inline, $unpack);
- }
- // pack the boot function too
- $unpackPacker = new JavaScriptPacker($unpack, 0, false, true);
- $unpack = $unpackPacker->pack();
-
- // arguments
- $params = array($packed, $ascii, $count, $keywords);
- if ($this->_fastDecode) {
- $params[] = 0;
- $params[] = '{}';
- }
- $params = implode(',', $params);
-
- // the whole thing
- return 'eval(' . $unpack . '(' . $params . "))\n";
- }
-
- private $buffer;
- private function _insertFastDecode($match) {
- return '{' . $this->buffer . ';';
- }
- private function _insertFastEncode($match) {
- return '{$encode=' . $this->buffer . ';';
- }
-
- // mmm.. ..which one do i need ??
- private function _getEncoder($ascii) {
- return $ascii > 10 ? $ascii > 36 ? $ascii > 62 ?
+ if (empty($script)) {
+ return $script;
+ }
+ else {
+ //$res = $parser->exec($script);
+ //$res = $this->_bootStrap($res, $keywords);
+ //return $res;
+ return $this->_bootStrap($parser->exec($script), $keywords);
+ }
+ }
+
+ private function _analyze($script, $regexp, $encode) {
+ // analyse
+ // retreive all words in the script
+ $all = array();
+ preg_match_all($regexp, $script, $all);
+ $_sorted = array(); // list of words sorted by frequency
+ $_encoded = array(); // dictionary of word->encoding
+ $_protected = array(); // instances of "protected" words
+ $all = $all[0]; // simulate the javascript comportement of global match
+ if (!empty($all)) {
+ $unsorted = array(); // same list, not sorted
+ $protected = array(); // "protected" words (dictionary of word->"word")
+ $value = array(); // dictionary of charCode->encoding (eg. 256->ff)
+ $this->_count = array(); // word->count
+ $i = count($all);
+ $j = 0; //$word = null;
+ // count the occurrences - used for sorting later
+ do {
+ --$i;
+ $word = '$' . $all[$i];
+ if (!isset($this->_count[$word])) {
+ $this->_count[$word] = 0;
+ $unsorted[$j] = $word;
+ // make a dictionary of all of the protected words in this script
+// these are words that might be mistaken for encoding
+ //if (is_string($encode) && method_exists($this, $encode))
+ $values[$j] = call_user_func(array(&$this, $encode), $j);
+ $protected['$' . $values[$j]] = $j++;
+ }
+ // increment the word counter
+ $this->_count[$word]++;
+ } while ($i > 0);
+ // prepare to sort the word list, first we must protect
+// words that are also used as codes. we assign them a code
+// equivalent to the word itself.
+ // e.g. if "do" falls within our encoding range
+// then we store keywords["do"] = "do";
+ // this avoids problems when decoding
+ $i = count($unsorted);
+ do {
+ $word = $unsorted[--$i];
+ if (isset($protected[$word]) /*!= null*/) {
+ $_sorted[$protected[$word]] = substr($word, 1);
+ $_protected[$protected[$word]] = true;
+ $this->_count[$word] = 0;
+ }
+ } while ($i);
+
+ // sort the words by frequency
+ // Note: the javascript and php version of sort can be different :
+ // in php manual, usort :
+ // " If two members compare as equal,
+ // their order in the sorted array is undefined."
+ // so the final packed script is different of the Dean's javascript version
+ // but equivalent.
+ // the ECMAscript standard does not guarantee this behaviour,
+ // and thus not all browsers (e.g. Mozilla versions dating back to at
+ // least 2003) respect this.
+ usort($unsorted, array(&$this, '_sortWords'));
+ $j = 0;
+ // because there are "protected" words in the list
+// we must add the sorted words around them
+ do {
+ if (!isset($_sorted[$i])) {
+ $_sorted[$i] = substr($unsorted[$j++], 1);
+ }
+ $_encoded[$_sorted[$i]] = $values[$i];
+ } while (++$i < count($unsorted));
+ }
+ return array(
+ 'sorted' => $_sorted,
+ 'encoded' => $_encoded,
+ 'protected' => $_protected,
+ );
+ }
+
+ private $_count = array();
+ private function _sortWords($match1, $match2) {
+ return $this->_count[$match2] - $this->_count[$match1];
+ }
+
+ // build the boot function used for loading and decoding
+ private function _bootStrap($packed, $keywords) {
+ $ENCODE = $this->_safeRegExp('$encode\\($count\\)');
+
+ // $packed: the packed script
+ $packed = "'" . $this->_escape($packed) . "'";
+
+ // $ascii: base for encoding
+ $ascii = min(count($keywords['sorted']), $this->_encoding);
+ if ($ascii == 0) {
+ $ascii = 1;
+ }
+
+ // $count: number of words contained in the script
+ $count = count($keywords['sorted']);
+
+ // $keywords: list of words contained in the script
+ foreach ($keywords['protected'] as $i => $value) {
+ $keywords['sorted'][$i] = '';
+ }
+ // convert from a string to an array
+ ksort($keywords['sorted']);
+ $keywords = "'" . implode('|', $keywords['sorted']) . "'.split('|')";
+
+ $encode = ($this->_encoding > 62) ? '_encode95' : $this->_getEncoder($ascii);
+ $encode = $this->_getJSFunction($encode);
+ $encode = preg_replace('/_encoding/', '$ascii', $encode);
+ $encode = preg_replace('/arguments\\.callee/', '$encode', $encode);
+ $inline = '\\$count' . ($ascii > 10 ? '.toString(\\$ascii)' : '');
+
+ // $decode: code snippet to speed up decoding
+ if ($this->_fastDecode) {
+ // create the decoder
+ $decode = $this->_getJSFunction('_decodeBody');
+ if ($this->_encoding > 62) {
+ $decode = preg_replace('/\\\\w/', '[\\xa1-\\xff]', $decode);
+ }
+ // perform the encoding inline for lower ascii values
+ elseif ($ascii < 36) {
+ $decode = preg_replace($ENCODE, $inline, $decode);
+ }
+ // special case: when $count==0 there are no keywords. I want to keep
+// the basic shape of the unpacking funcion so i'll frig the code...
+ if ($count == 0) {
+ $decode = preg_replace($this->_safeRegExp('($count)\\s*=\\s*1'), '$1=0', $decode, 1);
+ }
+ }
+
+ // boot function
+ $unpack = $this->_getJSFunction('_unpack');
+ if ($this->_fastDecode) {
+ // insert the decoder
+ $this->buffer = $decode;
+ $unpack = preg_replace_callback('/\\{/', array(&$this, '_insertFastDecode'), $unpack, 1);
+ }
+ $unpack = preg_replace('/"/', "'", $unpack);
+ if ($this->_encoding > 62) { // high-ascii
+ // get rid of the word-boundaries for regexp matches
+ $unpack = preg_replace('/\'\\\\\\\\b\'\s*\\+|\\+\s*\'\\\\\\\\b\'/', '', $unpack);
+ }
+ if ($ascii > 36 || $this->_encoding > 62 || $this->_fastDecode) {
+ // insert the encode function
+ $this->buffer = $encode;
+ $unpack = preg_replace_callback('/\\{/', array(&$this, '_insertFastEncode'), $unpack, 1);
+ }
+ else {
+ // perform the encoding inline
+ $unpack = preg_replace($ENCODE, $inline, $unpack);
+ }
+ // pack the boot function too
+ $unpackPacker = new JavaScriptPacker($unpack, 0, false, true);
+ $unpack = $unpackPacker->pack();
+
+ // arguments
+ $params = array($packed, $ascii, $count, $keywords);
+ if ($this->_fastDecode) {
+ $params[] = 0;
+ $params[] = '{}';
+ }
+ $params = implode(',', $params);
+
+ // the whole thing
+ return 'eval(' . $unpack . '(' . $params . "))\n";
+ }
+
+ private $buffer;
+ private function _insertFastDecode($match) {
+ return '{' . $this->buffer . ';';
+ }
+ private function _insertFastEncode($match) {
+ return '{$encode=' . $this->buffer . ';';
+ }
+
+ // mmm.. ..which one do i need ??
+ private function _getEncoder($ascii) {
+ return $ascii > 10 ? $ascii > 36 ? $ascii > 62 ?
'_encode95' : '_encode62' : '_encode36' : '_encode10';
- }
+ }
+
+ // zero encoding
+ // characters: 0123456789
+ private function _encode10($charCode) {
+ return $charCode;
+ }
+
+ // inherent base36 support
+ // characters: 0123456789abcdefghijklmnopqrstuvwxyz
+ private function _encode36($charCode) {
+ return base_convert($charCode, 10, 36);
+ }
+
+ // hitch a ride on base36 and add the upper case alpha characters
+ // characters: 0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ
+ private function _encode62($charCode) {
+ $res = '';
+ if ($charCode >= $this->_encoding) {
+ $res = $this->_encode62((int) ($charCode / $this->_encoding));
+ }
+ $charCode = $charCode % $this->_encoding;
+
+ if ($charCode > 35) {
+ return $res . chr($charCode + 29);
+ }
+ else {
+ return $res . base_convert($charCode, 10, 36);
+ }
+ }
+
+ // use high-ascii values
+ // characters: ¡¢£¤¥¦§¨©ª«¬®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþ
+ private function _encode95($charCode) {
+ $res = '';
+ if ($charCode >= $this->_encoding) {
+ $res = $this->_encode95($charCode / $this->_encoding);
+ }
- // zero encoding
- // characters: 0123456789
- private function _encode10($charCode) {
- return $charCode;
- }
-
- // inherent base36 support
- // characters: 0123456789abcdefghijklmnopqrstuvwxyz
- private function _encode36($charCode) {
- return base_convert($charCode, 10, 36);
- }
-
- // hitch a ride on base36 and add the upper case alpha characters
- // characters: 0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ
- private function _encode62($charCode) {
- $res = '';
- if ($charCode >= $this->_encoding) {
- $res = $this->_encode62((int)($charCode / $this->_encoding));
- }
- $charCode = $charCode % $this->_encoding;
-
- if ($charCode > 35)
- return $res . chr($charCode + 29);
- else
- return $res . base_convert($charCode, 10, 36);
- }
-
- // use high-ascii values
- // characters: ¡¢£¤¥¦§¨©ª«¬®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþ
- private function _encode95($charCode) {
- $res = '';
- if ($charCode >= $this->_encoding)
- $res = $this->_encode95($charCode / $this->_encoding);
-
- return $res . chr(($charCode % $this->_encoding) + 161);
- }
-
- private function _safeRegExp($string) {
- return '/'.preg_replace('/\$/', '\\\$', $string).'/';
- }
-
- private function _encodePrivate($charCode) {
- return "_" . $charCode;
- }
-
- // protect characters used by the parser
- private function _escape($script) {
- return preg_replace('/([\\\\\'])/', '\\\$1', $script);
- }
-
- // protect high-ascii characters already in the script
- private function _escape95($script) {
- return preg_replace_callback(
+ return $res . chr(($charCode % $this->_encoding) + 161);
+ }
+
+ private function _safeRegExp($string) {
+ return '/' . preg_replace('/\$/', '\\\$', $string) . '/';
+ }
+
+ private function _encodePrivate($charCode) {
+ return "_" . $charCode;
+ }
+
+ // protect characters used by the parser
+ private function _escape($script) {
+ return preg_replace('/([\\\\\'])/', '\\\$1', $script);
+ }
+
+ // protect high-ascii characters already in the script
+ private function _escape95($script) {
+ return preg_replace_callback(
'/[\\xa1-\\xff]/',
array(&$this, '_escape95Bis'),
$script
);
- }
- private function _escape95Bis($match) {
- return '\x'.((string)dechex(ord($match)));
- }
-
-
- private function _getJSFunction($aName) {
- if (defined('self::JSFUNCTION'.$aName))
- return constant('self::JSFUNCTION'.$aName);
- else
- return '';
- }
-
- // JavaScript Functions used.
- // Note : In Dean's version, these functions are converted
- // with 'String(aFunctionName);'.
- // This internal conversion complete the original code, ex :
- // 'while (aBool) anAction();' is converted to
- // 'while (aBool) { anAction(); }'.
- // The JavaScript functions below are corrected.
-
- // unpacking function - this is the boot strap function
- // data extracted from this packing routine is passed to
- // this function when decoded in the target
- // NOTE ! : without the ';' final.
- const JSFUNCTION_unpack =
+ }
+ private function _escape95Bis($match) {
+ return '\x' . ((string) dechex(ord($match)));
+ }
+
+
+ private function _getJSFunction($aName) {
+ if (defined('self::JSFUNCTION' . $aName)) {
+ return constant('self::JSFUNCTION' . $aName);
+ }
+ else {
+ return '';
+ }
+ }
+
+ // JavaScript Functions used.
+ // Note : In Dean's version, these functions are converted
+ // with 'String(aFunctionName);'.
+ // This internal conversion complete the original code, ex :
+ // 'while (aBool) anAction();' is converted to
+ // 'while (aBool) { anAction(); }'.
+ // The JavaScript functions below are corrected.
+
+ // unpacking function - this is the boot strap function
+// data extracted from this packing routine is passed to
+// this function when decoded in the target
+ // NOTE ! : without the ';' final.
+ const JSFUNCTION_unpack =
'function($packed, $ascii, $count, $keywords, $encode, $decode) {
while ($count--) {
@@ -462,17 +483,17 @@ class JavaScriptPacker {
}
return $packed;
}';
-/*
-'function($packed, $ascii, $count, $keywords, $encode, $decode) {
- while ($count--)
- if ($keywords[$count])
- $packed = $packed.replace(new RegExp(\'\\\\b\' + $encode($count) + \'\\\\b\', \'g\'), $keywords[$count]);
- return $packed;
-}';
-*/
+ /*
+ 'function($packed, $ascii, $count, $keywords, $encode, $decode) {
+ while ($count--)
+ if ($keywords[$count])
+ $packed = $packed.replace(new RegExp(\'\\\\b\' + $encode($count) + \'\\\\b\', \'g\'), $keywords[$count]);
+ return $packed;
+ }';
+ */
- // code-snippet inserted into the unpacker to speed up decoding
- const JSFUNCTION_decodeBody =
+ // code-snippet inserted into the unpacker to speed up decoding
+ const JSFUNCTION_decodeBody =
//_decode = function() {
// does the browser support String.replace where the
// replacement value is a function?
@@ -490,45 +511,45 @@ class JavaScriptPacker {
$count = 1;
}
';
-//};
-/*
-' if (!\'\'.replace(/^/, String)) {
- // decode all the values we need
- while ($count--) $decode[$encode($count)] = $keywords[$count] || $encode($count);
- // global replacement function
- $keywords = [function ($encoded) {return $decode[$encoded]}];
- // generic match
- $encode = function () {return\'\\\\w+\'};
- // reset the loop counter - we are now doing a global replace
- $count = 1;
- }';
-*/
-
- // zero encoding
- // characters: 0123456789
- const JSFUNCTION_encode10 =
+ //};
+ /*
+ ' if (!\'\'.replace(/^/, String)) {
+ // decode all the values we need
+ while ($count--) $decode[$encode($count)] = $keywords[$count] || $encode($count);
+ // global replacement function
+ $keywords = [function ($encoded) {return $decode[$encoded]}];
+ // generic match
+ $encode = function () {return\'\\\\w+\'};
+ // reset the loop counter - we are now doing a global replace
+ $count = 1;
+ }';
+ */
+
+ // zero encoding
+ // characters: 0123456789
+ const JSFUNCTION_encode10 =
'function($charCode) {
return $charCode;
-}';//;';
+}'; //;';
- // inherent base36 support
- // characters: 0123456789abcdefghijklmnopqrstuvwxyz
- const JSFUNCTION_encode36 =
+ // inherent base36 support
+ // characters: 0123456789abcdefghijklmnopqrstuvwxyz
+ const JSFUNCTION_encode36 =
'function($charCode) {
return $charCode.toString(36);
-}';//;';
+}'; //;';
- // hitch a ride on base36 and add the upper case alpha characters
- // characters: 0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ
- const JSFUNCTION_encode62 =
+ // hitch a ride on base36 and add the upper case alpha characters
+ // characters: 0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ
+ const JSFUNCTION_encode62 =
'function($charCode) {
return ($charCode < _encoding ? \'\' : arguments.callee(parseInt($charCode / _encoding))) +
(($charCode = $charCode % _encoding) > 35 ? String.fromCharCode($charCode + 29) : $charCode.toString(36));
}';
- // use high-ascii values
- // characters: ¡¢£¤¥¦§¨©ª«¬®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþ
- const JSFUNCTION_encode95 =
+ // use high-ascii values
+ // characters: ¡¢£¤¥¦§¨©ª«¬®¯°±²³´µ¶·¸¹º»¼½¾¿ÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖ×ØÙÚÛÜÝÞßàáâãäåæçèéêëìíîïðñòóôõö÷øùúûüýþ
+ const JSFUNCTION_encode95 =
'function($charCode) {
return ($charCode < _encoding ? \'\' : arguments.callee($charCode / _encoding)) +
String.fromCharCode($charCode % _encoding + 161);
@@ -538,203 +559,219 @@ class JavaScriptPacker {
class ParseMaster {
- public $ignoreCase = false;
- public $escapeChar = '';
+ public $ignoreCase = false;
+ public $escapeChar = '';
- // constants
- const EXPRESSION = 0;
- const REPLACEMENT = 1;
- const LENGTH = 2;
-
- // used to determine nesting levels
- private $GROUPS = '/\\(/';//g
- private $SUB_REPLACE = '/\\$\\d/';
- private $INDEXED = '/^\\$\\d+$/';
- private $TRIM = '/([\'"])\\1\\.(.*)\\.\\1\\1$/';
- private $ESCAPE = '/\\\./';//g
- private $QUOTE = '/\'/';
- private $DELETED = '/\\x01[^\\x01]*\\x01/';//g
-
- public function add($expression, $replacement = '') {
- // count the number of sub-expressions
- // - add one because each pattern is itself a sub-expression
- $length = 1 + preg_match_all($this->GROUPS, $this->_internalEscape((string)$expression), $out);
-
- // treat only strings $replacement
- if (is_string($replacement)) {
- // does the pattern deal with sub-expressions?
- if (preg_match($this->SUB_REPLACE, $replacement)) {
- // a simple lookup? (e.g. "$2")
- if (preg_match($this->INDEXED, $replacement)) {
- // store the index (used for fast retrieval of matched strings)
- $replacement = (int)(substr($replacement, 1)) - 1;
- } else { // a complicated lookup (e.g. "Hello $2 $1")
- // build a function to do the lookup
- $quote = preg_match($this->QUOTE, $this->_internalEscape($replacement))
+ // constants
+ const EXPRESSION = 0;
+ const REPLACEMENT = 1;
+ const LENGTH = 2;
+
+ // used to determine nesting levels
+ private $GROUPS = '/\\(/'; //g
+ private $SUB_REPLACE = '/\\$\\d/';
+ private $INDEXED = '/^\\$\\d+$/';
+ private $TRIM = '/([\'"])\\1\\.(.*)\\.\\1\\1$/';
+ private $ESCAPE = '/\\\./'; //g
+ private $QUOTE = '/\'/';
+ private $DELETED = '/\\x01[^\\x01]*\\x01/'; //g
+
+ public function add($expression, $replacement = '') {
+ // count the number of sub-expressions
+// - add one because each pattern is itself a sub-expression
+ $length = 1 + preg_match_all($this->GROUPS, $this->_internalEscape((string) $expression), $out);
+
+ // treat only strings $replacement
+ if (is_string($replacement)) {
+ // does the pattern deal with sub-expressions?
+ if (preg_match($this->SUB_REPLACE, $replacement)) {
+ // a simple lookup? (e.g. "$2")
+ if (preg_match($this->INDEXED, $replacement)) {
+ // store the index (used for fast retrieval of matched strings)
+ $replacement = (int) (substr($replacement, 1)) - 1;
+ }
+ else { // a complicated lookup (e.g. "Hello $2 $1")
+ // build a function to do the lookup
+ $quote = preg_match($this->QUOTE, $this->_internalEscape($replacement))
? '"' : "'";
- $replacement = array(
- 'fn' => '_backReferences',
- 'data' => array(
- 'replacement' => $replacement,
- 'length' => $length,
- 'quote' => $quote
- )
- );
- }
- }
- }
- // pass the modified arguments
- if (!empty($expression)) $this->_add($expression, $replacement, $length);
- else $this->_add('/^$/', $replacement, $length);
- }
-
- public function exec($string) {
- // execute the global replacement
- $this->_escaped = array();
-
- // simulate the _patterns.toSTring of Dean
- $regexp = '/';
- foreach ($this->_patterns as $reg) {
- $regexp .= '(' . substr($reg[self::EXPRESSION], 1, -1) . ')|';
- }
- $regexp = substr($regexp, 0, -1) . '/';
- $regexp .= ($this->ignoreCase) ? 'i' : '';
+ $replacement = array(
+ 'fn' => '_backReferences',
+ 'data' => array(
+ 'replacement' => $replacement,
+ 'length' => $length,
+ 'quote' => $quote,
+ ),
+ );
+ }
+ }
+ }
+ // pass the modified arguments
+ if (!empty($expression)) {
+ $this->_add($expression, $replacement, $length);
+ }
+ else {
+ $this->_add('/^$/', $replacement, $length);
+ }
+ }
+
+ public function exec($string) {
+ // execute the global replacement
+ $this->_escaped = array();
+
+ // simulate the _patterns.toSTring of Dean
+ $regexp = '/';
+ foreach ($this->_patterns as $reg) {
+ $regexp .= '(' . substr($reg[self::EXPRESSION], 1, -1) . ')|';
+ }
+ $regexp = substr($regexp, 0, -1) . '/';
+ $regexp .= ($this->ignoreCase) ? 'i' : '';
- $string = $this->_escape($string, $this->escapeChar);
- $string = preg_replace_callback(
+ $string = $this->_escape($string, $this->escapeChar);
+ $string = preg_replace_callback(
$regexp,
array(
- &$this,
- '_replacement'
- ),
+ &$this,
+ '_replacement',
+ ),
$string
);
- $string = $this->_unescape($string, $this->escapeChar);
+ $string = $this->_unescape($string, $this->escapeChar);
- return preg_replace($this->DELETED, '', $string);
- }
+ return preg_replace($this->DELETED, '', $string);
+ }
- public function reset() {
- // clear the patterns collection so that this object may be re-used
- $this->_patterns = array();
- }
-
- // private
- private $_escaped = array(); // escaped characters
- private $_patterns = array(); // patterns stored by index
-
- // create and add a new pattern to the patterns collection
- private function _add() {
- $arguments = func_get_args();
- $this->_patterns[] = $arguments;
- }
-
- // this is the global replace function (it's quite complicated)
- private function _replacement($arguments) {
- if (empty($arguments)) return '';
-
- $i = 1; $j = 0;
- // loop through the patterns
- while (isset($this->_patterns[$j])) {
- $pattern = $this->_patterns[$j++];
- // do we have a result?
- if (isset($arguments[$i]) && ($arguments[$i] != '')) {
- $replacement = $pattern[self::REPLACEMENT];
-
- if (is_array($replacement) && isset($replacement['fn'])) {
+ public function reset() {
+ // clear the patterns collection so that this object may be re-used
+ $this->_patterns = array();
+ }
+
+ // private
+ private $_escaped = array(); // escaped characters
+ private $_patterns = array(); // patterns stored by index
+
+ // create and add a new pattern to the patterns collection
+ private function _add() {
+ $arguments = func_get_args();
+ $this->_patterns[] = $arguments;
+ }
+
+ // this is the global replace function (it's quite complicated)
+ private function _replacement($arguments) {
+ if (empty($arguments)) {
+ return '';
+ }
- if (isset($replacement['data'])) $this->buffer = $replacement['data'];
- return call_user_func(array(&$this, $replacement['fn']), $arguments, $i);
+ $i = 1;
+ $j = 0;
+ // loop through the patterns
+ while (isset($this->_patterns[$j])) {
+ $pattern = $this->_patterns[$j++];
+ // do we have a result?
+ if (isset($arguments[$i]) && ($arguments[$i] != '')) {
+ $replacement = $pattern[self::REPLACEMENT];
+
+ if (is_array($replacement) && isset($replacement['fn'])) {
+
+ if (isset($replacement['data'])) {
+ $this->buffer = $replacement['data'];
+ }
+ return call_user_func(array(&$this, $replacement['fn']), $arguments, $i);
- } elseif (is_int($replacement)) {
- return $arguments[$replacement + $i];
+ }
+ elseif (is_int($replacement)) {
+ return $arguments[$replacement + $i];
- }
- $delete = ($this->escapeChar == '' ||
+ }
+ $delete = ($this->escapeChar == '' ||
strpos($arguments[$i], $this->escapeChar) === false)
? '' : "\x01" . $arguments[$i] . "\x01";
- return $delete . $replacement;
+ return $delete . $replacement;
+
+ // skip over references to sub-expressions
+ }
+ else {
+ $i += $pattern[self::LENGTH];
+ }
+ }
+ }
+
+ private function _backReferences($match, $offset) {
+ $replacement = $this->buffer['replacement'];
+ $quote = $this->buffer['quote'];
+ $i = $this->buffer['length'];
+ while ($i) {
+ $replacement = str_replace('$' . $i--, $match[$offset + $i], $replacement);
+ }
+ return $replacement;
+ }
- // skip over references to sub-expressions
- } else {
- $i += $pattern[self::LENGTH];
- }
- }
- }
-
- private function _backReferences($match, $offset) {
- $replacement = $this->buffer['replacement'];
- $quote = $this->buffer['quote'];
- $i = $this->buffer['length'];
- while ($i) {
- $replacement = str_replace('$'.$i--, $match[$offset + $i], $replacement);
- }
- return $replacement;
- }
-
- private function _replace_name($match, $offset){
- $length = strlen($match[$offset + 2]);
- $start = $length - max($length - strlen($match[$offset + 3]), 0);
- return substr($match[$offset + 1], $start, $length) . $match[$offset + 4];
- }
-
- private function _replace_encoded($match, $offset) {
- return $this->buffer[$match[$offset]];
- }
-
-
- // php : we cannot pass additional data to preg_replace_callback,
- // and we cannot use &$this in create_function, so let's go to lower level
- private $buffer;
-
- // encode escaped characters
- private function _escape($string, $escapeChar) {
- if ($escapeChar) {
- $this->buffer = $escapeChar;
- return preg_replace_callback(
- '/\\' . $escapeChar . '(.)' .'/',
+ private function _replace_name($match, $offset) {
+ $length = strlen($match[$offset + 2]);
+ $start = $length - max($length - strlen($match[$offset + 3]), 0);
+ return substr($match[$offset + 1], $start, $length) . $match[$offset + 4];
+ }
+
+ private function _replace_encoded($match, $offset) {
+ return $this->buffer[$match[$offset]];
+ }
+
+
+ // php : we cannot pass additional data to preg_replace_callback,
+ // and we cannot use &$this in create_function, so let's go to lower level
+ private $buffer;
+
+ // encode escaped characters
+ private function _escape($string, $escapeChar) {
+ if ($escapeChar) {
+ $this->buffer = $escapeChar;
+ return preg_replace_callback(
+ '/\\' . $escapeChar . '(.)' . '/',
array(&$this, '_escapeBis'),
$string
);
- } else {
- return $string;
- }
- }
- private function _escapeBis($match) {
- $this->_escaped[] = $match[1];
- return $this->buffer;
- }
-
- // decode escaped characters
- private function _unescape($string, $escapeChar) {
- if ($escapeChar) {
- $regexp = '/'.'\\'.$escapeChar.'/';
- $this->buffer = array('escapeChar'=> $escapeChar, 'i' => 0);
- return preg_replace_callback
- (
+ }
+ else {
+ return $string;
+ }
+ }
+ private function _escapeBis($match) {
+ $this->_escaped[] = $match[1];
+ return $this->buffer;
+ }
+
+ // decode escaped characters
+ private function _unescape($string, $escapeChar) {
+ if ($escapeChar) {
+ $regexp = '/' . '\\' . $escapeChar . '/';
+ $this->buffer = array(
+ 'escapeChar' => $escapeChar,
+ 'i' => 0,
+ );
+ return preg_replace_callback(
$regexp,
array(&$this, '_unescapeBis'),
$string
);
- } else {
- return $string;
- }
- }
- private function _unescapeBis() {
- if (isset($this->_escaped[$this->buffer['i']])
- && $this->_escaped[$this->buffer['i']] != '')
- {
- $temp = $this->_escaped[$this->buffer['i']];
- } else {
- $temp = '';
- }
- $this->buffer['i']++;
- return $this->buffer['escapeChar'] . $temp;
- }
-
- private function _internalEscape($string) {
- return preg_replace($this->ESCAPE, '', $string);
- }
+ }
+ else {
+ return $string;
+ }
+ }
+ private function _unescapeBis() {
+ if (isset($this->_escaped[$this->buffer['i']])
+ && $this->_escaped[$this->buffer['i']] != '') {
+ $temp = $this->_escaped[$this->buffer['i']];
+ }
+ else {
+ $temp = '';
+ }
+ $this->buffer['i']++;
+ return $this->buffer['escapeChar'] . $temp;
+ }
+
+ private function _internalEscape($string) {
+ return preg_replace($this->ESCAPE, '', $string);
+ }
}