Index: context_layouts/plugins/context_layouts_reaction_block.inc =================================================================== --- context_layouts/plugins/context_layouts_reaction_block.inc (revision 1709) +++ context_layouts/plugins/context_layouts_reaction_block.inc (working copy) @@ -1,27 +1,27 @@ get_active_layout(); + protected function isEnabledRegion($region) { + $layout = $this->getActiveLayout(); if ($layout && isset($layout['regions']) && is_array($layout['regions'])) { - return in_array($region, $layout['regions'], TRUE) && parent::is_enabled_region($region); + return in_array($region, $layout['regions'], TRUE) && parent::isEnabledRegion($region); } - return parent::is_enabled_region($region); + return parent::isEnabledRegion($region); } /** * Retrieve the first layout specified found by any active contexts. */ - function get_active_layout($info = TRUE) { - $contexts = $this->get_contexts(); + public function getActiveLayout($info = TRUE) { + $contexts = $this->getContexts(); $layouts = context_layouts_get_layouts(); if (!empty($contexts) && !empty($layouts)) { foreach ($contexts as $context) { - $values = $this->fetch_from_context($context); + $values = $this->fetchFromContext($context); if (isset($values['layout']) && isset($layouts[$values['layout']])) { return $info ? $layouts[$values['layout']] : $values['layout']; } @@ -37,7 +37,7 @@ /** * Add the layout template to page vars. */ - function add_layout_template(&$vars) { + public function addLayoutTemplate(&$vars) { if ($layout = $this->get_active_layout()) { if (!empty($layout['template'])) { global $theme; @@ -49,8 +49,8 @@ /** * Add the layout stylesheet to the CSS. */ - function add_layout_stylesheet() { - if ($layout = $this->get_active_layout()) { + public function addLayoutStylesheet() { + if ($layout = $this->getActiveLayout()) { if (!empty($layout['stylesheet'])) { drupal_add_css(drupal_get_path('theme', $layout['theme']) . '/' . $layout['stylesheet']); } @@ -60,13 +60,13 @@ /** * Override of editor form. */ - function editor_form($context) { + public function editorForm($context) { drupal_add_css(drupal_get_path('module', 'context_layouts') . '/plugins/context_layouts_reaction_block.css'); - $form = parent::editor_form($context); + $form = parent::editorForm($context); - if ($layouts = $this->get_layout_options()) { - $options = $this->fetch_from_context($context); + if ($layouts = $this->getLayoutOptions()) { + $options = $this->fetchFromContext($context); $form['layout'] = array( // #tree *must* be true for our values to be nested correctly. '#tree' => TRUE, @@ -95,13 +95,13 @@ /** * Override of editor form submit. */ - function editor_form_submit(&$context, $values) { + public function editorFormSubmit(&$context, $values) { // Someone has changed the layout, assume that the block values are not actually usable here. if (isset($context->reactions['block']['layout']) && $context->reactions['block']['layout'] != $values['layout']['layout']) { $options = $context->reactions['block']; } else { - $options = parent::editor_form_submit($context, $values); + $options = parent::editorFormSubmit($context, $values); } if (!empty($values['layout']['layout'])) { @@ -116,13 +116,13 @@ /** * Override of options form. */ - function options_form($context) { - $form = parent::options_form($context); - $options = $this->fetch_from_context($context); + public function optionsForm($context) { + $form = parent::optionsForm($context); + $options = $this->fetchFromContext($context); // Only alter the options form if the theme provides layouts. $theme_key = variable_get('theme_default', 'garland'); - $layouts = $this->get_layout_options(); + $layouts = $this->getLayoutOptions(); if (!empty($layouts)) { $form['layout'] = array( '#title' => t('Layout'), @@ -141,7 +141,7 @@ // @TODO: Move this to a theme function or somewhere that will get called even // if the form is using a cached version of itself (e.g. when validate fails). drupal_add_js(drupal_get_path('module', 'context_layouts') . '/plugins/context_layouts_reaction_block.js'); - drupal_add_js(array('contextLayouts' => array('layouts' => $this->get_layout_regions())), 'setting'); + drupal_add_js(array('contextLayouts' => array('layouts' => $this->getLayoutRegions())), 'setting'); } return $form; } @@ -149,8 +149,8 @@ /** * Override of submit handler. */ - function options_form_submit($values) { - $options = parent::options_form_submit($values); + public function optionsFormSubmit($values) { + $options = parent::optionsFormSubmit($values); // Only alter the options form if the theme provides layouts. $theme_key = variable_get('theme_default', 'garland'); @@ -176,7 +176,7 @@ /** * Get layout options for the given theme. */ - protected function get_layout_options($theme_key = NULL) { + protected function getLayoutOptions($theme_key = NULL) { $theme_key = !isset($theme_key) ? variable_get('theme_default', 'garland') : $theme_key; $layouts = context_layouts_get_layouts($theme_key); $layout_options = array(); @@ -191,7 +191,7 @@ /** * Get a layout to region map for the given theme. */ - protected function get_layout_regions($theme_key = NULL) { + protected function getLayoutRegions($theme_key = NULL) { $theme_key = !isset($theme_key) ? variable_get('theme_default', 'garland') : $theme_key; $layouts = context_layouts_get_layouts($theme_key); if (!empty($layouts)) { Index: context_layouts/context_layouts.module =================================================================== --- context_layouts/context_layouts.module (revision 1709) +++ context_layouts/context_layouts.module (working copy) @@ -62,7 +62,7 @@ function context_layouts_context_page_reaction() { $plugin = context_get_plugin('reaction', 'block'); if ($plugin && method_exists($plugin, 'add_layout_stylesheet')) { - $plugin->add_layout_stylesheet(); + $plugin->addLayoutStylesheet(); } } @@ -72,7 +72,7 @@ function context_layouts_preprocess_page(&$vars) { $plugin = context_get_plugin('reaction', 'block'); if ($plugin && method_exists($plugin, 'add_layout_template')) { - $plugin->add_layout_template($vars); + $plugin->addLayoutTemplate($vars); } } @@ -123,6 +123,6 @@ function context_layouts_get_active_layout($info = TRUE) { $plugin = context_get_plugin('reaction', 'block'); if ($plugin && method_exists($plugin, 'get_active_layout')) { - return $plugin->get_active_layout($info); + return $plugin->getActiveLayout($info); } } Index: plugins/context_reaction_menu.inc =================================================================== --- plugins/context_reaction_menu.inc (revision 1709) +++ plugins/context_reaction_menu.inc (working copy) @@ -3,11 +3,11 @@ /** * Expose menu items as context reactions. */ -class context_reaction_menu extends context_reaction { +class ContextReactionMenu extends ContextReaction { /** * Provide a form element that allow the admin to chose a menu item. */ - function options_form($context) { + public function optionsForm($context) { if (module_exists('menu')) { $menus = menu_parent_options(menu_get_menus(), array('mlid' => 0)); $root_menus = array(); @@ -37,7 +37,7 @@ '#description' => $this->description, '#options' => $menus, '#type' => 'select', - '#default_value' => $this->fetch_from_context($context), + '#default_value' => $this->fetchFromContext($context), ); } @@ -45,7 +45,7 @@ * Override of options_form_submit(). * Trim any identifier padding for non-unique path menu items. */ - function options_form_submit($values) { + public function optionsFormSubmit($values) { return trim($values, "'"); } @@ -53,19 +53,19 @@ * If primary + secondary links are pointed at the same menu, provide * contextual trailing by default. */ - function execute(&$vars = NULL) { + public function execute(&$vars = NULL) { if (variable_get('menu_main_links_source', 'main-menu') == variable_get('menu_secondary_links_source', 'user-menu')) { - $vars['main_menu'] = theme_get_setting('toggle_main_menu') ? $this->menu_navigation_links(variable_get('menu_main_links_source', 'main-menu')) : $vars['main_menu']; - $vars['secondary_menu'] = theme_get_setting('toggle_secondary_menu') ? $this->menu_navigation_links(variable_get('menu_secondary_links_source', 'secondary-links'), 1) : $vars['secondary_menu']; + $vars['main_menu'] = theme_get_setting('toggle_main_menu') ? $this->menuNavigationLinks(variable_get('menu_main_links_source', 'main-menu')) : $vars['main_menu']; + $vars['secondary_menu'] = theme_get_setting('toggle_secondary_menu') ? $this->menuNavigationLinks(variable_get('menu_secondary_links_source', 'secondary-links'), 1) : $vars['secondary_menu']; } - $vars['main_menu'] = $this->menu_set_active($vars['main_menu']); - $vars['secondary_menu'] = $this->menu_set_active($vars['secondary_menu']); + $vars['main_menu'] = $this->menuSetActive($vars['main_menu']); + $vars['secondary_menu'] = $this->menuSetActive($vars['secondary_menu']); } - function get_active_paths() { + public function getActivePaths() { $active_paths = array(); - foreach ($this->get_contexts() as $context) { + foreach ($this->getContexts() as $context) { if (isset($context->reactions[$this->plugin])) { $active_paths[] = $context->reactions[$this->plugin]; } @@ -86,10 +86,10 @@ * @return * A modified links array. */ - function menu_set_active($links = array(), $reset = FALSE) { + public function menuSetActive($links = array(), $reset = FALSE) { $new_links = array(); if (!empty($links)) { - $active_paths = $this->get_active_paths(); + $active_paths = $this->getActivePaths(); // Iterate through the provided links and build a new set of links // that includes active classes @@ -110,15 +110,15 @@ } /** - * Wrapper around menu_navigation_links() that gives themers the option of + * Wrapper around menuNavigationLinks() that gives themers the option of * building navigation links based on an active context trail. */ - function menu_navigation_links($menu_name, $level = 0) { + public function menuNavigationLinks($menu_name, $level = 0) { // Retrieve original path so we can repair it after our hack. $original_path = $_GET['q']; // Retrieve the first active menu path found. - if ($active_paths = $this->get_active_paths()) { + if ($active_paths = $this->getActivePaths()) { $path = current($active_paths); if (menu_get_item($path)) { menu_set_active_item($path); Index: plugins/context_condition_menu.inc =================================================================== --- plugins/context_condition_menu.inc (revision 1709) +++ plugins/context_condition_menu.inc (working copy) @@ -3,11 +3,11 @@ /** * Expose menu items as a context condition. */ -class context_condition_menu extends context_condition { +class ContextConditionMenu extends ContextCondition { /** * Override of condition_values(). */ - function condition_values() { + function ConditionValues() { if (module_exists('menu')) { $menus = menu_parent_options(menu_get_menus(), array('mlid' => 0)); $root_menus = array(); @@ -39,8 +39,8 @@ * Override of condition_form(). * Use multiselect widget. */ - function condition_form($context) { - $form = parent::condition_form($context); + public function conditionForm($context) { + $form = parent::conditionForm($context); $form['#type'] = 'select'; $form['#multiple'] = TRUE; return $form; @@ -50,9 +50,9 @@ * Override of condition_form_submit(). * Trim any identifier padding for non-unique path menu items. */ - function condition_form_submit($values) { + public function conditionFormSubmit($values) { // Trim any identifier padding for non-unique path menu items. - $values = parent::condition_form_submit($values); + $values = parent::conditionFormSubmit($values); $trimmed = array(); foreach ($values as $key => $value) { $trimmed[trim($key, "'")] = trim($value, "'"); @@ -63,13 +63,13 @@ /** * Override of execute(). */ - function execute() { - if ($this->condition_used()) { + public function execute() { + if ($this->conditionUsed()) { $trail = menu_get_active_trail(); foreach ($trail as $item) { if (!empty($item['href'])) { - foreach ($this->get_contexts($item['href']) as $context) { - $this->condition_met($context, $item['href']); + foreach ($this->getContexts($item['href']) as $context) { + $this->conditionMet($context, $item['href']); } } } Index: plugins/context_condition.inc =================================================================== --- plugins/context_condition.inc (revision 1709) +++ plugins/context_condition.inc (working copy) @@ -3,11 +3,11 @@ /** * Base class for a context condition. */ -class context_condition { - var $plugin; - var $title; - var $description; - var $values = array(); +class ContextCondition { + public $plugin; + public $title; + public $description; + public $values = array(); /** * Clone our references when we're being cloned. @@ -18,7 +18,7 @@ * over our properties and serializing and unserializing them, we force PHP to * copy them. */ - function __clone() { + public function __clone() { foreach ($this as $key => $val) { if (is_object($val) || (is_array($val))) { $this->{$key} = unserialize(serialize($val)); @@ -29,7 +29,7 @@ /** * Constructor. Do not override. */ - function __construct($plugin, $info) { + public final function __construct($plugin, $info) { $this->plugin = $plugin; $this->title = isset($info['title']) ? $info['title'] : $plugin; $this->description = isset($info['description']) ? $info['description'] : ''; @@ -38,27 +38,27 @@ /** * Condition values. */ - function condition_values() { + public function conditionValues() { return array(); } /** * Condition form. */ - function condition_form($context) { + public function conditionForm($context) { return array( '#title' => $this->title, '#description' => $this->description, - '#options' => $this->condition_values(), + '#options' => $this->conditionValues(), '#type' => 'checkboxes', - '#default_value' => $this->fetch_from_context($context, 'values'), + '#default_value' => $this->fetchFromContext($context, 'values'), ); } /** * Condition form submit handler. */ - function condition_form_submit($values) { + public function conditionFormSubmit($values) { ksort($values); // Editor forms are generally checkboxes -- do some checkbox processing. @@ -68,31 +68,31 @@ /** * Options form. Provide additional options for your condition. */ - function options_form($context) { + public function optionsForm($context) { return array(); } /** * Options form submit handler. */ - function options_form_submit($values) { + public function optionsFormSubmit($values) { return $values; } /** * Settings form. Provide variable settings for your condition. */ - function settings_form() { + public function settingsForm() { return array(); } /** * Context editor form for conditions. */ - function editor_form($context = NULL) { + public function editorForm($context = NULL) { $form = array(); if (!empty($this->values)) { - $options = $this->condition_values(); + $options = $this->conditionValues(); foreach ($this->values as $value => $contexts) { $label = "{$this->title}: "; $label .= isset($options[$value]) ? trim($options[$value], ' -') : $value; @@ -109,9 +109,9 @@ /** * Context editor form submit handler. */ - function editor_form_submit(&$context, $values) { + public function editorFormSubmit(&$context, $values) { // Merge existing values in from non-active conditions. - $existing = $this->fetch_from_context($context, 'values'); + $existing = $this->fetchFromContext($context, 'values'); $values += !empty($existing) ? $existing : array(); ksort($values); @@ -135,7 +135,7 @@ /** * Marks a context as having met this particular condition. */ - function condition_met($context, $value = NULL) { + public function conditionMet($context, $value = NULL) { if (isset($value)) { $this->values[$value] = isset($this->values[$value]) ? $this->values[$value] : array(); $this->values[$value][] = $context->name; @@ -148,7 +148,7 @@ * prevent expensive condition checks from being triggered when no contexts * use this condition. */ - function condition_used() { + public function conditionUsed() { $map = context_condition_map(); return !empty($map[$this->plugin]); } @@ -156,7 +156,7 @@ /** * Retrieve all contexts with the condition value provided. */ - function get_contexts($value = NULL) { + public function getContexts($value = NULL) { $map = context_condition_map(); $map = isset($map[$this->plugin]) ? $map[$this->plugin] : array(); @@ -187,7 +187,7 @@ /** * Retrieve options from the context provided. */ - function fetch_from_context($context, $key = NULL) { + public function fetchFromContext($context, $key = NULL) { if (isset($key)) { return isset($context->conditions[$this->plugin][$key]) ? $context->conditions[$this->plugin][$key] : array(); } Index: plugins/context_condition_sitewide.inc =================================================================== --- plugins/context_condition_sitewide.inc (revision 1709) +++ plugins/context_condition_sitewide.inc (working copy) @@ -3,21 +3,21 @@ /** * Simple sitewide context, always present. */ -class context_condition_sitewide extends context_condition { - function condition_values() { +class ContextConditionSitewide extends ContextCondition { + public function ConditionValues() { return array(1 => t('Always active')); } - function editor_form($context = NULL) { - $form = parent::editor_form($context); + public function editorForm($context = NULL) { + $form = parent::editorForm($context); $form[1]['#title'] = t('Always active'); $form['#weight'] = -10; return $form; } - function execute($value) { - foreach ($this->get_contexts($value) as $context) { - $this->condition_met($context, $value); + public function execute($value) { + foreach ($this->getContexts($value) as $context) { + $this->conditionMet($context, $value); } } } Index: plugins/context_condition_book.inc =================================================================== --- plugins/context_condition_book.inc (revision 1709) +++ plugins/context_condition_book.inc (working copy) @@ -3,8 +3,8 @@ /** * Expose book properties as a context condition. */ -class context_condition_book extends context_condition { - function condition_values() { +class ContextConditionBook extends ContextCondition { + public function conditionValues() { $values = array(); foreach (book_get_books() as $book) { $values[$book['menu_name']] = check_plain($book['title']); @@ -12,10 +12,10 @@ return $values; } - function execute($node, $op) { + public function execute($node, $op) { if (isset($node->book, $node->book['menu_name'])) { - foreach ($this->get_contexts($node->book['menu_name']) as $context) { - $this->condition_met($context, $node->book['menu_name']); + foreach ($this->getContexts($node->book['menu_name']) as $context) { + $this->conditionMet($context, $node->book['menu_name']); } } } Index: plugins/context_reaction_css_injector.inc =================================================================== --- plugins/context_reaction_css_injector.inc (revision 1709) +++ plugins/context_reaction_css_injector.inc (working copy) @@ -1,8 +1,8 @@ $this->description, '#options' => $list, '#type' => 'checkboxes', - '#default_value' => $this->fetch_from_context($context), + '#default_value' => $this->fetchFromContext($context), ); } - function execute() { - $contexts = $this->get_contexts(); + public function execute() { + $contexts = $this->getContexts(); foreach ($contexts as $context) { if (!empty($context->reactions[$this->plugin])) { foreach ($context->reactions[$this->plugin] as $crid) { Index: plugins/context_condition_node_taxonomy.inc =================================================================== --- plugins/context_condition_node_taxonomy.inc (revision 1709) +++ plugins/context_condition_node_taxonomy.inc (working copy) @@ -3,8 +3,8 @@ /** * Expose node taxonomy terms as a context condition. */ -class context_condition_node_taxonomy extends context_condition_node { - function condition_values() { +class ContextConditionNodeTaxonomy extends ContextConditionNode { + public function conditionValues() { $values = array(); if (module_exists('taxonomy')) { foreach (taxonomy_get_vocabularies() as $vocab) { @@ -18,8 +18,8 @@ return $values; } - function condition_form($context) { - $form = parent::condition_form($context); + public function conditionForm($context) { + $form = parent::conditionForm($context); $form['#type'] = 'select'; $form['#size'] = 12; $form['#multiple'] = TRUE; @@ -31,14 +31,14 @@ $options[$vocabulary->name] = array(); foreach ($tree as $term) { $options[$vocabulary->name][$term->tid] = str_repeat('-', $term->depth) . $term->name; - } - } + } + } } $form['#options'] = $options; return $form; } - function execute($node, $op) { + public function execute($node, $op) { // build a list of each taxonomy reference field belonging to the bundle for the current node $fields = field_info_fields(); $instance_fields = field_info_instances('node', $node->type); @@ -49,20 +49,20 @@ } } - if ($this->condition_used() && !empty($check_fields)) { + if ($this->conditionUsed() && !empty($check_fields)) { foreach ($check_fields as $field) { if (isset($node->{$field}[$node->language])) { foreach ($node->{$field}[$node->language] as $term) { - foreach ($this->get_contexts($term['tid']) as $context) { + foreach ($this->getContexts($term['tid']) as $context) { // Check the node form option. if ($op === 'form') { - $options = $this->fetch_from_context($context, 'options'); + $options = $this->fetchFromContext($context, 'options'); if (!empty($options['node_form'])) { - $this->condition_met($context, $term['tid']); + $this->conditionMet($context, $term['tid']); } } else { - $this->condition_met($context, $term['tid']); + $this->conditionMet($context, $term['tid']); } } } Index: plugins/context_condition_user_page.inc =================================================================== --- plugins/context_condition_user_page.inc (revision 1709) +++ plugins/context_condition_user_page.inc (working copy) @@ -3,8 +3,8 @@ /** * Expose user pages as a context condition. */ -class context_condition_user_page extends context_condition { - function condition_values() { +class ContextConditionUserPage extends ContextCondition { + public function conditionValues() { $values = array(); $values['view'] = t('User profile'); $values['form'] = t('User account form'); @@ -12,8 +12,8 @@ return $values; } - function options_form($context) { - $defaults = $this->fetch_from_context($context, 'options'); + public function optionsForm($context) { + $defaults = $this->fetchFromContext($context, 'options'); return array( 'mode' => array( '#title' => t('Active for'), @@ -28,29 +28,29 @@ ); } - function execute($account, $op) { + public function execute($account, $op) { global $user; - foreach ($this->get_contexts($op) as $context) { + foreach ($this->getContexts($op) as $context) { if ($op === 'register') { - $this->condition_met($context); + $this->conditionMet($context); } else { - $options = $this->fetch_from_context($context, 'options'); + $options = $this->fetchFromContext($context, 'options'); $mode = !empty($options['mode']) ? $options['mode'] : 'all'; switch ($options['mode']) { case 'current': if ($account->uid == $user->uid) { - $this->condition_met($context); + $this->conditionMet($context); } break; case 'other': if ($account->uid != $user->uid) { - $this->condition_met($context); + $this->conditionMet($context); } break; case 'all': default: - $this->condition_met($context); + $this->conditionMet($context); break; } } Index: plugins/context_condition_bookroot.inc =================================================================== --- plugins/context_condition_bookroot.inc (revision 1709) +++ plugins/context_condition_bookroot.inc (working copy) @@ -3,9 +3,9 @@ /** * Set the context on the basis of the node type of page's book root. */ -class context_condition_bookroot extends context_condition_node { - function execute($node, $op) { - if ($this->condition_used() && !empty($node->book['bid'])) { +class ContextConditionBookroot extends ContextConditionNode { + public function execute($node, $op) { + if ($this->conditionUsed() && !empty($node->book['bid'])) { $type = db_select('node') ->fields('node', array('type')) ->condition('nid', $node->book['nid']) Index: plugins/context_condition_node.inc =================================================================== --- plugins/context_condition_node.inc (revision 1709) +++ plugins/context_condition_node.inc (working copy) @@ -18,8 +18,8 @@ /** * Expose node views/node forms of specific node types as a context condition. */ -class context_condition_node extends context_condition { - function condition_values() { +class ContextConditionNode extends ContextCondition { + public function conditionValues() { $values = array(); foreach (node_type_get_types() as $type) { $values[$type->type] = check_plain($type->name); @@ -27,8 +27,8 @@ return $values; } - function options_form($context) { - $defaults = $this->fetch_from_context($context, 'options'); + public function optionsForm($context) { + $defaults = $this->fetchFromContext($context, 'options'); return array( 'node_form' => array( '#title' => t('Set on node form'), @@ -44,18 +44,18 @@ ); } - function execute($node, $op) { - foreach ($this->get_contexts($node->type) as $context) { + public function execute($node, $op) { + foreach ($this->getContexts($node->type) as $context) { // Check the node form option. - $options = $this->fetch_from_context($context, 'options'); + $options = $this->fetchFromContext($context, 'options'); if ($op === 'form') { - $options = $this->fetch_from_context($context, 'options'); + $options = $this->fetchFromContext($context, 'options'); if (!empty($options['node_form']) && in_array($options['node_form'], array(CONTEXT_NODE_FORM, CONTEXT_NODE_FORM_ONLY))) { - $this->condition_met($context, $node->type); + $this->conditionMet($context, $node->type); } } elseif (empty($options['node_form']) || $options['node_form'] != CONTEXT_NODE_FORM_ONLY) { - $this->condition_met($context, $node->type); + $this->conditionMet($context, $node->type); } } } Index: plugins/context_reaction_block.inc =================================================================== --- plugins/context_reaction_block.inc (revision 1709) +++ plugins/context_reaction_block.inc (working copy) @@ -3,17 +3,17 @@ /** * Expose blocks as context reactions. */ -class context_reaction_block extends context_reaction { +class contextReactionBlock extends ContextReaction { /** * Options form. */ - function options_form($context) { + function optionsForm($context) { // Rebuild the block info cache if necessary. - $this->get_blocks(NULL, NULL, $this->rebuild_needed()); - $this->rebuild_needed(FALSE); + $this->getBlocks(NULL, NULL, $this->rebuildNeeded()); + $this->rebuildNeeded(FALSE); $theme_key = variable_get('theme_default', 'garland'); - $weight_delta = $this->max_block_weight(); + $weight_delta = $this->maxBlockWeight(); $form = array( '#tree' => TRUE, @@ -38,7 +38,7 @@ '#prefix' => '
', '#suffix' => '
', ); - foreach ($this->get_blocks() as $block) { + foreach ($this->getBlocks() as $block) { $group = isset($block->context_group) ? $block->context_group : $block->module; if (!isset($form['selector'][$group])) { $form['selector'][$group] = array( @@ -64,7 +64,7 @@ '#title' => $label, '#tree' => TRUE, ); - foreach ($this->get_blocks($region, $context) as $block) { + foreach ($this->getBlocks($region, $context) as $block) { if (!empty($block->context)) { $form['blocks'][$region][$block->bid] = array( '#value' => check_plain($block->info), @@ -82,9 +82,9 @@ /** * Options form submit handler. */ - function options_form_submit($values) { + public function optionsFormSubmit($values) { $blocks = array(); - $block_info = $this->get_blocks(); + $block_info = $this->getBlocks(); // Retrieve blocks from submitted JSON string. if (!empty($values['state'])) { @@ -112,7 +112,7 @@ /** * Context editor form for blocks. */ - function editor_form($context) { + public function editorForm($context) { $form = array(); drupal_add_library('system', 'ui.droppable'); drupal_add_library('system', 'ui.sortable'); @@ -138,19 +138,19 @@ ); $form['browser'] = array( '#markup' => theme('context_block_browser', array( - 'blocks' => $this->get_blocks(NULL, NULL, $this->rebuild_needed()), + 'blocks' => $this->getBlocks(NULL, NULL, $this->rebuildNeeded()), 'context' => $context )), ); - $this->rebuild_needed(FALSE); + $this->rebuildNeeded(FALSE); return $form; } /** * Submit handler context editor form. */ - function editor_form_submit(&$context, $values) { - $edited = !empty($values['state']) ? (array) $this->json_decode($values['state']) : array(); + function editorFormSubmit(&$context, $values) { + $edited = !empty($values['state']) ? (array) $this->jsonDecode($values['state']) : array(); $options = array(); @@ -186,7 +186,7 @@ /** * Settings form for variables. */ - function settings_form() { + public function settingsForm() { $form = array(); $form['context_reaction_block_all_regions'] = array( '#title' => t('Show all regions'), @@ -200,7 +200,7 @@ /** * Execute. */ - function execute(&$page) { + public function execute(&$page) { global $theme; // The theme system might not yet be initialized. We need $theme. @@ -210,7 +210,7 @@ // Note that we check the output buffer for any content to ensure that we // are not in the middle of a PHP template render. if (isset($_GET['context_block']) && !ob_get_contents()) { - return $this->render_ajax($_GET['context_block']); + return $this->renderAjax($_GET['context_block']); } // Populate all block regions @@ -218,8 +218,8 @@ // Load all region content assigned via blocks. foreach (array_keys($all_regions) as $region) { - if ($this->is_enabled_region($region)) { - if ($blocks = $this->block_get_blocks_by_region($region)) { + if ($this->isEnabledRegion($region)) { + if ($blocks = $this->blockGetBlocksByRegion($region)) { $page[$region] = isset($page[$region]) ? array_merge($page[$region], $blocks) : $blocks; } } @@ -230,7 +230,7 @@ * Return a list of enabled regions for which blocks should be built. * Split out into a separate method for easy overrides in extending classes. */ - protected function is_enabled_region($region) { + protected function isEnabledRegion($region) { global $theme; $regions = array_keys(system_region_list($theme)); return in_array($region, $regions, TRUE); @@ -240,7 +240,7 @@ * Determine whether inline editing requirements are met and that the current * user may edit. */ - protected function is_editable_region($region, $reset = FALSE) { + protected function isEditableRegion($region, $reset = FALSE) { // Check requirements. // Generally speaking, it does not make sense to allow anonymous users to // edit a context inline. Though it may be possible to save (and restore) @@ -268,13 +268,13 @@ } // Check that this region is not hidden $visible = system_region_list($theme, REGIONS_VISIBLE); - return $requirements && $this->is_enabled_region($region) && isset($visible[$region]); + return $requirements && $this->isEnabledRegion($region) && isset($visible[$region]); } /** * Add markup for making a block editable. */ - protected function editable_block($block) { + protected function editableBlock($block) { if (!empty($block->content['#markup']) || element_children($block->content)) { $block->content = array( 'content' => $block->content, @@ -292,8 +292,8 @@ /** * Add markup for making a region editable. */ - protected function editable_region($region, $build) { - if ($this->is_editable_region($region) && + protected function editableRegion($region, $build) { + if ($this->isEditableRegion($region) && (!empty($build) || variable_get('context_reaction_block_all_regions', FALSE) || context_isset('context_ui', 'context_ui_editor_present')) @@ -309,15 +309,15 @@ /** * Get a renderable array of a region containing all enabled blocks. */ - function block_get_blocks_by_region($region) { + public function blockGetBlocksByRegion($region) { module_load_include('module', 'block', 'block'); $build = array(); - if ($list = $this->block_list($region)) { + if ($list = $this->blockList($region)) { $build = _block_get_renderable_array($list); } - if ($this->is_editable_region($region)) { - $build = $this->editable_region($region, $build); + if ($this->isEditableRegion($region)) { + $build = $this->editableRegion($region, $build); } return $build; } @@ -325,16 +325,16 @@ /** * An alternative version of block_list() that provides any context enabled blocks. */ - function block_list($region) { + public function blockList($region) { module_load_include('module', 'block', 'block'); $context_blocks = &drupal_static('context_reaction_block_list');; $contexts = context_active_contexts(); if (!isset($context_blocks)) { - $info = $this->get_blocks(); + $info = $this->getBlocks(); $context_blocks = array(); foreach ($contexts as $context) { - $options = $this->fetch_from_context($context); + $options = $this->fetchFromContext($context); if (!empty($options['blocks'])) { foreach ($options['blocks'] as $block) { $block = (object) $block; @@ -347,14 +347,14 @@ } } - $this->is_editable_check($context_blocks); + $this->isEditableCheck($context_blocks); foreach ($context_blocks as $r => $blocks) { $context_blocks[$r] = _block_render_blocks($blocks); // Make blocks editable if allowed. - if ($this->is_editable_region($r)) { + if ($this->isEditableRegion($r)) { foreach ($context_blocks[$r] as $key => $block) { - $context_blocks[$r][$key] = $this->editable_block($block); + $context_blocks[$r][$key] = $this->editableBlock($block); } } @@ -366,11 +366,11 @@ } /** - * Determine if there is an active context editor block, and set a flag. We will set a flag so + * Determine if there is an active context editor block, and set a flag. We will set a flag so * that we can make sure that blocks with empty content have some default content. This is * needed so the save of the context inline editor does not remove the blocks with no content. */ - function is_editable_check($context_blocks) { + public function isEditableCheck($context_blocks) { foreach ($context_blocks as $r => $blocks) { if (isset($blocks['context_ui-editor'])) { $block = $blocks['context_ui-editor']; @@ -394,8 +394,8 @@ * Generate the safe weight range for a block being added to a region such that * there are enough potential unique weights to support all blocks. */ - protected function max_block_weight() { - $blocks = $this->get_blocks(); + protected function maxBlockWeight() { + $blocks = $this->getBlocks(); $block_count = 0; foreach ($blocks as $region => $block_list) { $block_count += count($block_list); @@ -407,7 +407,7 @@ /** * Check or set whether a rebuild of the block info cache is needed. */ - function rebuild_needed($set = NULL) { + public function rebuildNeeded($set = NULL) { if (isset($set) && $set != variable_get('context_block_rebuild_needed', FALSE)) { variable_set('context_block_rebuild_needed', $set); } @@ -427,7 +427,7 @@ * @return * A keyed (by "module_delta" convention) array of blocks. */ - function get_blocks($region = NULL, $context = NULL, $reset = FALSE) { + public function getBlocks($region = NULL, $context = NULL, $reset = FALSE) { static $block_info; if (!isset($block_info) || $reset) { @@ -488,7 +488,7 @@ } // Add context blocks if provided. - if (is_object($context) && $options = $this->fetch_from_context($context)) { + if (is_object($context) && $options = $this->fetchFromContext($context)) { if (!empty($options['blocks'])) { foreach ($options['blocks'] as $block) { if ( @@ -511,19 +511,19 @@ /** * Sort callback. */ - static function block_sort($a, $b) { + static function blockSort($a, $b) { return ($a->weight - $b->weight); } /** * Compatibility wrapper around json_decode(). */ - protected function json_decode($json, $assoc = FALSE) { + protected function jsonDecode($json, $assoc = FALSE) { // Requires PHP 5.2. if (function_exists('json_decode')) { return json_decode($json, $assoc); } - return context_reaction_block::_json_decode($json); + return contextReactionBlock::_jsonDecode($json); } /** @@ -532,7 +532,7 @@ * * Original author: walidator.info 2009. */ - static function _json_decode($json) { + static function _jsonDecode($json) { $comment = FALSE; $out = '$x = '; for ($i=0; $i < strlen($json); $i++) { @@ -573,7 +573,7 @@ * Block renderer for AJAX requests. Triggered when $_GET['context_block'] * is set. See ->execute() for how this is called. */ - function render_ajax($param) { + public function renderAjax($param) { // Besure the page isn't a 404 or 403. $headers = drupal_get_http_header(); if (array_key_exists('status', $headers) && ($headers['status'] == "404 Not Found" || $headers['status'] == "403 Forbidden")) { @@ -588,19 +588,19 @@ list($module, $delta) = explode('-', $bid, 2); // Ensure $bid is valid. - $info = $this->get_blocks(); + $info = $this->getBlocks(); if (isset($info[$bid])) { module_load_include('module', 'block', 'block'); $block = $info[$bid]; $block->title = isset($block->title) ? $block->title : ''; - $block->context = $context; + $block->context = $context; $block->region = ''; $rendered_blocks = _block_render_blocks(array($block)); // For E_STRICT warning $block = array_shift($rendered_blocks); if (empty($block->content['#markup'])) { $block->content['#markup'] = "
" . t('This block appears empty when displayed on this page.') . "
"; } - $block = $this->editable_block($block); + $block = $this->editableBlock($block); $renderable_block = _block_get_renderable_array(array($block)); // For E_STRICT warning echo drupal_json_encode(array( 'status' => 1, Index: plugins/context_condition_context.inc =================================================================== --- plugins/context_condition_context.inc (revision 1709) +++ plugins/context_condition_context.inc (working copy) @@ -3,14 +3,14 @@ /** * Expose active contexts as a context condition. */ -class context_condition_context extends context_condition_path { - function execute() { - if ($this->condition_used()) { +class ContextConditionContext extends ContextConditionPath { + public function execute() { + if ($this->conditionUsed()) { $active_contexts = array_keys(context_active_contexts()); - foreach ($this->get_contexts() as $context) { - if (!in_array($context->name, $active_contexts, TRUE) && $values = $this->fetch_from_context($context, 'values')) { + foreach ($this->getContexts() as $context) { + if (!in_array($context->name, $active_contexts, TRUE) && $values = $this->fetchFromContext($context, 'values')) { if ($this->match($active_contexts, $values)) { - $this->condition_met($context); + $this->conditionMet($context); } } } Index: plugins/context_reaction_breadcrumb.inc =================================================================== --- plugins/context_reaction_breadcrumb.inc (revision 1709) +++ plugins/context_reaction_breadcrumb.inc (working copy) @@ -3,12 +3,12 @@ /** * Set the breadcrumb using a context reaction. */ -class context_reaction_breadcrumb extends context_reaction_menu { +class ContextReactionBreadcrumb extends ContextReactionMenu { /** * Override of execute(). */ function execute(&$vars = NULL) { - if ($active_paths = $this->get_active_paths()) { + if ($active_paths = $this->getActivePaths()) { $breadcrumb = array(l(t('Home'), '', array('purl' => array('disabled' => TRUE)))); foreach ($active_paths as $path) { $result = db_select('menu_links') Index: plugins/context_condition_language.inc =================================================================== --- plugins/context_condition_language.inc (revision 1709) +++ plugins/context_condition_language.inc (working copy) @@ -3,14 +3,14 @@ /** * Expose current language as a context condition. */ -class context_condition_language extends context_condition { - function condition_values() { +class ContextConditionLanguage extends ContextCondition { + public function conditionValues() { return module_exists('locale') ? locale_language_list() : array(); } - function execute($value) { - foreach ($this->get_contexts($value) as $context) { - $this->condition_met($context, $value); + public function execute($value) { + foreach ($this->getContexts($value) as $context) { + $this->conditionMet($context, $value); } } } Index: plugins/context_reaction_theme.inc =================================================================== --- plugins/context_reaction_theme.inc (revision 1709) +++ plugins/context_reaction_theme.inc (working copy) @@ -3,12 +3,12 @@ /** * Expose themes as context reactions. */ -class context_reaction_theme extends context_reaction { +class ContextReactionTheme extends ContextReaction { /** * Editor form. */ - function editor_form($context) { - $form = $this->options_form($context); + public function editorForm($context) { + $form = $this->optionsForm($context); // Hide descriptions which take up too much space. unset($form['title']['#description']); @@ -20,15 +20,15 @@ /** * Submit handler for editor form. */ - function editor_form_submit($context, $values) { + public function editorFormSubmit($context, $values) { return $values; } /** * Allow admins to provide a section title, section subtitle and section class. */ - function options_form($context) { - $values = $this->fetch_from_context($context); + public function optionsForm($context) { + $values = $this->fetchFromContext($context); $form = array( '#tree' => TRUE, '#title' => t('Theme variables'), @@ -53,9 +53,9 @@ /** * Set 'section_title', and 'section_subtitle' if not set */ - function execute(&$vars) { + public function execute(&$vars) { $classes = array(); - foreach ($this->get_contexts() as $k => $v) { + foreach ($this->getContexts() as $k => $v) { if (!empty($v->reactions[$this->plugin]['title']) && !isset($vars['section_title'])) { $vars['section_title'] = check_plain(t($v->reactions[$this->plugin]['title'])); } Index: plugins/context_reaction.inc =================================================================== --- plugins/context_reaction.inc (revision 1709) +++ plugins/context_reaction.inc (working copy) @@ -3,10 +3,10 @@ /** * Base class for a context reaction. */ -class context_reaction { - var $plugin; - var $title; - var $description; +class ContextReaction { + public $plugin; + public $title; + public $description; /** * Clone our references when we're being cloned. @@ -17,7 +17,7 @@ * over our properties and serializing and unserializing them, we force PHP to * copy them. */ - function __clone() { + public function __clone() { foreach ($this as $key => $val) { if (is_object($val) || (is_array($val))) { $this->{$key} = unserialize(serialize($val)); @@ -28,26 +28,26 @@ /** * Constructor. Do not override. */ - function __construct($plugin, $info) { + public final function __construct($plugin, $info) { $this->plugin = $plugin; $this->title = isset($info['title']) ? $info['title'] : $plugin; $this->description = isset($info['description']) ? $info['description'] : ''; } - function options_form($context) { + function optionsForm($context) { } /** * Options form submit handler. */ - function options_form_submit($values) { + function optionsFormSubmit($values) { return $values; } /** * Settings form. Provide variable settings for your reaction. */ - function settings_form() { + function settingsForm() { return array(); } @@ -66,10 +66,10 @@ /** * Retrieve active contexts that have values for this reaction. */ - function get_contexts() { + function getContexts() { $contexts = array(); foreach (context_active_contexts() as $context) { - if ($this->fetch_from_context($context)) { + if ($this->fetchFromContext($context)) { $contexts[$context->name] = $context; } } @@ -79,7 +79,7 @@ /** * Retrieve options from the context provided. */ - function fetch_from_context($context) { + function fetchFromContext($context) { return isset($context->reactions[$this->plugin]) ? $context->reactions[$this->plugin] : array(); } } Index: plugins/context_reaction_region.inc =================================================================== --- plugins/context_reaction_region.inc (revision 1709) +++ plugins/context_reaction_region.inc (working copy) @@ -1,12 +1,12 @@ fetch_from_context($context); + public function optionsForm($context) { + $values = $this->fetchFromContext($context); $form = array(); foreach (list_themes() as $theme) { if ($theme->status) { @@ -30,9 +30,9 @@ return $form; } - function execute(&$page) { + public function execute(&$page) { global $theme; - foreach ($this->get_contexts() as $k => $v) { + foreach ($this->getContexts() as $k => $v) { if (isset($v->reactions[$this->plugin][$theme])) { $regions = $v->reactions[$this->plugin][$theme]['disable']; foreach ($regions as $region => $disable) { Index: plugins/context_condition_taxonomy_term.inc =================================================================== --- plugins/context_condition_taxonomy_term.inc (revision 1709) +++ plugins/context_condition_taxonomy_term.inc (working copy) @@ -3,8 +3,8 @@ /** * Expose term views/term forms by vocabulary as a context condition. */ -class context_condition_taxonomy_term extends context_condition { - function condition_values() { +class ContextConditionTaxonomyTerm extends ContextCondition { + public function conditionValues() { $values = array(); foreach (taxonomy_get_vocabularies() as $vocab) { $values[$vocab->machine_name] = check_plain($vocab->name); @@ -12,8 +12,8 @@ return $values; } - function options_form($context) { - $defaults = $this->fetch_from_context($context, 'options'); + public function optionsForm($context) { + $defaults = $this->fetchFromContext($context, 'options'); return array( 'term_form' => array( '#title' => t('Set on term form'), @@ -29,18 +29,18 @@ ); } - function execute($term, $op) { - foreach ($this->get_contexts($term->vocabulary_machine_name) as $context) { + public function execute($term, $op) { + foreach ($this->getContexts($term->vocabulary_machine_name) as $context) { // Check the node form option. - $options = $this->fetch_from_context($context, 'options'); + $options = $this->fetchFromContext($context, 'options'); if ($op === 'form') { - $options = $this->fetch_from_context($context, 'options'); + $options = $this->fetchFromContext($context, 'options'); if (!empty($options['term_form']) && in_array($options['term_form'], array(1, 2))) { - $this->condition_met($context, $term->vocabulary_machine_name); + $this->conditionMet($context, $term->vocabulary_machine_name); } } elseif (empty($options['term_form']) || $options['term_form'] != 2) { - $this->condition_met($context, $term->vocabulary_machine_name); + $this->conditionMet($context, $term->vocabulary_machine_name); } } } Index: plugins/context_condition_path.inc =================================================================== --- plugins/context_condition_path.inc (revision 1709) +++ plugins/context_condition_path.inc (working copy) @@ -3,30 +3,30 @@ /** * Expose paths as a context condition. */ -class context_condition_path extends context_condition { +class ContextConditionPath extends ContextCondition { /** * Omit condition values. We will provide a custom input form for our conditions. */ - function condition_values() { + public function conditionValues() { return array(); } /** * Condition form. */ - function condition_form($context) { - $form = parent::condition_form($context); + public function conditionForm($context) { + $form = parent::conditionForm($context); unset($form['#options']); $form['#type'] = 'textarea'; - $form['#default_value'] = implode("\n", $this->fetch_from_context($context, 'values')); + $form['#default_value'] = implode("\n", $this->fetchFromContext($context, 'values')); return $form; } /** * Condition form submit handler. */ - function condition_form_submit($values) { + public function conditionFormSubmit($values) { $parsed = array(); $items = explode("\n", $values); if (!empty($items)) { @@ -43,17 +43,17 @@ /** * Execute. */ - function execute() { - if ($this->condition_used()) { + public function execute() { + if ($this->conditionUsed()) { // Include both the path alias and normal path for matching. $current_path = array(drupal_get_path_alias($_GET['q'])); if ($current_path != $_GET['q']) { $current_path[] = $_GET['q']; } - foreach ($this->get_contexts() as $context) { - $paths = $this->fetch_from_context($context, 'values'); + foreach ($this->getContexts() as $context) { + $paths = $this->fetchFromContext($context, 'values'); if ($this->match($current_path, $paths, TRUE)) { - $this->condition_met($context); + $this->conditionMet($context); } } } Index: plugins/context_condition_user.inc =================================================================== --- plugins/context_condition_user.inc (revision 1709) +++ plugins/context_condition_user.inc (working copy) @@ -3,8 +3,8 @@ /** * Expose current user role as a context condition. */ -class context_condition_user extends context_condition { - function condition_values() { +class ContextConditionUser extends ContextCondition { + public function conditionValues() { $values = array(); foreach (user_roles() as $rid => $role_name) { if ($rid == DRUPAL_ANONYMOUS_RID) { @@ -20,11 +20,11 @@ return $values; } - function execute($account) { + public function execute($account) { $roles = $account->roles; foreach ($roles as $rid => $role) { - foreach ($this->get_contexts($role) as $context) { - $this->condition_met($context, $role); + foreach ($this->getContexts($role) as $context) { + $this->conditionMet($context, $role); } } } Index: plugins/context_condition_views.inc =================================================================== --- plugins/context_condition_views.inc (revision 1709) +++ plugins/context_condition_views.inc (working copy) @@ -1,11 +1,11 @@ display_handler->display->display_plugin) { case 'page': case 'calendar': // Set contexts for this view. - foreach ($this->get_contexts($view->name) as $context) { - $this->condition_met($context, $view->name); + foreach ($this->getContexts($view->name) as $context) { + $this->conditionMet($context, $view->name); } // Set any contexts associated with the current display if (!empty($view->current_display)) { - foreach ($this->get_contexts("{$view->name}:{$view->current_display}") as $context) { - $this->condition_met($context, "{$view->name}:{$view->current_display}"); + foreach ($this->getContexts("{$view->name}:{$view->current_display}") as $context) { + $this->conditionMet($context, "{$view->name}:{$view->current_display}"); } } break; Index: plugins/context_reaction_theme_html.inc =================================================================== --- plugins/context_reaction_theme_html.inc (revision 1709) +++ plugins/context_reaction_theme_html.inc (working copy) @@ -2,12 +2,12 @@ /** * Expose themes as context reactions. */ -class context_reaction_theme_html extends context_reaction_theme { +class ContextReactionThemeHtml extends ContextReactionTheme { /** * Allow admins to provide additional body classes. */ - function options_form($context) { - $values = $this->fetch_from_context($context); + public function optionsForm($context) { + $values = $this->fetchFromContext($context); $form = array( 'class' => array( '#title' => t('Section class'), @@ -25,7 +25,7 @@ */ function execute(&$vars) { $classes = array(); - foreach ($this->get_contexts() as $k => $v) { + foreach ($this->getContexts() as $k => $v) { if (!empty($v->reactions[$this->plugin]['class'])) { $vars['classes_array'][] = $v->reactions[$this->plugin]['class']; } Index: plugins/context_reaction_debug.inc =================================================================== --- plugins/context_reaction_debug.inc (revision 1709) +++ plugins/context_reaction_debug.inc (working copy) @@ -3,12 +3,12 @@ /** * Output context debug information. */ -class context_reaction_debug extends context_reaction { - function options_form($context) { +class ContextReactionDebug extends ContextReaction { + public function optionsForm($context) { return array('debug' => array('#type' => 'value', '#value' => TRUE)); } - function options_form_submit($values) { + public function optionsFormSubmit($values) { return array('debug' => 1); } Index: context.plugins.inc =================================================================== --- context.plugins.inc (revision 1709) +++ context.plugins.inc (working copy) @@ -9,123 +9,123 @@ 'context' => array( 'title' => t('Context'), 'description' => t('Set this context on the basis of other active contexts. Put each context on a separate line. You can use the * character as a wildcard and ~ to exclude one or more contexts.'), - 'plugin' => 'context_condition_context', + 'plugin' => 'ContextConditionContext', ), 'node' => array( 'title' => t('Node type'), 'description' => t('Set this context when viewing a node page or using the add/edit form of one of these content types.'), - 'plugin' => 'context_condition_node', + 'plugin' => 'ContextConditionNode', ), 'sitewide' => array( 'title' => t('Sitewide context'), 'description' => t('Should this context always be set? If true, this context will be active across your entire site.'), - 'plugin' => 'context_condition_sitewide', + 'plugin' => 'ContextConditionSitewide', ), 'path' => array( 'title' => t('Path'), 'description' => t('Set this context when any of the paths above match the page path. Put each path on a separate line. You can use the "*" character as a wildcard and ~ to exclude one or more paths. Use <front> for the site front page.'), - 'plugin' => 'context_condition_path', + 'plugin' => 'ContextConditionPath', ), 'user' => array( 'title' => t('User role'), 'description' => t('Set this context when the current user has one of the selected role(s).'), - 'plugin' => 'context_condition_user', + 'plugin' => 'ContextConditionUser', ), 'user_page' => array( 'title' => t('User page'), 'description' => t('Set this context when viewing a user page.'), - 'plugin' => 'context_condition_user_page', + 'plugin' => 'ContextConditionUserPage', ), ); if (module_exists('menu')) { $registry['conditions']['menu'] = array( 'title' => t('Menu'), 'description' => t('Set this context when any of the selected menu items belong to the current active menu trail.'), - 'plugin' => 'context_condition_menu', + 'plugin' => 'ContextConditionMenu', ); } if (module_exists('views')) { $registry['conditions']['views'] = array( 'title' => t('Views'), 'description' => t('Set this context when displaying the page of one of these views.'), - 'plugin' => 'context_condition_views', + 'plugin' => 'ContextConditionViews', ); } if (module_exists('book')) { $registry['conditions']['book'] = array( 'title' => t('Book'), 'description' => t('Set this context when a node in the selected book is viewed.'), - 'plugin' => 'context_condition_book', + 'plugin' => 'ContextConditionBook', ); $registry['conditions']['bookroot'] = array( 'title' => t('Book root'), 'description' => t('Set this context when viewing a node whose root book is of the selected type.'), - 'plugin' => 'context_condition_bookroot', + 'plugin' => 'ContextConditionBookroot', ); } if (module_exists('locale')) { $registry['conditions']['language'] = array( 'title' => t('Language'), 'description' => t('Set this context when viewing the site in the selected language.'), - 'plugin' => 'context_condition_language', + 'plugin' => 'ContextConditionLanguage', ); } if (module_exists('taxonomy')) { $registry['conditions']['node_taxonomy'] = array( 'title' => t('Taxonomy'), 'description' => t('Set this context when viewing a node with the selected taxonomy terms.'), - 'plugin' => 'context_condition_node_taxonomy', + 'plugin' => 'ContextConditionNodeTaxonomy', ); $registry['conditions']['taxonomy_term'] = array( 'title' => t('Taxonomy term'), 'description' => t('Set this context when viewing a taxonomy term page.'), - 'plugin' => 'context_condition_taxonomy_term', + 'plugin' => 'ContextConditionTaxonomyTerm', ); } $registry['reactions'] = array( 'block' => array( 'title' => t('Blocks'), 'description' => t('Control block visibility using context.'), - 'plugin' => 'context_reaction_block', + 'plugin' => 'ContextReactionBlock', ), 'region' => array( 'title' => t('Regions'), 'description' => t('Control Region visiblity using context.'), - 'plugin' => 'context_reaction_region', + 'plugin' => 'ContextReactionRegion', ), 'breadcrumb' => array( 'title' => t('Breadcrumb'), 'description' => t('Set the breadcrumb trail to the selected menu item.'), - 'plugin' => 'context_reaction_breadcrumb', + 'plugin' => 'ContextReactionBreadcrumb', ), 'theme' => array( 'title' => t('Theme Page'), 'description' => t('Control page theme variables using context.'), - 'plugin' => 'context_reaction_theme', + 'plugin' => 'ContextReactionTheme', ), 'theme_html' => array( 'title' => t('Theme HTML'), 'description' => t('Control HTML theme variables using context.'), - 'plugin' => 'context_reaction_theme_html', + 'plugin' => 'ContextReactionThemeHtml', ), 'debug' => array( 'title' => t('Debug'), 'description' => t('Debug output reaction for SimpleTest.'), - 'plugin' => 'context_reaction_debug', + 'plugin' => 'ContextReactionDebug', ), ); if (module_exists('menu')) { $registry['reactions']['menu'] = array( 'title' => t('Menu'), 'description' => t('Control menu active class using context.'), - 'plugin' => 'context_reaction_menu', + 'plugin' => 'ContextReactionMenu', ); } if (module_exists('css_injector')) { $registry['reactions']['css_injector'] = array( 'title' => t('CSS Injector'), 'description' => t('Inject the selected css when this context is set.'), - 'plugin' => 'context_reaction_css_injector', + 'plugin' => 'ContextReactionCssInjector', ); } return $registry; @@ -144,63 +144,63 @@ 'handler' => array( 'path' => drupal_get_path('module', 'context') . '/plugins', 'file' => 'context_condition.inc', - 'class' => 'context_condition', + 'class' => 'ContextCondition', ), ); $plugins['context_condition_context'] = array( 'handler' => array( 'path' => drupal_get_path('module', 'context') . '/plugins', 'file' => 'context_condition_context.inc', - 'class' => 'context_condition_context', - 'parent' => 'context_condition_path', + 'class' => 'ContextConditionContext', + 'parent' => 'ContextConditionPath', ), ); $plugins['context_condition_node'] = array( 'handler' => array( 'path' => drupal_get_path('module', 'context') . '/plugins', 'file' => 'context_condition_node.inc', - 'class' => 'context_condition_node', - 'parent' => 'context_condition', + 'class' => 'ContextConditionNode', + 'parent' => 'ContextCondition', ), ); $plugins['context_condition_sitewide'] = array( 'handler' => array( 'path' => drupal_get_path('module', 'context') . '/plugins', 'file' => 'context_condition_sitewide.inc', - 'class' => 'context_condition_sitewide', - 'parent' => 'context_condition', + 'class' => 'ContextConditionSitewide', + 'parent' => 'ContextCondition', ), ); $plugins['context_condition_path'] = array( 'handler' => array( 'path' => drupal_get_path('module', 'context') . '/plugins', 'file' => 'context_condition_path.inc', - 'class' => 'context_condition_path', - 'parent' => 'context_condition', + 'class' => 'ContextConditionPath', + 'parent' => 'ContextCondition', ), ); $plugins['context_condition_user'] = array( 'handler' => array( 'path' => drupal_get_path('module', 'context') . '/plugins', 'file' => 'context_condition_user.inc', - 'class' => 'context_condition_user', - 'parent' => 'context_condition', + 'class' => 'ContextConditionUser', + 'parent' => 'ContextCondition', ), ); $plugins['context_condition_user_page'] = array( 'handler' => array( 'path' => drupal_get_path('module', 'context') . '/plugins', 'file' => 'context_condition_user_page.inc', - 'class' => 'context_condition_user_page', - 'parent' => 'context_condition', + 'class' => 'ContextConditionUserPage', + 'parent' => 'ContextCondition', ), ); $plugins['context_condition_menu'] = array( 'handler' => array( 'path' => drupal_get_path('module', 'context') . '/plugins', 'file' => 'context_condition_menu.inc', - 'class' => 'context_condition_menu', - 'parent' => 'context_condition', + 'class' => 'ContextConditionMenu', + 'parent' => 'ContextCondition', ), ); if (module_exists('taxonomy')) { @@ -208,16 +208,16 @@ 'handler' => array( 'path' => drupal_get_path('module', 'context') . '/plugins', 'file' => 'context_condition_node_taxonomy.inc', - 'class' => 'context_condition_node_taxonomy', - 'parent' => 'context_condition_node', + 'class' => 'ContextConditionNodeTaxonomy', + 'parent' => 'ContextConditionNode', ), ); $plugins['context_condition_taxonomy_term'] = array( 'handler' => array( 'path' => drupal_get_path('module', 'context') . '/plugins', 'file' => 'context_condition_taxonomy_term.inc', - 'class' => 'context_condition_taxonomy_term', - 'parent' => 'context_condition', + 'class' => 'ContextConditionTaxonomyTerm', + 'parent' => 'ContextCondition', ), ); } @@ -226,8 +226,8 @@ 'handler' => array( 'path' => drupal_get_path('module', 'context') . '/plugins', 'file' => 'context_condition_language.inc', - 'class' => 'context_condition_language', - 'parent' => 'context_condition', + 'class' => 'ContextConditionLanguage', + 'parent' => 'ContextCondition', ), ); } @@ -236,16 +236,16 @@ 'handler' => array( 'path' => drupal_get_path('module', 'context') . '/plugins', 'file' => 'context_condition_book.inc', - 'class' => 'context_condition_book', - 'parent' => 'context_condition', + 'class' => 'ContextConditionBook', + 'parent' => 'ContextCondition', ), ); $plugins['context_condition_bookroot'] = array( 'handler' => array( 'path' => drupal_get_path('module', 'context') . '/plugins', 'file' => 'context_condition_bookroot.inc', - 'class' => 'context_condition_bookroot', - 'parent' => 'context_condition_node', + 'class' => 'ContextConditionBookroot', + 'parent' => 'ContextConditionNode', ), ); } @@ -254,8 +254,8 @@ 'handler' => array( 'path' => drupal_get_path('module', 'context') . '/plugins', 'file' => 'context_condition_views.inc', - 'class' => 'context_condition_views', - 'parent' => 'context_condition', + 'class' => 'ContextConditionViews', + 'parent' => 'ContextCondition', ), ); } @@ -267,63 +267,63 @@ 'handler' => array( 'path' => drupal_get_path('module', 'context') . '/plugins', 'file' => 'context_reaction.inc', - 'class' => 'context_reaction', + 'class' => 'ContextReaction', ), ); $plugins['context_reaction_block'] = array( 'handler' => array( 'path' => drupal_get_path('module', 'context') . '/plugins', 'file' => 'context_reaction_block.inc', - 'class' => 'context_reaction_block', - 'parent' => 'context_reaction', + 'class' => 'ContextReactionBlock', + 'parent' => 'ContextReaction', ), ); $plugins['context_reaction_region'] = array( 'handler' => array( 'path' => drupal_get_path('module', 'context') . '/plugins', 'file' => 'context_reaction_region.inc', - 'class' => 'context_reaction_region', - 'parent' => 'context_reaction', + 'class' => 'ContextReactionRegion', + 'parent' => 'ContextReaction', ), ); $plugins['context_reaction_breadcrumb'] = array( 'handler' => array( 'path' => drupal_get_path('module', 'context') . '/plugins', 'file' => 'context_reaction_breadcrumb.inc', - 'class' => 'context_reaction_breadcrumb', - 'parent' => 'context_reaction_menu', + 'class' => 'ContextReactionBreadcrumb', + 'parent' => 'ContextReactionMenu', ), ); $plugins['context_reaction_menu'] = array( 'handler' => array( 'path' => drupal_get_path('module', 'context') . '/plugins', 'file' => 'context_reaction_menu.inc', - 'class' => 'context_reaction_menu', - 'parent' => 'context_reaction', + 'class' => 'ContextReactionMenu', + 'parent' => 'ContextReaction', ), ); $plugins['context_reaction_theme'] = array( 'handler' => array( 'path' => drupal_get_path('module', 'context') . '/plugins', 'file' => 'context_reaction_theme.inc', - 'class' => 'context_reaction_theme', - 'parent' => 'context_reaction', + 'class' => 'ContextReactionTheme', + 'parent' => 'ContextReaction', ), ); $plugins['context_reaction_theme_html'] = array( 'handler' => array( 'path' => drupal_get_path('module', 'context') . '/plugins', 'file' => 'context_reaction_theme_html.inc', - 'class' => 'context_reaction_theme_html', - 'parent' => 'context_reaction_theme', + 'class' => 'ContextReactionThemeHtml', + 'parent' => 'ContextReactionTheme', ), ); $plugins['context_reaction_debug'] = array( 'handler' => array( 'path' => drupal_get_path('module', 'context') . '/plugins', 'file' => 'context_reaction_debug.inc', - 'class' => 'context_reaction_debug', - 'parent' => 'context_reaction', + 'class' => 'ContextReactionDebug', + 'parent' => 'ContextReaction', ), ); if (module_exists('css_injector')) { @@ -331,8 +331,8 @@ 'handler' => array( 'path' => drupal_get_path('module', 'context') . '/plugins', 'file' => 'context_reaction_css_injector.inc', - 'class' => 'context_reaction_css_injector', - 'parent' => 'context_reaction', + 'class' => 'ContextReactionCssInjector', + 'parent' => 'ContextReaction', ), ); } Index: context.module =================================================================== --- context.module (revision 1709) +++ context.module (working copy) @@ -393,7 +393,7 @@ foreach (array_keys(context_conditions()) as $condition) { if ($plugin = context_get_plugin('condition', $condition)) { foreach (context_enabled_contexts() as $context) { - $values = $plugin->fetch_from_context($context, 'values'); + $values = $plugin->fetchFromContext($context, 'values'); foreach ($values as $value) { if (!isset($condition_map[$condition][$value])) { $condition_map[$condition][$value] = array(); Index: context_ui/export_ui/context_export_ui.class.php =================================================================== --- context_ui/export_ui/context_export_ui.class.php (revision 1709) +++ context_ui/export_ui/context_export_ui.class.php (working copy) @@ -22,7 +22,7 @@ function list_render(&$form_state) { $table = array( 'header' => $this->list_table_header(), - 'rows' => $this->rows, + 'rows' => $this->rows, 'attributes' => array( 'class' => array('context-admin'), 'id' => 'ctools-export-ui-list-items', @@ -103,7 +103,7 @@ * @param $form_state * Form state array */ -function context_ui_form(&$form, &$form_state) { +function context_ui_form(&$form, &$form_state) { $conditions = array_keys(context_conditions()); sort($conditions); $reactions = array_keys(context_reactions()); @@ -173,8 +173,8 @@ '#tree' => TRUE, '#plugin' => $plugin, '#context_enabled' => isset($context->conditions[$condition]), // This flag is used at the theme layer. - 'values' => $plugin->condition_form($context), - 'options' => $plugin->options_form($context), + 'values' => $plugin->conditionForm($context), + 'options' => $plugin->optionsForm($context), ); $form['conditions']['selector']['#options'][$condition] = $plugin->title; } @@ -224,7 +224,7 @@ * A context object */ function _context_ui_rebuild_from_input($context, $input, $conditions, $reactions) { - $condition_defaults = array(); + $condition_defaults = array(); foreach ($conditions as $condition) { if ($plugin = context_get_plugin('condition', $condition)) { $condition_defaults[$condition] = array( Index: context_ui/context_ui.module =================================================================== --- context_ui/context_ui.module (revision 1709) +++ context_ui/context_ui.module (working copy) @@ -134,7 +134,7 @@ // Edit context conditions. foreach (array_keys(context_conditions()) as $condition) { $plugin = context_get_plugin('condition', $condition); - if (method_exists($plugin, 'editor_form') && ($plugin_form = $plugin->editor_form($context))) { + if (method_exists($plugin, 'editor_form') && ($plugin_form = $plugin->editorForm($context))) { $form_context['condition'][$condition] = $plugin_form; } } @@ -146,7 +146,7 @@ // Edit context reactions. foreach (array_keys(context_reactions()) as $reaction) { $plugin = context_get_plugin('reaction', $reaction); - if (method_exists($plugin, 'editor_form') && ($plugin_form = $plugin->editor_form($context))) { + if (method_exists($plugin, 'editor_form') && ($plugin_form = $plugin->editorForm($context))) { $form_context["reaction-{$reaction}"] = $plugin_form + array('#title' => $plugin->title); } } @@ -181,8 +181,8 @@ foreach (array_keys(context_conditions()) as $condition) { if (isset($values['condition'][$condition])) { $plugin = context_get_plugin('condition', $condition); - if ($plugin && method_exists($plugin, 'editor_form_submit')) { - $context->conditions[$condition]['values'] = $plugin->editor_form_submit($context, $values['condition'][$condition]); + if ($plugin && method_exists($plugin, 'editorFormSubmit')) { + $context->conditions[$condition]['values'] = $plugin->editorFormSubmit($context, $values['condition'][$condition]); } } if (isset($context->conditions[$condition]) && context_empty($context->conditions[$condition]['values'])) { @@ -192,8 +192,8 @@ foreach (array_keys(context_reactions()) as $reaction) { if (isset($values["reaction-{$reaction}"])) { $plugin = context_get_plugin('reaction', $reaction); - if ($plugin && method_exists($plugin, 'editor_form_submit')) { - $context->reactions[$reaction] = $plugin->editor_form_submit($context, $values["reaction-{$reaction}"]); + if ($plugin && method_exists($plugin, 'editorFormSubmit')) { + $context->reactions[$reaction] = $plugin->editorFormSubmit($context, $values["reaction-{$reaction}"]); } } if (isset($context->reactions[$reaction]) && context_empty($context->reactions[$reaction])) { @@ -239,7 +239,7 @@ $form = array(); foreach (context_conditions() as $condition => $info) { if ($plugin = context_get_plugin('condition', $condition)) { - $settings_form = $plugin->settings_form(); + $settings_form = $plugin->settingsForm(); if ($settings_form) { $form['conditions'][$reaction] = $settings_form; $form['conditions'][$reaction]['#tree'] = FALSE; @@ -250,7 +250,7 @@ } foreach (context_reactions() as $reaction => $info) { if ($plugin = context_get_plugin('reaction', $reaction)) { - $settings_form = $plugin->settings_form(); + $settings_form = $plugin->settingsForm(); if ($settings_form) { $form['reactions'][$reaction] = $settings_form; $form['reactions'][$reaction]['#tree'] = FALSE; Index: context.install =================================================================== --- context.install (revision 1709) +++ context.install (working copy) @@ -390,3 +390,8 @@ } } } + +function context_update_7001() { + module_disable(array('context')); + module_enable(array('context')); +}