From e41c4344de0725cedef8cb8e714eb79a1e2ed21f Mon Sep 17 00:00:00 2001 From: Mariano D'Agostino Date: Fri, 20 Jul 2012 15:30:02 -0300 Subject: [PATCH] Issue #1510064: Change 'datastore' to 'configstore' to match changes in D8 --- README.txt | 46 +++++++++++++++++------------------ configuration.admin.inc | 32 ++++++++++++------------ configuration.export.inc | 10 ++++---- configuration.module | 24 +++++++++--------- includes/configuration.ctools.inc | 20 +++++++-------- includes/configuration.field.inc | 14 +++++------ includes/configuration.filter.inc | 14 +++++------ includes/configuration.image.inc | 14 +++++------ includes/configuration.menu.inc | 28 ++++++++++----------- includes/configuration.node.inc | 16 ++++++------ includes/configuration.taxonomy.inc | 16 ++++++------ includes/configuration.user.inc | 28 ++++++++++----------- observers/observer.image.inc | 4 +-- tests/configuration.test | 16 ++++++------ 14 files changed, 141 insertions(+), 141 deletions(-) diff --git a/README.txt b/README.txt index c615753..3c68ec2 100644 --- a/README.txt +++ b/README.txt @@ -18,9 +18,9 @@ move configurations between completely different sites (migrate configurations) This module is a rewrite of the features module without the features part of it. The module also uses some concepts from the configuration management initiative, -specifically the concept of the "activestore" and "datastore" architecture. +specifically the concept of the "activestore" and "configstore" architecture. -The configuration module isn't a replacement for features. The vision is that +The configuration module isn't a replacement for features. The vision is that they could work together. Features currently serves two purposes, 1) to group configuration together to satisfy a certain use-case, and 2) the actual export and management of configuration into a "feature" module. Features module is an @@ -32,53 +32,53 @@ read the KIT specification. INSTALLATION ------------ -After downloading the configuration module and uncompressing it, copy the whole +After downloading the configuration module and uncompressing it, copy the whole configuration directory to your modules directory and activate the module. DEFINITIONS ----------- - + * activestore - + The activestore is where configuration is read from by Drupal. The configuration module imports all exportables into the database. All - exportables effectively become faux-exportables, configuration is not read + exportables effectively become faux-exportables, configuration is not read from exported code. - - * datastore - - The datastore is configuration data stored on-disk using ctools exportable + + * configstore + + The configstore is configuration data stored on-disk using ctools exportable files and configuration api exports. This configuration is not read and - accessed by Drupal for page construction. Configuration from the datastore + accessed by Drupal for page construction. Configuration from the configstore is activated (imported) into the activestore. Drupal accesses configuration from the activestore. - + * config.export - + Documentation needs to be written. - + * migration - + Documentation needs to be written. - + USAGE ----- * Tracking configuration - + Add documentation on how to track configuration. - + * Un-tracking configuration - + Add documentation on how to stop tracking configuration. - + * Migrate configuration to another site. - + Add documentation on how to migrate to another site. - + * General settings - + Describe what each setting does. diff --git a/configuration.admin.inc b/configuration.admin.inc index 83cc596..d792a7e 100644 --- a/configuration.admin.inc +++ b/configuration.admin.inc @@ -21,7 +21,7 @@ function configuration_tracking_form($form, &$form_state) { return $form; } $form['help_text'] = array( - '#markup' => 'Choose the configurations to write or activate. Writing to activestore requires writing the entire component to datastore. You cannot write individual configs to datastore. You have to select all components and write the entire component to datastore. Individual components may be imported into activestore.', + '#markup' => 'Choose the configurations to write or activate. Writing to activestore requires writing the entire component to configstore. You cannot write individual configs to configstore. You have to select all components and write the entire component to configstore. Individual components may be imported into activestore.', '#prefix' => '
', '#suffix' => '
', ); @@ -124,18 +124,18 @@ function configuration_tracking_form($form, &$form_state) { $form['buttons'] = array('#theme' => 'configuration_form_buttons', '#tree' => FALSE); - // Do not allow writing to datastore if on remote server. + // Do not allow writing to configstore if on remote server. if (variable_get('remote_server', 0) < 1) { $form['buttons']['submit'] = array( '#type' => 'submit', - '#value' => t('Write Activestore to Datastore'), + '#value' => t('Write Activestore to Configstore'), '#weight' => 9, ); } $form['buttons']['revert'] = array( '#type' => 'submit', - '#value' => t('Import Datastore to Activestore'), + '#value' => t('Import Configstore to Activestore'), '#weight' => 10, '#submit' => array('configuration_activate_form_submit'), ); @@ -229,7 +229,7 @@ function configuration_notracking_form($form, &$form_state) { if (variable_get('remote_server', 0) < 1) { $form['buttons']['submit'] = array( '#type' => 'submit', - '#value' => t('Write to Datastore'), + '#value' => t('Write to Configstore'), '#weight' => 10, ); } @@ -392,7 +392,7 @@ function configuration_activate_form($form, &$form_state) { ); $form['buttons']['revert'] = array( '#type' => 'submit', - '#value' => t('Update Datastore'), + '#value' => t('Update Configstore'), '#weight' => 10, '#submit' => array('configuration_notracking_form_submit'), ); @@ -608,12 +608,12 @@ function configuration_notracking_form_validate($form, &$form_state) { $form_state['configuration_export'] = $configuration_export; } function configuration_tracking_form_validate($form, &$form_state) { - if ($form_state['values']['op'] == t('Write Activestore to Datastore')) { + if ($form_state['values']['op'] == t('Write Activestore to Configstore')) { $configuration_export = $form_state['configuration_export']; foreach ($configuration_export as $component => $config) { $num_on = count(array_filter($config)); if ($num_on != 0 && $num_on != $form[$component]['items']['#overridden']) { - form_set_error('packages', t('Writing to activestore requires writing the entire component to datastore. Select all checkboxes on the %component tab to write to datastore.', array('%component' => $component))); + form_set_error('packages', t('Writing to activestore requires writing the entire component to configstore. Select all checkboxes on the %component tab to write to configstore.', array('%component' => $component))); } } } @@ -666,7 +666,7 @@ function configuration_settings_form($form, &$form_state) { $form['general_settings']['remote_server'] = array( '#type' => 'checkbox', '#title' => t('This is a remote server'), - '#description' => t('If this is a remote server and you do not have access to the filesystem of this server, the ability to write files to datastore should not be allowed.'), + '#description' => t('If this is a remote server and you do not have access to the filesystem of this server, the ability to write files to configstore should not be allowed.'), '#default_value' => variable_get('remote_server', -1), ); @@ -764,7 +764,7 @@ function configuration_diff($component, $identifier) { foreach ($overrides as $component => $items) { foreach ($items as $identifier => $item) { $rows[] = array(array(array('data' => $component, 'colspan' => 4, 'header' => TRUE))); - $diff = new Diff(explode("\n", configuration_var_export($item['datastore'])), explode("\n", configuration_var_export($item['activestore']))); + $diff = new Diff(explode("\n", configuration_var_export($item['configstore'])), explode("\n", configuration_var_export($item['activestore']))); $rows = array_merge($rows, $formatter->format($diff)); $d = $formatter->format($diff); if (empty($d)) { @@ -781,7 +781,7 @@ function configuration_diff($component, $identifier) { } } $header = array( - array('data' => t('Datastore'), 'colspan' => 2), + array('data' => t('Configstore'), 'colspan' => 2), array('data' => t('Activestore'), 'colspan' => 2), ); $output .= theme('table', array('header' => $header, 'rows' => $rows, 'attributes' => array('class' => array('diff', 'configuration-diff')))); @@ -879,7 +879,7 @@ function configuration_download_diff($config) { $files = configuration_export_render($export, TRUE); foreach ($files as $component => $activestore) { - $datastore = file_get_contents("config://" . $component . '.inc'); + $configstore = file_get_contents("config://" . $component . '.inc'); $formatter = new UnifiedDiffFormatter(); //$formatter = new DiffFormatter(); @@ -887,7 +887,7 @@ function configuration_download_diff($config) { $formatter->trailing_context_lines = 2; //$formatter->show_header = $show_header - $diff = new Diff(explode("\n", $datastore), explode("\n", $activestore)); + $diff = new Diff(explode("\n", $configstore), explode("\n", $activestore)); print '--- ' . $component . ".inc\n"; print '+++ ' . $component . ".inc\n"; print $formatter->format($diff); @@ -909,9 +909,9 @@ function _configuration_get_status_link($status, $component = NULL, $config_item case CONFIGURATION_DATASTORE_OVERRIDDEN : if ($diff) { - return l(t('Datastore Changed'), 'admin/config/system/configuration/' . $component . '/' . $config_item . '/diff'); + return l(t('Configstore Changed'), 'admin/config/system/configuration/' . $component . '/' . $config_item . '/diff'); } - return t('Datastore Changed'); + return t('Configstore Changed'); case CONFIGURATION_TRACKED_DATASTORE_ONLY : case CONFIGURATION_DATASTORE_ONLY : return t('New Configuration'); case CONFIGURATION_IN_SYNC : return t('In Sync'); @@ -935,4 +935,4 @@ function configuration_in_activestore($component, $identifier) { // // dpm($activestore); // } return TRUE; -} \ No newline at end of file +} diff --git a/configuration.export.inc b/configuration.export.inc index 562d2d9..0352bfc 100644 --- a/configuration.export.inc +++ b/configuration.export.inc @@ -872,7 +872,7 @@ function configuration_write_exports($components = NULL, $exclude = array()) { configuration_write_export_file(); } else { - // Can't write to datastore. + // Can't write to configstore. return FALSE; } } @@ -884,7 +884,7 @@ function configuration_write_exports($components = NULL, $exclude = array()) { } /** - * Check components on datastore to see if there are any changes that would be + * Check components on configstore to see if there are any changes that would be * lost as a result of rewriting them. * * @param $changed A Bitmask to check config status against @@ -893,16 +893,16 @@ function configuration_write_exports($components = NULL, $exclude = array()) { */ function configuration_check_changed($changed, $components, $config = NULL) { $config = is_null($config) ? configuration_get_configuration() : $config; - // Do not write the export file if the datastore is different + // Do not write the export file if the configstore is different foreach ($components as $component) { if (array_key_exists($component, $config)) { foreach ($config[$component] as $info) { if ($info['status'] & $changed) { - drupal_set_message(t('Unable to write exports. Your datastore has configs that would be lost in %component.', array('%component' => $component)), 'error'); + drupal_set_message(t('Unable to write exports. Your configstore has configs that would be lost in %component.', array('%component' => $component)), 'error'); return FALSE; } } } } return TRUE; -} \ No newline at end of file +} diff --git a/configuration.module b/configuration.module index d5ff9dd..90b0fe3 100644 --- a/configuration.module +++ b/configuration.module @@ -8,7 +8,7 @@ /** * A bit flag used to let us know if a configuration is the same in both the - * activestore and the datastore. + * activestore and the configstore. */ define('CONFIGURATION_IN_SYNC', 0x0000); @@ -20,7 +20,7 @@ define('CONFIGURATION_ACTIVESTORE_OVERRIDDEN', 0x0001); /** * A bit flag used to let us know if a configuration was overridden as a result - * of changing the datastore directly. + * of changing the configstore directly. * * This flag is set when configuration changes are detected via the "Check for * new configurations" button on settings screen. @@ -28,18 +28,18 @@ define('CONFIGURATION_ACTIVESTORE_OVERRIDDEN', 0x0001); define('CONFIGURATION_DATASTORE_OVERRIDDEN', 0X0002); /** - * Both activestore and datastore have a changed. We have a conflict. + * Both activestore and configstore have a changed. We have a conflict. */ define('CONFIGURATION_CONFLICT', CONFIGURATION_ACTIVESTORE_OVERRIDDEN | CONFIGURATION_DATASTORE_OVERRIDDEN); /** - * A bit flag used to let us know if a configuration is only in the datastore + * A bit flag used to let us know if a configuration is only in the configstore * and is also being tracked in config.export. */ define('CONFIGURATION_TRACKED_DATASTORE_ONLY', 0x0004); /** - * A bit flag used to let us know if a configuration is only in the datastore. + * A bit flag used to let us know if a configuration is only in the configstore. */ define('CONFIGURATION_DATASTORE_ONLY', 0x0008); @@ -192,7 +192,7 @@ function configuration_menu() { if (module_exists('diff')) { $items['admin/config/system/configuration/%/%/diff'] = array( 'title' => 'Review overrides', - 'description' => 'Compare activestore and datastore.', + 'description' => 'Compare activestore and configstore.', 'page callback' => 'configuration_diff', 'page arguments' => array(4, 5), 'access arguments' => array('access configuration management'), @@ -263,7 +263,7 @@ function configuration_init() { drupal_set_message(t('You have new Configurations that need to be activated. !click_here to activate your configurations.', array('!click_here' => l(t('Click here'), 'admin/config/system/configuration/activate'))), 'warning', FALSE); } elseif ($overridden == CONFIGURATION_CONFLICT) { - drupal_set_message(t('You have conflicts with your Configurations. Activating configurations will overwrite what is in the activestore, or you can write what is in the activestore back to datastore. !click_here to resolve.', array('!click_here' => l(t('Click here'), 'admin/config/system/configuration/activate'))), 'error', FALSE); + drupal_set_message(t('You have conflicts with your Configurations. Activating configurations will overwrite what is in the activestore, or you can write what is in the activestore back to configstore. !click_here to resolve.', array('!click_here' => l(t('Click here'), 'admin/config/system/configuration/activate'))), 'error', FALSE); } } } @@ -532,7 +532,7 @@ function configuration_save($configs) { $current_config = configuration_get_configuration(); - // Check to see if there is anything in datastore that would be lost + // Check to see if there is anything in configstore that would be lost if (!configuration_check_changed((CONFIGURATION_DATASTORE_ONLY), array_keys($configs), $current_config)) { return FALSE; } @@ -672,7 +672,7 @@ function configuration_delete_multiple($cids) { } /** - * Add a configuration as datastore only + * Add a configuration as configstore only * * @param $component The component of the configuration. * @param $name The unique name of the configuration. @@ -989,7 +989,7 @@ function _configuration_write_export_table() { $cids[] = $row->cid; // If the hash in the config.export file is different than what we have in - // the database, then the datastore was overridden. + // the database, then the configstore was overridden. if ($info['hash'] && $info['hash'] != $row->hash) { db_update('config_export') ->fields(array( @@ -1021,7 +1021,7 @@ function _configuration_write_export_table() { $removed_configs[] = $old->name; } if ($removed) { - drupal_set_message(t('Removed %num configuration(s). No Longer tracking %config. Not found in datastore.', array('%num' => $removed, '%config' => join(', ', $removed_configs)))); + drupal_set_message(t('Removed %num configuration(s). No Longer tracking %config. Not found in configstore.', array('%num' => $removed, '%config' => join(', ', $removed_configs)))); } } } @@ -1093,4 +1093,4 @@ function configuration_hook_info() { */ foreach (file_scan_directory(drupal_get_path('module', 'configuration') . '/observers', '/.*/') as $filename) { require $filename->uri; -} \ No newline at end of file +} diff --git a/includes/configuration.ctools.inc b/includes/configuration.ctools.inc index fa61ebd..fe156b0 100644 --- a/includes/configuration.ctools.inc +++ b/includes/configuration.ctools.inc @@ -327,7 +327,7 @@ function _ctools_configuration_export_crud_save($table, $name, $object) { $object->export_type = $in_activestore->export_type; } - // @todo: Panel pages can't import from datastore this way. Have to figure + // @todo: Panel pages can't import from configstore this way. Have to figure // out how to get panel pages imported. // page_manager_get_tasks(); // module_load_include('inc', 'panels', 'plugins/task_handlers/panel_context'); @@ -418,31 +418,31 @@ function ctools_configuration_check($identifier) { */ $return = ''; $status = $config[$component][$identifier]['status']; - $md5_datastore = (is_array($export_code) && array_key_exists($identifier, $export_code)) ? md5(serialize($export_code[$identifier])) : ''; + $md5_configstore = (is_array($export_code) && array_key_exists($identifier, $export_code)) ? md5(serialize($export_code[$identifier])) : ''; $md5_activestore = (is_array($export_code) && array_key_exists($identifier, $export_code)) ? md5(serialize($export[$identifier])) : ''; // Configs in code are not the same as what was just saved in activestore. // There is no way of telling if the change was in the activestore or the - // datastore. Mark them changed in both. - if ($md5_datastore == $config[$component][$identifier]['hash'] && $md5_datastore != $md5_activestore) { + // configstore. Mark them changed in both. + if ($md5_configstore == $config[$component][$identifier]['hash'] && $md5_configstore != $md5_activestore) { // dsm('configs in code are not the same as what was just saved in activestore.'); $status = $status | CONFIGURATION_ACTIVESTORE_OVERRIDDEN; configuration_set_status($component, $identifier, $status); } // Menu in the activestore is the same as what is in code. - if ($md5_activestore == $md5_datastore) { + if ($md5_activestore == $md5_configstore) { // dsm('config in activestore are same as what is in code'); $status = CONFIGURATION_IN_SYNC; configuration_set_status($component, $identifier, $status); configuration_set_hash($component, $identifier, $md5_activestore); } - if ($md5_activestore != $md5_datastore) { + if ($md5_activestore != $md5_configstore) { $status = $status | CONFIGURATION_DATASTORE_OVERRIDDEN; configuration_set_status($component, $identifier, $status); } // When checking for new configurations, check to see if configurations are - // the same in datastore as last activestore - if (!$from_activestore && $md5_datastore == $config[$component][$identifier]['hash']) { + // the same in configstore as last activestore + if (!$from_activestore && $md5_configstore == $config[$component][$identifier]['hash']) { // dsm('config in code are same as last in activestore'); $status = $status & ~CONFIGURATION_DATASTORE_OVERRIDDEN; configuration_set_status($component, $identifier, $status); @@ -451,7 +451,7 @@ function ctools_configuration_check($identifier) { // Store the config array in cache for easy access if ($status != CONFIGURATION_IN_SYNC) { $configuration[$component][$identifier]['activestore'] = (is_array($export_code) && array_key_exists($identifier, $export_code)) ? $export[$identifier] : ''; - $configuration[$component][$identifier]['datastore'] = (is_array($export_code) && array_key_exists($identifier, $export_code)) ? $export_code[$identifier] : ''; + $configuration[$component][$identifier]['configstore'] = (is_array($export_code) && array_key_exists($identifier, $export_code)) ? $export_code[$identifier] : ''; cache_set("$component:$identifier", $configuration, 'cache_configuration'); } } @@ -476,4 +476,4 @@ function ctools_configuration_hash($identifier) { } return md5(serialize($export[$identifier])); -} \ No newline at end of file +} diff --git a/includes/configuration.field.inc b/includes/configuration.field.inc index 82f33f3..ff44e6d 100644 --- a/includes/configuration.field.inc +++ b/includes/configuration.field.inc @@ -242,29 +242,29 @@ function configuration_check_field($identifier) { $return = ''; $component = 'field'; $status = $config[$component][$identifier]['status']; - $md5_datastore = (is_array($fields_code) && array_key_exists($identifier, $fields_code)) ? md5(serialize($fields_code[$identifier])) : ''; + $md5_configstore = (is_array($fields_code) && array_key_exists($identifier, $fields_code)) ? md5(serialize($fields_code[$identifier])) : ''; $md5_activestore = (is_array($fields) && array_key_exists($identifier, $fields)) ? md5(serialize($fields[$identifier])) : ''; // Configs in code are not the same as what was just saved in activestore. - if ($from_activestore == TRUE && $md5_datastore != $md5_activestore) { + if ($from_activestore == TRUE && $md5_configstore != $md5_activestore) { // dsm('configs in code are not the same as what was just saved in activestore.'); $status = $status | CONFIGURATION_ACTIVESTORE_OVERRIDDEN; configuration_set_status($component, $identifier, $status); } // Menu in the activestore is the same as what is in code. - if ($md5_activestore == $md5_datastore) { + if ($md5_activestore == $md5_configstore) { // dsm('config in activestore are same as what is in code'); $status = CONFIGURATION_IN_SYNC; configuration_set_status($component, $identifier, $status); configuration_set_hash($component, $identifier, $md5_activestore); } - if ($md5_activestore != $md5_datastore && $md5_datastore != $config['field'][$identifier]['hash']) { + if ($md5_activestore != $md5_configstore && $md5_configstore != $config['field'][$identifier]['hash']) { $status = $status | CONFIGURATION_DATASTORE_OVERRIDDEN; configuration_set_status($component, $identifier, $status); } // When checking for new configurations, check to see if configurations are - // the same in datastore as last activestore, and remove bit. - if (!$from_activestore && $md5_datastore == $config['field'][$identifier]['hash']) { + // the same in configstore as last activestore, and remove bit. + if (!$from_activestore && $md5_configstore == $config['field'][$identifier]['hash']) { // dsm('config in code are same as last in activestore'); $status = $status & ~CONFIGURATION_DATASTORE_OVERRIDDEN; configuration_set_status($component, $identifier, $status); @@ -273,7 +273,7 @@ function configuration_check_field($identifier) { // Store the config array in cache for easy access if ($status != CONFIGURATION_IN_SYNC) { $configuration[$component][$identifier]['activestore'] = (is_array($fields) && array_key_exists($identifier, $fields)) ? $fields[$identifier] : ''; - $configuration[$component][$identifier]['datastore'] = (is_array($fields_code) && array_key_exists($identifier, $fields_code)) ? $fields_code[$identifier] : ''; + $configuration[$component][$identifier]['configstore'] = (is_array($fields_code) && array_key_exists($identifier, $fields_code)) ? $fields_code[$identifier] : ''; cache_set("$component:$identifier", $configuration, 'cache_configuration'); } } diff --git a/includes/configuration.filter.inc b/includes/configuration.filter.inc index 78225bb..86988b9 100644 --- a/includes/configuration.filter.inc +++ b/includes/configuration.filter.inc @@ -158,27 +158,27 @@ function configuration_check_filter($identifier) { $return = ''; $component = 'filter'; $status = $config[$component][$identifier]['status']; - $md5_datastore = (is_array($formats_code) && array_key_exists($identifier, $formats_code)) ? md5(serialize($formats_code[$identifier])) : ''; + $md5_configstore = (is_array($formats_code) && array_key_exists($identifier, $formats_code)) ? md5(serialize($formats_code[$identifier])) : ''; $md5_activestore = (is_array($formats_code) && array_key_exists($identifier, $formats_code)) ? md5(serialize($formats[$identifier])) : ''; // Configs in code are not the same as what was just saved in activestore. - if ($from_activestore == TRUE && $md5_datastore != $md5_activestore) { + if ($from_activestore == TRUE && $md5_configstore != $md5_activestore) { $status = $status | CONFIGURATION_ACTIVESTORE_OVERRIDDEN; configuration_set_status($component, $identifier, $status); } // Menu in the activestore is the same as what is in code. - if ($md5_activestore == $md5_datastore) { + if ($md5_activestore == $md5_configstore) { $status = CONFIGURATION_IN_SYNC; configuration_set_status($component, $identifier, $status); configuration_set_hash($component, $identifier, $md5_activestore); } - if ($md5_activestore != $md5_datastore) { + if ($md5_activestore != $md5_configstore) { $status = $status | CONFIGURATION_DATASTORE_OVERRIDDEN; configuration_set_status($component, $identifier, $status); } // When checking for new configurations, check to see if configurations are - // the same in datastore as last activestore. Remove the datastore overridden. - if ($md5_datastore == $config[$component][$identifier]['hash']) { + // the same in configstore as last activestore. Remove the configstore overridden. + if ($md5_configstore == $config[$component][$identifier]['hash']) { $status = $status & ~CONFIGURATION_DATASTORE_OVERRIDDEN; configuration_set_status($component, $identifier, $status); } @@ -186,7 +186,7 @@ function configuration_check_filter($identifier) { // Store the config array in cache for easy access if ($status != CONFIGURATION_IN_SYNC) { $configuration[$component][$identifier]['activestore'] = (is_array($formats_code) && array_key_exists($identifier, $formats_code)) ? $formats[$identifier] : ''; - $configuration[$component][$identifier]['datastore'] = (is_array($formats_code) && array_key_exists($identifier, $formats_code)) ? $formats_code[$identifier] : ''; + $configuration[$component][$identifier]['configstore'] = (is_array($formats_code) && array_key_exists($identifier, $formats_code)) ? $formats_code[$identifier] : ''; cache_set("$component:$identifier", $configuration, 'cache_configuration'); } } diff --git a/includes/configuration.image.inc b/includes/configuration.image.inc index 0d54961..b21e519 100644 --- a/includes/configuration.image.inc +++ b/includes/configuration.image.inc @@ -139,27 +139,27 @@ function configuration_check_image($identifier) { $return = ''; $component = 'image'; $status = $config[$component][$identifier]['status']; - $md5_datastore = (is_array($styles_code) && array_key_exists($identifier, $styles_code)) ? md5(serialize($styles_code[$identifier])) : ''; + $md5_configstore = (is_array($styles_code) && array_key_exists($identifier, $styles_code)) ? md5(serialize($styles_code[$identifier])) : ''; $md5_activestore = (is_array($styles_code) && array_key_exists($identifier, $styles_code)) ? md5(serialize($styles[$identifier])) : ''; // Configs in code are not the same as what was just saved in activestore. - if ($from_activestore == TRUE && $md5_datastore != $md5_activestore) { + if ($from_activestore == TRUE && $md5_configstore != $md5_activestore) { $status = $status | CONFIGURATION_ACTIVESTORE_OVERRIDDEN; configuration_set_status($component, $identifier, $status); } // Menu in the activestore is the same as what is in code. - if ($md5_activestore == $md5_datastore) { + if ($md5_activestore == $md5_configstore) { $status = CONFIGURATION_IN_SYNC; configuration_set_status($component, $identifier, $status); configuration_set_hash($component, $identifier, $md5_activestore); } - if ($md5_activestore != $md5_datastore) { + if ($md5_activestore != $md5_configstore) { $status = $status | CONFIGURATION_DATASTORE_OVERRIDDEN; configuration_set_status($component, $identifier, $status); } // When checking for new configurations, check to see if configurations are - // the same in datastore as last activestore. Remove the datastore overridden. - if ($md5_datastore == $config[$component][$identifier]['hash']) { + // the same in configstore as last activestore. Remove the configstore overridden. + if ($md5_configstore == $config[$component][$identifier]['hash']) { $status = $status & ~CONFIGURATION_DATASTORE_OVERRIDDEN; configuration_set_status($component, $identifier, $status); } @@ -167,7 +167,7 @@ function configuration_check_image($identifier) { // Store the config array in cache for easy access if ($status != CONFIGURATION_IN_SYNC) { $configuration[$component][$identifier]['activestore'] = (is_array($styles_code) && array_key_exists($identifier, $styles_code)) ? $styles[$identifier] : ''; - $configuration[$component][$identifier]['datastore'] = (is_array($styles_code) && array_key_exists($identifier, $styles_code)) ? $styles_code[$identifier] : ''; + $configuration[$component][$identifier]['configstore'] = (is_array($styles_code) && array_key_exists($identifier, $styles_code)) ? $styles_code[$identifier] : ''; cache_set("$component:$identifier", $configuration, 'cache_configuration'); } } diff --git a/includes/configuration.menu.inc b/includes/configuration.menu.inc index 3d33de3..1f89628 100644 --- a/includes/configuration.menu.inc +++ b/includes/configuration.menu.inc @@ -346,27 +346,27 @@ function configuration_check_menu_links($identifier) { $return = ''; $component = 'menu_links'; $status = $config[$component][$identifier]['status']; - $md5_datastore = (is_array($menu_links_code) && array_key_exists($identifier, $menu_links_code)) ? md5(serialize($menu_links_code[$identifier])) : ''; + $md5_configstore = (is_array($menu_links_code) && array_key_exists($identifier, $menu_links_code)) ? md5(serialize($menu_links_code[$identifier])) : ''; $md5_activestore = (is_array($menu_links_code) && array_key_exists($identifier, $menu_links_code)) ? md5(serialize($menu_links[$identifier])) : ''; // Configs in code are not the same as what was just saved in activestore. - if ($from_activestore == TRUE && $md5_datastore != $md5_activestore) { + if ($from_activestore == TRUE && $md5_configstore != $md5_activestore) { $status = $status | CONFIGURATION_ACTIVESTORE_OVERRIDDEN; configuration_set_status($component, $identifier, $status); } // Menu in the activestore is the same as what is in code. - if ($md5_activestore == $md5_datastore) { + if ($md5_activestore == $md5_configstore) { $status = CONFIGURATION_IN_SYNC; configuration_set_status($component, $identifier, $status); configuration_set_hash($component, $identifier, $md5_activestore); } - if ($md5_activestore != $md5_datastore) { + if ($md5_activestore != $md5_configstore) { $status = $status | CONFIGURATION_DATASTORE_OVERRIDDEN; configuration_set_status($component, $identifier, $status); } // When checking for new configurations, check to see if configurations are - // the same in datastore as last activestore. Remove the datastore overridden. - if ($md5_datastore == $config[$component][$identifier]['hash']) { + // the same in configstore as last activestore. Remove the configstore overridden. + if ($md5_configstore == $config[$component][$identifier]['hash']) { $status = $status & ~CONFIGURATION_DATASTORE_OVERRIDDEN; configuration_set_status($component, $identifier, $status); } @@ -374,7 +374,7 @@ function configuration_check_menu_links($identifier) { // Store the config array in cache for easy access if ($status != CONFIGURATION_IN_SYNC) { $configuration[$component][$identifier]['activestore'] = (is_array($menu_links_code) && array_key_exists($identifier, $menu_links_code)) ? $menu_links[$identifier] : ''; - $configuration[$component][$identifier]['datastore'] = (is_array($menu_links_code) && array_key_exists($identifier, $menu_links_code)) ? $menu_links_code[$identifier] : ''; + $configuration[$component][$identifier]['configstore'] = (is_array($menu_links_code) && array_key_exists($identifier, $menu_links_code)) ? $menu_links_code[$identifier] : ''; cache_set("$component:$identifier", $configuration, 'cache_configuration'); } } @@ -426,27 +426,27 @@ function configuration_check_menu_custom($identifier, $from_activestore = FALSE) $return = ''; $component = 'menu_custom'; $status = $config[$component][$identifier]['status']; - $md5_datastore = (is_array($menus_code) && array_key_exists($identifier, $menus_code)) ? md5(serialize($menus_code[$identifier])) : ''; + $md5_configstore = (is_array($menus_code) && array_key_exists($identifier, $menus_code)) ? md5(serialize($menus_code[$identifier])) : ''; $md5_activestore = (is_array($menus_code) && array_key_exists($identifier, $menus_code)) ? md5(serialize($menus[$identifier])) : ''; // Configs in code are not the same as what was just saved in activestore. - if ($from_activestore == TRUE && $md5_datastore != $md5_activestore) { + if ($from_activestore == TRUE && $md5_configstore != $md5_activestore) { $status = $status | CONFIGURATION_ACTIVESTORE_OVERRIDDEN; configuration_set_status($component, $identifier, $status); } // Menu in the activestore is the same as what is in code. - if ($md5_activestore == $md5_datastore) { + if ($md5_activestore == $md5_configstore) { $status = CONFIGURATION_IN_SYNC; configuration_set_status($component, $identifier, $status); configuration_set_hash($component, $identifier, $md5_activestore); } - if ($md5_activestore != $md5_datastore) { + if ($md5_activestore != $md5_configstore) { $status = $status | CONFIGURATION_DATASTORE_OVERRIDDEN; configuration_set_status($component, $identifier, $status); } // When checking for new configurations, check to see if configurations are - // the same in datastore as last activestore. Remove the datastore overridden. - if ($md5_datastore == $config[$component][$identifier]['hash']) { + // the same in configstore as last activestore. Remove the configstore overridden. + if ($md5_configstore == $config[$component][$identifier]['hash']) { $status = $status & ~CONFIGURATION_DATASTORE_OVERRIDDEN; configuration_set_status($component, $identifier, $status); } @@ -454,7 +454,7 @@ function configuration_check_menu_custom($identifier, $from_activestore = FALSE) // Store the config array in cache for easy access if ($status != CONFIGURATION_IN_SYNC) { $configuration[$component][$identifier]['activestore'] = (is_array($menus_code) && array_key_exists($identifier, $menus_code)) ? $menus[$identifier] : ''; - $configuration[$component][$identifier]['datastore'] = (is_array($menus_code) && array_key_exists($identifier, $menus_code)) ? $menus_code[$identifier] : ''; + $configuration[$component][$identifier]['configstore'] = (is_array($menus_code) && array_key_exists($identifier, $menus_code)) ? $menus_code[$identifier] : ''; cache_set("$component:$identifier", $configuration, 'cache_configuration'); } } diff --git a/includes/configuration.node.inc b/includes/configuration.node.inc index 00e26db..1567560 100644 --- a/includes/configuration.node.inc +++ b/includes/configuration.node.inc @@ -236,28 +236,28 @@ function configuration_check_node($identifier) { $return = ''; $component = 'node'; $status = $config[$component][$identifier]['status']; - $md5_datastore = (is_array($items_code) && array_key_exists($identifier, $items_code)) ? md5(serialize($items_code[$identifier])) : ''; + $md5_configstore = (is_array($items_code) && array_key_exists($identifier, $items_code)) ? md5(serialize($items_code[$identifier])) : ''; $md5_activestore = (is_array($items_code) && array_key_exists($identifier, $items_code)) ? md5(serialize($items[$identifier])) : ''; // Configs in code are not the same as what was just saved in activestore. - if ($from_activestore == TRUE && $md5_datastore != $md5_activestore) { + if ($from_activestore == TRUE && $md5_configstore != $md5_activestore) { // dsm('configs in code are not the same as what was just saved in activestore.'); $status = $status | CONFIGURATION_ACTIVESTORE_OVERRIDDEN; configuration_set_status($component, $identifier, $status); } // Menu in the activestore is the same as what is in code. - if ($md5_activestore == $md5_datastore) { + if ($md5_activestore == $md5_configstore) { $status = CONFIGURATION_IN_SYNC; configuration_set_status($component, $identifier, $status); configuration_set_hash($component, $identifier, $md5_activestore); } - if ($md5_activestore != $md5_datastore) { + if ($md5_activestore != $md5_configstore) { $status = $status | CONFIGURATION_DATASTORE_OVERRIDDEN; configuration_set_status($component, $identifier, $status); } // When checking for new configurations, check to see if configurations are - // the same in datastore as last activestore. Remove the datastore overridden. - if ($md5_datastore == $config[$component][$identifier]['hash']) { + // the same in configstore as last activestore. Remove the configstore overridden. + if ($md5_configstore == $config[$component][$identifier]['hash']) { $status = $status & ~CONFIGURATION_DATASTORE_OVERRIDDEN; configuration_set_status($component, $identifier, $status); } @@ -265,7 +265,7 @@ function configuration_check_node($identifier) { // Store the config array in cache for easy access if ($status != CONFIGURATION_IN_SYNC) { $configuration[$component][$identifier]['activestore'] = (is_array($items_code) && array_key_exists($identifier, $items_code)) ? $items[$identifier] : ''; - $configuration[$component][$identifier]['datastore'] = (is_array($items_code) && array_key_exists($identifier, $items_code)) ? $items_code[$identifier] : ''; + $configuration[$component][$identifier]['configstore'] = (is_array($items_code) && array_key_exists($identifier, $items_code)) ? $items_code[$identifier] : ''; cache_set("$component:$identifier", $configuration, 'cache_configuration'); } } @@ -283,4 +283,4 @@ function configuration_hash_node($identifier) { eval(array_pop($code)); return md5(serialize($items[$identifier])); -} \ No newline at end of file +} diff --git a/includes/configuration.taxonomy.inc b/includes/configuration.taxonomy.inc index ada2fee..db6eb0b 100644 --- a/includes/configuration.taxonomy.inc +++ b/includes/configuration.taxonomy.inc @@ -137,27 +137,27 @@ function configuration_check_taxonomy($identifier) { $return = ''; $component = 'taxonomy'; $status = $config[$component][$identifier]['status']; - $md5_datastore = (is_array($vocab_code) && array_key_exists($identifier, $vocab_code)) ? md5(serialize($vocab_code[$identifier])) : ''; + $md5_configstore = (is_array($vocab_code) && array_key_exists($identifier, $vocab_code)) ? md5(serialize($vocab_code[$identifier])) : ''; $md5_activestore = (is_array($vocab_code) && array_key_exists($identifier, $vocab_code)) ? md5(serialize($vocab[$identifier])) : ''; // Configs in code are not the same as what was just saved in activestore. - if ($from_activestore == TRUE && $md5_datastore != $md5_activestore) { + if ($from_activestore == TRUE && $md5_configstore != $md5_activestore) { $status = $status | CONFIGURATION_ACTIVESTORE_OVERRIDDEN; configuration_set_status($component, $identifier, $status); } // Menu in the activestore is the same as what is in code. - if ($md5_activestore == $md5_datastore) { + if ($md5_activestore == $md5_configstore) { $status = CONFIGURATION_IN_SYNC; configuration_set_status($component, $identifier, $status); configuration_set_hash($component, $identifier, $md5_activestore); } - if ($md5_activestore != $md5_datastore) { + if ($md5_activestore != $md5_configstore) { $status = $status | CONFIGURATION_DATASTORE_OVERRIDDEN; configuration_set_status($component, $identifier, $status); } // When checking for new configurations, check to see if configurations are - // the same in datastore as last activestore. Remove the datastore overridden. - if ($md5_datastore == $config[$component][$identifier]['hash']) { + // the same in configstore as last activestore. Remove the configstore overridden. + if ($md5_configstore == $config[$component][$identifier]['hash']) { $status = $status & ~CONFIGURATION_DATASTORE_OVERRIDDEN; configuration_set_status($component, $identifier, $status); } @@ -165,7 +165,7 @@ function configuration_check_taxonomy($identifier) { // Store the config array in cache for easy access if ($status != CONFIGURATION_IN_SYNC) { $configuration[$component][$identifier]['activestore'] = (is_array($vocab_code) && array_key_exists($identifier, $vocab_code)) ? $vocab[$identifier] : ''; - $configuration[$component][$identifier]['datastore'] = (is_array($vocab_code) && array_key_exists($identifier, $vocab_code)) ? $vocab_code[$identifier] : ''; + $configuration[$component][$identifier]['configstore'] = (is_array($vocab_code) && array_key_exists($identifier, $vocab_code)) ? $vocab_code[$identifier] : ''; cache_set("$component:$identifier", $configuration, 'cache_configuration'); } } @@ -182,4 +182,4 @@ function configuration_hash_taxonomy($identifier) { eval('$vocab = ' . substr(array_pop($code), 8)); return md5(serialize($vocab[$identifier])); -} \ No newline at end of file +} diff --git a/includes/configuration.user.inc b/includes/configuration.user.inc index d3d70eb..ee4d6bb 100644 --- a/includes/configuration.user.inc +++ b/includes/configuration.user.inc @@ -313,27 +313,27 @@ function configuration_check_user_permission($identifier) { foreach ($identifiers as $identifier) { $component = 'user_permission'; $status = $config[$component][$identifier]['status']; - $md5_datastore = (is_array($permissions_code) && array_key_exists($identifier, $permissions_code)) ? md5(serialize($permissions_code[$identifier])) : ''; + $md5_configstore = (is_array($permissions_code) && array_key_exists($identifier, $permissions_code)) ? md5(serialize($permissions_code[$identifier])) : ''; $md5_activestore = (is_array($permissions_code) && array_key_exists($identifier, $permissions_code)) ? md5(serialize($permissions[$identifier])) : ''; // Configs in code are not the same as what was just saved in activestore. - if ($from_activestore == TRUE && $md5_datastore != $md5_activestore) { + if ($from_activestore == TRUE && $md5_configstore != $md5_activestore) { $status = $status | CONFIGURATION_ACTIVESTORE_OVERRIDDEN; configuration_set_status($component, $identifier, $status); } // Menu in the activestore is the same as what is in code. - if ($md5_activestore == $md5_datastore) { + if ($md5_activestore == $md5_configstore) { $status = CONFIGURATION_IN_SYNC; configuration_set_status($component, $identifier, $status); configuration_set_hash($component, $identifier, $md5_activestore); } - if ($md5_activestore != $md5_datastore) { + if ($md5_activestore != $md5_configstore) { $status = $status | CONFIGURATION_DATASTORE_OVERRIDDEN; configuration_set_status($component, $identifier, $status); } // When checking for new configurations, check to see if configurations are - // the same in datastore as last activestore. Remove the datastore overridden. - if ($md5_datastore == $config[$component][$identifier]['hash']) { + // the same in configstore as last activestore. Remove the configstore overridden. + if ($md5_configstore == $config[$component][$identifier]['hash']) { $status = $status & ~CONFIGURATION_DATASTORE_OVERRIDDEN; configuration_set_status($component, $identifier, $status); } @@ -341,7 +341,7 @@ function configuration_check_user_permission($identifier) { // Store the config array in cache for easy access if ($status != CONFIGURATION_IN_SYNC) { $configuration[$component][$identifier]['activestore'] = (is_array($permissions_code) && array_key_exists($identifier, $permissions_code)) ? $permissions[$identifier] : ''; - $configuration[$component][$identifier]['datastore'] = (is_array($permissions_code) && array_key_exists($identifier, $permissions_code)) ? $permissions_code[$identifier] : ''; + $configuration[$component][$identifier]['configstore'] = (is_array($permissions_code) && array_key_exists($identifier, $permissions_code)) ? $permissions_code[$identifier] : ''; cache_set("$component:$identifier", $configuration, 'cache_configuration'); } } @@ -411,24 +411,24 @@ function configuration_check_user_role($identifier) { } } } - $md5_datastore = (is_array($roles_code) && array_key_exists($identifier, $roles_code)) ? md5(serialize($roles_code[$identifier])) : ''; + $md5_configstore = (is_array($roles_code) && array_key_exists($identifier, $roles_code)) ? md5(serialize($roles_code[$identifier])) : ''; $md5_activestore = (is_array($roles_code) && array_key_exists($identifier, $roles_code)) ? md5(serialize($roles[$identifier])) : ''; // When checking for new configurations, check to see if configurations are - // the same in datastore as last activestore - if (!$from_activestore && (isset($config[$identifier]) && isset($roles_code[$identifier])) && $md5_datastore == $config[$identifier]['hash']) { + // the same in configstore as last activestore + if (!$from_activestore && (isset($config[$identifier]) && isset($roles_code[$identifier])) && $md5_configstore == $config[$identifier]['hash']) { $status = $status & ~CONFIGURATION_DATASTORE_OVERRIDDEN; configuration_set_status($component, $identifier, $status); } // Menu in the activestore is the same as what is in code. - if ((isset($roles[$identifier]) && isset($roles_code[$identifier])) && $md5_activestore == $md5_datastore) { + if ((isset($roles[$identifier]) && isset($roles_code[$identifier])) && $md5_activestore == $md5_configstore) { $status = CONFIGURATION_IN_SYNC; configuration_set_status($component, $identifier, $status); configuration_set_hash($component, $identifier, $md5_activestore); } // Compare what was just exported to what is on the file system. - if ((isset($roles[$identifier]) && isset($roles_code[$identifier])) && ($md5_activestore != $md5_datastore)) { + if ((isset($roles[$identifier]) && isset($roles_code[$identifier])) && ($md5_activestore != $md5_configstore)) { $status = $settings['status'] | CONFIGURATION_DATASTORE_OVERRIDDEN; configuration_set_status($component, $identifier, $status); } @@ -437,7 +437,7 @@ function configuration_check_user_role($identifier) { if ($status != CONFIGURATION_IN_SYNC) { // Supress error, there may not be anything in activestore $configuration[$component][$identifier]['activestore'] = (is_array($roles_code) && array_key_exists($identifier, $roles_code)) ? $roles[$identifier] : ''; - $configuration[$component][$identifier]['datastore'] = (is_array($roles_code) && array_key_exists($identifier, $roles_code)) ? $roles_code[$identifier] : ''; + $configuration[$component][$identifier]['configstore'] = (is_array($roles_code) && array_key_exists($identifier, $roles_code)) ? $roles_code[$identifier] : ''; cache_set("$component:$identifier", $configuration, 'cache_configuration'); } @@ -461,4 +461,4 @@ function configuration_hash_user_role($identifier) { eval(array_pop($code)); return md5(serialize($roles[$identifier])); -} \ No newline at end of file +} diff --git a/observers/observer.image.inc b/observers/observer.image.inc index 4ff72c4..31e0d93 100644 --- a/observers/observer.image.inc +++ b/observers/observer.image.inc @@ -37,13 +37,13 @@ function configuration_form_image_style_revert_form_alter(&$form, $form_state) { } /** - * Restore the values from the datastore when an image style is reverted. + * Restore the values from the configstore when an image style is reverted. */ function configuration_revert_image_style($form, $form_state) { if (!empty($form_state['image_style']['name'])) { $identifier = $form_state['image_style']['name']; $cache = cache_get("image:$identifier", 'cache_configuration'); - $cache->data['image'][$identifier]['activestore'] = $cache->data['image'][$identifier]['datastore']; + $cache->data['image'][$identifier]['activestore'] = $cache->data['image'][$identifier]['configstore']; cache_set('image:' . $identifier, $cache->data['image'][$identifier], 'cache_configuration'); configuration_set_status('image', $identifier, CONFIGURATION_IN_SYNC); configuration_check_configurations(TRUE); diff --git a/tests/configuration.test b/tests/configuration.test index 58352fe..e92fb24 100644 --- a/tests/configuration.test +++ b/tests/configuration.test @@ -23,16 +23,16 @@ class ConfigurationWebTestCase extends DrupalWebTestCase { $edit["user_role[items][" . $roles[3] . "]"] = 1; $this->tracked = $edit; - $this->drupalPost('admin/config/system/configuration/notracking', $edit, t('Write to Datastore')); + $this->drupalPost('admin/config/system/configuration/notracking', $edit, t('Write to Configstore')); // After start traking configurations, a file should be created by each component. $types = array('field', 'filter', 'user_permission', 'user_role', 'taxonomy'); foreach ($types as $type) { - $config_file_exists = file_exists($this->datastore_path . '/configuration.' . $type . '.inc'); + $config_file_exists = file_exists($this->configstore_path . '/configuration.' . $type . '.inc'); $this->assertTrue($config_file_exists, "Configuration file for $type was created."); } // Nodes and images styles are saved into configuration.inc - $config_file_exists = file_exists($this->datastore_path . '/configuration.inc'); + $config_file_exists = file_exists($this->configstore_path . '/configuration.inc'); $this->assertTrue($config_file_exists, "Configuration file for nodes and image styles was created."); $this->assertResponse(200); @@ -57,16 +57,16 @@ class ConfigurationWebTestCase extends DrupalWebTestCase { function setUp($modules = array()) { parent::setUp($modules); //Generate an unique path for this test based on the database prefix. - $this->datastore_path = file_directory_temp(); + $this->configstore_path = file_directory_temp(); - variable_set('configuration_config_path', $this->datastore_path); - $this->verbose('Saving configurations into: ' . $this->datastore_path); - file_prepare_directory(variable_get('configuration_config_path', $this->datastore_path)); + variable_set('configuration_config_path', $this->configstore_path); + $this->verbose('Saving configurations into: ' . $this->configstore_path); + file_prepare_directory(variable_get('configuration_config_path', $this->configstore_path)); // Use the administration interface so config:// is correctly set up. $this->adminLogin(); $edit = array(); - $edit["configuration_config_path"] = $this->datastore_path; + $edit["configuration_config_path"] = $this->configstore_path; $this->drupalPost('admin/config/system/configuration/settings', $edit, t('Save configuration')); $this->drupalLogout(); } -- 1.7.10