Conjunto de cambios 59029b2 en sipes para modules_contrib/views/modules/user/views_plugin_argument_validate_user.inc

Fecha y hora:

26/05/2016 14:17:08 (hace 8 años)

Autor:

José Gregorio Puentes <jpuentes@…>

Branches:

stable, version-3.0

Children:

32a0eb4

Parents:

b907fa2

Mensaje:

se actualizo la version del modulo views

Fichero:

• modules_contrib/views/modules/user/views_plugin_argument_validate_user.inc (modificado) (5 diferencias)

modules_contrib/views/modules/user/views_plugin_argument_validate_user.inc

@@ -9 +9 @@
  */
 class views_plugin_argument_validate_user extends views_plugin_argument_validate {
-  function validate_form(&$form, &$form_state) {
-    // We are unable to rely on options having already been set, so let's make
-    // sure defaults are here:
-    if (!isset($this->argument->options['validate_user_argument_type'])) {
-      $this->argument->options['validate_user_argument_type'] = 'uid';
-      $this->argument->options['validate_user_roles'] = array();
-    }
+  function option_definition() {
+    $options = parent::option_definition();
+    $options['type'] = array('default' => 'uid');
+    $options['restrict_roles'] = array('default' => FALSE);
+    $options['roles'] = array('default' => array());
 
-    $form['validate_user_argument_type'] = array(
+    return $options;
+  }
+
+  function options_form(&$form, &$form_state) {
+    $form['type'] = array(
       '#type' => 'radios',
       '#title' => t('Type of user argument to allow'),
@@ -25 +27 @@
         'either' => t('Allow both numeric UIDs and string usernames'),
       ),
-      '#default_value' => $this->argument->options['validate_user_argument_type'],
-      '#process' => array('expand_radios', 'views_process_dependency'),
-      '#dependency' => array('edit-options-validate-type' => array($this->id)),
-      '#prefix' => '<div id="edit-options-validate-user-argument-type-wrapper">',
-      '#suffix' => '</div>',
+      '#default_value' => $this->options['type'],
     );
 
-    $form['validate_user_restrict_roles'] = array(
+    $form['restrict_roles'] = array(
       '#type' => 'checkbox',
       '#title' => t('Restrict user based on role'),
-      '#default_value' => !empty($this->argument->options['validate_user_restrict_roles']),
-      '#process' => array('views_process_dependency'),
-      '#dependency' => array('edit-options-validate-type' => array($this->id)),
+      '#default_value' => $this->options['restrict_roles'],
     );
 
-    $form['validate_user_roles'] = array(
+    $form['roles'] = array(
       '#type' => 'checkboxes',
-      '#prefix' => '<div id="edit-options-validate-user-roles-wrapper">',
+      '#prefix' => '<div id="edit-options-argument-validate-user-roles-wrapper">',
       '#suffix' => '</div>',
       '#title' => t('Restrict to the selected roles'),
       '#options' => user_roles(TRUE),
-      '#default_value' => $this->argument->options['validate_user_roles'],
+      '#default_value' => $this->options['roles'],
       '#description' => t('If no roles are selected, users from any role will be allowed.'),
       '#process' => array('expand_checkboxes', 'views_process_dependency'),
       '#dependency' => array(
-        'edit-options-validate-type' => array($this->id),
-        'edit-options-validate-user-restrict-roles' => array(1),
+        'edit-options-argument-validate-user-restrict-roles' => array(1),
       ),
-      '#dependency_count' => 2,
     );
   }
 
+  function options_submit($form, &$form_state, &$options) {
+    // filter trash out of the options so we don't store giant unnecessary arrays
+    $options['roles'] = array_filter($options['roles']);
+  }
+
+  function convert_options(&$options) {
+    if (!isset($options['type']) && isset($this->argument->options['validate_user_argument_type'])) {
+      $options['type'] = $this->argument->options['validate_user_argument_type'];
+      $options['restrict_roles'] = $this->argument->options['validate_user_restrict_roles'];
+      $options['roles'] = $this->argument->options['validate_user_roles'];
+    }
+  }
+
   function validate_argument($argument) {
-    $type = $this->argument->options['validate_user_argument_type'];
+    $type = $this->options['type'];
     // is_numeric() can return false positives, so we ensure it's an integer.
     // However, is_integer() will always fail, since $argument is a string.
@@ -97 +104 @@
 
     // See if we're filtering users based on roles.
-    if (!empty($this->argument->options['validate_user_restrict_roles']) && !empty($this->argument->options['validate_user_roles'])) {
-      $roles = $this->argument->options['validate_user_roles'];
+    if (!empty($this->options['restrict_roles']) && !empty($this->options['roles'])) {
+      $roles = $this->options['roles'];
       $account->roles = array();
       $account->roles[] = $account->uid ? DRUPAL_AUTHENTICATED_RID : DRUPAL_ANONYMOUS_RID;
@@ -105 +112 @@
         $account->roles[] = $role->rid;
       }
-      if (!(bool)array_intersect($account->roles, $roles)) {
+      if (!(bool) array_intersect($account->roles, $roles)) {
         return FALSE;
       }
@@ -111 +118 @@
 
     $this->argument->argument = $account->uid;
-    $this->argument->validated_title = check_plain($account->name);
+    $this->argument->validated_title = isset($account->name) ? check_plain($account->name) : check_plain(variable_get('anonymous', t('Anonymous')));
     return TRUE;
   }
 }
-