diff --git skinr.module skinr.module index cceb172..d7795c3 100644 --- skinr.module +++ skinr.module @@ -87,8 +87,6 @@ function skinr_skin_extract($module, $sids, $settings, $theme = NULL) { $theme = skinr_current_theme(); } - $info = skinr_skin_data(); - $extracted = array( 'module' => $module, 'sids' => $sids, @@ -635,26 +633,6 @@ function skinr_skin_default() { } /** - * Retrieves all the Skinr skins from theme parents. Theme skins - * will override any skins of the same name from its parents. - */ -function skinr_inherited_skins($theme) { - $themes = list_themes(); - - $all_skins = $skins = array(); - $base_theme = (!empty($themes[$theme]->info['base theme'])) ? $themes[$theme]->info['base theme'] : ''; - while ($base_theme) { - $all_skins[] = (!empty($themes[$base_theme]->info['skinr'])) ? (array)$themes[$base_theme]->info['skinr'] : array(); - $base_theme = (!empty($themes[$base_theme]->info['base theme'])) ? $themes[$base_theme]->info['base theme'] : ''; - } - array_reverse($all_skins); - foreach ($all_skins as $new_skin) { - $skins = array_merge($skins, $new_skin); - } - return $skins; -} - -/** * Helper function to scan and collect skin .info data. * * @return @@ -689,7 +667,7 @@ function _skinr_rebuild_skinset_data() { // modify the data in the .info files if necessary. $type = 'skinset'; drupal_alter('skinr_info', $skinsets[$key]->info, $skinsets[$key], $type); - + // @todo Give the stylesheets and scripts proper path information, or leave 'till later? } @@ -698,6 +676,8 @@ function _skinr_rebuild_skinset_data() { /** * Helper function to process a skin or theme .info file. + * @param $info + * Needs to be documented. * * @return * A skinset. @@ -731,11 +711,6 @@ function _skinr_skinset($info) { } } - // Inherit skins from parent theme, if inherit_skins is set to true. - if (!empty($skinset['options']['inherit_skins'])) { - $skinr_info = array_merge(skinr_inherited_skins($info->name), $skinr_info); - } - $defaults = skinr_skin_default(); foreach ($skinr_info as $id => $skin) { @@ -813,48 +788,37 @@ function _skinr_add_path_to_files($files, $path, $type) { /** * Helper function to process an array of skins or themes .info files. * - * @param $type - * Either 'theme' or 'skinset'. - * * @return * An array of skinsets. */ -function skinr_skinsets($type) { - $skinsets = &drupal_static(__FUNCTION__, array('theme' => array(), 'skinset' => array())); - // @todo drupal_static_reset('skinr_skinsets'); - - if (empty($skinsets[$type])) { - $themes = list_themes(); - - if ($type == 'theme') { - foreach ($themes as $theme) { - $skinset = new StdClass(); - $skinset->filename = $theme->filename; - $skinset->name = $theme->name; - $skinset->status = $theme->status ? 1 : 0; - $skinset->info = $theme->info; - - $skinsets[$type][$skinset->name] = $skinset; - } - } - elseif ($type == 'skinset') { - $result = db_query("SELECT * FROM {skinr_skinsets}"); - foreach ($result as $skinset) { - if (file_exists($skinset->filename)) { - $skinset->info = unserialize($skinset->info); - - $skinsets[$type][$skinset->name] = $skinset; - } +function skinr_skinsets() { + $skinsets = &drupal_static(__FUNCTION__, array()); + + if (empty($skinsets)) { + $result = db_query("SELECT * FROM {skinr_skinsets}"); + foreach ($result as $skinset) { + if (file_exists($skinset->filename)) { + $skinset->info = unserialize($skinset->info); + $skinsets[$skinset->name] = $skinset; } } + $themes = list_themes(); $default_status = array(); foreach ($themes as $theme) { $default_status[$theme->name] = $theme->name; } - foreach ($skinsets[$type] as $key => $skinset) { - $skinset->type = $type; + foreach ($skinsets as $key => $skinset) { + if (isset($themes[$key])) { + $skinset->type = 'theme'; + $skinset->status = !empty($theme->status) ? 1 : 0; + } + else { + $skinset->type = 'skinset'; + } + + // @todo Allow skins to inherit from other skins. $additional = _skinr_skinset($skinset); $skinset->options = $additional['options']; @@ -867,7 +831,7 @@ function skinr_skinsets($type) { } } - return $skinsets[$type]; + return $skinsets; } /** @@ -1028,19 +992,20 @@ function skinr_skin_data() { $cache = &drupal_static(__FUNCTION__); if (is_null($cache)) { - $skins_skinsets = skinr_skinsets('skinset'); - $themes_skinsets = skinr_skinsets('theme'); + $skinsets = skinr_skinsets(); // Need to merge all skins skinsets into a single list of skins. // Also merge in the groups information. $additional_skins = array(); $groups = array(); - foreach ($skins_skinsets as $key => $skinset) { - if (!empty($skinset->skins) && $skinset->status == 1) { - $additional_skins += $skinset->skins; - } - if (!empty($skinset->options['groups'])) { - $groups += $skinset->options['groups']; + foreach ($skinsets as $key => $skinset) { + if ($skinset->type == 'skinset') { + if (!empty($skinset->skins) && $skinset->status == 1) { + $additional_skins += $skinset->skins; + } + if (!empty($skinset->options['groups'])) { + $groups += $skinset->options['groups']; + } } } @@ -1052,16 +1017,18 @@ function skinr_skin_data() { continue; } - if (isset($themes_skinsets[$theme->name])) { - $cache[$theme->name] = $themes_skinsets[$theme->name]; + if (!empty($skinsets[$theme->name])) { + $cache[$theme->name] = $skinsets[$theme->name]; $cache[$theme->name]->skins += $additional_skins; $cache[$theme->name]->options['groups'] += $groups; } else { - $cache[$theme->name] = array( - 'options' => array('groups' => $groups), - 'skins' => $additional_skins, - ); + $cache[$theme->name] = new stdClass(); + $cache[$theme->name]->name = $theme->name; + $cache[$theme->name]->status = 1; + $cache[$theme->name]->type = 'theme'; + $cache[$theme->name]->skins = $additional_skins; + $cache[$theme->name]->options = array('groups' => $groups); } } } diff --git skinr_ui.admin.inc skinr_ui.admin.inc index 6bde637..cd6c5a0 100644 --- skinr_ui.admin.inc +++ skinr_ui.admin.inc @@ -139,14 +139,14 @@ function theme_skinr_ui_filters($variables) { if (!empty($form['status']) && count(element_children($form['status']))) { $output .= '
' . (!empty($form['current']) ? '
' . t('and') . ' ' . t('where') . '
' : ''); - + $output .= '
'; - + foreach (element_children($form['status']) as $key) { $output .= drupal_render($form['status'][$key]); } $output .= '
'; - + $output .= '
'; } $output .= drupal_render($form['actions']); @@ -195,7 +195,7 @@ function skinr_ui_list($form, &$form_state) { $form['filter'] = skinr_ui_filter_form(); $form['#submit'][] = 'skinr_ui_filter_form_submit'; $form['admin'] = skinr_ui_admin_skins(); - + drupal_add_css(drupal_get_path('module', 'skinr') . '/css/skinr_ui.css'); return $form; @@ -309,7 +309,7 @@ function skinr_ui_admin_skins() { } } } - + // Sort table. array_multisort($sorts, $sort, $options); @@ -397,7 +397,7 @@ function skinr_ui_multiple_delete_confirm_submit($form, &$form_state) { foreach ($form_state['values']['skins'] as $skin => $value) { $parts = explode('__', $skin, 3); - $skinr = new StdClass(); + $skinr = new stdClass(); $skinr->theme = $parts[0]; $skinr->module = $parts[1]; $skinr->sid = $parts[2]; @@ -405,7 +405,7 @@ function skinr_ui_multiple_delete_confirm_submit($form, &$form_state) { skinr_set($skinr); } - + $count = count($form_state['values']['skins']); if ($count == 1) { watchdog('content', 'Deleted 1 skinr setting.'); @@ -472,7 +472,7 @@ function skinr_ui_admin_skinsets($form, $form_state) { $form['skinsets'] = array('#tree' => TRUE); - + // Iterate through each of the skinsets. foreach ($skinsets as $name => $skinset) { $extra = array(); @@ -537,7 +537,7 @@ function _skinr_ui_admin_skinsets_build_row($info, $extra) { $form['screenshot'] = array( '#markup' => file_exists($info['screenshot']) ? theme('image', array('path' => $info['screenshot'], 'alt' => t('Screenshot for %theme theme', array('%theme' => $info['name'])), 'attributes' => array('class' => 'screenshot'), 'getsize' => FALSE)) : t('no screenshot'), ); - + $form['name'] = array( '#markup' => $info['name'], ); @@ -608,7 +608,7 @@ function skinr_ui_sort_by_info_name($a, $b) { function skinr_ui_admin_skinsets_submit($form, &$form_state) { // Store list of previously enabled themes and disable all themes. $old_skinset_list = $new_skinset_list = array(); - foreach (skinr_skinsets('skinset') as $skinset) { + foreach (skinr_skinsets() as $skinset) { if ($skinset->status) { $old_skinset_list[] = $skinset->name; } @@ -656,18 +656,18 @@ function theme_skinr_ui_admin_skinsets_fieldset($variables) { foreach (element_children($form) as $key) { // Stick it into $skinset for easier accessing. $skinset = $form[$key]; - + $row = array(); // Screenshot. $row[] = array('data' => $skinset['screenshot'], 'class' => array('screenshot')); - + // Name. $row[] = theme('skinr_ui_admin_skinsets_info', array( 'name' => drupal_render($skinset['name']), 'description' => drupal_render($skinset['description']) )); - + // Version. $row[] = drupal_render($skinset['version']); @@ -725,27 +725,27 @@ function theme_skinr_ui_admin_skinsets_incompatible($variables) { function skinr_ui_admin_skinsets_settings($form, $form_state, $skinset_name) { $form = array(); - $skinsets = skinr_skinsets('skinset'); + $skinsets = skinr_skinsets(); if (!empty($skinsets[$skinset_name])) { $skinset = $skinsets[$skinset_name]; - + $themes = list_themes(); ksort($themes); - + $form['skins'] = array('#tree' => TRUE); - + // Iterate through each of the skinsets. foreach ($skinset->skins as $name => $skin) { foreach ($themes as $theme) { if (!$theme->status) { continue; } - + // Create a row entry for this skinset. $form['skins'][$theme->name][$name] = _skinr_ui_admin_skinsets_settings_build_row($skin, $theme->name); } } - + // Add basic information to the fieldsets. $current_theme = skinr_current_theme(TRUE); foreach (element_children($form['skins']) as $theme_name) { @@ -829,13 +829,13 @@ function theme_skinr_ui_admin_skinsets_settings_fieldset($variables) { foreach (element_children($form) as $key) { // Stick it into $skin for easier accessing. $skin = $form[$key]; - + $row = array(); // Enabled. unset($skin['enable']['#title']); $row[] = array('class' => array('checkbox'), 'data' => drupal_render($skin['enable'])); - + // Name. $row[] = theme('skinr_ui_admin_skinsets_settings_info', array( 'name' => drupal_render($skin['name']), @@ -878,9 +878,9 @@ function skinr_ui_admin_skinsets_settings_submit($form, &$form_state) { } } } - + foreach ($statuses as $name => $status) { - $skinr_skin = new StdClass(); + $skinr_skin = new stdClass(); $skinr_skin->name = $form_state['values']['skinset']; $skinr_skin->type = 'skinset'; $skinr_skin->skin = $name; @@ -963,7 +963,7 @@ function skinr_ui_export_form($form, &$form_state, $theme = NULL) { if (!empty($theme->info['hidden'])) { continue; } - + if ($theme->name == $current_theme) { // Do nothing. } diff --git skinr_ui.module skinr_ui.module index 7de33de..1341ca7 100644 --- skinr_ui.module +++ skinr_ui.module @@ -69,10 +69,10 @@ function skinr_ui_menu() { // @see http://drupal.org/node/320303 $skinsets = array(); if (in_array('skinr', module_list())) { - $skinsets = skinr_skinsets('skinset'); + $skinsets = skinr_skinsets(); } foreach ($skinsets as $skinset) { - $items['admin/appearance/skinr/skins/settings/'. $skinset->name] = array( + $items['admin/appearance/skinr/skins/settings/' . $skinset->name] = array( 'title' => $skinset->info['name'], 'description' => 'Manage which options are available for each Skin when changing Skinr settings.', 'page callback' => 'drupal_get_form', @@ -339,7 +339,7 @@ function skinr_ui_edit($js = FALSE, $module, $sid, $sids = NULL) { if ($js) { // Do additional ajax related stuff. } - + $arguments = array( 'skinr' => array( 'module' => $module, @@ -390,7 +390,7 @@ function skinr_ui_form_alter(&$form, $form_state, $form_id) { if ($form_id == 'update_script_selection_form') { return; } - + $skinr_config = skinr_fetch_config(); $info = skinr_skin_data();