From 8f7fbe378647e782dfb347212f93a4084642c708 Mon Sep 17 00:00:00 2001 From: frega Date: Wed, 20 May 2015 22:07:35 +0200 Subject: [PATCH] Run drupalcs adding and fixing coding standards as well as small issues w/ t() functions --- eck_shared_entities.module | 18 ++++++++++--- .../eck/property_behavior/shared_entity.inc | 25 ++++++++++++++--- .../property_behavior/shared_entity_title.inc | 27 ++++++++++++++++--- .../SharedEntities_SelectionHandler.class.php | 17 +++++++++--- .../shared_entites_selection_handler.inc | 11 ++++++-- 5 files changed, 82 insertions(+), 16 deletions(-) diff --git a/eck_shared_entities.module b/eck_shared_entities.module index 4dd385d..f37898d 100644 --- a/eck_shared_entities.module +++ b/eck_shared_entities.module @@ -1,4 +1,11 @@ name . ' ' . $bundle->name . ' entities' => array( - 'title' => t('Can edit share flag for ' . $bundle->label . ' entities'), - 'description' => t('Allow the user to mark ' . $bundle->label . ' (' . $entity_type->label . ') entities as shared.'), + 'title' => t('Can edit share flag for @bundle_label entities', array( + '@bundle_label' => $bundle->label, + )), + 'description' => t('Allow the user to mark @bundle_label (@entity_type_label) entities as shared.', array( + '@bundle_label' => $bundle->label, + '@entity_type_label' => $entity_type->label, + )), ), ); } @@ -84,4 +96,4 @@ function eck_shared_entities_query_shared_entities_alter(QueryAlterableInterface } $query->condition($filter_condition); -} \ No newline at end of file +} diff --git a/plugins/eck/property_behavior/shared_entity.inc b/plugins/eck/property_behavior/shared_entity.inc index 3403e86..07c77ce 100644 --- a/plugins/eck/property_behavior/shared_entity.inc +++ b/plugins/eck/property_behavior/shared_entity.inc @@ -1,9 +1,28 @@ 'Shared Entity Flag', - 'default_widget' => 'eck_shared_entities_shared_entity_property_widget' + 'default_widget' => 'eck_shared_entities_shared_entity_property_widget', ); +/** + * Returns array defining share entity flag widget. + * + * @param string $property + * Name of the property + * @param array $vars + * Additional variables passed to property widget. + * + * @return array + * Return array of defining share entity flag widget. + */ function eck_shared_entities_shared_entity_property_widget($property, $vars) { $entity = $vars['entity']; list($id) = entity_extract_ids($entity->entityType(), $entity); @@ -15,8 +34,8 @@ function eck_shared_entities_shared_entity_property_widget($property, $vars) { '#description' => t('Share this @label entity to make it available for reuse.', array('@label' => $entity->type)), '#attributes' => array('data-shared-entity-flag-' . $entity->entityType() => $id), '#weight' => 90, - '#disabled' => !(user_access('edit share flag for all entities') || user_access('edit share flag for ' . $entity->entityType() . ' ' . $entity->type . ' entities')) + '#disabled' => !(user_access('edit share flag for all entities') || user_access('edit share flag for ' . $entity->entityType() . ' ' . $entity->type . ' entities')), ); return $shared_entity_widget; -} \ No newline at end of file +} diff --git a/plugins/eck/property_behavior/shared_entity_title.inc b/plugins/eck/property_behavior/shared_entity_title.inc index e09b531..efcaf96 100644 --- a/plugins/eck/property_behavior/shared_entity_title.inc +++ b/plugins/eck/property_behavior/shared_entity_title.inc @@ -1,9 +1,28 @@ 'Shared Entity Title (required for the shared flag)', - 'default_widget' => 'eck_shared_entities_shared_entity_title_property_widget' + 'default_widget' => 'eck_shared_entities_shared_entity_title_property_widget', ); +/** + * Returns array defining shared entity title widget. + * + * @param string $property + * Name of the property + * @param array $vars + * Additional variables passed to property widget. + * + * @return array + * Return array of defining share entity title widget. + */ function eck_shared_entities_shared_entity_title_property_widget($property, $vars) { $entity = $vars['entity']; list($id) = entity_extract_ids($entity->entityType(), $entity); @@ -19,9 +38,9 @@ function eck_shared_entities_shared_entity_title_property_widget($property, $var '#states' => array( 'visible' => array( '[data-shared-entity-flag-' . $entity->entityType() . '="' . $id . '"]:input' => array('checked' => TRUE), - ) - ) + ), + ), ); return $shared_entity_title_widget; -} \ No newline at end of file +} diff --git a/plugins/entityreference/selection/SharedEntities_SelectionHandler.class.php b/plugins/entityreference/selection/SharedEntities_SelectionHandler.class.php index cbc39d7..50a3b86 100644 --- a/plugins/entityreference/selection/SharedEntities_SelectionHandler.class.php +++ b/plugins/entityreference/selection/SharedEntities_SelectionHandler.class.php @@ -1,8 +1,16 @@ $entity) { list(,, $bundle) = entity_extract_ids($entity_type, $entity); - // Use shared entity title when available + // Use shared entity title when available. if (isset($entity->shared_title) && trim($entity->shared_title) !== '') { $label = trim($entity->shared_title); - } else { + } + else { $label = $this->getLabel($entity); } $options[$bundle][$entity_id] = check_plain($label); @@ -66,4 +75,4 @@ public function getReferencableEntities($match = NULL, $match_operator = 'CONTAI return $options; } -} \ No newline at end of file +} diff --git a/plugins/entityreference/selection/shared_entites_selection_handler.inc b/plugins/entityreference/selection/shared_entites_selection_handler.inc index b66a516..6419112 100644 --- a/plugins/entityreference/selection/shared_entites_selection_handler.inc +++ b/plugins/entityreference/selection/shared_entites_selection_handler.inc @@ -1,5 +1,12 @@ t('Only shared entities'), - 'class' => 'SharedEntities_SelectionHandler' -); \ No newline at end of file + 'class' => 'SharedEntitiesSelectionHandler', +);