@@ -25,7 +25,7 @@ discard block |
||
| 25 | 25 | // there are no unread messages or invitations. |
| 26 | 26 | if (empty($unread_invitations) && empty($unread_messages)) { |
| 27 | 27 | $links['no-unread-messages'] = array( |
| 28 | - 'href' => 'user/' . $user->uid . '/contacts', |
|
| 28 | + 'href' => 'user/'.$user->uid.'/contacts', |
|
| 29 | 29 | 'query' => array('qt-commons_trusted_contacts' => 'messages'), |
| 30 | 30 | 'title' => t('No unread messages'), |
| 31 | 31 | 'weight' => -9, |
@@ -34,8 +34,8 @@ discard block |
||
| 34 | 34 | |
| 35 | 35 | // Add a link to the user's invitations. |
| 36 | 36 | if ($unread_invitations) { |
| 37 | - $links['unread-invitations']= array( |
|
| 38 | - 'href' => 'user/' . $user->uid . '/contacts', |
|
| 37 | + $links['unread-invitations'] = array( |
|
| 38 | + 'href' => 'user/'.$user->uid.'/contacts', |
|
| 39 | 39 | 'query' => array('qt-commons_trusted_contacts' => 'invitations'), |
| 40 | 40 | 'title' => format_plural($unread_invitations, '1 invitation', '@count invitations'), |
| 41 | 41 | 'weight' => -8, |
@@ -44,8 +44,8 @@ discard block |
||
| 44 | 44 | |
| 45 | 45 | // Add a link to the user's unread messages. |
| 46 | 46 | if ($unread_messages) { |
| 47 | - $links['unread-messages']= array( |
|
| 48 | - 'href' => 'user/' . $user->uid . '/contacts', |
|
| 47 | + $links['unread-messages'] = array( |
|
| 48 | + 'href' => 'user/'.$user->uid.'/contacts', |
|
| 49 | 49 | 'query' => array('qt-commons_trusted_contacts' => 'messages'), |
| 50 | 50 | 'title' => format_plural($unread_messages, '1 message', '@count messages'), |
| 51 | 51 | 'weight' => -7, |
@@ -79,7 +79,7 @@ discard block |
||
| 79 | 79 | 'page callback' => 'commons_trusted_contacts_request_trust', |
| 80 | 80 | 'page arguments' => array(1, 3), |
| 81 | 81 | 'access callback' => 'commons_trusted_contacts_request_trust_access', |
| 82 | - 'access arguments' => array(1,2), |
|
| 82 | + 'access arguments' => array(1, 2), |
|
| 83 | 83 | 'type' => MENU_CALLBACK, |
| 84 | 84 | ); |
| 85 | 85 | |
@@ -262,20 +262,20 @@ discard block |
||
| 262 | 262 | $view->get_total_rows = TRUE; |
| 263 | 263 | $view->execute(); |
| 264 | 264 | $tabs['contacts'] = array( |
| 265 | - 'title' => t('Trusted Contacts') . ' <span class="commons-bw-result-count">' . $view->total_rows . '</span>', |
|
| 265 | + 'title' => t('Trusted Contacts').' <span class="commons-bw-result-count">'.$view->total_rows.'</span>', |
|
| 266 | 266 | 'contents' => views_embed_view('trusted_contacts'), |
| 267 | 267 | ); |
| 268 | 268 | |
| 269 | 269 | module_load_include('inc', 'privatemsg', 'privatemsg.pages'); |
| 270 | 270 | |
| 271 | 271 | $tabs['messages'] = array( |
| 272 | - 'title' => t('Messages') . ' <span class="commons-bw-result-count">' . privatemsg_unread_count($account) . '</span>', |
|
| 272 | + 'title' => t('Messages').' <span class="commons-bw-result-count">'.privatemsg_unread_count($account).'</span>', |
|
| 273 | 273 | 'contents' => privatemsg_list_page(), |
| 274 | 274 | ); |
| 275 | 275 | |
| 276 | 276 | |
| 277 | 277 | $tabs['invitations'] = array( |
| 278 | - 'title' => t('Invitations') . ' <span class="commons-bw-result-count">' . count(commons_trusted_contacts_get_pending_invitations($account->uid)) . '</span>', |
|
| 278 | + 'title' => t('Invitations').' <span class="commons-bw-result-count">'.count(commons_trusted_contacts_get_pending_invitations($account->uid)).'</span>', |
|
| 279 | 279 | 'contents' => views_embed_view('trusted_contacts_invitations'), |
| 280 | 280 | ); |
| 281 | 281 | |
@@ -336,7 +336,7 @@ discard block |
||
| 336 | 336 | } |
| 337 | 337 | |
| 338 | 338 | // Hide the trust link from anonymous and users without subscribe access. |
| 339 | - list($id, , $bundle) = entity_extract_ids($entity_type, $entity); |
|
| 339 | + list($id,, $bundle) = entity_extract_ids($entity_type, $entity); |
|
| 340 | 340 | $user_is_active_member = og_is_member($entity_type, $id, 'user', $account, array(OG_STATE_ACTIVE)); |
| 341 | 341 | if (!$account->uid || !og_user_access('user', $entity->uid, 'subscribe') && !$user_is_active_member) { |
| 342 | 342 | return; |
@@ -351,7 +351,7 @@ discard block |
||
| 351 | 351 | if (variable_get('commons_trusted_contacts_global_messaging', FALSE) || $user_is_active_member) { |
| 352 | 352 | $link = array('#type' => 'link'); |
| 353 | 353 | $link['#title'] = t('Message'); |
| 354 | - $link['#href'] = 'user/' . $user->uid . '/contacts/messages/popup/' . $id; |
|
| 354 | + $link['#href'] = 'user/'.$user->uid.'/contacts/messages/popup/'.$id; |
|
| 355 | 355 | // without an #options array template.php doesn't assign classes |
| 356 | 356 | $link['#options'] = array(); |
| 357 | 357 | $element[0][] = $link; |
@@ -400,7 +400,7 @@ discard block |
||
| 400 | 400 | return $element; |
| 401 | 401 | } |
| 402 | 402 | |
| 403 | - $token = drupal_get_token('request' . ':' . $id . ':' . $account->uid); |
|
| 403 | + $token = drupal_get_token('request'.':'.$id.':'.$account->uid); |
|
| 404 | 404 | $url = "request-trust/$id/$token/nojs"; |
| 405 | 405 | |
| 406 | 406 | $link = array('#type' => 'link'); |
@@ -410,7 +410,7 @@ discard block |
||
| 410 | 410 | $link['#options'] = array( |
| 411 | 411 | 'attributes' => array( |
| 412 | 412 | 'class' => array('use-ajax'), |
| 413 | - 'id' => 'user-' . $entity->uid |
|
| 413 | + 'id' => 'user-'.$entity->uid |
|
| 414 | 414 | ) |
| 415 | 415 | ); |
| 416 | 416 | $element[0][] = $link; |
@@ -441,11 +441,11 @@ discard block |
||
| 441 | 441 | |
| 442 | 442 | case 'approve_ignore': |
| 443 | 443 | |
| 444 | - $approve = l(t('Approve'), 'approve-trust/' . $entity->id . '/' . $items[0]['value']); |
|
| 445 | - $ignore = l(t('Ignore'), 'ignore-trust/' . $entity->id . '/' . $items[0]['value']); |
|
| 444 | + $approve = l(t('Approve'), 'approve-trust/'.$entity->id.'/'.$items[0]['value']); |
|
| 445 | + $ignore = l(t('Ignore'), 'ignore-trust/'.$entity->id.'/'.$items[0]['value']); |
|
| 446 | 446 | |
| 447 | 447 | $element[0] = array( |
| 448 | - '#markup' => $approve . ' ' . $ignore, |
|
| 448 | + '#markup' => $approve.' '.$ignore, |
|
| 449 | 449 | ); |
| 450 | 450 | return $element; |
| 451 | 451 | } |
@@ -544,7 +544,7 @@ discard block |
||
| 544 | 544 | |
| 545 | 545 | // Membership not found, return but throw an error to watchdog. |
| 546 | 546 | if (!isset($return['og_membership'])) { |
| 547 | - watchdog('commons_trusted_contacts', "Warning: expected trusted contact link not found between " . $og_membership->gid . " and " . $og_membership->etid, WATCHDOG_WARNING); |
|
| 547 | + watchdog('commons_trusted_contacts', "Warning: expected trusted contact link not found between ".$og_membership->gid." and ".$og_membership->etid, WATCHDOG_WARNING); |
|
| 548 | 548 | return; |
| 549 | 549 | } |
| 550 | 550 | |
@@ -649,8 +649,8 @@ discard block |
||
| 649 | 649 | $token = $wrapper->field_membership_token->value(); |
| 650 | 650 | $options = array('absolute' => TRUE); |
| 651 | 651 | $arguments = array( |
| 652 | - '@{approve-url}' => url('approve-trust/' . $og_membership->id . '/' . $token, $options), |
|
| 653 | - '@{ignore-url}' => url('ignore-trust/' . $og_membership->id . '/' . $token, $options), |
|
| 652 | + '@{approve-url}' => url('approve-trust/'.$og_membership->id.'/'.$token, $options), |
|
| 653 | + '@{ignore-url}' => url('ignore-trust/'.$og_membership->id.'/'.$token, $options), |
|
| 654 | 654 | ); |
| 655 | 655 | $message = message_create('trusted_contact_request_pending', array( |
| 656 | 656 | 'uid' => $account->uid, |
@@ -677,12 +677,12 @@ discard block |
||
| 677 | 677 | ), |
| 678 | 678 | ); |
| 679 | 679 | // We trip due to https://api.drupal.org/comment/32698#comment-32698 |
| 680 | - $commands[] = ajax_command_replace('#user-' . $account->uid, trim(theme('html_tag__request_pending', $element))); |
|
| 680 | + $commands[] = ajax_command_replace('#user-'.$account->uid, trim(theme('html_tag__request_pending', $element))); |
|
| 681 | 681 | $page = array('#type' => 'ajax', '#commands' => $commands); |
| 682 | 682 | ajax_deliver($page); |
| 683 | 683 | } |
| 684 | 684 | else { |
| 685 | - drupal_goto('user/' . $og_membership->gid); |
|
| 685 | + drupal_goto('user/'.$og_membership->gid); |
|
| 686 | 686 | } |
| 687 | 687 | } |
| 688 | 688 | |
@@ -703,8 +703,8 @@ discard block |
||
| 703 | 703 | // Ajax |
| 704 | 704 | |
| 705 | 705 | if ($ajax == 'ajax') { |
| 706 | - $token = drupal_get_token('request' . ':' . $account->uid . ':' . $user->uid); |
|
| 707 | - $new = l(t('Trusted Contact'), 'request-trust/' . $account->uid . '/' . $token . '/nojs', array('attributes' => array('class' => array('use-ajax')))); |
|
| 706 | + $token = drupal_get_token('request'.':'.$account->uid.':'.$user->uid); |
|
| 707 | + $new = l(t('Trusted Contact'), 'request-trust/'.$account->uid.'/'.$token.'/nojs', array('attributes' => array('class' => array('use-ajax')))); |
|
| 708 | 708 | |
| 709 | 709 | $commands = array(); |
| 710 | 710 | $commands[] = ajax_command_replace(".field-name-group-group a", $new); |
@@ -712,7 +712,7 @@ discard block |
||
| 712 | 712 | ajax_deliver($page); |
| 713 | 713 | } |
| 714 | 714 | else { |
| 715 | - drupal_goto('user/' . $account->uid); |
|
| 715 | + drupal_goto('user/'.$account->uid); |
|
| 716 | 716 | } |
| 717 | 717 | } |
| 718 | 718 | |
@@ -755,7 +755,7 @@ discard block |
||
| 755 | 755 | message_notify_send_message($message); |
| 756 | 756 | |
| 757 | 757 | // Redirect to Invitations screen. |
| 758 | - drupal_goto('user/' . $user->uid . '/contacts', array('query' => array('qt-commons_trusted_contacts' => 'invitations'))); |
|
| 758 | + drupal_goto('user/'.$user->uid.'/contacts', array('query' => array('qt-commons_trusted_contacts' => 'invitations'))); |
|
| 759 | 759 | } |
| 760 | 760 | |
| 761 | 761 | /** |
@@ -781,7 +781,7 @@ discard block |
||
| 781 | 781 | $wrapper->save(); |
| 782 | 782 | |
| 783 | 783 | // Redirect to Invitations screen. |
| 784 | - drupal_goto('user/' . $user->uid . '/contacts', array('query' => array('qt-commons_trusted_contacts' => 'invitations'))); |
|
| 784 | + drupal_goto('user/'.$user->uid.'/contacts', array('query' => array('qt-commons_trusted_contacts' => 'invitations'))); |
|
| 785 | 785 | } |
| 786 | 786 | |
| 787 | 787 | /** |
@@ -815,7 +815,7 @@ discard block |
||
| 815 | 815 | t('You have exceeded the limit of @limit trusted contacts. Before you can add more contacts, you must <a href="@remove-contacts-links">remove some of your existing contacts.</a>', |
| 816 | 816 | array( |
| 817 | 817 | '@limit' => $contacts_limit, |
| 818 | - '@remove-contacts-link' => url('user/' . $requestor->uid . '/contacts', |
|
| 818 | + '@remove-contacts-link' => url('user/'.$requestor->uid.'/contacts', |
|
| 819 | 819 | array( |
| 820 | 820 | 'query' => array( |
| 821 | 821 | 'qt-commons_trusted_contacts' => 'contacts', |
@@ -863,7 +863,7 @@ discard block |
||
| 863 | 863 | function commons_trusted_contacts_request_trust_access($account, $token) { |
| 864 | 864 | global $user; |
| 865 | 865 | |
| 866 | - return drupal_valid_token($token, 'request' . ':' . $account->uid . ':' . $user->uid) && user_is_logged_in(); |
|
| 866 | + return drupal_valid_token($token, 'request'.':'.$account->uid.':'.$user->uid) && user_is_logged_in(); |
|
| 867 | 867 | } |
| 868 | 868 | |
| 869 | 869 | /** |
@@ -876,7 +876,7 @@ discard block |
||
| 876 | 876 | function commons_trusted_contacts_un_trust_access($account, $token) { |
| 877 | 877 | global $user; |
| 878 | 878 | |
| 879 | - return drupal_valid_token($token, 'untrust' . ':' . $account->uid . ':' . $user->uid) && user_is_logged_in(); |
|
| 879 | + return drupal_valid_token($token, 'untrust'.':'.$account->uid.':'.$user->uid) && user_is_logged_in(); |
|
| 880 | 880 | } |
| 881 | 881 | |
| 882 | 882 | /** |
@@ -960,7 +960,7 @@ discard block |
||
| 960 | 960 | $form['actions']['cancel'] = array( |
| 961 | 961 | '#type' => 'link', |
| 962 | 962 | '#title' => t('Cancel'), |
| 963 | - '#href' => 'user/' . $user->uid . '/contacts', |
|
| 963 | + '#href' => 'user/'.$user->uid.'/contacts', |
|
| 964 | 964 | '#options' => array( |
| 965 | 965 | 'query' => array('qt-commons_trusted_contacts' => 'messages'), |
| 966 | 966 | ), |
@@ -978,7 +978,7 @@ discard block |
||
| 978 | 978 | |
| 979 | 979 | if ($form['delete_destination']['#value'] == 'messages') { |
| 980 | 980 | // TODO: Redirect to the messages quick-tab. |
| 981 | - $form['delete_destination']['#value'] = 'user/' . $user->uid . '/contacts'; |
|
| 981 | + $form['delete_destination']['#value'] = 'user/'.$user->uid.'/contacts'; |
|
| 982 | 982 | } |
| 983 | 983 | } |
| 984 | 984 | |
@@ -1028,7 +1028,7 @@ discard block |
||
| 1028 | 1028 | // to perform the task of hiding the groups fields. |
| 1029 | 1029 | '#attached' => array( |
| 1030 | 1030 | 'js' => array( |
| 1031 | - drupal_get_path('module', 'commons_trusted_contacts') . '/scripts/commons-trusted-contacts.js', |
|
| 1031 | + drupal_get_path('module', 'commons_trusted_contacts').'/scripts/commons-trusted-contacts.js', |
|
| 1032 | 1032 | ), |
| 1033 | 1033 | ), |
| 1034 | 1034 | ); |
@@ -1127,7 +1127,7 @@ discard block |
||
| 1127 | 1127 | $actions = array(); |
| 1128 | 1128 | $files = commons_trusted_contacts_operations_load_action_includes(); |
| 1129 | 1129 | foreach ($files as $filename) { |
| 1130 | - $action_info_fn = 'commons_trusted_contacts_' . str_replace('.', '_', basename($filename, '.inc')) . '_info'; |
|
| 1130 | + $action_info_fn = 'commons_trusted_contacts_'.str_replace('.', '_', basename($filename, '.inc')).'_info'; |
|
| 1131 | 1131 | $action_info = call_user_func($action_info_fn); |
| 1132 | 1132 | if (is_array($action_info)) { |
| 1133 | 1133 | $actions += $action_info; |
@@ -1148,7 +1148,7 @@ discard block |
||
| 1148 | 1148 | function commons_trusted_contacts_operations_load_action_includes() { |
| 1149 | 1149 | static $loaded = FALSE; |
| 1150 | 1150 | |
| 1151 | - $path = drupal_get_path('module', 'commons_trusted_contacts') . '/includes/actions/'; |
|
| 1151 | + $path = drupal_get_path('module', 'commons_trusted_contacts').'/includes/actions/'; |
|
| 1152 | 1152 | $files = array( |
| 1153 | 1153 | 'set_state_active.action.inc', |
| 1154 | 1154 | 'set_state_blocked.action.inc', |
@@ -1157,7 +1157,7 @@ discard block |
||
| 1157 | 1157 | |
| 1158 | 1158 | if (!$loaded) { |
| 1159 | 1159 | foreach ($files as $file) { |
| 1160 | - include_once $path . $file; |
|
| 1160 | + include_once $path.$file; |
|
| 1161 | 1161 | } |
| 1162 | 1162 | $loaded = TRUE; |
| 1163 | 1163 | } |
@@ -1177,7 +1177,7 @@ discard block |
||
| 1177 | 1177 | // Include original functions. |
| 1178 | 1178 | module_load_include('inc', 'privatemsg', 'privatemsg.pages'); |
| 1179 | 1179 | |
| 1180 | - $form = privatemsg_new($form, $form_state, $account->uid, 'New private message from ' . $user->name); |
|
| 1180 | + $form = privatemsg_new($form, $form_state, $account->uid, 'New private message from '.$user->name); |
|
| 1181 | 1181 | |
| 1182 | 1182 | $form['actions'] = array('#type' => 'actions'); |
| 1183 | 1183 | |
@@ -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 | |
@@ -87,7 +87,7 @@ discard block |
||
| 87 | 87 | $keys = arg(2); |
| 88 | 88 | if (!module_exists('commons_search_solr') && !empty($keys)) { |
| 89 | 89 | // Remove the search keys from the form action only if we're using core search. |
| 90 | - $form['#action'] = str_replace("/" . check_plain(arg(2)), '', $form['#action']); |
|
| 90 | + $form['#action'] = str_replace("/".check_plain(arg(2)), '', $form['#action']); |
|
| 91 | 91 | } |
| 92 | 92 | } |
| 93 | 93 | } |
@@ -105,19 +105,19 @@ discard block |
||
| 105 | 105 | // Add on a filter to the solr query to only list results within the |
| 106 | 106 | // specified group. |
| 107 | 107 | $qm = (strpos($form_state['redirect'], '?') !== FALSE ? '' : '?'); |
| 108 | - $form_state['redirect'] .= $qm . '&f[1]=sm_og_group_ref:node:' . $form_state['search_group_id']; |
|
| 108 | + $form_state['redirect'] .= $qm.'&f[1]=sm_og_group_ref:node:'.$form_state['search_group_id']; |
|
| 109 | 109 | } |
| 110 | 110 | else { |
| 111 | 111 | // Using core search to search within a group doesn't work, so we simply |
| 112 | 112 | // use a view with exposed search terms to do the searching. |
| 113 | - drupal_goto('search/group/' . $form_state['search_group_id'], array('query' => array('keys' => $keys))); |
|
| 113 | + drupal_goto('search/group/'.$form_state['search_group_id'], array('query' => array('keys' => $keys))); |
|
| 114 | 114 | } |
| 115 | 115 | } |
| 116 | 116 | else { |
| 117 | 117 | if ($form_state['values']['custom_search_types'] == 'c-user') { |
| 118 | 118 | // Force update the redirect on User search since Custom Search is weird. |
| 119 | 119 | $keys = check_plain($form_state['values']['search_block_form']); |
| 120 | - $form_state['redirect'] = 'search/user/' . $keys; |
|
| 120 | + $form_state['redirect'] = 'search/user/'.$keys; |
|
| 121 | 121 | } |
| 122 | 122 | } |
| 123 | 123 | } |
@@ -134,7 +134,7 @@ discard block |
||
| 134 | 134 | && preg_match('/sm_og_group_ref:"node:([0-9]+)"&/', urldecode($variables['response']->request), $match) |
| 135 | 135 | ) { |
| 136 | 136 | $group = node_load($match[1]); |
| 137 | - $title = t('Search within !group', array('!group' => '<em>' . $group->title . '</em>')); |
|
| 137 | + $title = t('Search within !group', array('!group' => '<em>'.$group->title.'</em>')); |
|
| 138 | 138 | $variables['title'] = $title; |
| 139 | 139 | } |
| 140 | 140 | } |
@@ -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 | } |