From efd78095e38f509d49db0709930153e96813891a Mon Sep 17 00:00:00 2001 From: Jason Yergeau Date: Sun, 30 Oct 2011 22:28:24 -0300 Subject: [PATCH] Issue #1313768: completes the process of moving all UI-related functions for Rules into a separate inc file. --- fusion_apply/fusion_apply_rules.inc | 364 ----------------------------------- fusion_apply/fusion_apply_ui.module | 6 +- 2 files changed, 5 insertions(+), 365 deletions(-) diff --git a/fusion_apply/fusion_apply_rules.inc b/fusion_apply/fusion_apply_rules.inc index 88c0d1f..99747ed 100644 --- a/fusion_apply/fusion_apply_rules.inc +++ b/fusion_apply/fusion_apply_rules.inc @@ -1,370 +1,6 @@ t('Title'), 'field' => 'title'), - array('data' => t('Type'), 'field' => 'type'), - array('data' => t('Operations'), 'colspan' => 2) - ); - - $rules = fusion_apply_rule_load_multiple(); - $rows = array(); - foreach ($rules as $rule) { - $row = array( - check_plain($rule->title), - check_plain($rule->rule_type), - l(t('edit'), 'admin/appearance/fusion/rules/edit/'. $rule->rid), - l(t('delete'), 'admin/appearance/fusion/rules/delete/'. $rule->rid), - ); - $rows[] = $row; - } - - $link = l(t('Create a new rule'), 'admin/appearance/fusion/rules/add'); - $row = array(); - if (empty($rows)) { - $row[] = array( - 'data' => t('No rules have been set up yet. !url.', array('!url' => $link)), - 'colspan' => 4, - ); - } - else { - $row[] = array( - 'data' => t('!url.', array('!url' => $link)), - 'colspan' => 4, - ); - } - $rows[] = $row; - - $output .= theme('table', array('header' => $headers, 'rows' => $rows)); - $output .= drupal_render($form); - - return $output; -} - -/** - * Menu callback; displays the edit form for a Fusion Apply rule. - * - * @ingroup forms - */ -function fusion_apply_rule_add($form, &$form_state) { - $form = array(); - $form['#tree'] = TRUE; - - $form['rule']['title'] = array( - '#type' => 'textfield', - '#title' => t('Title'), - '#default_value' => !empty($form_state['values']['rule']['title']) ? $form_state['values']['rule']['title'] : '', - '#description' => t('Descriptive title for this rule; used by administrators.'), - '#required' => TRUE, - ); - $options = array('page' => t('Page')); - foreach (list_themes() as $theme_name => $theme) { - if (empty($theme->status)) { - continue; - } - // Create a list options containing visible regions of this theme. - $regions = array(); - foreach (system_region_list($theme_name, REGIONS_VISIBLE) as $region_name => $region) { - $regions['region__' . $region_name] = $region; - } - // Group the list of options by theme. - $key = t('@name Regions', array('@name' => $theme->info['name'])); - $options[$key] = $regions; - } - $form['rule']['rule_type'] = array( - '#type' => 'select', - '#title' => t('Type'), - '#options' => $options, - '#default_value' => !empty($form_state['values']['rule']['rule_type']) ? $form_state['values']['rule']['rule_type'] : '', - '#description' => t('Type of element the rule is applied to.'), - '#required' => TRUE, - ); - - $form['buttons']['save'] = array( - '#type' => 'submit', - '#value' => t('Add'), - ); - - return $form; -} - -/** - * Process fusion_apply_rule_add() submissions. - */ -function fusion_apply_rule_add_submit($form, &$form_state) { - $rule = new stdClass(); - $rule->rid = NULL; - $rule->title = $form_state['values']['rule']['title']; - $rule->rule_type = $form_state['values']['rule']['rule_type']; - $rule->node_types = array(); - $rule->roles = array(); - $rule->visibility = 0; - $rule->pages = ''; - - fusion_apply_rule_save($rule); - // Set rule id, if we inserted a new rule to allow others to know what rule they're working with. - $form_state['values']['rule']['rid'] = $rule->rid; - - $form_state['redirect'] = 'admin/appearance/fusion/rules/edit/' . $rule->rid; -} - -/** - * Form builder for the rule configuration form. - * - * @param $rid - * The rule ID. - * - * @see fusion_apply_rule_edit_submit() - * @ingroup forms - */ -function fusion_apply_rule_edit($form, &$form_state, $rid = NULL) { - $form['rule'] = array( - '#weight' => -1, - ); - - if (isset($form_state['values'])) { - $rule = array( - 'title' => $form_state['values']['title'], - 'rule_type' => $form_state['values']['rule_type'], - 'node_types' => $form_state['values']['types'], - 'roles' => $form_state['values']['roles'], - 'visibility' => $form_state['values']['visibility'], - 'pages' => $form_state['values']['pages'], - ); - } - elseif (isset($rid) && $rule = fusion_apply_rule_load($rid)) { - $rule = (array) $rule; - $form['rule']['rid'] = array( - '#type' => 'value', - '#value' => $rid, - ); - } - else { - $rule = array( - 'title' => '', - 'rule_type' => '', - 'node_types' => array(), - 'roles' => array(), - 'visibility' => 0, - 'pages' => '', - ); - } - - $form['rule']['title'] = array( - '#type' => 'textfield', - '#title' => t('Rule title'), - '#default_value' => $rule['title'], - '#description' => t('Descriptive title for this rule; used by administrators.'), - '#required' => TRUE, - ); - - $form['rule']['rule_type'] = array( - '#type' => 'hidden', - '#value' => $rule['rule_type'], - ); - $form['rule']['rule_type_displayed'] = array( - '#type' => 'item', - '#title' => t('Rule type'), - '#markup' => $rule['rule_type'], - '#description' => t('Type of element the rule is applied to.'), - ); - - // Visibility settings. - $form['visibility_title'] = array( - '#type' => 'item', - '#title' => t('Visibility settings'), - ); - $form['visibility'] = array( - '#type' => 'vertical_tabs', - '#attached' => array( - 'js' => array(drupal_get_path('module', 'fusion_apply_ui') . '/js/fusion_apply_ui.rules.js'), - ), - ); - - // Per-path visibility. - $form['visibility']['path'] = array( - '#type' => 'fieldset', - '#title' => t('Pages'), - '#collapsible' => TRUE, - '#collapsed' => TRUE, - '#group' => 'visibility', - '#weight' => 0, - ); - - $access = user_access('use PHP for settings'); - if (isset($rule['visibility']) && $rule['visibility'] == FUSION_APPLY_RULE_VISIBILITY_PHP && !$access) { - $form['visibility']['path']['visibility'] = array( - '#type' => 'value', - '#value' => FUSION_APPLY_RULE_VISIBILITY_PHP, - ); - $form['visibility']['path']['pages'] = array( - '#type' => 'value', - '#value' => isset($rule['pages']) ? $rule['pages'] : '', - ); - } - else { - $options = array( - FUSION_APPLY_RULE_VISIBILITY_NOTLISTED => t('All pages except those listed'), - FUSION_APPLY_RULE_VISIBILITY_LISTED => t('Only the listed pages'), - ); - $description = t("Specify pages by using their paths. Enter one path per line. The '*' character is a wildcard. Example paths are %blog for the blog page and %blog-wildcard for every personal blog. %front is the front page.", array('%blog' => 'blog', '%blog-wildcard' => 'blog/*', '%front' => '')); - - if (module_exists('php') && $access) { - $options += array(FUSION_APPLY_RULE_VISIBILITY_PHP => t('Pages on which this PHP code returns TRUE (experts only)')); - $title = t('Pages or PHP code'); - $description .= ' ' . t('If the PHP option is chosen, enter PHP code between %php. Note that executing incorrect PHP code can break your Drupal site.', array('%php' => '')); - } - else { - $title = t('Pages'); - } - $form['visibility']['path']['visibility'] = array( - '#type' => 'radios', - '#title' => t('Show block on specific pages'), - '#options' => $options, - '#default_value' => isset($rule['visibility']) ? $rule['visibility'] : FUSION_APPLY_RULE_VISIBILITY_NOTLISTED, - ); - $form['visibility']['path']['pages'] = array( - '#type' => 'textarea', - '#title' => '' . $title . '', - '#default_value' => isset($rule['pages']) ? $rule['pages'] : '', - '#description' => $description, - ); - } - - // Per-node visbility. - $form['visibility']['node_type'] = array( - '#type' => 'fieldset', - '#title' => t('Content types'), - '#collapsible' => TRUE, - '#collapsed' => TRUE, - '#group' => 'visibility', - '#weight' => 5, - ); - $form['visibility']['node_type']['types'] = array( - '#type' => 'checkboxes', - '#title' => t('Show block for specific content types'), - '#default_value' => $rule['node_types'], - '#options' => node_type_get_names(), - '#description' => t('Show this block only on pages that display content of the given type(s). If you select no types, there will be no type-specific limitation.'), - ); - - // Per-role visibility. - $role_options = array_map('check_plain', user_roles()); - $form['visibility']['role'] = array( - '#type' => 'fieldset', - '#title' => t('Roles'), - '#collapsible' => TRUE, - '#collapsed' => TRUE, - '#group' => 'visibility', - '#weight' => 10, - ); - $form['visibility']['role']['roles'] = array( - '#type' => 'checkboxes', - '#title' => t('Show block for specific roles'), - '#default_value' => $rule['roles'], - '#options' => $role_options, - '#description' => t('Show this rule only for the selected role(s). If you select no roles, the rule will be visible to all users.'), - ); - - $form['actions'] = array('#type' => 'actions'); - $form['actions']['submit'] = array( - '#type' => 'submit', - '#value' => t('Save rule'), - ); - if (isset($rule['rid'])) { - $form['actions']['delete'] = array( - '#type' => 'submit', - '#value' => t('Delete'), - '#submit' => array('fusion_apply_rule_delete_submit'), - ); - } - - return $form; -} - -/** - * Form submission handler for the rule configuration form. - * - * @see fusion_apply_rule_edit() - */ -function fusion_apply_rule_edit_submit($form, &$form_state) { - $rule = new stdClass(); - $rule->rid = !empty($form_state['values']['rid']) ? $form_state['values']['rid'] : NULL; - $rule->rule_type = $form_state['values']['rule_type']; - $rule->title = $form_state['values']['title']; - $rule->node_types = array_filter($form_state['values']['types']); - $rule->roles = $form_state['values']['roles']; - $rule->visibility = (int) $form_state['values']['visibility']; - $rule->pages = trim($form_state['values']['pages']); - - fusion_apply_rule_save($rule); - // Set rule id, if we inserted a new rule to allow others to know what rule they're working with. - $form_state['values']['rid'] = $rule->rid; - - $form_state['redirect'] = 'admin/appearance/fusion/rules'; -} - -/** - * Called from within the rule edit form; redirects to fusion_apply_rule_delete_confirm(). - * - * @ingroup forms - */ -function fusion_apply_rule_delete_submit($form, &$form_state) { - $destination = array(); - if (isset($_REQUEST['destination'])) { - $destination = drupal_get_destination(); - unset($_REQUEST['destination']); - } - $form_state['redirect'] = array('admin/appearance/fusion/rules/delete/'. $form_state['values']['rid'], $destination); -} - -/** - * Menu callback; displays the delete confirmation for a skins rule. - * - * @param $rid - * The rule ID. - * - * @ingroup forms - */ -function fusion_apply_rule_delete_confirm($form, &$form_state, $rid) { - $form['rid'] = array( - '#type' => 'value', - '#value' => $rid, - ); - - $rule = fusion_apply_rule_load($rid); - return confirm_form($form, - t('Are you sure you want to delete %title?', array('%title' => $rule->title)), - isset($_GET['destination']) ? $_GET['destination'] : 'admin/appearance/fusion/rules', - t('This action cannot be undone.'), - t('Delete'), - t('Cancel') - ); -} - -/** - * Process fusion_apply_rule_delete_confirm() submissions. - */ -function fusion_apply_rule_delete_confirm_submit($form, &$form_state) { - if ($form_state['values']['confirm']) { - fusion_apply_rule_delete($form_state['values']['rid']); - } - - $form_state['redirect'] = 'admin/appearance/fusion/rules'; -} - - -/** * @defgroup skin page rule handlers * @{ */ diff --git a/fusion_apply/fusion_apply_ui.module b/fusion_apply/fusion_apply_ui.module index 5a6dbb7..5ed7b14 100644 --- a/fusion_apply/fusion_apply_ui.module +++ b/fusion_apply/fusion_apply_ui.module @@ -79,7 +79,8 @@ function fusion_apply_ui_menu() { 'type' => MENU_LOCAL_TASK, 'weight' => 1, 'description' => t('Configure region and page level skin rules.'), - 'access arguments' => array('administer fusion'), + 'access arguments' => array('administer fusion'), + 'file' => 'fusion_apply_ui.rules.inc', ); $items['admin/appearance/fusion/rules/add'] = array( 'title' => 'Create a new rule', @@ -87,6 +88,7 @@ function fusion_apply_ui_menu() { 'page arguments' => array('fusion_apply_rule_add'), 'type' => MENU_LOCAL_ACTION, 'access arguments' => array('administer fusion'), + 'file' => 'fusion_apply_ui.rules.inc', ); $items['admin/appearance/fusion/rules/edit'] = array( 'title' => 'Edit rule', @@ -94,6 +96,7 @@ function fusion_apply_ui_menu() { 'page arguments' => array('fusion_apply_rule_edit'), 'type' => MENU_CALLBACK, 'access arguments' => array('administer fusion'), + 'file' => 'fusion_apply_ui.rules.inc', ); $items['admin/appearance/fusion/rules/delete'] = array( 'title' => 'Delete rule', @@ -101,6 +104,7 @@ function fusion_apply_ui_menu() { 'page arguments' => array('fusion_apply_rule_delete_confirm'), 'type' => MENU_CALLBACK, 'access arguments' => array('administer fusion'), + 'file' => 'fusion_apply_ui.rules.inc', ); } -- 1.7.3.4