@@ -5,6 +5,6 @@ |
||
| 5 | 5 | function render($values) { |
| 6 | 6 | global $user; |
| 7 | 7 | |
| 8 | - return l(t('Send private message'), 'user/' . $user->uid . '/contacts/messages/popup/' . $values->og_membership_etid); |
|
| 8 | + return l(t('Send private message'), 'user/'.$user->uid.'/contacts/messages/popup/'.$values->og_membership_etid); |
|
| 9 | 9 | } |
| 10 | 10 | } |
@@ -10,7 +10,7 @@ discard block |
||
| 10 | 10 | * Get the search adapter and Solr environment for dynamic faceting. |
| 11 | 11 | */ |
| 12 | 12 | function commons_search_solr_search_environment() { |
| 13 | - return "apachesolr@" . apachesolr_default_environment(); |
|
| 13 | + return "apachesolr@".apachesolr_default_environment(); |
|
| 14 | 14 | } |
| 15 | 15 | |
| 16 | 16 | /** |
@@ -23,9 +23,9 @@ discard block |
||
| 23 | 23 | if (empty($env_id)) { |
| 24 | 24 | $env_id = commons_search_solr_search_environment(); |
| 25 | 25 | } |
| 26 | - foreach($facets as $facet) { |
|
| 26 | + foreach ($facets as $facet) { |
|
| 27 | 27 | $facet['settings'] = serialize($facet['settings']); |
| 28 | - $facet['name'] = $env_id . $facet['name']; |
|
| 28 | + $facet['name'] = $env_id.$facet['name']; |
|
| 29 | 29 | $facet['searcher'] = $env_id; |
| 30 | 30 | $merge = db_merge('facetapi') |
| 31 | 31 | ->key(array('name' => $facet['name'])) |
@@ -410,7 +410,7 @@ discard block |
||
| 410 | 410 | * Get the panels subtype for the facet block. |
| 411 | 411 | */ |
| 412 | 412 | function commons_search_solr_panel_facet_subtype($facet_name) { |
| 413 | - return 'facetapi-' . facetapi_hash_delta($facet_name); |
|
| 413 | + return 'facetapi-'.facetapi_hash_delta($facet_name); |
|
| 414 | 414 | } |
| 415 | 415 | |
| 416 | 416 | /** |
@@ -425,7 +425,7 @@ discard block |
||
| 425 | 425 | */ |
| 426 | 426 | function commons_search_solr_environment_form_submit($form, $form_state) { |
| 427 | 427 | if ($form_state['values']['make_default'] == 1) { |
| 428 | - commons_search_solr_create_facets('apachesolr@' . $form_state['build_info']['args']['0']['env_id']); |
|
| 428 | + commons_search_solr_create_facets('apachesolr@'.$form_state['build_info']['args']['0']['env_id']); |
|
| 429 | 429 | // Need to clear caches so we can rebuild block definitions. |
| 430 | 430 | cache_clear_all('*', 'cache_block', TRUE); |
| 431 | 431 | cache_clear_all('*', 'cache_apachesolr', TRUE); |
@@ -482,7 +482,7 @@ discard block |
||
| 482 | 482 | * Implements hook_apachesolr_process_results(). |
| 483 | 483 | */ |
| 484 | 484 | function commons_search_solr_apachesolr_process_results(&$results, DrupalSolrQueryInterface $query) { |
| 485 | - foreach($results AS $rkey => $result) { |
|
| 485 | + foreach ($results AS $rkey => $result) { |
|
| 486 | 486 | if ($results[$rkey]['fields']['entity_type'] == 'node') { |
| 487 | 487 | if ($node = node_load($results[$rkey]['fields']['entity_id'])) { |
| 488 | 488 | $node_view = node_view($node, 'teaser'); |
@@ -50,7 +50,7 @@ discard block |
||
| 50 | 50 | $pane->pid = 'new-463814d4-a8ba-7b94-c9d5-77faae3cea01'; |
| 51 | 51 | $pane->panel = 'two_33_66_first'; |
| 52 | 52 | $pane->type = 'block'; |
| 53 | - $pane->subtype = commons_search_solr_panel_facet_subtype(commons_search_solr_search_environment() . ':block:sm_og_group_ref'); |
|
| 53 | + $pane->subtype = commons_search_solr_panel_facet_subtype(commons_search_solr_search_environment().':block:sm_og_group_ref'); |
|
| 54 | 54 | $pane->shown = TRUE; |
| 55 | 55 | $pane->access = array(); |
| 56 | 56 | $pane->configuration = array( |
@@ -72,7 +72,7 @@ discard block |
||
| 72 | 72 | $pane->pid = 'new-7accd7bf-9b29-ce34-8de0-528f3a89ba02'; |
| 73 | 73 | $pane->panel = 'two_33_66_first'; |
| 74 | 74 | $pane->type = 'block'; |
| 75 | - $pane->subtype = commons_search_solr_panel_facet_subtype(commons_search_solr_search_environment() . ':block:im_field_topics'); |
|
| 75 | + $pane->subtype = commons_search_solr_panel_facet_subtype(commons_search_solr_search_environment().':block:im_field_topics'); |
|
| 76 | 76 | $pane->shown = TRUE; |
| 77 | 77 | $pane->access = array(); |
| 78 | 78 | $pane->configuration = array( |
@@ -94,7 +94,7 @@ discard block |
||
| 94 | 94 | $pane->pid = 'new-0ff4a758-76a3-1944-29fe-a19ae7f1abd1'; |
| 95 | 95 | $pane->panel = 'two_33_66_first'; |
| 96 | 96 | $pane->type = 'block'; |
| 97 | - $pane->subtype = commons_search_solr_panel_facet_subtype(commons_search_solr_search_environment() . ':block:bundle'); |
|
| 97 | + $pane->subtype = commons_search_solr_panel_facet_subtype(commons_search_solr_search_environment().':block:bundle'); |
|
| 98 | 98 | $pane->shown = TRUE; |
| 99 | 99 | $pane->access = array(); |
| 100 | 100 | $pane->configuration = array( |
@@ -116,7 +116,7 @@ discard block |
||
| 116 | 116 | $pane->pid = 'new-971af469-d142-9b34-4d91-7d2b2b06d750'; |
| 117 | 117 | $pane->panel = 'two_33_66_first'; |
| 118 | 118 | $pane->type = 'block'; |
| 119 | - $pane->subtype = commons_search_solr_panel_facet_subtype(commons_search_solr_search_environment() . ':block:author'); |
|
| 119 | + $pane->subtype = commons_search_solr_panel_facet_subtype(commons_search_solr_search_environment().':block:author'); |
|
| 120 | 120 | $pane->shown = TRUE; |
| 121 | 121 | $pane->access = array(); |
| 122 | 122 | $pane->configuration = array( |
@@ -138,7 +138,7 @@ discard block |
||
| 138 | 138 | $pane->pid = 'new-9580c1e3-390b-0954-65a6-3804ab628265'; |
| 139 | 139 | $pane->panel = 'two_33_66_first'; |
| 140 | 140 | $pane->type = 'block'; |
| 141 | - $pane->subtype = commons_search_solr_panel_facet_subtype(commons_search_solr_search_environment() . ':block:created'); |
|
| 141 | + $pane->subtype = commons_search_solr_panel_facet_subtype(commons_search_solr_search_environment().':block:created'); |
|
| 142 | 142 | $pane->shown = TRUE; |
| 143 | 143 | $pane->access = array(); |
| 144 | 144 | $pane->configuration = array( |
@@ -160,7 +160,7 @@ discard block |
||
| 160 | 160 | $pane->pid = 'new-036759bf-aab4-5b04-8d88-81e0debf0e23'; |
| 161 | 161 | $pane->panel = 'two_33_66_first'; |
| 162 | 162 | $pane->type = 'block'; |
| 163 | - $pane->subtype = commons_search_solr_panel_facet_subtype(commons_search_solr_search_environment() . ':block:changed'); |
|
| 163 | + $pane->subtype = commons_search_solr_panel_facet_subtype(commons_search_solr_search_environment().':block:changed'); |
|
| 164 | 164 | $pane->shown = TRUE; |
| 165 | 165 | $pane->access = array(); |
| 166 | 166 | $pane->configuration = array( |
@@ -112,7 +112,7 @@ discard block |
||
| 112 | 112 | ->execute(); |
| 113 | 113 | $user_ids = array_keys($results['user']); |
| 114 | 114 | foreach ($user_ids as $uid) { |
| 115 | - $out_results[] = user_view(user_load($uid), 'search_results');($user_ids); |
|
| 115 | + $out_results[] = user_view(user_load($uid), 'search_results'); ($user_ids); |
|
| 116 | 116 | } |
| 117 | 117 | $build['pager'] = array( |
| 118 | 118 | // As nice as it would be to make this use #theme, it is a bit more |
@@ -159,7 +159,7 @@ discard block |
||
| 159 | 159 | ), |
| 160 | 160 | '#image_style' => '50x50', |
| 161 | 161 | '#path' => array( |
| 162 | - 'path' => 'user/' . $build['#account']->uid, |
|
| 162 | + 'path' => 'user/'.$build['#account']->uid, |
|
| 163 | 163 | 'options' => array( |
| 164 | 164 | 'attributes' => array( |
| 165 | 165 | 'class' => array('user-picture'), |
@@ -174,9 +174,9 @@ discard block |
||
| 174 | 174 | $groups = array(); |
| 175 | 175 | foreach ($build['#account']->og_user_node[LANGUAGE_NONE] AS $og_node) { |
| 176 | 176 | if ($gnode = node_load($og_node['target_id'])) { |
| 177 | - $groups['group-item group-' . $gnode->nid] = array( |
|
| 177 | + $groups['group-item group-'.$gnode->nid] = array( |
|
| 178 | 178 | 'title' => $gnode->title, |
| 179 | - 'href' => 'node/' . $gnode->nid, |
|
| 179 | + 'href' => 'node/'.$gnode->nid, |
|
| 180 | 180 | 'attributes' => array( |
| 181 | 181 | 'class' => array('group-link'), |
| 182 | 182 | ), |
@@ -249,7 +249,7 @@ discard block |
||
| 249 | 249 | $form['custom_search_types']['#options'] = array_merge(array('s-user' => t('People')), $other_options); |
| 250 | 250 | } |
| 251 | 251 | //We want to override the #submit with our own, the other submits aren't relevant for the user page |
| 252 | - $form['#submit'][]= 'commons_search_solr_user_search_submit'; |
|
| 252 | + $form['#submit'][] = 'commons_search_solr_user_search_submit'; |
|
| 253 | 253 | } |
| 254 | 254 | } |
| 255 | 255 | |
@@ -283,8 +283,8 @@ discard block |
||
| 283 | 283 | function commons_search_solr_user_search_submit($form, &$form_state) { |
| 284 | 284 | if ($form_state['values']['custom_search_types'] == 's-user') { |
| 285 | 285 | $user_search_page = apachesolr_search_page_load('user_search'); |
| 286 | - $keys = '/' . $form_state['values']['search_block_form']; |
|
| 287 | - $form_state['redirect'] = $user_search_page['search_path'] . $keys; |
|
| 286 | + $keys = '/'.$form_state['values']['search_block_form']; |
|
| 287 | + $form_state['redirect'] = $user_search_page['search_path'].$keys; |
|
| 288 | 288 | } |
| 289 | 289 | } |
| 290 | 290 | |
@@ -26,7 +26,7 @@ |
||
| 26 | 26 | $form['sort_by']['#title'] = t('sorted by'); |
| 27 | 27 | foreach ($form['type']['#options'] as $type => $name) { |
| 28 | 28 | if ($type != 'All') { |
| 29 | - $form['type']['#options'][$type] = t(strtolower(substr($name, 0, 1)) . substr($name,1) . 's'); |
|
| 29 | + $form['type']['#options'][$type] = t(strtolower(substr($name, 0, 1)).substr($name, 1).'s'); |
|
| 30 | 30 | } |
| 31 | 31 | } |
| 32 | 32 | } |
@@ -145,7 +145,7 @@ |
||
| 145 | 145 | if ($form_state['step'] == 'views_form_views_form' && $vbo->options['vbo_operations']['action::commons_content_moderation_delete_node_block_user']['selected'] == 1) { |
| 146 | 146 | if (module_exists('mollom') && _mollom_access('report to mollom')) { |
| 147 | 147 | $form['mollom_text'] = array( |
| 148 | - '#markup' => '<p>' . t('Deleted content will be reported to Mollom.') . '</p>', |
|
| 148 | + '#markup' => '<p>'.t('Deleted content will be reported to Mollom.').'</p>', |
|
| 149 | 149 | ); |
| 150 | 150 | } |
| 151 | 151 | } |
@@ -36,7 +36,7 @@ discard block |
||
| 36 | 36 | |
| 37 | 37 | if (!isset($commons_entity_integrations)) { |
| 38 | 38 | foreach (module_implements('commons_entity_integration') as $module) { |
| 39 | - $commons_entity_integrations[$module] = call_user_func($module . '_commons_entity_integration'); |
|
| 39 | + $commons_entity_integrations[$module] = call_user_func($module.'_commons_entity_integration'); |
|
| 40 | 40 | } |
| 41 | 41 | } |
| 42 | 42 | |
@@ -140,7 +140,7 @@ discard block |
||
| 140 | 140 | $form['#suffix'] .= '<span class="ajax-new-content"></span>'; |
| 141 | 141 | } |
| 142 | 142 | |
| 143 | - $output = theme('status_messages') . drupal_render($form); |
|
| 143 | + $output = theme('status_messages').drupal_render($form); |
|
| 144 | 144 | $js = drupal_add_js(); |
| 145 | 145 | $settings = call_user_func_array('array_merge_recursive', $js['settings']['data']); |
| 146 | 146 | |
@@ -170,7 +170,7 @@ discard block |
||
| 170 | 170 | */ |
| 171 | 171 | function commons_media_page_build(&$page) { |
| 172 | 172 | $page['page_bottom']['commons_media']['#attached']['css'] = array( |
| 173 | - drupal_get_path('module', 'commons_media') . '/commons_media.css' => array( |
|
| 173 | + drupal_get_path('module', 'commons_media').'/commons_media.css' => array( |
|
| 174 | 174 | 'every_page' => TRUE, |
| 175 | 175 | ), |
| 176 | 176 | ); |
@@ -255,7 +255,7 @@ discard block |
||
| 255 | 255 | function commons_media_form_file_entity_add_upload_alter(&$form, &$form_state, $form_id) { |
| 256 | 256 | // Automatically upload selected files. |
| 257 | 257 | if ($form['#step'] == 1) { |
| 258 | - $form['#attached']['js'][] = drupal_get_path('module', 'commons_media') . '/commons_media_autoupload.js'; |
|
| 258 | + $form['#attached']['js'][] = drupal_get_path('module', 'commons_media').'/commons_media_autoupload.js'; |
|
| 259 | 259 | } |
| 260 | 260 | } |
| 261 | 261 | |
@@ -276,7 +276,7 @@ discard block |
||
| 276 | 276 | $form['options']['fields']['#access'] = FALSE; |
| 277 | 277 | |
| 278 | 278 | // Attach JavaScript to automatically embed files. |
| 279 | - $form['#attached']['js'][] = drupal_get_path('module', 'commons_media') . '/commons_media_autoembed.js'; |
|
| 279 | + $form['#attached']['js'][] = drupal_get_path('module', 'commons_media').'/commons_media_autoembed.js'; |
|
| 280 | 280 | } |
| 281 | 281 | |
| 282 | 282 | /** |
@@ -315,7 +315,7 @@ discard block |
||
| 315 | 315 | // Only move files that aren't currently in use. |
| 316 | 316 | if (empty($usage)) { |
| 317 | 317 | $scheme = 'private://'; |
| 318 | - $uri = file_stream_wrapper_uri_normalize($scheme . $source_file->filename); |
|
| 318 | + $uri = file_stream_wrapper_uri_normalize($scheme.$source_file->filename); |
|
| 319 | 319 | file_move($source_file, $uri, FILE_EXISTS_RENAME); |
| 320 | 320 | } |
| 321 | 321 | } |
@@ -340,7 +340,7 @@ discard block |
||
| 340 | 340 | $collected_fields = array(); |
| 341 | 341 | |
| 342 | 342 | // Determine the list of instances to iterate on. |
| 343 | - list(, , $bundle) = entity_extract_ids($type, $entity); |
|
| 343 | + list(,, $bundle) = entity_extract_ids($type, $entity); |
|
| 344 | 344 | $instances = field_info_instances($type, $bundle); |
| 345 | 345 | $fields = field_info_fields(); |
| 346 | 346 | |
@@ -129,7 +129,7 @@ discard block |
||
| 129 | 129 | * Implements hook_form_alter(). |
| 130 | 130 | */ |
| 131 | 131 | function commons_follow_form_alter(&$form, &$form_state, $form_id) { |
| 132 | - if ($form_id != 'views_exposed_form' || strpos($form['#id'],'views-exposed-form-commons-bw') !== 0 || empty($form['following'])) { |
|
| 132 | + if ($form_id != 'views_exposed_form' || strpos($form['#id'], 'views-exposed-form-commons-bw') !== 0 || empty($form['following'])) { |
|
| 133 | 133 | return; |
| 134 | 134 | } |
| 135 | 135 | |
@@ -206,7 +206,7 @@ discard block |
||
| 206 | 206 | // We don't use module_invoke_all() is we want to retain the array keys, |
| 207 | 207 | // which are the user IDs. |
| 208 | 208 | foreach (module_implements('commons_follow_get_nids') as $module) { |
| 209 | - $function = $module . '_commons_follow_get_nids'; |
|
| 209 | + $function = $module.'_commons_follow_get_nids'; |
|
| 210 | 210 | $result = $function($account, $options); |
| 211 | 211 | if (empty($result)) { |
| 212 | 212 | continue; |
@@ -258,7 +258,7 @@ discard block |
||
| 258 | 258 | function commons_follow_views_api() { |
| 259 | 259 | return array( |
| 260 | 260 | 'api' => 3, |
| 261 | - 'path' => drupal_get_path('module', 'commons_follow') . '/includes/views', |
|
| 261 | + 'path' => drupal_get_path('module', 'commons_follow').'/includes/views', |
|
| 262 | 262 | ); |
| 263 | 263 | } |
| 264 | 264 | |
@@ -328,7 +328,7 @@ discard block |
||
| 328 | 328 | $followed_content = commons_follow_get_followed_content($account); |
| 329 | 329 | $followed_mids = array(); |
| 330 | 330 | foreach ($followed_content as $key => $content) { |
| 331 | - $function = $key . '_commons_follow_get_message_ids'; |
|
| 331 | + $function = $key.'_commons_follow_get_message_ids'; |
|
| 332 | 332 | if (function_exists($function)) { |
| 333 | 333 | $function($followed_mids, $followed_content); |
| 334 | 334 | } |
@@ -346,11 +346,11 @@ discard block |
||
| 346 | 346 | return; |
| 347 | 347 | } |
| 348 | 348 | global $user; |
| 349 | - $prefix = variable_get('message_subscribe_flag_prefix', 'subscribe') . '_'; |
|
| 350 | - if(strpos($view->name, $prefix) === 0 && isset($view->args[0]) && $user->uid != $view->args[0]) { |
|
| 349 | + $prefix = variable_get('message_subscribe_flag_prefix', 'subscribe').'_'; |
|
| 350 | + if (strpos($view->name, $prefix) === 0 && isset($view->args[0]) && $user->uid != $view->args[0]) { |
|
| 351 | 351 | $flag_content_keys = array_keys($query->table_queue); |
| 352 | - foreach($flag_content_keys AS $key) { |
|
| 353 | - if(strpos($key, 'flag_content') === 0) { |
|
| 352 | + foreach ($flag_content_keys AS $key) { |
|
| 353 | + if (strpos($key, 'flag_content') === 0) { |
|
| 354 | 354 | //Convert the Send Email Query |
| 355 | 355 | $join = $query->table_queue[$key]['join']; |
| 356 | 356 | $join->extra[1] = array( |
@@ -15,7 +15,7 @@ |
||
| 15 | 15 | ); |
| 16 | 16 | |
| 17 | 17 | $form['explanation'] = array( |
| 18 | - '#markup' => '<p>' . t("Control how you are notified of new content and activity. When you follow a group, topic, user, or other content, you'll see updates in your content and activity streams, and you will automatically get email updates unlesss you disable emails or unfollow.") . '</p>', |
|
| 18 | + '#markup' => '<p>'.t("Control how you are notified of new content and activity. When you follow a group, topic, user, or other content, you'll see updates in your content and activity streams, and you will automatically get email updates unlesss you disable emails or unfollow.").'</p>', |
|
| 19 | 19 | ); |
| 20 | 20 | |
| 21 | 21 | $form['message_subscribe_email'] = array( |