BOINC / boinc

drupal/sites/default/boinc/modules/contrib/views/includes/view.inc

Switch Indentation +28 added lines, -28 removed lines

@@ -1522,23 +1522,23 @@ 
       foreach ($display->handler->option_definition() as $option => $definition) {
         // Special handling for some items
         switch ($option) {
-          case 'defaults':
-            // skip these
-            break;
-          default:
-            if (!$display->handler->is_defaulted($option)) {
-              $value = $display->handler->get_option($option);
-              if ($id == 'default') {
-                $default = isset($definition['default']) ? $definition['default'] : NULL;
-              }
-              else {
-                $default = $this->display['default']->handler->get_option($option);
-              }
-
-              if ($value !== $default) {
-                $output .= $indent . '$handler->override_option(\'' . $option . '\', ' . views_var_export($value, $indent) . ");\n";
-              }
+        case 'defaults':
+          // skip these
+          break;
+        default:
+          if (!$display->handler->is_defaulted($option)) {
+            $value = $display->handler->get_option($option);
+            if ($id == 'default') {
+              $default = isset($definition['default']) ? $definition['default'] : NULL;
+            }
+            else {
+              $default = $this->display['default']->handler->get_option($option);
             }
+
+            if ($value !== $default) {
+              $output .= $indent . '$handler->override_option(\'' . $option . '\', ' . views_var_export($value, $indent) . ");\n";
+            }
+          }
         }
       }
     }
@@ -1735,18 +1735,18 @@ 
       }
       $fields[] = $field;
       switch ($info['type']) {
-        case 'blob':
-          $defs[] = '%b';
-          break;
-        case 'int':
-          $defs[] = '%d';
-          break;
-        case 'float':
-        case 'numeric':
-          $defs[] = '%f';
-          break;
-        default:
-          $defs[] = "'%s'";
+      case 'blob':
+        $defs[] = '%b';
+        break;
+      case 'int':
+        $defs[] = '%d';
+        break;
+      case 'float':
+      case 'numeric':
+        $defs[] = '%f';
+        break;
+      default:
+        $defs[] = "'%s'";
       }
       if (empty($info['serialize'])) {
         $values[] = $this->$field;

drupal/sites/default/boinc/modules/contrib/views/includes/handlers.inc

Switch Indentation +78 added lines, -78 removed lines

@@ -881,27 +881,27 @@ 
   $db_type = $GLOBALS['db_type'];
   $offset = $set_offset !== NULL ? $set_offset : views_get_timezone();
   switch ($db_type) {
-    case 'mysql':
-    case 'mysqli':
-      switch ($field_type) {
-        case 'int':
-          $field = "FROM_UNIXTIME($field)";
-          break;
-        case 'datetime':
-          break;
-      }
+  case 'mysql':
+  case 'mysqli':
+    switch ($field_type) {
+    case 'int':
+    $field = "FROM_UNIXTIME($field)";
+    break;
+    case 'datetime':
+    break;
+    }
       if (!empty($offset)) {
         $field = "($field + INTERVAL $offset SECOND)";
       }
       return $field;
-    case 'pgsql':
-      switch ($field_type) {
-        case 'int':
-          $field = "$field::ABSTIME";
-          break;
-        case 'datetime':
-          break;
-      }
+  case 'pgsql':
+    switch ($field_type) {
+    case 'int':
+    $field = "$field::ABSTIME";
+    break;
+    case 'datetime':
+    break;
+    }
       if (!empty($offset)) {
         $field = "($field + INTERVAL '$offset SECONDS')";
       }
@@ -929,49 +929,49 @@ 
   $db_type = $GLOBALS['db_type'];
   $field = views_date_sql_field($field, $field_type, $set_offset);
   switch ($db_type) {
-    case 'mysql':
-    case 'mysqli':
-      $replace = array(
-        'Y' => '%Y',
-        'y' => '%y',
-        'M' => '%%b',
-        'm' => '%m',
-        'n' => '%c',
-        'F' => '%M',
-        'D' => '%a',
-        'd' => '%%d',
-        'l' => '%W',
-        'j' => '%e',
-        'W' => '%v',
-        'H' => '%H',
-        'h' => '%h',
-        'i' => '%i',
-        's' => '%%s',
-        'A' => '%p',
-        );
-      $format = strtr($format, $replace);
-      return "DATE_FORMAT($field, '$format')";
-    case 'pgsql':
-      $replace = array(
-        'Y' => 'YYYY',
-        'y' => 'YY',
-        'M' => 'Mon',
-        'm' => 'MM',
-        'n' => 'MM', // no format for Numeric representation of a month, without leading zeros
-        'F' => 'Month',
-        'D' => 'Dy',
-        'd' => 'DD',
-        'l' => 'Day',
-        'j' => 'DD', // no format for Day of the month without leading zeros
-        'W' => 'WW',
-        'H' => 'HH24',
-        'h' => 'HH12',
-        'i' => 'MI',
-        's' => 'SS',
-        'A' => 'AM',
-        );
-      $format = strtr($format, $replace);
-      return "TO_CHAR($field, '$format')";
+  case 'mysql':
+  case 'mysqli':
+    $replace = array(
+      'Y' => '%Y',
+      'y' => '%y',
+      'M' => '%%b',
+      'm' => '%m',
+      'n' => '%c',
+      'F' => '%M',
+      'D' => '%a',
+      'd' => '%%d',
+      'l' => '%W',
+      'j' => '%e',
+      'W' => '%v',
+      'H' => '%H',
+      'h' => '%h',
+      'i' => '%i',
+      's' => '%%s',
+      'A' => '%p',
+      );
+    $format = strtr($format, $replace);
+    return "DATE_FORMAT($field, '$format')";
+  case 'pgsql':
+    $replace = array(
+      'Y' => 'YYYY',
+      'y' => 'YY',
+      'M' => 'Mon',
+      'm' => 'MM',
+      'n' => 'MM', // no format for Numeric representation of a month, without leading zeros
+      'F' => 'Month',
+      'D' => 'Dy',
+      'd' => 'DD',
+      'l' => 'Day',
+      'j' => 'DD', // no format for Day of the month without leading zeros
+      'W' => 'WW',
+      'H' => 'HH24',
+      'h' => 'HH12',
+      'i' => 'MI',
+      's' => 'SS',
+      'A' => 'AM',
+      );
+    $format = strtr($format, $replace);
+    return "TO_CHAR($field, '$format')";
   }
 }
 
@@ -1014,30 +1014,30 @@ 
     return "EXTRACT(SECOND FROM($field))";
   case('WEEK'):  // ISO week number for date
     switch ($db_type) {
-      case('mysql'):
-      case('mysqli'):
-        // WEEK using arg 3 in mysql should return the same value as postgres EXTRACT
-        return "WEEK($field, 3)";
-      case('pgsql'):
-        return "EXTRACT(WEEK FROM($field))";
+    case('mysql'):
+    case('mysqli'):
+      // WEEK using arg 3 in mysql should return the same value as postgres EXTRACT
+      return "WEEK($field, 3)";
+    case('pgsql'):
+      return "EXTRACT(WEEK FROM($field))";
     }
   case('DOW'):
     switch ($db_type) {
-      case('mysql'):
-      case('mysqli'):
-        // mysql returns 1 for Sunday through 7 for Saturday
-        // php date functions and postgres use 0 for Sunday and 6 for Saturday
-        return "INTEGER(DAYOFWEEK($field) - 1)";
-      case('pgsql'):
-        return "EXTRACT(DOW FROM($field))";
+    case('mysql'):
+    case('mysqli'):
+      // mysql returns 1 for Sunday through 7 for Saturday
+      // php date functions and postgres use 0 for Sunday and 6 for Saturday
+      return "INTEGER(DAYOFWEEK($field) - 1)";
+    case('pgsql'):
+      return "EXTRACT(DOW FROM($field))";
     }
   case('DOY'):
     switch ($db_type) {
-      case('mysql'):
-      case('mysqli'):
-        return "DAYOFYEAR($field)";
-      case('pgsql'):
-        return "EXTRACT(DOY FROM($field))";
+    case('mysql'):
+    case('mysqli'):
+      return "DAYOFYEAR($field)";
+    case('pgsql'):
+      return "EXTRACT(DOY FROM($field))";
     }
   }
 }

drupal/sites/default/boinc/modules/contrib/views/includes/convert.inc

Switch Indentation +40 added lines, -40 removed lines

@@ -41,13 +41,13 @@ 
 
     $ts = tablesort_init($header);
     switch ($ts['sql']) {
-      case 'name':
-      default:
-        $sorts[] = $item[0];
-        break;
-      case 'title':
-        $sorts[] = $item[1];
-        break;
+    case 'name':
+    default:
+      $sorts[] = $item[0];
+      break;
+    case 'title':
+      $sorts[] = $item[1];
+      break;
     }
   }
 
@@ -226,10 +226,10 @@ 
       if ($menu['type'] == 'default tab') {
         $tab_options = array('type' => 'none');
         switch ($imported->menu_tab_default_parent_type) {
-          case 'tab':
-          case 'normal':
-            $tab_options['type'] = $imported->menu_tab_default_parent_type;
-            break;
+        case 'tab':
+        case 'normal':
+          $tab_options['type'] = $imported->menu_tab_default_parent_type;
+          break;
         }
       }
       $tab_options['title'] = $imported->menu_parent_title;
@@ -391,35 +391,35 @@ 
 
 function views1_convert_style(&$view, &$handler, $type) {
   switch ($type) {
-    case 'list':
-      $handler->set_option('style_plugin', 'list');
-      $handler->set_option('style_options', array('type' => 'ul'));
-      $handler->set_option('row_plugin', 'fields');
-      break;
-    case 'node':
-      $handler->set_option('row_plugin', 'node');
-      $handler->set_option('row_options', array('teaser' => FALSE, 'links' => TRUE));
-      break;
-    case 'teaser':
-      $handler->set_option('row_plugin', 'node');
-      $handler->set_option('row_options', array('teaser' => TRUE, 'links' => TRUE));
-      break;
-    case 'table':
-      $options = array();
-      $options['columns'] = array();
-      $options['default'] = '';
-      $options['info'] = array();
-      $options['override'] = FALSE;
-      $options['order'] = 'asc';
-
-      $handler->set_option('style_plugin', 'table');
-      $handler->set_option('style_options', $options);
-      break;
-    default:
-      // Ask around if anybody else knows.
-      foreach (module_implements('views_convert') as $module) {
-        module_invoke($module, 'views_convert', $handler->display->id, 'style', $view, $type);
-      }
+  case 'list':
+    $handler->set_option('style_plugin', 'list');
+    $handler->set_option('style_options', array('type' => 'ul'));
+    $handler->set_option('row_plugin', 'fields');
+    break;
+  case 'node':
+    $handler->set_option('row_plugin', 'node');
+    $handler->set_option('row_options', array('teaser' => FALSE, 'links' => TRUE));
+    break;
+  case 'teaser':
+    $handler->set_option('row_plugin', 'node');
+    $handler->set_option('row_options', array('teaser' => TRUE, 'links' => TRUE));
+    break;
+  case 'table':
+    $options = array();
+    $options['columns'] = array();
+    $options['default'] = '';
+    $options['info'] = array();
+    $options['override'] = FALSE;
+    $options['order'] = 'asc';
+
+    $handler->set_option('style_plugin', 'table');
+    $handler->set_option('style_options', $options);
+    break;
+  default:
+    // Ask around if anybody else knows.
+    foreach (module_implements('views_convert') as $module) {
+      module_invoke($module, 'views_convert', $handler->display->id, 'style', $view, $type);
+    }
   }
 }
 /**

drupal/sites/default/boinc/modules/contrib/views/plugins/views_plugin_cache.inc

Switch Indentation +48 added lines, -48 removed lines

@@ -80,22 +80,22 @@ 
    */
   function cache_set($type) {
     switch ($type) {
-      case 'query':
-        // Not supported currently, but this is certainly where we'd put it.
-        break;
-      case 'results':
-        $data = array(
-          'result' => $this->view->result,
-          'total_rows' => $this->view->total_rows,
-          'pager' => $this->view->pager,
-        );
-        cache_set($this->get_results_key(), $data, $this->table, $this->cache_set_expire($type));
-        break;
-      case 'output':
-        $this->gather_headers();
-        $this->storage['output'] = $this->view->display_handler->output;
-        cache_set($this->get_output_key(), $this->storage, $this->table, $this->cache_set_expire($type));
-        break;
+    case 'query':
+      // Not supported currently, but this is certainly where we'd put it.
+      break;
+    case 'results':
+      $data = array(
+        'result' => $this->view->result,
+        'total_rows' => $this->view->total_rows,
+        'pager' => $this->view->pager,
+      );
+      cache_set($this->get_results_key(), $data, $this->table, $this->cache_set_expire($type));
+      break;
+    case 'output':
+      $this->gather_headers();
+      $this->storage['output'] = $this->view->display_handler->output;
+      cache_set($this->get_output_key(), $this->storage, $this->table, $this->cache_set_expire($type));
+      break;
     }
   }
 
@@ -108,32 +108,32 @@ 
   function cache_get($type) {
     $cutoff = $this->cache_expire($type);
     switch ($type) {
-      case 'query':
-        // Not supported currently, but this is certainly where we'd put it.
-        return FALSE;
-      case 'results':
-        // Values to set: $view->result, $view->total_rows, $view->execute_time,
-        // $view->pager['current_page'].
-        if ($cache = cache_get($this->get_results_key(), $this->table)) {
-          if (!$cutoff || $cache->created > $cutoff) {
-            $this->view->result = $cache->data['result'];
-            $this->view->total_rows = $cache->data['total_rows'];
-            $this->view->pager = $cache->data['pager'];
-            $this->view->execute_time = 0;
-            return TRUE;
-          }
+    case 'query':
+      // Not supported currently, but this is certainly where we'd put it.
+      return FALSE;
+    case 'results':
+      // Values to set: $view->result, $view->total_rows, $view->execute_time,
+      // $view->pager['current_page'].
+      if ($cache = cache_get($this->get_results_key(), $this->table)) {
+        if (!$cutoff || $cache->created > $cutoff) {
+          $this->view->result = $cache->data['result'];
+          $this->view->total_rows = $cache->data['total_rows'];
+          $this->view->pager = $cache->data['pager'];
+          $this->view->execute_time = 0;
+          return TRUE;
         }
-        return FALSE;
-      case 'output':
-        if ($cache = cache_get($this->get_output_key(), $this->table)) {
-          if (!$cutoff || $cache->created > $cutoff) {
-            $this->storage = $cache->data;
-            $this->view->display_handler->output = $cache->data['output'];
-            $this->restore_headers();
-            return TRUE;
-          }
+      }
+      return FALSE;
+    case 'output':
+      if ($cache = cache_get($this->get_output_key(), $this->table)) {
+        if (!$cutoff || $cache->created > $cutoff) {
+          $this->storage = $cache->data;
+          $this->view->display_handler->output = $cache->data['output'];
+          $this->restore_headers();
+          return TRUE;
         }
-        return FALSE;
+      }
+      return FALSE;
     }
   }
 
@@ -221,16 +221,16 @@ 
         foreach ($types as $id => $info) {
           if (!isset($start[$scope][$type][$id])) {
             switch ($type) {
-              case 'setting':
-                $this->storage['js'][] = array($info, $type, $scope);
-                break;
+            case 'setting':
+              $this->storage['js'][] = array($info, $type, $scope);
+              break;
 
-              case 'inline':
-                $this->storage['js'][] = array($info['code'], $type, $scope, $info['defer']);
-                break;
+            case 'inline':
+              $this->storage['js'][] = array($info['code'], $type, $scope, $info['defer']);
+              break;
 
-              default:
-                $this->storage['js'][] = array($id, $type, $scope, $info['defer'], $info['cache']);
+            default:
+              $this->storage['js'][] = array($id, $type, $scope, $info['defer'], $info['cache']);
             }
           }
         }

drupal/sites/default/boinc/modules/contrib/views/plugins/views_plugin_display.inc

Switch Indentation +606 added lines, -606 removed lines

@@ -903,534 +903,534 @@ 
     }
 
     switch ($form_state['section']) {
-      case 'display_title':
-        $form['#title'] .= t('The name of this display');
-        $form['display_title'] = array(
-          '#type' => 'textfield',
-          '#description' => t('This title will appear only in the administrative interface for the View.'),
-          '#default_value' => $this->display->display_title,
-        );
-        break;
-      case 'title':
-        $form['#title'] .= t('The title of this view');
-        $form['title'] = array(
-          '#type' => 'textfield',
-          '#description' => t('This title will be displayed with the view, wherever titles are normally displayed; i.e, as the page title, block title, etc.'),
-          '#default_value' => $this->get_option('title'),
-        );
-        break;
-      case 'css_class':
-        $form['#title'] .= t('CSS class');
-        $form['css_class'] = array(
-          '#type' => 'textfield',
-          '#description' => t('The CSS class names will be added to the view. This enables you to use specific CSS code for each view. You may define multiples classes separated by spaces.'),
-          '#default_value' => $this->get_option('css_class'),
-        );
-        break;
-      case 'use_ajax':
-        $form['#title'] .= t('Use AJAX when available to load this view');
-        $form['description'] = array(
-          '#prefix' => '<div class="description form-item">',
-          '#suffix' => '</div>',
-          '#value' => t('If set, this view will use an AJAX mechanism for paging, table sorting and exposed filters. This means the entire page will not refresh. It is not recommended that you use this if this view is the main content of the page as it will prevent deep linking to specific pages, but it is very useful for side content.'),
-        );
-        $form['use_ajax'] = array(
-          '#type' => 'radios',
-          '#options' => array(1 => t('Yes'), 0 => t('No')),
-          '#default_value' => $this->get_option('use_ajax') ? 1 : 0,
-        );
-        break;
-      case 'use_pager':
-        $form['#title'] .= t('Use a pager for this view');
-        $form['use_pager'] = array(
-          '#type' => 'radios',
-          '#options' => array(TRUE => t('Full pager'), 'mini' => t('Mini pager'), 0 => t('No')),
-          '#default_value' => $this->get_option('use_pager'),
-        );
-        $form['pager_element'] = array(
-          '#type' => 'textfield',
-          '#title' => t('Pager element'),
-          '#description' => t("Unless you're experiencing problems with pagers related to this view, you should leave this at 0. If using multiple pagers on one page you may need to set this number to a higher value so as not to conflict within the ?page= array. Large values will add a lot of commas to your URLs, so avoid if possible."),
-          '#default_value' => intval($this->get_option('pager_element')),
-        );
-        break;
-      case 'items_per_page':
-        $form['#title'] .= $this->use_pager() ? t('Items per page') : t('Items to display');
-
-        $form['items_per_page'] = array(
-          '#type' => 'textfield',
-          '#description' => t('The number of items to display per page. Enter 0 for no limit.'),
-          '#default_value' => intval($this->get_option('items_per_page')),
-        );
-        $form['offset'] = array(
-          '#type' => 'textfield',
-          '#title' => t('Offset'),
-          '#description' => t('The number of items to skip. For example, if this field is 3, the first 3 items will be skipped and not displayed. Offset can not be used if items to display is 0; instead use a very large number there.'),
-          '#default_value' => intval($this->get_option('offset')),
-        );
-        break;
-      case 'use_more':
-        $form['#title'] .= t('Add a more link to the bottom of the display.');
-        $form['use_more'] = array(
-          '#type' => 'checkbox',
-          '#title' => t('Create more link'),
-          '#description' => t("This will add a more link to the bottom of this view, which will link to the page view. If you have more than one page view, the link will point to the display specified in 'Link display' above."),
-          '#default_value' => $this->get_option('use_more'),
-        );
-        $form['use_more_always'] = array(
-          '#type' => 'checkbox',
-          '#title' => t('Always display more link'),
-          '#description' => t("This will display the more link even if there are no more items to display."),
-          '#default_value' => $this->get_option('use_more_always'),
-        );
-        $form['use_more_text'] = array(
-          '#type' => 'textfield',
-          '#title' => t('More link text'),
-          '#description' => t("The text to display for the more link."),
-          '#default_value' => $this->get_option('use_more_text'),
-        );
-        break;
-      case 'distinct':
-        $form['#title'] .= t('Display only distinct items, without duplicates.');
-        $form['distinct'] = array(
-          '#type' => 'checkbox',
-          '#title' => t('Distinct'),
-          '#description' => t('This will make the view display only distinct items. If there are multiple identical items, each will be displayed only once. You can use this to try and remove duplicates from a view, though it does not always work. Note that this can slow queries down, so use it with caution.'),
-          '#default_value' => $this->get_option('distinct'),
-        );
-        break;
-      case 'access':
-        $form['#title'] .= t('Access restrictions');
-        $form['access'] = array(
-          '#prefix' => '<div class="clear-block">',
-          '#suffix' => '</div>',
-          '#tree' => TRUE,
-        );
-
-        $access = $this->get_option('access');
-        $form['access']['type'] =  array(
-          '#type' => 'radios',
-          '#options' => views_fetch_plugin_names('access'),
-          '#default_value' => $access['type'],
-        );
+    case 'display_title':
+      $form['#title'] .= t('The name of this display');
+      $form['display_title'] = array(
+        '#type' => 'textfield',
+        '#description' => t('This title will appear only in the administrative interface for the View.'),
+        '#default_value' => $this->display->display_title,
+      );
+      break;
+    case 'title':
+      $form['#title'] .= t('The title of this view');
+      $form['title'] = array(
+        '#type' => 'textfield',
+        '#description' => t('This title will be displayed with the view, wherever titles are normally displayed; i.e, as the page title, block title, etc.'),
+        '#default_value' => $this->get_option('title'),
+      );
+      break;
+    case 'css_class':
+      $form['#title'] .= t('CSS class');
+      $form['css_class'] = array(
+        '#type' => 'textfield',
+        '#description' => t('The CSS class names will be added to the view. This enables you to use specific CSS code for each view. You may define multiples classes separated by spaces.'),
+        '#default_value' => $this->get_option('css_class'),
+      );
+      break;
+    case 'use_ajax':
+      $form['#title'] .= t('Use AJAX when available to load this view');
+      $form['description'] = array(
+        '#prefix' => '<div class="description form-item">',
+        '#suffix' => '</div>',
+        '#value' => t('If set, this view will use an AJAX mechanism for paging, table sorting and exposed filters. This means the entire page will not refresh. It is not recommended that you use this if this view is the main content of the page as it will prevent deep linking to specific pages, but it is very useful for side content.'),
+      );
+      $form['use_ajax'] = array(
+        '#type' => 'radios',
+        '#options' => array(1 => t('Yes'), 0 => t('No')),
+        '#default_value' => $this->get_option('use_ajax') ? 1 : 0,
+      );
+      break;
+    case 'use_pager':
+      $form['#title'] .= t('Use a pager for this view');
+      $form['use_pager'] = array(
+        '#type' => 'radios',
+        '#options' => array(TRUE => t('Full pager'), 'mini' => t('Mini pager'), 0 => t('No')),
+        '#default_value' => $this->get_option('use_pager'),
+      );
+      $form['pager_element'] = array(
+        '#type' => 'textfield',
+        '#title' => t('Pager element'),
+        '#description' => t("Unless you're experiencing problems with pagers related to this view, you should leave this at 0. If using multiple pagers on one page you may need to set this number to a higher value so as not to conflict within the ?page= array. Large values will add a lot of commas to your URLs, so avoid if possible."),
+        '#default_value' => intval($this->get_option('pager_element')),
+      );
+      break;
+    case 'items_per_page':
+      $form['#title'] .= $this->use_pager() ? t('Items per page') : t('Items to display');
 
-        $access_plugin = views_fetch_plugin_data('access', $access['type']);
-        if (!empty($access_plugin['uses options'])) {
-          $form['markup'] = array(
-            '#prefix' => '<div class="form-item description">',
-            '#suffix' => '</div>',
-            '#value' => t('You may also adjust the !settings for the currently selected access restriction by clicking on the icon.', array('!settings' => $this->option_link(t('settings'), 'access_options'))),
-          );
-        }
+      $form['items_per_page'] = array(
+        '#type' => 'textfield',
+        '#description' => t('The number of items to display per page. Enter 0 for no limit.'),
+        '#default_value' => intval($this->get_option('items_per_page')),
+      );
+      $form['offset'] = array(
+        '#type' => 'textfield',
+        '#title' => t('Offset'),
+        '#description' => t('The number of items to skip. For example, if this field is 3, the first 3 items will be skipped and not displayed. Offset can not be used if items to display is 0; instead use a very large number there.'),
+        '#default_value' => intval($this->get_option('offset')),
+      );
+      break;
+    case 'use_more':
+      $form['#title'] .= t('Add a more link to the bottom of the display.');
+      $form['use_more'] = array(
+        '#type' => 'checkbox',
+        '#title' => t('Create more link'),
+        '#description' => t("This will add a more link to the bottom of this view, which will link to the page view. If you have more than one page view, the link will point to the display specified in 'Link display' above."),
+        '#default_value' => $this->get_option('use_more'),
+      );
+      $form['use_more_always'] = array(
+        '#type' => 'checkbox',
+        '#title' => t('Always display more link'),
+        '#description' => t("This will display the more link even if there are no more items to display."),
+        '#default_value' => $this->get_option('use_more_always'),
+      );
+      $form['use_more_text'] = array(
+        '#type' => 'textfield',
+        '#title' => t('More link text'),
+        '#description' => t("The text to display for the more link."),
+        '#default_value' => $this->get_option('use_more_text'),
+      );
+      break;
+    case 'distinct':
+      $form['#title'] .= t('Display only distinct items, without duplicates.');
+      $form['distinct'] = array(
+        '#type' => 'checkbox',
+        '#title' => t('Distinct'),
+        '#description' => t('This will make the view display only distinct items. If there are multiple identical items, each will be displayed only once. You can use this to try and remove duplicates from a view, though it does not always work. Note that this can slow queries down, so use it with caution.'),
+        '#default_value' => $this->get_option('distinct'),
+      );
+      break;
+    case 'access':
+      $form['#title'] .= t('Access restrictions');
+      $form['access'] = array(
+        '#prefix' => '<div class="clear-block">',
+        '#suffix' => '</div>',
+        '#tree' => TRUE,
+      );
 
-        break;
-      case 'access_options':
-        $access = $this->get_option('access');
-        $plugin = $this->get_access_plugin();
-        $form['#title'] .= t('Access options');
-        if ($plugin) {
-          $form['#help_topic'] = $plugin->definition['help topic'];
-          $form['#help_module'] = $plugin->definition['module'];
+      $access = $this->get_option('access');
+      $form['access']['type'] =  array(
+        '#type' => 'radios',
+        '#options' => views_fetch_plugin_names('access'),
+        '#default_value' => $access['type'],
+      );
 
-          $form['access_options'] = array(
-            '#tree' => TRUE,
-          );
-          $form['access_options']['type'] = array(
-            '#type' => 'value',
-            '#value' => $access['type'],
-          );
-          $plugin->options_form($form['access_options'], $form_state);
-        }
-        break;
-      case 'cache':
-        $form['#title'] .= t('Caching');
-        $form['cache'] = array(
-          '#prefix' => '<div class="clear-block">',
+      $access_plugin = views_fetch_plugin_data('access', $access['type']);
+      if (!empty($access_plugin['uses options'])) {
+        $form['markup'] = array(
+          '#prefix' => '<div class="form-item description">',
           '#suffix' => '</div>',
-          '#tree' => TRUE,
-        );
-
-        $cache = $this->get_option('cache');
-        $form['cache']['type'] =  array(
-          '#type' => 'radios',
-          '#options' => views_fetch_plugin_names('cache'),
-          '#default_value' => $cache['type'],
+          '#value' => t('You may also adjust the !settings for the currently selected access restriction by clicking on the icon.', array('!settings' => $this->option_link(t('settings'), 'access_options'))),
         );
+      }
 
-        $cache_plugin = views_fetch_plugin_data('cache', $cache['type']);
-        if (!empty($cache_plugin['uses options'])) {
-          $form['markup'] = array(
-            '#prefix' => '<div class="form-item description">',
-            '#suffix' => '</div>',
-            '#value' => t('You may also adjust the !settings for the currently selected cache mechanism by clicking on the icon.', array('!settings' => $this->option_link(t('settings'), 'cache_options'))),
-          );
-        }
-        break;
-      case 'cache_options':
-        $cache = $this->get_option('cache');
-        $plugin = $this->get_cache_plugin();
-        $form['#title'] .= t('Caching options');
-        if ($plugin) {
-          $form['#help_topic'] = $plugin->definition['help topic'];
-          $form['#help_module'] = $plugin->definition['module'];
+      break;
+    case 'access_options':
+      $access = $this->get_option('access');
+      $plugin = $this->get_access_plugin();
+      $form['#title'] .= t('Access options');
+      if ($plugin) {
+        $form['#help_topic'] = $plugin->definition['help topic'];
+        $form['#help_module'] = $plugin->definition['module'];
 
-          $form['cache_options'] = array(
-            '#tree' => TRUE,
-          );
-          $form['cache_options']['type'] = array(
-            '#type' => 'value',
-            '#value' => $cache['type'],
-          );
-          $plugin->options_form($form['cache_options'], $form_state);
-        }
-        break;
-      case 'header':
-        $form['#title'] .= t('Header');
-        $form['header_empty'] = array(
-          '#type' => 'checkbox',
-          '#title' => t('Display even if view has no result'),
-          '#default_value' => $this->get_option('header_empty'),
+        $form['access_options'] = array(
+          '#tree' => TRUE,
         );
-        $form['header'] = array(
-          '#type' => 'textarea',
-          '#default_value' => $this->get_option('header'),
-          '#rows' => 6,
-          '#description' => t('Text to display at the top of the view. May contain an explanation or links or whatever you like. Optional.'),
+        $form['access_options']['type'] = array(
+          '#type' => 'value',
+          '#value' => $access['type'],
         );
+        $plugin->options_form($form['access_options'], $form_state);
+      }
+      break;
+    case 'cache':
+      $form['#title'] .= t('Caching');
+      $form['cache'] = array(
+        '#prefix' => '<div class="clear-block">',
+        '#suffix' => '</div>',
+        '#tree' => TRUE,
+      );
 
-        $form['header_format'] = filter_form($this->get_option('header_format'), NULL, array('header_format'));
-        break;
-      case 'footer':
-        $form['#title'] .= t('Footer');
-        $form['footer_empty'] = array(
-          '#type' => 'checkbox',
-          '#title' => t('Display even if view has no result'),
-          '#default_value' => $this->get_option('footer_empty'),
-        );
-        $form['footer'] = array(
-          '#type' => 'textarea',
-          '#default_value' => $this->get_option('footer'),
-          '#rows' => 6,
-          '#description' => t('Text to display beneath the view. May contain an explanation or links or whatever you like. Optional.'),
-        );
+      $cache = $this->get_option('cache');
+      $form['cache']['type'] =  array(
+        '#type' => 'radios',
+        '#options' => views_fetch_plugin_names('cache'),
+        '#default_value' => $cache['type'],
+      );
 
-        $form['footer_format'] = filter_form($this->get_option('footer_format'), NULL, array('footer_format'));
-        break;
-      case 'empty':
-        $form['#title'] .= t('Empty text');
-        $form['empty'] = array(
-          '#type' => 'textarea',
-          '#default_value' => $this->get_option('empty'),
-          '#rows' => 6,
-          '#description' => t('Text to display if the view has no results. Optional.'),
+      $cache_plugin = views_fetch_plugin_data('cache', $cache['type']);
+      if (!empty($cache_plugin['uses options'])) {
+        $form['markup'] = array(
+          '#prefix' => '<div class="form-item description">',
+          '#suffix' => '</div>',
+          '#value' => t('You may also adjust the !settings for the currently selected cache mechanism by clicking on the icon.', array('!settings' => $this->option_link(t('settings'), 'cache_options'))),
         );
+      }
+      break;
+    case 'cache_options':
+      $cache = $this->get_option('cache');
+      $plugin = $this->get_cache_plugin();
+      $form['#title'] .= t('Caching options');
+      if ($plugin) {
+        $form['#help_topic'] = $plugin->definition['help topic'];
+        $form['#help_module'] = $plugin->definition['module'];
 
-        $form['empty_format'] = filter_form($this->get_option('empty_format'), NULL, array('empty_format'));
-        break;
-      case 'style_plugin':
-        $form['#title'] .= t('How should this view be styled');
-        $form['#help_topic'] = 'style';
-        $form['style_plugin'] =  array(
-          '#type' => 'radios',
-          '#options' => views_fetch_plugin_names('style', $this->get_style_type(), array($this->view->base_table)),
-          '#default_value' => $this->get_option('style_plugin'),
-          '#description' => t('If the style you choose has settings, be sure to click the settings button that will appear next to it in the View summary.'),
+        $form['cache_options'] = array(
+          '#tree' => TRUE,
         );
+        $form['cache_options']['type'] = array(
+          '#type' => 'value',
+          '#value' => $cache['type'],
+        );
+        $plugin->options_form($form['cache_options'], $form_state);
+      }
+      break;
+    case 'header':
+      $form['#title'] .= t('Header');
+      $form['header_empty'] = array(
+        '#type' => 'checkbox',
+        '#title' => t('Display even if view has no result'),
+        '#default_value' => $this->get_option('header_empty'),
+      );
+      $form['header'] = array(
+        '#type' => 'textarea',
+        '#default_value' => $this->get_option('header'),
+        '#rows' => 6,
+        '#description' => t('Text to display at the top of the view. May contain an explanation or links or whatever you like. Optional.'),
+      );
 
-        $style_plugin = views_fetch_plugin_data('style', $this->get_option('style_plugin'));
-        if (!empty($style_plugin['uses options'])) {
-          $form['markup'] = array(
-            '#prefix' => '<div class="form-item description">',
-            '#suffix' => '</div>',
-            '#value' => t('You may also adjust the !settings for the currently selected style by clicking on the icon.', array('!settings' => $this->option_link(t('settings'), 'style_options'))),
-          );
-        }
+      $form['header_format'] = filter_form($this->get_option('header_format'), NULL, array('header_format'));
+      break;
+    case 'footer':
+      $form['#title'] .= t('Footer');
+      $form['footer_empty'] = array(
+        '#type' => 'checkbox',
+        '#title' => t('Display even if view has no result'),
+        '#default_value' => $this->get_option('footer_empty'),
+      );
+      $form['footer'] = array(
+        '#type' => 'textarea',
+        '#default_value' => $this->get_option('footer'),
+        '#rows' => 6,
+        '#description' => t('Text to display beneath the view. May contain an explanation or links or whatever you like. Optional.'),
+      );
 
-        break;
-      case 'style_options':
-        $form['#title'] .= t('Style options');
-        $style = TRUE;
-        $type = 'style_plugin';
-        $name = $this->get_option('style_plugin');
+      $form['footer_format'] = filter_form($this->get_option('footer_format'), NULL, array('footer_format'));
+      break;
+    case 'empty':
+      $form['#title'] .= t('Empty text');
+      $form['empty'] = array(
+        '#type' => 'textarea',
+        '#default_value' => $this->get_option('empty'),
+        '#rows' => 6,
+        '#description' => t('Text to display if the view has no results. Optional.'),
+      );
 
-      case 'row_options':
-        if (!isset($name)) {
-          $name = $this->get_option('row_plugin');
-        }
-        // if row, $style will be empty.
-        if (empty($style)) {
-          $form['#title'] .= t('Row style options');
-          $type = 'row_plugin';
-        }
-        $plugin = $this->get_plugin(empty($style) ? 'row' : 'style');
-        if ($plugin) {
-          if (isset($plugin->definition['help topic'])) {
-            $form['#help_topic'] = $plugin->definition['help topic'];
-            $form['#help_module'] = $plugin->definition['module'];
-          }
-          $form[$form_state['section']] = array(
-            '#tree' => TRUE,
-          );
-          $plugin->options_form($form[$form_state['section']], $form_state);
-        }
-        break;
-      case 'row_plugin':
-        $form['#title'] .= t('How should each row in this view be styled');
-        $form['#help_topic'] = 'style-row';
-        $form['row_plugin'] =  array(
-          '#type' => 'radios',
-          '#options' => views_fetch_plugin_names('row', $this->get_style_type(), array($this->view->base_table)),
-          '#default_value' => $this->get_option('row_plugin'),
+      $form['empty_format'] = filter_form($this->get_option('empty_format'), NULL, array('empty_format'));
+      break;
+    case 'style_plugin':
+      $form['#title'] .= t('How should this view be styled');
+      $form['#help_topic'] = 'style';
+      $form['style_plugin'] =  array(
+        '#type' => 'radios',
+        '#options' => views_fetch_plugin_names('style', $this->get_style_type(), array($this->view->base_table)),
+        '#default_value' => $this->get_option('style_plugin'),
+        '#description' => t('If the style you choose has settings, be sure to click the settings button that will appear next to it in the View summary.'),
+      );
+
+      $style_plugin = views_fetch_plugin_data('style', $this->get_option('style_plugin'));
+      if (!empty($style_plugin['uses options'])) {
+        $form['markup'] = array(
+          '#prefix' => '<div class="form-item description">',
+          '#suffix' => '</div>',
+          '#value' => t('You may also adjust the !settings for the currently selected style by clicking on the icon.', array('!settings' => $this->option_link(t('settings'), 'style_options'))),
         );
+      }
 
-        $row_plugin = views_fetch_plugin_data('row', $this->get_option('row_plugin'));
-        if (!empty($row_plugin['uses options'])) {
-          $form['markup'] = array(
-            '#prefix' => '<div class="form-item description">',
-            '#suffix' => '</div>',
-            '#value' => t('You may also adjust the !settings for the currently selected row style by clicking on the icon.', array('!settings' => $this->option_link(t('settings'), 'row_options'))),
-          );
+      break;
+    case 'style_options':
+      $form['#title'] .= t('Style options');
+      $style = TRUE;
+      $type = 'style_plugin';
+      $name = $this->get_option('style_plugin');
+
+    case 'row_options':
+      if (!isset($name)) {
+        $name = $this->get_option('row_plugin');
+      }
+      // if row, $style will be empty.
+      if (empty($style)) {
+        $form['#title'] .= t('Row style options');
+        $type = 'row_plugin';
+      }
+      $plugin = $this->get_plugin(empty($style) ? 'row' : 'style');
+      if ($plugin) {
+        if (isset($plugin->definition['help topic'])) {
+          $form['#help_topic'] = $plugin->definition['help topic'];
+          $form['#help_module'] = $plugin->definition['module'];
         }
+        $form[$form_state['section']] = array(
+          '#tree' => TRUE,
+        );
+        $plugin->options_form($form[$form_state['section']], $form_state);
+      }
+      break;
+    case 'row_plugin':
+      $form['#title'] .= t('How should each row in this view be styled');
+      $form['#help_topic'] = 'style-row';
+      $form['row_plugin'] =  array(
+        '#type' => 'radios',
+        '#options' => views_fetch_plugin_names('row', $this->get_style_type(), array($this->view->base_table)),
+        '#default_value' => $this->get_option('row_plugin'),
+      );
 
-        break;
-      case 'link_display':
-        $form['#title'] .= t('Which display to use for path');
-        foreach ($this->view->display as $display_id => $display) {
-          if ($display->handler->has_path()) {
-            $options[$display_id] = $display->display_title;
-          }
-        }
-        $form['link_display'] = array(
-          '#type' => 'radios',
-          '#options' => $options,
-          '#description' => t("Which display to use to get this display's path for things like summary links, rss feed links, more links, etc."),
-          '#default_value' => $this->get_link_display(),
+      $row_plugin = views_fetch_plugin_data('row', $this->get_option('row_plugin'));
+      if (!empty($row_plugin['uses options'])) {
+        $form['markup'] = array(
+          '#prefix' => '<div class="form-item description">',
+          '#suffix' => '</div>',
+          '#value' => t('You may also adjust the !settings for the currently selected row style by clicking on the icon.', array('!settings' => $this->option_link(t('settings'), 'row_options'))),
         );
-        break;
-      case 'analyze-theme':
-        $form['#title'] .= t('Theming information');
-        $form['#help_topic'] = 'analyze-theme';
+      }
 
-        if (isset($_POST['theme'])) {
-          $this->view->theme = $_POST['theme'];
-        }
-        else if (empty($this->view->theme)) {
-          $this->view->theme = variable_get('theme_default', 'garland');
+      break;
+    case 'link_display':
+      $form['#title'] .= t('Which display to use for path');
+      foreach ($this->view->display as $display_id => $display) {
+        if ($display->handler->has_path()) {
+          $options[$display_id] = $display->display_title;
         }
+      }
+      $form['link_display'] = array(
+        '#type' => 'radios',
+        '#options' => $options,
+        '#description' => t("Which display to use to get this display's path for things like summary links, rss feed links, more links, etc."),
+        '#default_value' => $this->get_link_display(),
+      );
+      break;
+    case 'analyze-theme':
+      $form['#title'] .= t('Theming information');
+      $form['#help_topic'] = 'analyze-theme';
 
-        global $custom_theme;
-        $custom_theme = $this->view->theme;
-        init_theme();
-
-        $funcs = array();
-        // Get theme functions for the display. Note that some displays may
-        // not have themes. The 'feed' display, for example, completely
-        // delegates to the style.
-        if (!empty($this->definition['theme'])) {
-          $funcs[] = $this->option_link(t('Display output'), 'analyze-theme-display') . ': '  . $this->format_themes($this->theme_functions());
-          $themes = $this->additional_theme_functions();
-          if ($themes) {
-            foreach ($themes as $theme) {
-              $funcs[] = $this->option_link(t('Alternative display output'), 'analyze-theme-display') . ': '  . $this->format_themes($theme);
-            }
+      if (isset($_POST['theme'])) {
+        $this->view->theme = $_POST['theme'];
+      }
+      else if (empty($this->view->theme)) {
+        $this->view->theme = variable_get('theme_default', 'garland');
+      }
+
+      global $custom_theme;
+      $custom_theme = $this->view->theme;
+      init_theme();
+
+      $funcs = array();
+      // Get theme functions for the display. Note that some displays may
+      // not have themes. The 'feed' display, for example, completely
+      // delegates to the style.
+      if (!empty($this->definition['theme'])) {
+        $funcs[] = $this->option_link(t('Display output'), 'analyze-theme-display') . ': '  . $this->format_themes($this->theme_functions());
+        $themes = $this->additional_theme_functions();
+        if ($themes) {
+          foreach ($themes as $theme) {
+            $funcs[] = $this->option_link(t('Alternative display output'), 'analyze-theme-display') . ': '  . $this->format_themes($theme);
           }
         }
+      }
 
-        $plugin = $this->get_plugin();
-        if ($plugin) {
-          $funcs[] = $this->option_link(t('Style output'), 'analyze-theme-style') . ': ' . $this->format_themes($plugin->theme_functions(), $plugin->additional_theme_functions());
-          $themes = $plugin->additional_theme_functions();
-          if ($themes) {
-            foreach ($themes as $theme) {
-              $funcs[] = $this->option_link(t('Alternative style'), 'analyze-theme-style') . ': '  . $this->format_themes($theme);
-            }
+      $plugin = $this->get_plugin();
+      if ($plugin) {
+        $funcs[] = $this->option_link(t('Style output'), 'analyze-theme-style') . ': ' . $this->format_themes($plugin->theme_functions(), $plugin->additional_theme_functions());
+        $themes = $plugin->additional_theme_functions();
+        if ($themes) {
+          foreach ($themes as $theme) {
+            $funcs[] = $this->option_link(t('Alternative style'), 'analyze-theme-style') . ': '  . $this->format_themes($theme);
           }
+        }
 
-          if ($plugin->uses_row_plugin()) {
-            $row_plugin = $this->get_plugin('row');
-            if ($row_plugin) {
-              $funcs[] = $this->option_link(t('Row style output'), 'analyze-theme-row') . ': ' . $this->format_themes($row_plugin->theme_functions());
-              $themes = $row_plugin->additional_theme_functions();
-              if ($themes) {
-                foreach ($themes as $theme) {
-                  $funcs[] = $this->option_link(t('Alternative row style'), 'analyze-theme-row') . ': '  . $this->format_themes($theme);
-                }
+        if ($plugin->uses_row_plugin()) {
+          $row_plugin = $this->get_plugin('row');
+          if ($row_plugin) {
+            $funcs[] = $this->option_link(t('Row style output'), 'analyze-theme-row') . ': ' . $this->format_themes($row_plugin->theme_functions());
+            $themes = $row_plugin->additional_theme_functions();
+            if ($themes) {
+              foreach ($themes as $theme) {
+                $funcs[] = $this->option_link(t('Alternative row style'), 'analyze-theme-row') . ': '  . $this->format_themes($theme);
               }
             }
           }
+        }
 
-          if ($plugin->uses_fields()) {
-            foreach ($this->get_handlers('field') as $id => $handler) {
-              $funcs[] = $this->option_link(t('Field @field (ID: @id)', array('@field' => $handler->ui_name(), '@id' => $id)), 'analyze-theme-field') . ': ' . $this->format_themes($handler->theme_functions());
-            }
+        if ($plugin->uses_fields()) {
+          foreach ($this->get_handlers('field') as $id => $handler) {
+            $funcs[] = $this->option_link(t('Field @field (ID: @id)', array('@field' => $handler->ui_name(), '@id' => $id)), 'analyze-theme-field') . ': ' . $this->format_themes($handler->theme_functions());
           }
         }
+      }
 
-        $form['important'] = array(
-          '#prefix' => '<div class="form-item description">',
-          '#suffix' => '</div>',
-          '#value' => '<p>' . t('This section lists all possible templates for the display plugin and for the style plugins, ordered roughly from the least specific to the most specific. The active template for each plugin -- which is the most specific template found on the system -- is highlighted in bold.') . '</p>',
-        );
+      $form['important'] = array(
+        '#prefix' => '<div class="form-item description">',
+        '#suffix' => '</div>',
+        '#value' => '<p>' . t('This section lists all possible templates for the display plugin and for the style plugins, ordered roughly from the least specific to the most specific. The active template for each plugin -- which is the most specific template found on the system -- is highlighted in bold.') . '</p>',
+      );
 
-        foreach (list_themes() as $key => $theme) {
-          $options[$key] = $theme->info['name'];
-        }
+      foreach (list_themes() as $key => $theme) {
+        $options[$key] = $theme->info['name'];
+      }
 
-        $form['box'] = array(
-          '#prefix' => '<div class="container-inline">',
-          '#suffix' => '</div>',
-        );
-        $form['box']['theme'] = array(
-          '#type' => 'select',
-          '#options' => $options,
-          '#default_value' => $this->view->theme,
-        );
+      $form['box'] = array(
+        '#prefix' => '<div class="container-inline">',
+        '#suffix' => '</div>',
+      );
+      $form['box']['theme'] = array(
+        '#type' => 'select',
+        '#options' => $options,
+        '#default_value' => $this->view->theme,
+      );
 
-        $form['box']['change'] = array(
-          '#type' => 'submit',
-          '#value' => t('Change theme'),
-          '#submit' => array('views_ui_edit_display_form_change_theme'),
-        );
+      $form['box']['change'] = array(
+        '#type' => 'submit',
+        '#value' => t('Change theme'),
+        '#submit' => array('views_ui_edit_display_form_change_theme'),
+      );
 
-        $form['analysis'] = array(
-          '#prefix' => '<div class="form-item">',
-          '#suffix' => '</div>',
-          '#value' => theme('item_list', $funcs),
-        );
+      $form['analysis'] = array(
+        '#prefix' => '<div class="form-item">',
+        '#suffix' => '</div>',
+        '#value' => theme('item_list', $funcs),
+      );
 
-        $form['rescan_button'] = array(
-          '#prefix' => '<div class="form-item">',
-          '#suffix' => '</div>',
-        );
-        $form['rescan_button']['button'] = array(
-          '#type' => 'submit',
-          '#value' => t('Rescan template files'),
-          '#submit' => array('views_ui_config_item_form_rescan'),
-        );
-        $form['rescan_button']['markup'] = array(
-          '#prefix' => '<div class="description">',
-          '#suffix' => '</div>',
-          '#value' => t("<strong>Important!</strong> When adding, removing, or renaming template files, it is necessary to make Drupal aware of the changes by making it rescan the files on your system. By clicking this button you clear Drupal's theme registry and thereby trigger this rescanning process. The highlighted templates above will then reflect the new state of your system."),
-        );
+      $form['rescan_button'] = array(
+        '#prefix' => '<div class="form-item">',
+        '#suffix' => '</div>',
+      );
+      $form['rescan_button']['button'] = array(
+        '#type' => 'submit',
+        '#value' => t('Rescan template files'),
+        '#submit' => array('views_ui_config_item_form_rescan'),
+      );
+      $form['rescan_button']['markup'] = array(
+        '#prefix' => '<div class="description">',
+        '#suffix' => '</div>',
+        '#value' => t("<strong>Important!</strong> When adding, removing, or renaming template files, it is necessary to make Drupal aware of the changes by making it rescan the files on your system. By clicking this button you clear Drupal's theme registry and thereby trigger this rescanning process. The highlighted templates above will then reflect the new state of your system."),
+      );
 
-        $form_state['ok_button'] = TRUE;
-        break;
-      case 'analyze-theme-display':
-        $form['#title'] .= t('Theming information (display)');
-        $output = '<p>' . t('Back to !info.', array('!info' => $this->option_link(t('theming information'), 'analyze-theme'))) . '</p>';
+      $form_state['ok_button'] = TRUE;
+      break;
+    case 'analyze-theme-display':
+      $form['#title'] .= t('Theming information (display)');
+      $output = '<p>' . t('Back to !info.', array('!info' => $this->option_link(t('theming information'), 'analyze-theme'))) . '</p>';
 
-        if (empty($this->definition['theme'])) {
-          $output .= t('This display has no theming information');
-        }
-        else {
-          $output .= '<p>' . t('This is the default theme template used for this display.') . '</p>';
-          $output .= '<pre>' . check_plain(file_get_contents('./' . $this->definition['theme path'] . '/' . strtr($this->definition['theme'], '_', '-') . '.tpl.php')) . '</pre>';
-        }
+      if (empty($this->definition['theme'])) {
+        $output .= t('This display has no theming information');
+      }
+      else {
+        $output .= '<p>' . t('This is the default theme template used for this display.') . '</p>';
+        $output .= '<pre>' . check_plain(file_get_contents('./' . $this->definition['theme path'] . '/' . strtr($this->definition['theme'], '_', '-') . '.tpl.php')) . '</pre>';
+      }
 
-        if (!empty($this->definition['additional themes'])) {
-          foreach ($this->definition['additional themes'] as $theme => $type) {
-            $output .= '<p>' . t('This is an alternative template for this display.') . '</p>';
-            $output .= '<pre>' . check_plain(file_get_contents('./' . $this->definition['theme path'] . '/' . strtr($theme, '_', '-') . '.tpl.php')) . '</pre>';
-          }
+      if (!empty($this->definition['additional themes'])) {
+        foreach ($this->definition['additional themes'] as $theme => $type) {
+          $output .= '<p>' . t('This is an alternative template for this display.') . '</p>';
+          $output .= '<pre>' . check_plain(file_get_contents('./' . $this->definition['theme path'] . '/' . strtr($theme, '_', '-') . '.tpl.php')) . '</pre>';
         }
+      }
 
-        $form['analysis'] = array(
-          '#prefix' => '<div class="form-item">',
-          '#suffix' => '</div>',
-          '#value' => $output,
-        );
+      $form['analysis'] = array(
+        '#prefix' => '<div class="form-item">',
+        '#suffix' => '</div>',
+        '#value' => $output,
+      );
 
-        $form_state['ok_button'] = TRUE;
-        break;
-      case 'analyze-theme-style':
-        $form['#title'] .= t('Theming information (style)');
-        $output = '<p>' . t('Back to !info.', array('!info' => $this->option_link(t('theming information'), 'analyze-theme'))) . '</p>';
+      $form_state['ok_button'] = TRUE;
+      break;
+    case 'analyze-theme-style':
+      $form['#title'] .= t('Theming information (style)');
+      $output = '<p>' . t('Back to !info.', array('!info' => $this->option_link(t('theming information'), 'analyze-theme'))) . '</p>';
 
-        $plugin = $this->get_plugin();
+      $plugin = $this->get_plugin();
 
-        if (empty($plugin->definition['theme'])) {
-          $output .= t('This display has no style theming information');
-        }
-        else {
-          $output .= '<p>' . t('This is the default theme template used for this style.') . '</p>';
-          $output .= '<pre>' . check_plain(file_get_contents('./' . $plugin->definition['theme path'] . '/' . strtr($plugin->definition['theme'], '_', '-') . '.tpl.php')) . '</pre>';
-        }
+      if (empty($plugin->definition['theme'])) {
+        $output .= t('This display has no style theming information');
+      }
+      else {
+        $output .= '<p>' . t('This is the default theme template used for this style.') . '</p>';
+        $output .= '<pre>' . check_plain(file_get_contents('./' . $plugin->definition['theme path'] . '/' . strtr($plugin->definition['theme'], '_', '-') . '.tpl.php')) . '</pre>';
+      }
 
-        if (!empty($plugin->definition['additional themes'])) {
-          foreach ($plugin->definition['additional themes'] as $theme => $type) {
-            $output .= '<p>' . t('This is an alternative template for this style.') . '</p>';
-            $output .= '<pre>' . check_plain(file_get_contents('./' . $plugin->definition['theme path'] . '/' . strtr($theme, '_', '-') . '.tpl.php')) . '</pre>';
-          }
+      if (!empty($plugin->definition['additional themes'])) {
+        foreach ($plugin->definition['additional themes'] as $theme => $type) {
+          $output .= '<p>' . t('This is an alternative template for this style.') . '</p>';
+          $output .= '<pre>' . check_plain(file_get_contents('./' . $plugin->definition['theme path'] . '/' . strtr($theme, '_', '-') . '.tpl.php')) . '</pre>';
         }
+      }
 
-        $form['analysis'] = array(
-          '#prefix' => '<div class="form-item">',
-          '#suffix' => '</div>',
-          '#value' => $output,
-        );
+      $form['analysis'] = array(
+        '#prefix' => '<div class="form-item">',
+        '#suffix' => '</div>',
+        '#value' => $output,
+      );
 
-        $form_state['ok_button'] = TRUE;
-        break;
-      case 'analyze-theme-row':
-        $form['#title'] .= t('Theming information (row style)');
-        $output = '<p>' . t('Back to !info.', array('!info' => $this->option_link(t('theming information'), 'analyze-theme'))) . '</p>';
+      $form_state['ok_button'] = TRUE;
+      break;
+    case 'analyze-theme-row':
+      $form['#title'] .= t('Theming information (row style)');
+      $output = '<p>' . t('Back to !info.', array('!info' => $this->option_link(t('theming information'), 'analyze-theme'))) . '</p>';
 
-        $plugin = $this->get_plugin('row');
+      $plugin = $this->get_plugin('row');
 
-        if (empty($plugin->definition['theme'])) {
-          $output .= t('This display has no row style theming information');
-        }
-        else {
-          $output .= '<p>' . t('This is the default theme template used for this row style.') . '</p>';
-          $output .= '<pre>' . check_plain(file_get_contents('./' . $plugin->definition['theme path'] . '/' . strtr($plugin->definition['theme'], '_', '-') . '.tpl.php')) . '</pre>';
-        }
+      if (empty($plugin->definition['theme'])) {
+        $output .= t('This display has no row style theming information');
+      }
+      else {
+        $output .= '<p>' . t('This is the default theme template used for this row style.') . '</p>';
+        $output .= '<pre>' . check_plain(file_get_contents('./' . $plugin->definition['theme path'] . '/' . strtr($plugin->definition['theme'], '_', '-') . '.tpl.php')) . '</pre>';
+      }
 
-        if (!empty($plugin->definition['additional themes'])) {
-          foreach ($plugin->definition['additional themes'] as $theme => $type) {
-            $output .= '<p>' . t('This is an alternative template for this row style.') . '</p>';
-            $output .= '<pre>' . check_plain(file_get_contents('./' . $plugin->definition['theme path'] . '/' . strtr($theme, '_', '-') . '.tpl.php')) . '</pre>';
-          }
+      if (!empty($plugin->definition['additional themes'])) {
+        foreach ($plugin->definition['additional themes'] as $theme => $type) {
+          $output .= '<p>' . t('This is an alternative template for this row style.') . '</p>';
+          $output .= '<pre>' . check_plain(file_get_contents('./' . $plugin->definition['theme path'] . '/' . strtr($theme, '_', '-') . '.tpl.php')) . '</pre>';
         }
+      }
 
-        $form['analysis'] = array(
-          '#prefix' => '<div class="form-item">',
-          '#suffix' => '</div>',
-          '#value' => $output,
-        );
+      $form['analysis'] = array(
+        '#prefix' => '<div class="form-item">',
+        '#suffix' => '</div>',
+        '#value' => $output,
+      );
 
-        $form_state['ok_button'] = TRUE;
-        break;
-      case 'analyze-theme-field':
-        $form['#title'] .= t('Theming information (row style)');
-        $output = '<p>' . t('Back to !info.', array('!info' => $this->option_link(t('theming information'), 'analyze-theme'))) . '</p>';
+      $form_state['ok_button'] = TRUE;
+      break;
+    case 'analyze-theme-field':
+      $form['#title'] .= t('Theming information (row style)');
+      $output = '<p>' . t('Back to !info.', array('!info' => $this->option_link(t('theming information'), 'analyze-theme'))) . '</p>';
 
-        $output .= '<p>' . t('This is the default theme template used for this row style.') . '</p>';
+      $output .= '<p>' . t('This is the default theme template used for this row style.') . '</p>';
 
-        // Field templates aren't registered the normal way...and they're always
-        // this one, anyhow.
-        $output .= '<pre>' . check_plain(file_get_contents(drupal_get_path('module', 'views') . '/theme/views-view-field.tpl.php')) . '</pre>';
+      // Field templates aren't registered the normal way...and they're always
+      // this one, anyhow.
+      $output .= '<pre>' . check_plain(file_get_contents(drupal_get_path('module', 'views') . '/theme/views-view-field.tpl.php')) . '</pre>';
 
-        $form['analysis'] = array(
-          '#prefix' => '<div class="form-item">',
-          '#suffix' => '</div>',
-          '#value' => $output,
-        );
-        $form_state['ok_button'] = TRUE;
-        break;
+      $form['analysis'] = array(
+        '#prefix' => '<div class="form-item">',
+        '#suffix' => '</div>',
+        '#value' => $output,
+      );
+      $form_state['ok_button'] = TRUE;
+      break;
 
-      case 'exposed_block':
-        $form['#title'] .= t('Put the exposed form in a block');
-        $form['description'] = array(
-          '#prefix' => '<div class="description form-item">',
-          '#suffix' => '</div>',
-          '#value' => t('If set, any exposed widgets will not appear with this view. Instead, a block will be made available to the Drupal block administration system, and the exposed form will appear there. Note that this block must be enabled manually, Views will not enable it for you.'),
-        );
-        $form['exposed_block'] = array(
-          '#type' => 'radios',
-          '#options' => array(1 => t('Yes'), 0 => t('No')),
-          '#default_value' => $this->get_option('exposed_block') ? 1 : 0,
-        );
-        break;
+    case 'exposed_block':
+      $form['#title'] .= t('Put the exposed form in a block');
+      $form['description'] = array(
+        '#prefix' => '<div class="description form-item">',
+        '#suffix' => '</div>',
+        '#value' => t('If set, any exposed widgets will not appear with this view. Instead, a block will be made available to the Drupal block administration system, and the exposed form will appear there. Note that this block must be enabled manually, Views will not enable it for you.'),
+      );
+      $form['exposed_block'] = array(
+        '#type' => 'radios',
+        '#options' => array(1 => t('Yes'), 0 => t('No')),
+        '#default_value' => $this->get_option('exposed_block') ? 1 : 0,
+      );
+      break;
     }
   }
 
@@ -1476,38 +1476,38 @@ 
    */
   function options_validate(&$form, &$form_state) {
     switch ($form_state['section']) {
-      case 'display_title':
-        if (empty($form_state['values']['display_title'])) {
-          form_error($form['display_title'], t('Display title may not be empty.'));
-        }
-        break;
-      case 'css_class':
-        $css_class = $form_state['values']['css_class'];
-        if (preg_match('/[^a-zA-Z0-9- ]/', $css_class)) {
-          form_error($form['css_class'], t('CSS classes must be alphanumeric or dashes only.'));
-        }
+    case 'display_title':
+      if (empty($form_state['values']['display_title'])) {
+        form_error($form['display_title'], t('Display title may not be empty.'));
+      }
+      break;
+    case 'css_class':
+      $css_class = $form_state['values']['css_class'];
+      if (preg_match('/[^a-zA-Z0-9- ]/', $css_class)) {
+        form_error($form['css_class'], t('CSS classes must be alphanumeric or dashes only.'));
+      }
+    break;
+    case 'style_options':
+      $style = TRUE;
+    case 'row_options':
+      // if row, $style will be empty.
+      $plugin = $this->get_plugin(empty($style) ? 'row' : 'style');
+      if ($plugin) {
+        $plugin->options_validate($form[$form_state['section']], $form_state);
+      }
+      break;
+    case 'access_options':
+      $plugin = $this->get_access_plugin();
+      if ($plugin) {
+        $plugin->options_validate($form['access_options'], $form_state);
+      }
+      break;
+    case 'cache_options':
+      $plugin = $this->get_cache_plugin();
+      if ($plugin) {
+        $plugin->options_validate($form['cache_options'], $form_state);
+      }
       break;
-      case 'style_options':
-        $style = TRUE;
-      case 'row_options':
-        // if row, $style will be empty.
-        $plugin = $this->get_plugin(empty($style) ? 'row' : 'style');
-        if ($plugin) {
-          $plugin->options_validate($form[$form_state['section']], $form_state);
-        }
-        break;
-      case 'access_options':
-        $plugin = $this->get_access_plugin();
-        if ($plugin) {
-          $plugin->options_validate($form['access_options'], $form_state);
-        }
-        break;
-      case 'cache_options':
-        $plugin = $this->get_cache_plugin();
-        if ($plugin) {
-          $plugin->options_validate($form['cache_options'], $form_state);
-        }
-        break;
     }
   }
 
@@ -1524,129 +1524,129 @@ 
 
     $section = $form_state['section'];
     switch ($section) {
-      case 'display_title':
-        $this->display->display_title = $form_state['values']['display_title'];
-        break;
-      case 'access':
-        $access = $this->get_option('access');
-        if ($access['type'] != $form_state['values']['access']['type']) {
-          $plugin = views_get_plugin('access', $form_state['values']['access']['type']);
-          if ($plugin) {
-            $access = array('type' => $form_state['values']['access']['type']);
-            $plugin->option_defaults($access);
-            $this->set_option('access', $access);
-            if (!empty($plugin->definition['uses options'])) {
-              views_ui_add_form_to_stack('display', $this->view, $this->display->id, array('access_options'));
-            }
+    case 'display_title':
+      $this->display->display_title = $form_state['values']['display_title'];
+      break;
+    case 'access':
+      $access = $this->get_option('access');
+      if ($access['type'] != $form_state['values']['access']['type']) {
+        $plugin = views_get_plugin('access', $form_state['values']['access']['type']);
+        if ($plugin) {
+          $access = array('type' => $form_state['values']['access']['type']);
+          $plugin->option_defaults($access);
+          $this->set_option('access', $access);
+          if (!empty($plugin->definition['uses options'])) {
+            views_ui_add_form_to_stack('display', $this->view, $this->display->id, array('access_options'));
           }
         }
+      }
 
-        break;
-      case 'access_options':
-        $plugin = views_get_plugin('access', $form_state['values'][$section]['type']);
+      break;
+    case 'access_options':
+      $plugin = views_get_plugin('access', $form_state['values'][$section]['type']);
+      if ($plugin) {
+        $plugin->options_submit($form['access_options'], $form_state);
+        $this->set_option('access', $form_state['values'][$section]);
+      }
+      break;
+    case 'cache':
+      $cache = $this->get_option('cache');
+      if ($cache['type'] != $form_state['values']['cache']['type']) {
+        $plugin = views_get_plugin('cache', $form_state['values']['cache']['type']);
         if ($plugin) {
-          $plugin->options_submit($form['access_options'], $form_state);
-          $this->set_option('access', $form_state['values'][$section]);
-        }
-        break;
-      case 'cache':
-        $cache = $this->get_option('cache');
-        if ($cache['type'] != $form_state['values']['cache']['type']) {
-          $plugin = views_get_plugin('cache', $form_state['values']['cache']['type']);
-          if ($plugin) {
-            $cache = array('type' => $form_state['values']['cache']['type']);
-            $plugin->option_defaults($cache);
-            $this->set_option('cache', $cache);
-            if (!empty($plugin->definition['uses options'])) {
-              views_ui_add_form_to_stack('display', $this->view, $this->display->id, array('cache_options'));
-            }
+          $cache = array('type' => $form_state['values']['cache']['type']);
+          $plugin->option_defaults($cache);
+          $this->set_option('cache', $cache);
+          if (!empty($plugin->definition['uses options'])) {
+            views_ui_add_form_to_stack('display', $this->view, $this->display->id, array('cache_options'));
           }
         }
+      }
 
-        break;
-      case 'cache_options':
-        $plugin = views_get_plugin('cache', $form_state['values'][$section]['type']);
+      break;
+    case 'cache_options':
+      $plugin = views_get_plugin('cache', $form_state['values'][$section]['type']);
+      if ($plugin) {
+        $plugin->options_submit($form['cache_options'], $form_state);
+        $this->set_option('cache', $form_state['values'][$section]);
+      }
+      break;
+    case 'title':
+    case 'css_class':
+    case 'link_display':
+      $this->set_option($section, $form_state['values'][$section]);
+      break;
+    case 'use_ajax':
+      $this->set_option($section, (bool)$form_state['values'][$section]);
+      break;
+    case 'use_pager':
+      $this->set_option($section, $form_state['values'][$section]);
+      $this->set_option('pager_element', intval($form_state['values']['pager_element']));
+      break;
+    case 'items_per_page':
+      $this->set_option($section, intval($form_state['values'][$section]));
+      $this->set_option('offset', intval($form_state['values']['offset']));
+      break;
+    case 'use_more':
+      $this->set_option($section, intval($form_state['values'][$section]));
+      $this->set_option('use_more_always', intval($form_state['values']['use_more_always']));
+      $this->set_option('use_more_text', $form_state['values']['use_more_text']);
+    case 'distinct':
+      $this->set_option($section, $form_state['values'][$section]);
+      break;
+    case 'row_plugin':
+      // This if prevents resetting options to default if they don't change
+      // the plugin.
+      if ($this->get_option($section) != $form_state['values'][$section]) {
+        $plugin = views_get_plugin('row', $form_state['values'][$section]);
         if ($plugin) {
-          $plugin->options_submit($form['cache_options'], $form_state);
-          $this->set_option('cache', $form_state['values'][$section]);
-        }
-        break;
-      case 'title':
-      case 'css_class':
-      case 'link_display':
-        $this->set_option($section, $form_state['values'][$section]);
-        break;
-      case 'use_ajax':
-        $this->set_option($section, (bool)$form_state['values'][$section]);
-        break;
-      case 'use_pager':
-        $this->set_option($section, $form_state['values'][$section]);
-        $this->set_option('pager_element', intval($form_state['values']['pager_element']));
-        break;
-      case 'items_per_page':
-        $this->set_option($section, intval($form_state['values'][$section]));
-        $this->set_option('offset', intval($form_state['values']['offset']));
-        break;
-      case 'use_more':
-        $this->set_option($section, intval($form_state['values'][$section]));
-        $this->set_option('use_more_always', intval($form_state['values']['use_more_always']));
-        $this->set_option('use_more_text', $form_state['values']['use_more_text']);
-      case 'distinct':
-        $this->set_option($section, $form_state['values'][$section]);
-        break;
-      case 'row_plugin':
-        // This if prevents resetting options to default if they don't change
-        // the plugin.
-        if ($this->get_option($section) != $form_state['values'][$section]) {
-          $plugin = views_get_plugin('row', $form_state['values'][$section]);
-          if ($plugin) {
-            $this->set_option($section, $form_state['values'][$section]);
-            $this->set_option('row_options', array());
-
-            // send ajax form to options page if we use it.
-            if (!empty($plugin->definition['uses options'])) {
-              views_ui_add_form_to_stack('display', $this->view, $this->display->id, array('row_options'));
-            }
-          }
-        }
-        break;
-      case 'style_plugin':
-        // This if prevents resetting options to default if they don't change
-        // the plugin.
-        if ($this->get_option($section) != $form_state['values'][$section]) {
-          $plugin = views_get_plugin('style', $form_state['values'][$section]);
-          if ($plugin) {
-            $this->set_option($section, $form_state['values'][$section]);
-            $this->set_option('style_options', array());
-            // send ajax form to options page if we use it.
-            if (!empty($plugin->definition['uses options'])) {
-              views_ui_add_form_to_stack('display', $this->view, $this->display->id, array('style_options'));
-            }
+          $this->set_option($section, $form_state['values'][$section]);
+          $this->set_option('row_options', array());
+
+          // send ajax form to options page if we use it.
+          if (!empty($plugin->definition['uses options'])) {
+            views_ui_add_form_to_stack('display', $this->view, $this->display->id, array('row_options'));
           }
         }
-        break;
-      case 'style_options':
-        $style = TRUE;
-      case 'row_options':
-        // if row, $style will be empty.
-        $plugin = $this->get_plugin(empty($style) ? 'row' : 'style');
+      }
+      break;
+    case 'style_plugin':
+      // This if prevents resetting options to default if they don't change
+      // the plugin.
+      if ($this->get_option($section) != $form_state['values'][$section]) {
+        $plugin = views_get_plugin('style', $form_state['values'][$section]);
         if ($plugin) {
-          $plugin->options_submit($form[$section], $form_state);
-        }
-        $this->set_option($section, $form_state['values'][$section]);
-        break;
-      case 'header':
-      case 'footer':
-      case 'empty':
-        $this->set_option($section, $form_state['values'][$section]);
-        $this->set_option($section . '_format', $form_state['values'][$section . '_format']);
-        if ($section != 'empty') {
-          $this->set_option($section . '_empty', $form_state['values'][$section . '_empty']);
+          $this->set_option($section, $form_state['values'][$section]);
+          $this->set_option('style_options', array());
+          // send ajax form to options page if we use it.
+          if (!empty($plugin->definition['uses options'])) {
+            views_ui_add_form_to_stack('display', $this->view, $this->display->id, array('style_options'));
+          }
         }
-        break;
-      case 'exposed_block':
-        $this->set_option($section, (bool) $form_state['values'][$section]);
-        break;
+      }
+      break;
+    case 'style_options':
+      $style = TRUE;
+    case 'row_options':
+      // if row, $style will be empty.
+      $plugin = $this->get_plugin(empty($style) ? 'row' : 'style');
+      if ($plugin) {
+        $plugin->options_submit($form[$section], $form_state);
+      }
+      $this->set_option($section, $form_state['values'][$section]);
+      break;
+    case 'header':
+    case 'footer':
+    case 'empty':
+      $this->set_option($section, $form_state['values'][$section]);
+      $this->set_option($section . '_format', $form_state['values'][$section . '_format']);
+      if ($section != 'empty') {
+        $this->set_option($section . '_empty', $form_state['values'][$section . '_empty']);
+      }
+      break;
+    case 'exposed_block':
+      $this->set_option($section, (bool) $form_state['values'][$section]);
+      break;
     }
   }
 

drupal/sites/default/boinc/modules/contrib/views/plugins/views_plugin_display_feed.inc

Switch Indentation +35 added lines, -35 removed lines

@@ -125,36 +125,36 @@ 
     parent::options_form($form, $form_state);
 
     switch ($form_state['section']) {
-      case 'title':
-        $title = $form['title'];
-        // A little juggling to move the 'title' field beyond our checkbox.
-        unset($form['title']);
-        $form['sitename_title'] = array(
-          '#type' => 'checkbox',
-          '#title' => t('Use the site name for the title'),
-          '#default_value' => $this->get_option('sitename_title'),
-        );
-        $form['title'] = $title;
-        $form['title']['#process'] = array('views_process_dependency');
-        $form['title']['#dependency'] = array('edit-sitename-title' => array(FALSE));
-        break;
-      case 'displays':
-        $form['#title'] .= t('Attach to');
-        $displays = array();
-        foreach ($this->view->display as $display_id => $display) {
-          if (!empty($display->handler) && $display->handler->accept_attachments()) {
-            $displays[$display_id] = $display->display_title;
-          }
+    case 'title':
+      $title = $form['title'];
+      // A little juggling to move the 'title' field beyond our checkbox.
+      unset($form['title']);
+      $form['sitename_title'] = array(
+        '#type' => 'checkbox',
+        '#title' => t('Use the site name for the title'),
+        '#default_value' => $this->get_option('sitename_title'),
+      );
+      $form['title'] = $title;
+      $form['title']['#process'] = array('views_process_dependency');
+      $form['title']['#dependency'] = array('edit-sitename-title' => array(FALSE));
+      break;
+    case 'displays':
+      $form['#title'] .= t('Attach to');
+      $displays = array();
+      foreach ($this->view->display as $display_id => $display) {
+        if (!empty($display->handler) && $display->handler->accept_attachments()) {
+          $displays[$display_id] = $display->display_title;
         }
-        $form['displays'] = array(
-          '#type' => 'checkboxes',
-          '#description' => t('The feed icon will be available only to the selected displays.'),
-          '#options' => $displays,
-          '#default_value' => $this->get_option('displays'),
-        );
-        break;
-      case 'path':
-        $form['path']['#description'] = t('This view will be displayed by visiting this path on your site. It is recommended that the path be something like "path/%/%/feed" or "path/%/%/rss.xml", putting one % in the path for each argument you have defined in the view.');
+      }
+      $form['displays'] = array(
+        '#type' => 'checkboxes',
+        '#description' => t('The feed icon will be available only to the selected displays.'),
+        '#options' => $displays,
+        '#default_value' => $this->get_option('displays'),
+      );
+      break;
+    case 'path':
+      $form['path']['#description'] = t('This view will be displayed by visiting this path on your site. It is recommended that the path be something like "path/%/%/feed" or "path/%/%/rss.xml", putting one % in the path for each argument you have defined in the view.');
     }
   }
 
@@ -166,12 +166,12 @@ 
     // It is very important to call the parent function here:
     parent::options_submit($form, $form_state);
     switch ($form_state['section']) {
-      case 'title':
-        $this->set_option('sitename_title', $form_state['values']['sitename_title']);
-        break;
-      case 'displays':
-        $this->set_option($form_state['section'], $form_state['values'][$form_state['section']]);
-        break;
+    case 'title':
+      $this->set_option('sitename_title', $form_state['values']['sitename_title']);
+      break;
+    case 'displays':
+      $this->set_option($form_state['section'], $form_state['values'][$form_state['section']]);
+      break;
     }
   }
 

drupal/sites/default/boinc/modules/contrib/views/plugins/views_plugin_display_attachment.inc

Switch Indentation +77 added lines, -77 removed lines

@@ -118,66 +118,66 @@ 
     parent::options_form($form, $form_state);
 
     switch ($form_state['section']) {
-      case 'inherit_arguments':
-        $form['#title'] .= t('Inherit arguments');
-        $form['inherit_arguments'] = array(
-          '#type' => 'checkbox',
-          '#title' => t('Inherit'),
-          '#description' => t('Should this display inherit its arguments from the parent display to which it is attached?'),
-          '#default_value' => $this->get_option('inherit_arguments'),
-        );
-        break;
-      case 'inherit_exposed_filters':
-        $form['#title'] .= t('Inherit exposed filters');
-        $form['inherit_exposed_filters'] = array(
-          '#type' => 'checkbox',
-          '#title' => t('Inherit'),
-          '#description' => t('Should this display inherit its exposed filter values from the parent display to which it is attached?'),
-          '#default_value' => $this->get_option('inherit_exposed_filters'),
-        );
-        break;
-      case 'inherit_pager':
-        $form['#title'] .= t('Inherit pager');
-        $form['inherit_pager'] = array(
-          '#type' => 'checkbox',
-          '#title' => t('Inherit'),
-          '#description' => t('Should this display inherit its paging values from the parent display to which it is attached? Note that this will provide unexpected results if the number of items to display do not match.'),
-          '#default_value' => $this->get_option('inherit_pager'),
-        );
-        break;
-      case 'render_pager':
-        $form['#title'] .= t('Render pager');
-        $form['render_pager'] = array(
-          '#type' => 'checkbox',
-          '#title' => t('Render'),
-          '#description' => t('Should this display render the pager values? If not it can inherit from the parent...'),
-          '#default_value' => $this->get_option('render_pager'),
-        );
-        break;
-      case 'attachment_position':
-        $form['#title'] .= t('Position');
-        $form['attachment_position'] = array(
-          '#type' => 'radios',
-          '#description' => t('Attach before or after the parent display?'),
-          '#options' => $this->attachment_positions(),
-          '#default_value' => $this->get_option('attachment_position'),
-        );
-        break;
-      case 'displays':
-        $form['#title'] .= t('Attach to');
-        $displays = array();
-        foreach ($this->view->display as $display_id => $display) {
-          if (!empty($display->handler) && $display->handler->accept_attachments()) {
-            $displays[$display_id] = $display->display_title;
-          }
+    case 'inherit_arguments':
+      $form['#title'] .= t('Inherit arguments');
+      $form['inherit_arguments'] = array(
+        '#type' => 'checkbox',
+        '#title' => t('Inherit'),
+        '#description' => t('Should this display inherit its arguments from the parent display to which it is attached?'),
+        '#default_value' => $this->get_option('inherit_arguments'),
+      );
+      break;
+    case 'inherit_exposed_filters':
+      $form['#title'] .= t('Inherit exposed filters');
+      $form['inherit_exposed_filters'] = array(
+        '#type' => 'checkbox',
+        '#title' => t('Inherit'),
+        '#description' => t('Should this display inherit its exposed filter values from the parent display to which it is attached?'),
+        '#default_value' => $this->get_option('inherit_exposed_filters'),
+      );
+      break;
+    case 'inherit_pager':
+      $form['#title'] .= t('Inherit pager');
+      $form['inherit_pager'] = array(
+        '#type' => 'checkbox',
+        '#title' => t('Inherit'),
+        '#description' => t('Should this display inherit its paging values from the parent display to which it is attached? Note that this will provide unexpected results if the number of items to display do not match.'),
+        '#default_value' => $this->get_option('inherit_pager'),
+      );
+      break;
+    case 'render_pager':
+      $form['#title'] .= t('Render pager');
+      $form['render_pager'] = array(
+        '#type' => 'checkbox',
+        '#title' => t('Render'),
+        '#description' => t('Should this display render the pager values? If not it can inherit from the parent...'),
+        '#default_value' => $this->get_option('render_pager'),
+      );
+      break;
+    case 'attachment_position':
+      $form['#title'] .= t('Position');
+      $form['attachment_position'] = array(
+        '#type' => 'radios',
+        '#description' => t('Attach before or after the parent display?'),
+        '#options' => $this->attachment_positions(),
+        '#default_value' => $this->get_option('attachment_position'),
+      );
+      break;
+    case 'displays':
+      $form['#title'] .= t('Attach to');
+      $displays = array();
+      foreach ($this->view->display as $display_id => $display) {
+        if (!empty($display->handler) && $display->handler->accept_attachments()) {
+          $displays[$display_id] = $display->display_title;
         }
-        $form['displays'] = array(
-          '#type' => 'checkboxes',
-          '#description' => t('Select which display or displays this should attach to.'),
-          '#options' => $displays,
-          '#default_value' => $this->get_option('displays'),
-        );
-        break;
+      }
+      $form['displays'] = array(
+        '#type' => 'checkboxes',
+        '#description' => t('Select which display or displays this should attach to.'),
+        '#options' => $displays,
+        '#default_value' => $this->get_option('displays'),
+      );
+      break;
     }
   }
 
@@ -189,14 +189,14 @@ 
     // It is very important to call the parent function here:
     parent::options_submit($form, $form_state);
     switch ($form_state['section']) {
-      case 'inherit_arguments':
-      case 'inherit_pager':
-      case 'render_pager':
-      case 'inherit_exposed_filters':
-      case 'attachment_position':
-      case 'displays':
-        $this->set_option($form_state['section'], $form_state['values'][$form_state['section']]);
-        break;
+    case 'inherit_arguments':
+    case 'inherit_pager':
+    case 'render_pager':
+    case 'inherit_exposed_filters':
+    case 'attachment_position':
+    case 'displays':
+      $this->set_option($form_state['section'], $form_state['values'][$form_state['section']]);
+      break;
     }
   }
 
@@ -232,16 +232,16 @@ 
     $attachment = $view->execute_display($this->display->id, $args);
 
     switch ($this->get_option('attachment_position')) {
-      case 'before':
-        $this->view->attachment_before .= $attachment;
-        break;
-      case 'after':
-        $this->view->attachment_after .= $attachment;
-        break;
-      case 'both':
-        $this->view->attachment_before .= $attachment;
-        $this->view->attachment_after .= $attachment;
-        break;
+    case 'before':
+      $this->view->attachment_before .= $attachment;
+      break;
+    case 'after':
+      $this->view->attachment_after .= $attachment;
+      break;
+    case 'both':
+      $this->view->attachment_before .= $attachment;
+      $this->view->attachment_after .= $attachment;
+      break;
     }
 
     $view->destroy();

drupal/sites/default/boinc/modules/contrib/views/plugins/views_plugin_display_block.inc

Switch Indentation +25 added lines, -25 removed lines

@@ -130,24 +130,24 @@ 
     parent::options_form($form, $form_state);
 
     switch ($form_state['section']) {
-      case 'block_description':
-        $form['#title'] .= t('Block admin description');
-        $form['block_description'] = array(
-          '#type' => 'textfield',
-          '#description' => t('This will appear as the name of this block in administer >> site building >> blocks.'),
-          '#default_value' => $this->get_option('block_description'),
-        );
-        break;
-      case 'block_caching':
-        $form['#title'] .= t('Block caching type');
-
-        $form['block_caching'] = array(
-          '#type' => 'radios',
-          '#description' => t("This sets the default status for Drupal's built-in block caching method; this requires that caching be turned on in block administration, and be careful because you have little control over when this cache is flushed."),
-          '#options' => $this->block_caching_modes(),
-          '#default_value' => $this->get_cache_type(),
-        );
-        break;
+    case 'block_description':
+      $form['#title'] .= t('Block admin description');
+      $form['block_description'] = array(
+        '#type' => 'textfield',
+        '#description' => t('This will appear as the name of this block in administer >> site building >> blocks.'),
+        '#default_value' => $this->get_option('block_description'),
+      );
+      break;
+    case 'block_caching':
+      $form['#title'] .= t('Block caching type');
+
+      $form['block_caching'] = array(
+        '#type' => 'radios',
+        '#description' => t("This sets the default status for Drupal's built-in block caching method; this requires that caching be turned on in block administration, and be careful because you have little control over when this cache is flushed."),
+        '#options' => $this->block_caching_modes(),
+        '#default_value' => $this->get_cache_type(),
+      );
+      break;
     }
   }
 
@@ -159,13 +159,13 @@ 
     // It is very important to call the parent function here:
     parent::options_submit($form, $form_state);
     switch ($form_state['section']) {
-      case 'block_description':
-        $this->set_option('block_description', $form_state['values']['block_description']);
-        break;
-      case 'block_caching':
-        $this->set_option('block_caching', $form_state['values']['block_caching']);
-        $this->save_block_cache($form_state['view']->name.'-'.$form_state['display_id'], $form_state['values']['block_caching']);
-        break;
+    case 'block_description':
+      $this->set_option('block_description', $form_state['values']['block_description']);
+      break;
+    case 'block_caching':
+      $this->set_option('block_caching', $form_state['values']['block_caching']);
+      $this->save_block_cache($form_state['view']->name.'-'.$form_state['display_id'], $form_state['values']['block_caching']);
+      break;
     }
   }
 

drupal/sites/default/boinc/modules/contrib/views/plugins/views_plugin_display_page.inc

Switch Indentation +228 added lines, -228 removed lines

@@ -100,21 +100,21 @@ 
       }
 
       switch ($menu['type']) {
-        case 'none':
-        default:
-          $items[$path]['type'] = MENU_CALLBACK;
-          break;
-        case 'normal':
-          $items[$path]['type'] = MENU_NORMAL_ITEM;
-          // Insert item into the proper menu
-          $items[$path]['menu_name'] = $menu['name'];
-          break;
-        case 'tab':
-          $items[$path]['type'] = MENU_LOCAL_TASK;
-          break;
-        case 'default tab':
-          $items[$path]['type'] = MENU_DEFAULT_LOCAL_TASK;
-          break;
+      case 'none':
+      default:
+        $items[$path]['type'] = MENU_CALLBACK;
+        break;
+      case 'normal':
+        $items[$path]['type'] = MENU_NORMAL_ITEM;
+        // Insert item into the proper menu
+        $items[$path]['menu_name'] = $menu['name'];
+        break;
+      case 'tab':
+        $items[$path]['type'] = MENU_LOCAL_TASK;
+        break;
+      case 'default tab':
+        $items[$path]['type'] = MENU_DEFAULT_LOCAL_TASK;
+        break;
       }
 
       // If this is a 'default' tab, check to see if we have to create teh
@@ -144,13 +144,13 @@ 
               'menu_name' => $tab_options['name'],
             );
             switch ($tab_options['type']) {
-              default:
-              case 'normal':
-                $items[$default_path]['type'] = MENU_NORMAL_ITEM;
-                break;
-              case 'tab':
-                $items[$default_path]['type'] = MENU_LOCAL_TASK;
-                break;
+            default:
+            case 'normal':
+              $items[$default_path]['type'] = MENU_NORMAL_ITEM;
+              break;
+            case 'tab':
+              $items[$default_path]['type'] = MENU_LOCAL_TASK;
+              break;
             }
             if (isset($tab_options['weight'])) {
               $items[$default_path]['weight'] = intval($tab_options['weight']);
@@ -221,17 +221,17 @@ 
       $menu = array('type' => 'none');
     }
     switch($menu['type']) {
-      case 'none':
-      default:
-        $menu_str = t('No menu');
-        break;
-      case 'normal':
-        $menu_str = t('Normal: @title', array('@title' => $menu['title']));
-        break;
-      case 'tab':
-      case 'default tab':
-        $menu_str = t('Tab: @title', array('@title' => $menu['title']));
-        break;
+    case 'none':
+    default:
+      $menu_str = t('No menu');
+      break;
+    case 'normal':
+      $menu_str = t('Normal: @title', array('@title' => $menu['title']));
+      break;
+    case 'tab':
+    case 'default tab':
+      $menu_str = t('Tab: @title', array('@title' => $menu['title']));
+      break;
     }
 
     if (strlen($menu_str) > 16) {
@@ -258,176 +258,176 @@ 
     parent::options_form($form, $form_state);
 
     switch ($form_state['section']) {
-      case 'path':
-        $form['#title'] .= t('The menu path or URL of this view');
-        $form['#help_topic'] = 'path';
-        $form['path'] = array(
-          '#type' => 'textfield',
-          '#description' => t('This view will be displayed by visiting this path on your site. You may use "%" in your URL to represent values that will be used for arguments: For example, "node/%/feed".'),
-          '#default_value' => $this->get_option('path'),
+    case 'path':
+      $form['#title'] .= t('The menu path or URL of this view');
+      $form['#help_topic'] = 'path';
+      $form['path'] = array(
+        '#type' => 'textfield',
+        '#description' => t('This view will be displayed by visiting this path on your site. You may use "%" in your URL to represent values that will be used for arguments: For example, "node/%/feed".'),
+        '#default_value' => $this->get_option('path'),
 	  '#field_prefix' => '<span dir="ltr">' . url(NULL, array('absolute' => TRUE)) . (variable_get('clean_url', 0) ? '' : '?q='),
 	  '#field_suffix' => '</span>&lrm;',
 	  '#attributes' => array('dir'=>'ltr'),
-        );
-        break;
-      case 'menu':
-        $form['#title'] .= t('Menu item entry');
-        $form['#help_topic'] = 'menu';
-        $form['menu'] = array(
-          '#prefix' => '<div class="clear-block">',
-          '#suffix' => '</div>',
-          '#tree' => TRUE,
-        );
-        $menu = $this->get_option('menu');
-        if (empty($menu)) {
-          $menu = array('type' => 'none', 'title' => '', 'weight' => 0);
-        }
-        $form['menu']['type'] = array(
-          '#prefix' => '<div class="views-left-30">',
-          '#suffix' => '</div>',
-          '#title' => t('Type'),
-          '#type' => 'radios',
-          '#options' => array(
-            'none' => t('No menu entry'),
-            'normal' => t('Normal menu entry'),
-            'tab' => t('Menu tab'),
-            'default tab' => t('Default menu tab')
-          ),
-          '#default_value' => $menu['type'],
-        );
-        $form['menu']['title'] = array(
-          '#prefix' => '<div class="views-left-50">',
-          '#title' => t('Title'),
-          '#type' => 'textfield',
-          '#default_value' => $menu['title'],
-          '#description' => t('If set to normal or tab, enter the text to use for the menu item.'),
-          '#process' => array('views_process_dependency'),
-          '#dependency' => array('radio:menu[type]' => array('normal', 'tab', 'default tab')),
-        );
-        $form['menu']['description'] = array(
-          '#title' => t('Description'),
-          '#type' => 'textfield',
-          '#default_value' => $menu['description'],
-          '#description' => t("If set to normal or tab, enter the text to use for the menu item's description."),
-          '#process' => array('views_process_dependency'),
-          '#dependency' => array('radio:menu[type]' => array('normal', 'tab', 'default tab')),
-        );
-        $form['menu']['name-warning'] = array(
-          '#type' => 'markup',
-          '#prefix' => '<div class="warning">',
-          '#value' => t("Warning: Changing this item's menu will not work reliably in Drupal 6.4 or earlier. Please upgrade your copy of Drupal at !url.", array('!url' => l('drupal.org', 'http://drupal.org/project/Drupal+project'))),
-          '#suffix' => '</div>',
+      );
+      break;
+    case 'menu':
+      $form['#title'] .= t('Menu item entry');
+      $form['#help_topic'] = 'menu';
+      $form['menu'] = array(
+        '#prefix' => '<div class="clear-block">',
+        '#suffix' => '</div>',
+        '#tree' => TRUE,
+      );
+      $menu = $this->get_option('menu');
+      if (empty($menu)) {
+        $menu = array('type' => 'none', 'title' => '', 'weight' => 0);
+      }
+      $form['menu']['type'] = array(
+        '#prefix' => '<div class="views-left-30">',
+        '#suffix' => '</div>',
+        '#title' => t('Type'),
+        '#type' => 'radios',
+        '#options' => array(
+          'none' => t('No menu entry'),
+          'normal' => t('Normal menu entry'),
+          'tab' => t('Menu tab'),
+          'default tab' => t('Default menu tab')
+        ),
+        '#default_value' => $menu['type'],
+      );
+      $form['menu']['title'] = array(
+        '#prefix' => '<div class="views-left-50">',
+        '#title' => t('Title'),
+        '#type' => 'textfield',
+        '#default_value' => $menu['title'],
+        '#description' => t('If set to normal or tab, enter the text to use for the menu item.'),
+        '#process' => array('views_process_dependency'),
+        '#dependency' => array('radio:menu[type]' => array('normal', 'tab', 'default tab')),
+      );
+      $form['menu']['description'] = array(
+        '#title' => t('Description'),
+        '#type' => 'textfield',
+        '#default_value' => $menu['description'],
+        '#description' => t("If set to normal or tab, enter the text to use for the menu item's description."),
+        '#process' => array('views_process_dependency'),
+        '#dependency' => array('radio:menu[type]' => array('normal', 'tab', 'default tab')),
+      );
+      $form['menu']['name-warning'] = array(
+        '#type' => 'markup',
+        '#prefix' => '<div class="warning">',
+        '#value' => t("Warning: Changing this item's menu will not work reliably in Drupal 6.4 or earlier. Please upgrade your copy of Drupal at !url.", array('!url' => l('drupal.org', 'http://drupal.org/project/Drupal+project'))),
+        '#suffix' => '</div>',
+        '#process' => array('views_process_dependency'),
+        '#dependency' => array('radio:menu[type]' => array('normal')),
+        '#access' => version_compare(VERSION, '6.5', '<'),
+      );
+
+      // Only display the menu selector if menu module is enabled.
+      if (module_exists('menu')) {
+        $form['menu']['name'] = array(
+          '#title' => t('Menu'),
+          '#type' => 'select',
+          '#options' => menu_get_menus(),
+          '#default_value' => $menu['name'],
+          '#description' => t('Insert item into an available menu.'), //
           '#process' => array('views_process_dependency'),
           '#dependency' => array('radio:menu[type]' => array('normal')),
-          '#access' => version_compare(VERSION, '6.5', '<'),
         );
-
-        // Only display the menu selector if menu module is enabled.
-        if (module_exists('menu')) {
-          $form['menu']['name'] = array(
-            '#title' => t('Menu'),
-            '#type' => 'select',
-            '#options' => menu_get_menus(),
-            '#default_value' => $menu['name'],
-            '#description' => t('Insert item into an available menu.'), //
-            '#process' => array('views_process_dependency'),
-            '#dependency' => array('radio:menu[type]' => array('normal')),
-          );
-        }
-        else {
-          $form['menu']['name'] = array(
-            '#type' => 'value',
-            '#value' => $menu['name'],
-          );
-          $form['menu']['markup'] = array(
-            '#value' => t('Menu selection requires the activation of menu module.'),
-          );
-        }
-        $form['menu']['weight'] = array(
-          '#suffix' => '</div>',
-          '#title' => t('Weight'),
-          '#type' => 'textfield',
-          '#default_value' => isset($menu['weight']) ? $menu['weight'] : 0,
-          '#description' => t('The lower the weight the higher/further left it will appear.'),
-          '#process' => array('views_process_dependency'),
-          '#dependency' => array('radio:menu[type]' => array('normal', 'tab', 'default tab')),
+      }
+      else {
+        $form['menu']['name'] = array(
+          '#type' => 'value',
+          '#value' => $menu['name'],
         );
-        break;
-      case 'tab_options':
-        $form['#title'] .= t('Default tab options');
-        $tab_options = $this->get_option('tab_options');
-        if (empty($tab_options)) {
-          $tab_options = array('type' => 'none', 'title' => '', 'weight' => 0);
-        }
-
-        $form['tab_markup'] = array(
-          '#prefix' => '<div class="form-item description">',
-          '#suffix' => '</div>',
-          '#value' => t('When providing a menu item as a tab, Drupal needs to know what the parent menu item of that tab will be. Sometimes the parent will already exist, but other times you will need to have one created. The path of a parent item will always be the same path with the last part left off. i.e, if the path to this view is <em>foo/bar/baz</em>, the parent path would be <em>foo/bar</em>.'),
+        $form['menu']['markup'] = array(
+          '#value' => t('Menu selection requires the activation of menu module.'),
         );
+      }
+      $form['menu']['weight'] = array(
+        '#suffix' => '</div>',
+        '#title' => t('Weight'),
+        '#type' => 'textfield',
+        '#default_value' => isset($menu['weight']) ? $menu['weight'] : 0,
+        '#description' => t('The lower the weight the higher/further left it will appear.'),
+        '#process' => array('views_process_dependency'),
+        '#dependency' => array('radio:menu[type]' => array('normal', 'tab', 'default tab')),
+      );
+      break;
+    case 'tab_options':
+      $form['#title'] .= t('Default tab options');
+      $tab_options = $this->get_option('tab_options');
+      if (empty($tab_options)) {
+        $tab_options = array('type' => 'none', 'title' => '', 'weight' => 0);
+      }
 
-        $form['tab_options'] = array(
-          '#prefix' => '<div class="clear-block">',
-          '#suffix' => '</div>',
-          '#tree' => TRUE,
-        );
-        $form['tab_options']['type'] = array(
-          '#prefix' => '<div class="views-left-25">',
-          '#suffix' => '</div>',
-          '#title' => t('Parent menu item'),
-          '#type' => 'radios',
-          '#options' => array('none' => t('Already exists'), 'normal' => t('Normal menu item'), 'tab' => t('Menu tab')),
-          '#default_value' => $tab_options['type'],
-        );
-        $form['tab_options']['title'] = array(
-          '#prefix' => '<div class="views-left-75">',
-          '#title' => t('Title'),
-          '#type' => 'textfield',
-          '#default_value' => $tab_options['title'],
-          '#description' => t('If creating a parent menu item, enter the title of the item.'),
+      $form['tab_markup'] = array(
+        '#prefix' => '<div class="form-item description">',
+        '#suffix' => '</div>',
+        '#value' => t('When providing a menu item as a tab, Drupal needs to know what the parent menu item of that tab will be. Sometimes the parent will already exist, but other times you will need to have one created. The path of a parent item will always be the same path with the last part left off. i.e, if the path to this view is <em>foo/bar/baz</em>, the parent path would be <em>foo/bar</em>.'),
+      );
+
+      $form['tab_options'] = array(
+        '#prefix' => '<div class="clear-block">',
+        '#suffix' => '</div>',
+        '#tree' => TRUE,
+      );
+      $form['tab_options']['type'] = array(
+        '#prefix' => '<div class="views-left-25">',
+        '#suffix' => '</div>',
+        '#title' => t('Parent menu item'),
+        '#type' => 'radios',
+        '#options' => array('none' => t('Already exists'), 'normal' => t('Normal menu item'), 'tab' => t('Menu tab')),
+        '#default_value' => $tab_options['type'],
+      );
+      $form['tab_options']['title'] = array(
+        '#prefix' => '<div class="views-left-75">',
+        '#title' => t('Title'),
+        '#type' => 'textfield',
+        '#default_value' => $tab_options['title'],
+        '#description' => t('If creating a parent menu item, enter the title of the item.'),
+        '#process' => array('views_process_dependency'),
+        '#dependency' => array('radio:tab_options[type]' => array('normal', 'tab')),
+      );
+      $form['tab_options']['description'] = array(
+        '#title' => t('Description'),
+        '#type' => 'textfield',
+        '#default_value' => $tab_options['description'],
+        '#description' => t('If creating a parent menu item, enter the description of the item.'),
+        '#process' => array('views_process_dependency'),
+        '#dependency' => array('radio:tab_options[type]' => array('normal', 'tab')),
+      );
+      // Only display the menu selector if menu module is enabled.
+      if (module_exists('menu')) {
+        $form['tab_options']['name'] = array(
+          '#title' => t('Menu'),
+          '#type' => 'select',
+          '#options' => menu_get_menus(),
+          '#default_value' => $tab_options['name'],
+          '#description' => t('Insert item into an available menu.'),
           '#process' => array('views_process_dependency'),
-          '#dependency' => array('radio:tab_options[type]' => array('normal', 'tab')),
+          '#dependency' => array('radio:tab_options[type]' => array('normal')),
         );
-        $form['tab_options']['description'] = array(
-          '#title' => t('Description'),
-          '#type' => 'textfield',
-          '#default_value' => $tab_options['description'],
-          '#description' => t('If creating a parent menu item, enter the description of the item.'),
-          '#process' => array('views_process_dependency'),
-          '#dependency' => array('radio:tab_options[type]' => array('normal', 'tab')),
+      }
+      else {
+        $form['tab_options']['name'] = array(
+          '#type' => 'value',
+          '#value' => $tab_options['name'],
         );
-        // Only display the menu selector if menu module is enabled.
-        if (module_exists('menu')) {
-          $form['tab_options']['name'] = array(
-            '#title' => t('Menu'),
-            '#type' => 'select',
-            '#options' => menu_get_menus(),
-            '#default_value' => $tab_options['name'],
-            '#description' => t('Insert item into an available menu.'),
-            '#process' => array('views_process_dependency'),
-            '#dependency' => array('radio:tab_options[type]' => array('normal')),
-          );
-        }
-        else {
-          $form['tab_options']['name'] = array(
-            '#type' => 'value',
-            '#value' => $tab_options['name'],
-          );
-          $form['tab_options']['markup'] = array(
-            '#value' => t('Menu selection requires the activation of menu module.'),
-          );
-        }
-        $form['tab_options']['weight'] = array(
-          '#suffix' => '</div>',
-          '#title' => t('Tab weight'),
-          '#type' => 'textfield',
-          '#default_value' => $tab_options['weight'],
-          '#size' => 5,
-          '#description' => t('If the parent menu item is a tab, enter the weight of the tab. The lower the number, the more to the left it will be.'),
-          '#process' => array('views_process_dependency'),
-          '#dependency' => array('radio:tab_options[type]' => array('tab')),
+        $form['tab_options']['markup'] = array(
+          '#value' => t('Menu selection requires the activation of menu module.'),
         );
-        break;
+      }
+      $form['tab_options']['weight'] = array(
+        '#suffix' => '</div>',
+        '#title' => t('Tab weight'),
+        '#type' => 'textfield',
+        '#default_value' => $tab_options['weight'],
+        '#size' => 5,
+        '#description' => t('If the parent menu item is a tab, enter the weight of the tab. The lower the number, the more to the left it will be.'),
+        '#process' => array('views_process_dependency'),
+        '#dependency' => array('radio:tab_options[type]' => array('tab')),
+      );
+      break;
     }
   }
 
@@ -435,37 +435,37 @@ 
     // It is very important to call the parent function here:
     parent::options_validate($form, $form_state);
     switch ($form_state['section']) {
-      case 'path':
-        if (strpos($form_state['values']['path'], '$arg') !== FALSE) {
-          form_error($form['path'], t('"$arg" is no longer supported. Use % instead.'));
-        }
+    case 'path':
+      if (strpos($form_state['values']['path'], '$arg') !== FALSE) {
+        form_error($form['path'], t('"$arg" is no longer supported. Use % instead.'));
+      }
 
-        if (strpos($form_state['values']['path'], '%') === 0) {
-          form_error($form['path'], t('"%" may not be used for the first segment of a path.'));
-        }
+      if (strpos($form_state['values']['path'], '%') === 0) {
+        form_error($form['path'], t('"%" may not be used for the first segment of a path.'));
+      }
 
-        // automatically remove '/' from path.
-        $form_state['values']['path'] = trim($form_state['values']['path'], '/');
+      // automatically remove '/' from path.
+      $form_state['values']['path'] = trim($form_state['values']['path'], '/');
 
-        break;
-      case 'menu':
-        $path = $this->get_option('path');
-        if ($form_state['values']['menu']['type'] == 'normal' && strpos($path, '%') !== FALSE) {
-          form_error($form['menu']['type'], t('Views cannot create normal menu items for paths with a % in them.'));
-        }
+      break;
+    case 'menu':
+      $path = $this->get_option('path');
+      if ($form_state['values']['menu']['type'] == 'normal' && strpos($path, '%') !== FALSE) {
+        form_error($form['menu']['type'], t('Views cannot create normal menu items for paths with a % in them.'));
+      }
 
-        if ($form_state['values']['menu']['type'] == 'default tab' || $form_state['values']['menu']['type'] == 'tab') {
-          $bits = explode('/', $path);
-          $last = array_pop($bits);
-          if ($last == '%') {
-            form_error($form['menu']['type'], t('A display whose path ends with a % cannot be a tab.'));
-          }
+      if ($form_state['values']['menu']['type'] == 'default tab' || $form_state['values']['menu']['type'] == 'tab') {
+        $bits = explode('/', $path);
+        $last = array_pop($bits);
+        if ($last == '%') {
+          form_error($form['menu']['type'], t('A display whose path ends with a % cannot be a tab.'));
         }
+      }
 
-        if ($form_state['values']['menu']['type'] != 'none' && empty($form_state['values']['menu']['title'])) {
-          form_error($form['menu']['title'], t('Title is required for this menu type.'));
-        }
-        break;
+      if ($form_state['values']['menu']['type'] != 'none' && empty($form_state['values']['menu']['title'])) {
+        form_error($form['menu']['title'], t('Title is required for this menu type.'));
+      }
+      break;
     }
   }
 
@@ -473,19 +473,19 @@ 
     // It is very important to call the parent function here:
     parent::options_submit($form, $form_state);
     switch ($form_state['section']) {
-      case 'path':
-        $this->set_option('path', $form_state['values']['path']);
-        break;
-      case 'menu':
-        $this->set_option('menu', $form_state['values']['menu']);
-        // send ajax form to options page if we use it.
-        if ($form_state['values']['menu']['type'] == 'default tab') {
-          views_ui_add_form_to_stack('display', $this->view, $this->display->id, array('tab_options'));
-        }
-        break;
-      case 'tab_options':
-        $this->set_option('tab_options', $form_state['values']['tab_options']);
-        break;
+    case 'path':
+      $this->set_option('path', $form_state['values']['path']);
+      break;
+    case 'menu':
+      $this->set_option('menu', $form_state['values']['menu']);
+      // send ajax form to options page if we use it.
+      if ($form_state['values']['menu']['type'] == 'default tab') {
+        views_ui_add_form_to_stack('display', $this->view, $this->display->id, array('tab_options'));
+      }
+      break;
+    case 'tab_options':
+      $this->set_option('tab_options', $form_state['values']['tab_options']);
+      break;
     }
   }