? nodereferrer_codestyle.patch Index: nodereferrer.install =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/nodereferrer/nodereferrer.install,v retrieving revision 1.3 diff -u -p -r1.3 nodereferrer.install --- nodereferrer.install 5 Mar 2009 03:30:38 -0000 1.3 +++ nodereferrer.install 4 Aug 2009 07:06:04 -0000 @@ -1,5 +1,9 @@ $v) { $data[$k] = array(); } - } else { + } + else { $data = array(); } return $data; @@ -70,7 +72,7 @@ function nodereferrer_field_settings($op ); $options = nodereferrer_nodereference_field_options(); - $form['referrer_fields'] = array ( + $form['referrer_fields'] = array( '#type' => 'checkboxes', '#title' => t('Referring Fields'), '#multiple' => TRUE, @@ -162,8 +164,8 @@ function nodereferrer_field($op, &$node, // clear any modules referring to me as my title or other data may change. // and nodereference doesn't clear the cache yet. - foreach (nodereferrer_referrers($node->nid, $fields, $types, false) as $delta => $item) { - $cid = 'content:'. $item['nid'] .':'. $item['vid']; + foreach (nodereferrer_referrers($node->nid, $fields, $types, FALSE) as $delta => $item) { + $cid = 'content:' . $item['nid'] . ':' . $item['vid']; cache_clear_all($cid, 'cache_page'); } return; @@ -262,9 +264,9 @@ function nodereferrer_theme_formatter($f $themed_items = array(); foreach ($items as $i) { $i['field'] = $info; // Add some extra information the themer might like to have - $themed_items[] = theme('nodereferrer_field_'.$formatter, $i); + $themed_items[] = theme('nodereferrer_field_' . $formatter, $i); } - $out = theme_item_list($themed_items).$pager; + $out = theme_item_list($themed_items) . $pager; return $out; } @@ -277,7 +279,7 @@ function theme_nodereferrer_formatter_de } function theme_nodereferrer_field_default($element) { - return l($element['title'], 'node/'. $element['nid']); + return l($element['title'], 'node/' . $element['nid']); } /** @@ -330,7 +332,7 @@ function nodereferrer_widget_info() { } /** - * Implementation of hook_content_is_empty + * Implementation of hook_content_is_empty(). */ function nodereferrer_content_is_empty($item, $field) { return TRUE; @@ -345,12 +347,12 @@ function nodereferrer_content_is_empty($ * @param nodetypes * array of node types to be checked for referrers * @param translations - * boolean if true, also return nodes that referrer to translations of the given node + * boolean if TRUE, also return nodes that referrer to translations of the given node */ function nodereferrer_referrers($nid, $fieldnames = array(), $nodetypes = array(), $translations = 0, $order = 'DESC') { if ($nodetypes) { - $filter_nodetypes = "AND n.type IN ('". implode("', '", $nodetypes) ."')"; + $filter_nodetypes = "AND n.type IN ('" . implode("', '", $nodetypes) . "')"; } else { $filter_nodetypes = ''; @@ -384,7 +386,7 @@ function nodereferrer_referrers($nid, $ $values = array(); - foreach($fieldnames as $fieldname) { + foreach ($fieldnames as $fieldname) { if ($fields[$fieldname]['type'] == 'nodereference') { $db_info = content_database_info($fields[$fieldname]); @@ -392,18 +394,19 @@ function nodereferrer_referrers($nid, $ $query = "SELECT n.nid, n.vid, n.title FROM {" . $db_info['table'] . "} nr INNER JOIN {node} current_node ON current_node.nid = %d - INNER JOIN {node} n ON n.vid = nr.vid AND n.status = 1 ". $filter_nodetypes ." + INNER JOIN {node} n ON n.vid = nr.vid AND n.status = 1 " . $filter_nodetypes . " LEFT JOIN {node} translations ON current_node.tnid > 0 AND translations.tnid = current_node.tnid WHERE (current_node.tnid = 0 AND nr." . $db_info['columns']['nid']['column'] . " = current_node.nid) OR (current_node.tnid > 0 AND nr." . $db_info['columns']['nid']['column'] . " = translations.nid) - ORDER BY ". $order; - } else { + ORDER BY " . $order; + } + else { $query = "SELECT n.nid, n.vid, n.title FROM {" . $db_info['table'] . "} nr - INNER JOIN {node} n ON n.vid = nr.vid AND n.status = 1 ". $filter_nodetypes ." + INNER JOIN {node} n ON n.vid = nr.vid AND n.status = 1 " . $filter_nodetypes . " WHERE nr." . $db_info['columns']['nid']['column'] . " = %d - ORDER BY ". $order; + ORDER BY " . $order; } $query = db_rewrite_sql($query); @@ -425,16 +428,16 @@ function nodereferrer_referrers($nid, $ function nodereferrer_nodereference_field_options() { $options = array(); $types = content_fields(); - foreach($types as $type) { + foreach ($types as $type) { if ($type['type'] == 'nodereference') { - $options[$type['field_name']] = $type['field_name'] .' ('. $type['widget']['label'] .')'; + $options[$type['field_name']] = $type['field_name'] . ' (' . $type['widget']['label'] . ')'; } } return $options; } /** - * Implementation of hook_nodeapi + * Implementation of hook_nodeapi(). */ function nodereferrer_nodeapi($node, $op) { switch ($op) { @@ -450,7 +453,7 @@ function nodereferrer_nodeapi($node, $op // when the referencing node is updated. if ($field['type'] == 'nodereference') { $node_field = isset($node->$field['field_name']) ? $node->$field['field_name'] : array(); - foreach($node_field as $delta => $item) { + foreach ($node_field as $delta => $item) { $nids[$item['nid']] = $item['nid']; } } @@ -475,12 +478,12 @@ function nodereferrer_nodeapi($node, $op } /** - * Implementation of hook_views_api + * Implementation of hook_views_api(). */ function nodereferrer_views_api() { return array( 'api' => '2.0', - 'path' => drupal_get_path('module', 'nodereferrer').'/views', + 'path' => drupal_get_path('module', 'nodereferrer') . '/views', ); } Index: views/nodereferrer.views.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/nodereferrer/views/nodereferrer.views.inc,v retrieving revision 1.2 diff -u -p -r1.2 nodereferrer.views.inc --- views/nodereferrer.views.inc 17 Jun 2009 16:07:12 -0000 1.2 +++ views/nodereferrer.views.inc 4 Aug 2009 07:06:05 -0000 @@ -1,5 +1,9 @@ 'nid', 'help' => t('Allows views to query the node\'s references by a certain node type.'), 'filter' => array( - 'handler' =>'nodereferrer_view_handler_filter_type', + 'handler' => 'nodereferrer_view_handler_filter_type', ), 'argument' => array( 'handler' => 'nodereferrer_view_handler_argument_type', @@ -55,7 +59,7 @@ function nodereferrer_views_data_alter(& function nodereferrer_views_handlers() { return array( 'info' => array( - 'path' => drupal_get_path('module', 'nodereferrer').'/views', + 'path' => drupal_get_path('module', 'nodereferrer') . '/views', ), 'handlers' => array( 'nodereferrer_view_handler_filter' => array( Index: views/nodereferrer_view_handler_argument.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/nodereferrer/views/nodereferrer_view_handler_argument.inc,v retrieving revision 1.1 diff -u -p -r1.1 nodereferrer_view_handler_argument.inc --- views/nodereferrer_view_handler_argument.inc 5 Mar 2009 03:51:08 -0000 1.1 +++ views/nodereferrer_view_handler_argument.inc 4 Aug 2009 07:06:05 -0000 @@ -1,4 +1,9 @@ t('Return nodes that refer to given node id'), 'not in' => t('Do not return nodes that do not refer to given node id'), ), - '#required' => true, + '#required' => TRUE, ); $form['fields'] = array( @@ -37,8 +42,8 @@ class nodereferrer_view_handler_argument if (module_exists('translation')) { $form['multilingual'] = array( '#type' => 'fieldset', - '#collapsible' => 'true', - '#collapsed' => 'true', + '#collapsible' => TRUE, + '#collapsed' => TRUE, '#title' => t('Multilingual options'), ); @@ -84,12 +89,13 @@ class nodereferrer_view_handler_argument if ($this->options['operator'] == 'in') { $this->query->add_where($this->options['group'], 'FALSE'); } - } else { - $in = '('.implode(', ',$list).')'; + } + else { + $in = '(' . implode(', ', $list) . ')'; $this->query->add_where( $this->options['group'], - "$this->table_alias.$this->real_field " . $this->options['operator'].' '.$in + "$this->table_alias . $this->real_field " . $this->options['operator'] . ' ' . $in ); } } @@ -98,7 +104,7 @@ class nodereferrer_view_handler_argument * Given a node id, field names and content names, returns the list of nodes * that refer to the given node. This takes translation settings into account */ - function referrers($nid, $fields, $types = null) { + function referrers($nid, $fields, $types = NULL) { return array_keys(nodereferrer_referrers_with_translations( $nid, $fields, $types, !empty($this->options['multilingual']['referrers_of_translations']), Index: views/nodereferrer_view_handler_argument_field.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/nodereferrer/views/nodereferrer_view_handler_argument_field.inc,v retrieving revision 1.1 diff -u -p -r1.1 nodereferrer_view_handler_argument_field.inc --- views/nodereferrer_view_handler_argument_field.inc 5 Mar 2009 03:51:08 -0000 1.1 +++ views/nodereferrer_view_handler_argument_field.inc 4 Aug 2009 07:06:05 -0000 @@ -1,4 +1,9 @@ argument; if (empty($this->options['fields'])) { $fields = array_keys(nodereferrer_nodereference_field_options()); - } else { + } + else { $fields = array_keys(array_filter($this->options['fields'])); } Index: views/nodereferrer_view_handler_argument_type.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/nodereferrer/views/nodereferrer_view_handler_argument_type.inc,v retrieving revision 1.1 diff -u -p -r1.1 nodereferrer_view_handler_argument_type.inc --- views/nodereferrer_view_handler_argument_type.inc 5 Mar 2009 03:51:08 -0000 1.1 +++ views/nodereferrer_view_handler_argument_type.inc 4 Aug 2009 07:06:05 -0000 @@ -1,4 +1,9 @@ 'fieldset', - '#collapsible' => 'true', - '#collapsed' => 'true', + '#collapsible' => TRUE, + '#collapsed' => TRUE, '#title' => t('Multilingual options'), ); @@ -85,7 +90,7 @@ class nodereferrer_view_handler_field ex * Given a node id, field names and content names, returns the list of nodes * that refer to the given node. This takes translation settings into account */ - function referrers($nid, $fields, $types = null) { + function referrers($nid, $fields, $types = NULL) { return nodereferrer_referrers_with_translations( $nid, $fields, $types, !empty($this->options['multilingual']['referrers_of_translations']), @@ -100,15 +105,17 @@ class nodereferrer_view_handler_field ex function render($values) { $list = $this->get_item_list($values->nid); foreach ($list as $k => $v) { - $list[$k] = theme('nodereferrer_field_'.$this->options['formatter'], $v); + $list[$k] = theme('nodereferrer_field_' . $this->options['formatter'], $v); } if ($this->options['list'] == 'list') { if (count($list)) { - return '