@@ -16,7 +16,7 @@ discard block |
||
| 16 | 16 | $types = content_profile_get_types('types'); |
| 17 | 17 | switch ($type) { |
| 18 | 18 | case 'user': |
| 19 | - foreach($types as $type_name => $type) { |
|
| 19 | + foreach ($types as $type_name => $type) { |
|
| 20 | 20 | if (isset($object)) { |
| 21 | 21 | $profile = content_profile_load($type_name, $object->uid); |
| 22 | 22 | } |
@@ -27,27 +27,27 @@ discard block |
||
| 27 | 27 | $fields = content_types($type_name); |
| 28 | 28 | foreach ($fields['fields'] as $field_name => $field) { |
| 29 | 29 | if (!$field['multiple'] && ($field['widget']['type'] == 'text_textfield' || $field['widget']['type'] == 'number')) { |
| 30 | - $values['content-profile-'. $type_name .'-'. substr($field_name, 6)] = check_plain($profile->{$field_name}[0]['value']); |
|
| 31 | - $values['content-profile-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = $profile->{$field_name}[0]['value']; |
|
| 30 | + $values['content-profile-'.$type_name.'-'.substr($field_name, 6)] = check_plain($profile->{$field_name}[0]['value']); |
|
| 31 | + $values['content-profile-'.$type_name.'-'.substr($field_name, 6).'-raw'] = $profile->{$field_name}[0]['value']; |
|
| 32 | 32 | } |
| 33 | 33 | } |
| 34 | 34 | } |
| 35 | 35 | break; |
| 36 | 36 | |
| 37 | 37 | case 'flag_friend': |
| 38 | - if(!empty($object)) { |
|
| 39 | - foreach($types as $type_name => $type) { |
|
| 38 | + if (!empty($object)) { |
|
| 39 | + foreach ($types as $type_name => $type) { |
|
| 40 | 40 | $profile_requestor = content_profile_load($type_name, $object->friend->uid); |
| 41 | 41 | $profile_requestee = content_profile_load($type_name, $object->uid); |
| 42 | 42 | |
| 43 | 43 | $fields = content_types($type_name); |
| 44 | 44 | foreach ($fields['fields'] as $field_name => $field) { |
| 45 | 45 | if (!$field['multiple'] && ($field['widget']['type'] == 'text_textfield' || $field['widget']['type'] == 'number')) { |
| 46 | - $values['requestor-'. $type_name .'-'. substr($field_name, 6)] = check_plain($profile_requestor->{$field_name}[0]['value']); |
|
| 47 | - $values['requestor-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = $profile_requestor->{$field_name}[0]['value']; |
|
| 46 | + $values['requestor-'.$type_name.'-'.substr($field_name, 6)] = check_plain($profile_requestor->{$field_name}[0]['value']); |
|
| 47 | + $values['requestor-'.$type_name.'-'.substr($field_name, 6).'-raw'] = $profile_requestor->{$field_name}[0]['value']; |
|
| 48 | 48 | |
| 49 | - $values['requestee-'. $type_name .'-'. substr($field_name, 6)] = check_plain($profile_requestee->{$field_name}[0]['value']); |
|
| 50 | - $values['requestee-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = $profile_requestee->{$field_name}[0]['value']; |
|
| 49 | + $values['requestee-'.$type_name.'-'.substr($field_name, 6)] = check_plain($profile_requestee->{$field_name}[0]['value']); |
|
| 50 | + $values['requestee-'.$type_name.'-'.substr($field_name, 6).'-raw'] = $profile_requestee->{$field_name}[0]['value']; |
|
| 51 | 51 | } |
| 52 | 52 | } |
| 53 | 53 | } |
@@ -69,23 +69,23 @@ discard block |
||
| 69 | 69 | $fields = content_types($type_name); |
| 70 | 70 | foreach ($fields['fields'] as $field_name => $field) { |
| 71 | 71 | if (!$field['multiple'] && ($field['widget']['type'] == 'text_textfield' || $field['widget']['type'] == 'number')) { |
| 72 | - $tokens['user']['content-profile-'. $type_name .'-'. substr($field_name, 6)] = t($fields['description']) .'-'. t($field['widget']['label']); |
|
| 73 | - $tokens['user']['content-profile-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = t($fields['description']) .'-'. t($field['widget']['label']) .' '. t('WARNING - raw user input'); |
|
| 72 | + $tokens['user']['content-profile-'.$type_name.'-'.substr($field_name, 6)] = t($fields['description']).'-'.t($field['widget']['label']); |
|
| 73 | + $tokens['user']['content-profile-'.$type_name.'-'.substr($field_name, 6).'-raw'] = t($fields['description']).'-'.t($field['widget']['label']).' '.t('WARNING - raw user input'); |
|
| 74 | 74 | } |
| 75 | 75 | } |
| 76 | 76 | } |
| 77 | 77 | } |
| 78 | 78 | |
| 79 | 79 | if ($type == 'flag_friend' && module_exists('flag_friend')) { |
| 80 | - foreach($types as $type_name => $type) { |
|
| 80 | + foreach ($types as $type_name => $type) { |
|
| 81 | 81 | $fields = content_types($type_name); |
| 82 | 82 | foreach ($fields['fields'] as $field_name => $field) { |
| 83 | 83 | if (!$field['multiple'] && ($field['widget']['type'] == 'text_textfield' || $field['widget']['type'] == 'number')) { |
| 84 | - $tokens['content_profile_flag_friend']['requestor-'. $type_name .'-'. substr($field_name, 6)] = t('Requestor:') . t($fields['description']) .'-'. t($field['widget']['label']); |
|
| 85 | - $tokens['content_profile_flag_friend']['requestor-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = t('Requestor:') . t($fields['description']) .'-'. t($field['widget']['label']) .' '. t('WARNING - raw user input'); |
|
| 84 | + $tokens['content_profile_flag_friend']['requestor-'.$type_name.'-'.substr($field_name, 6)] = t('Requestor:').t($fields['description']).'-'.t($field['widget']['label']); |
|
| 85 | + $tokens['content_profile_flag_friend']['requestor-'.$type_name.'-'.substr($field_name, 6).'-raw'] = t('Requestor:').t($fields['description']).'-'.t($field['widget']['label']).' '.t('WARNING - raw user input'); |
|
| 86 | 86 | |
| 87 | - $tokens['content_profile_flag_friend']['requestee-'. $type_name .'-'. substr($field_name, 6)] = t('Requestee:') . t($fields['description']) .'-'. t($field['widget']['label']); |
|
| 88 | - $tokens['content_profile_flag_friend']['requestee-'. $type_name .'-'. substr($field_name, 6) .'-raw'] = t('Requestee:') .t($fields['description']) .'-'. t($field['widget']['label']) .' '. t('WARNING - raw user input'); |
|
| 87 | + $tokens['content_profile_flag_friend']['requestee-'.$type_name.'-'.substr($field_name, 6)] = t('Requestee:').t($fields['description']).'-'.t($field['widget']['label']); |
|
| 88 | + $tokens['content_profile_flag_friend']['requestee-'.$type_name.'-'.substr($field_name, 6).'-raw'] = t('Requestee:').t($fields['description']).'-'.t($field['widget']['label']).' '.t('WARNING - raw user input'); |
|
| 89 | 89 | } |
| 90 | 90 | } |
| 91 | 91 | } |
@@ -19,7 +19,7 @@ discard block |
||
| 19 | 19 | */ |
| 20 | 20 | function content_profile_ctools_plugin_directory($module, $plugin) { |
| 21 | 21 | if ($module == 'ctools' && $plugin == 'relationships') { |
| 22 | - return 'panels/' . $plugin; |
|
| 22 | + return 'panels/'.$plugin; |
|
| 23 | 23 | } |
| 24 | 24 | } |
| 25 | 25 | |
@@ -31,11 +31,11 @@ discard block |
||
| 31 | 31 | |
| 32 | 32 | //Register a path for each content profile type |
| 33 | 33 | foreach (content_profile_get_types('names') as $type => $typename) { |
| 34 | - $items['admin/content/node-type/'. str_replace('_', '-', $type) .'/edit'] = array( |
|
| 34 | + $items['admin/content/node-type/'.str_replace('_', '-', $type).'/edit'] = array( |
|
| 35 | 35 | 'title' => 'Edit', |
| 36 | 36 | 'type' => MENU_DEFAULT_LOCAL_TASK, |
| 37 | 37 | ); |
| 38 | - $items['admin/content/node-type/'. str_replace('_', '-', $type) .'/profile'] = array( |
|
| 38 | + $items['admin/content/node-type/'.str_replace('_', '-', $type).'/profile'] = array( |
|
| 39 | 39 | 'title' => 'Content profile', |
| 40 | 40 | 'description' => 'Configure the display and management of this content profile.', |
| 41 | 41 | 'page callback' => 'drupal_get_form', |
@@ -47,7 +47,7 @@ discard block |
||
| 47 | 47 | ); |
| 48 | 48 | } |
| 49 | 49 | foreach (content_profile_get_types('names') as $type => $type_name) { |
| 50 | - $items['user/%user/profile/'. $type] = array( |
|
| 50 | + $items['user/%user/profile/'.$type] = array( |
|
| 51 | 51 | 'title callback' => 'check_plain', |
| 52 | 52 | 'title' => drupal_ucfirst($type_name), |
| 53 | 53 | 'page callback' => 'content_profile_page_edit', |
@@ -69,8 +69,8 @@ discard block |
||
| 69 | 69 | */ |
| 70 | 70 | function content_profile_menu_alter(&$items) { |
| 71 | 71 | foreach (content_profile_get_types('names', 'edit_tab', 'sub') as $type => $type_name) { |
| 72 | - if (!empty($items['user/%user_category/edit/'. $type])) { |
|
| 73 | - $item = &$items['user/%user_category/edit/'. $type]; |
|
| 72 | + if (!empty($items['user/%user_category/edit/'.$type])) { |
|
| 73 | + $item = &$items['user/%user_category/edit/'.$type]; |
|
| 74 | 74 | $item = array( |
| 75 | 75 | 'page callback' => 'content_profile_page_edit', |
| 76 | 76 | 'page arguments' => array($type, 1), |
@@ -91,7 +91,7 @@ discard block |
||
| 91 | 91 | // Else user may view the page when they are going to create their own profile |
| 92 | 92 | // or have permission to create it for others. |
| 93 | 93 | global $user; |
| 94 | - if ($user->uid == $account->uid || user_access('administer nodes') ){ |
|
| 94 | + if ($user->uid == $account->uid || user_access('administer nodes')) { |
|
| 95 | 95 | return node_access('create', $type); |
| 96 | 96 | } |
| 97 | 97 | return FALSE; |
@@ -106,7 +106,7 @@ discard block |
||
| 106 | 106 | if (!$node) { |
| 107 | 107 | $node = array('uid' => $account->uid, 'name' => (isset($account->name) ? $account->name : ''), 'type' => $type, 'language' => ''); |
| 108 | 108 | } |
| 109 | - return drupal_get_form($type .'_node_form', $node); |
|
| 109 | + return drupal_get_form($type.'_node_form', $node); |
|
| 110 | 110 | } |
| 111 | 111 | |
| 112 | 112 | |
@@ -116,7 +116,7 @@ discard block |
||
| 116 | 116 | function content_profile_views_api() { |
| 117 | 117 | return array( |
| 118 | 118 | 'api' => 2, |
| 119 | - 'path' => drupal_get_path('module', 'content_profile') .'/views', |
|
| 119 | + 'path' => drupal_get_path('module', 'content_profile').'/views', |
|
| 120 | 120 | ); |
| 121 | 121 | } |
| 122 | 122 | |
@@ -201,7 +201,7 @@ discard block |
||
| 201 | 201 | if (is_object($type)) { |
| 202 | 202 | $type = $type->type; |
| 203 | 203 | } |
| 204 | - return variable_get('content_profile_use_'. $type, FALSE); |
|
| 204 | + return variable_get('content_profile_use_'.$type, FALSE); |
|
| 205 | 205 | } |
| 206 | 206 | |
| 207 | 207 | /** |
@@ -217,7 +217,7 @@ discard block |
||
| 217 | 217 | * @param $value |
| 218 | 218 | * The value to compare the given setting too. |
| 219 | 219 | */ |
| 220 | -function content_profile_get_types($op = 'types', $setting = NULL , $value = TRUE) { |
|
| 220 | +function content_profile_get_types($op = 'types', $setting = NULL, $value = TRUE) { |
|
| 221 | 221 | $types = array(); |
| 222 | 222 | |
| 223 | 223 | foreach (node_get_types($op) as $type => $info) { |
@@ -235,17 +235,17 @@ discard block |
||
| 235 | 235 | function content_profile_node_type($op, $info) { |
| 236 | 236 | switch ($op) { |
| 237 | 237 | case 'delete': |
| 238 | - variable_del('content_profile_use_'. $info->type); |
|
| 239 | - variable_del('content_profile_'. $info->type); |
|
| 238 | + variable_del('content_profile_use_'.$info->type); |
|
| 239 | + variable_del('content_profile_'.$info->type); |
|
| 240 | 240 | break; |
| 241 | 241 | case 'update': |
| 242 | 242 | if (!empty($info->old_type) && $info->old_type != $info->type) { |
| 243 | 243 | if (is_content_profile($info->old_type)) { |
| 244 | - $settings = variable_get('content_profile_'. $info->old_type, array()); |
|
| 245 | - variable_del('content_profile_use_'. $info->old_type); |
|
| 246 | - variable_del('content_profile_'. $info->old_type); |
|
| 247 | - variable_set('content_profile_use_'. $info->type, 1); |
|
| 248 | - variable_set('content_profile_'. $info->type, $settings); |
|
| 244 | + $settings = variable_get('content_profile_'.$info->old_type, array()); |
|
| 245 | + variable_del('content_profile_use_'.$info->old_type); |
|
| 246 | + variable_del('content_profile_'.$info->old_type); |
|
| 247 | + variable_set('content_profile_use_'.$info->type, 1); |
|
| 248 | + variable_set('content_profile_'.$info->type, $settings); |
|
| 249 | 249 | } |
| 250 | 250 | } |
| 251 | 251 | break; |
@@ -268,15 +268,15 @@ discard block |
||
| 268 | 268 | $form['content_profile']['content_profile_use'] = array( |
| 269 | 269 | '#type' => 'checkbox', |
| 270 | 270 | '#title' => t('Use this content type as a content profile for users'), |
| 271 | - '#default_value' => variable_get('content_profile_use_'. $form['#node_type']->type, FALSE), |
|
| 271 | + '#default_value' => variable_get('content_profile_use_'.$form['#node_type']->type, FALSE), |
|
| 272 | 272 | ); |
| 273 | 273 | } |
| 274 | - elseif (isset($form['#node']) && $form['#node']->type .'_node_form' == $form_id && is_content_profile($form['#node'])) { |
|
| 274 | + elseif (isset($form['#node']) && $form['#node']->type.'_node_form' == $form_id && is_content_profile($form['#node'])) { |
|
| 275 | 275 | // Customize the redirect target and buttons of our own node forms. |
| 276 | 276 | if (arg(0) == 'user' && is_numeric(arg(1)) && arg(2) == 'edit' || arg(2) == 'profile') { |
| 277 | 277 | $form['buttons']['preview']['#access'] = FALSE; |
| 278 | 278 | $form['buttons']['delete']['#access'] = FALSE; |
| 279 | - $form['#redirect'] = arg(2) == 'profile' ? 'user/'. $form['#node']->uid : $_GET['q']; |
|
| 279 | + $form['#redirect'] = arg(2) == 'profile' ? 'user/'.$form['#node']->uid : $_GET['q']; |
|
| 280 | 280 | } |
| 281 | 281 | // Set the author value - note that this works only for admins. |
| 282 | 282 | if (!empty($_GET['uid']) && ($uid = intval($_GET['uid'])) && ($user = user_load($uid))) { |
@@ -313,7 +313,7 @@ discard block |
||
| 313 | 313 | $condition = array_fill(0, count($types), "type = '%s'"); |
| 314 | 314 | $arguments = array_merge(array_keys($types), array($account->uid)); |
| 315 | 315 | |
| 316 | - $result = db_query("SELECT * FROM {node} WHERE (". implode(' OR ', $condition) .") AND uid = %d", $arguments); |
|
| 316 | + $result = db_query("SELECT * FROM {node} WHERE (".implode(' OR ', $condition).") AND uid = %d", $arguments); |
|
| 317 | 317 | while ($node = db_fetch_object($result)) { |
| 318 | 318 | _content_profile_node_delete($node); |
| 319 | 319 | } |
@@ -380,7 +380,7 @@ discard block |
||
| 380 | 380 | // Check if this nodetype already exists |
| 381 | 381 | if ($nid = content_profile_profile_exists($node, $node->uid)) { |
| 382 | 382 | // This node already exists, redirect to edit page |
| 383 | - drupal_goto('node/'. $nid .'/edit', 'destination=user/'. $node->uid); |
|
| 383 | + drupal_goto('node/'.$nid.'/edit', 'destination=user/'.$node->uid); |
|
| 384 | 384 | } |
| 385 | 385 | } |
| 386 | 386 | elseif ($op == 'validate' && is_content_profile($node) && user_access('administer nodes')) { |
@@ -428,7 +428,7 @@ discard block |
||
| 428 | 428 | * e.g. user_edit, register or weight. |
| 429 | 429 | */ |
| 430 | 430 | function content_profile_get_settings($type, $return = 'all') { |
| 431 | - $settings = variable_get('content_profile_'. $type, array()); |
|
| 431 | + $settings = variable_get('content_profile_'.$type, array()); |
|
| 432 | 432 | $settings += content_profile_settings_info(); |
| 433 | 433 | if ($return == 'all') { |
| 434 | 434 | return $settings; |
@@ -440,7 +440,7 @@ discard block |
||
| 440 | 440 | * Saves the content_profile settings of a content type. |
| 441 | 441 | */ |
| 442 | 442 | function content_profile_set_settings($type, $settings) { |
| 443 | - variable_set('content_profile_'. $type, $settings); |
|
| 443 | + variable_set('content_profile_'.$type, $settings); |
|
| 444 | 444 | } |
| 445 | 445 | |
| 446 | 446 | /** |
@@ -506,7 +506,7 @@ discard block |
||
| 506 | 506 | return node_help('node/%/edit', array(1 => $node->nid)); |
| 507 | 507 | } |
| 508 | 508 | else { |
| 509 | - return node_help('node/add/'. $type, array('node', 'add', $type)); |
|
| 509 | + return node_help('node/add/'.$type, array('node', 'add', $type)); |
|
| 510 | 510 | } |
| 511 | 511 | } |
| 512 | 512 | } |
@@ -525,7 +525,7 @@ discard block |
||
| 525 | 525 | $node = content_profile_load($type, $uid); |
| 526 | 526 | |
| 527 | 527 | if (($style = content_profile_get_settings($type, 'user_display')) && $node && node_access('view', $node)) { |
| 528 | - $content['content_profile_'. $type] = array( |
|
| 528 | + $content['content_profile_'.$type] = array( |
|
| 529 | 529 | '#theme' => ($style == 'link') ? 'content_profile_display_link' : 'content_profile_display_view', |
| 530 | 530 | '#edit_link' => content_profile_get_settings($type, 'edit_link'), |
| 531 | 531 | '#uid' => $uid, |
@@ -538,8 +538,8 @@ discard block |
||
| 538 | 538 | // Working around the bug described at http://drupal.org/node/302873 |
| 539 | 539 | module_load_include('inc', 'content_profile', 'content_profile.theme'); |
| 540 | 540 | } |
| 541 | - elseif (user_access('create '. $type .' content') && content_profile_get_settings($type, 'add_link') && !$node && ($uid == $user->uid || user_access('administer nodes'))) { |
|
| 542 | - $content['content_profile_'. $type] = array( |
|
| 541 | + elseif (user_access('create '.$type.' content') && content_profile_get_settings($type, 'add_link') && !$node && ($uid == $user->uid || user_access('administer nodes'))) { |
|
| 542 | + $content['content_profile_'.$type] = array( |
|
| 543 | 543 | '#admin' => $uid != $user->uid, |
| 544 | 544 | '#theme' => 'content_profile_display_add_link', |
| 545 | 545 | '#uid' => $uid, |
@@ -580,7 +580,7 @@ discard block |
||
| 580 | 580 | ), |
| 581 | 581 | ); |
| 582 | 582 | if (module_exists('pageroute')) { |
| 583 | - $return['content_profile_pageroute_empty'] = array( |
|
| 583 | + $return['content_profile_pageroute_empty'] = array( |
|
| 584 | 584 | 'arguments' => array('type_name' => NULL), |
| 585 | 585 | 'file' => 'content_profile.pageroute.inc', |
| 586 | 586 | ); |
@@ -632,7 +632,7 @@ discard block |
||
| 632 | 632 | */ |
| 633 | 633 | function content_profile_simpletest() { |
| 634 | 634 | // Scan through content_profile/tests directory for any .test files to tell SimpleTest module. |
| 635 | - $tests = file_scan_directory(drupal_get_path('module', 'content_profile') .'/tests', '\.test'); |
|
| 635 | + $tests = file_scan_directory(drupal_get_path('module', 'content_profile').'/tests', '\.test'); |
|
| 636 | 636 | return array_keys($tests); |
| 637 | 637 | } |
| 638 | 638 | |
@@ -51,7 +51,7 @@ |
||
| 51 | 51 | $join->construct(); |
| 52 | 52 | $this->ensure_my_table(); |
| 53 | 53 | |
| 54 | - $alias = $join->definition['table'] .'_'. $join->definition['left_table']; |
|
| 54 | + $alias = $join->definition['table'].'_'.$join->definition['left_table']; |
|
| 55 | 55 | $this->alias = $this->query->add_relationship($alias, $join, $this->definition['base'], $this->relationship); |
| 56 | 56 | } |
| 57 | 57 | } |
@@ -31,7 +31,7 @@ |
||
| 31 | 31 | function content_profile_views_handlers() { |
| 32 | 32 | return array( |
| 33 | 33 | 'info' => array( |
| 34 | - 'path' => drupal_get_path('module', 'content_profile') .'/views', |
|
| 34 | + 'path' => drupal_get_path('module', 'content_profile').'/views', |
|
| 35 | 35 | ), |
| 36 | 36 | 'handlers' => array( |
| 37 | 37 | 'content_profile_views_handler_relationship' => array( |
@@ -13,29 +13,29 @@ discard block |
||
| 13 | 13 | $types = array_keys(content_profile_get_types('names')); |
| 14 | 14 | $type = array_shift($types); |
| 15 | 15 | $config = |
| 16 | -array ( |
|
| 16 | +array( |
|
| 17 | 17 | 'rules' => |
| 18 | - array ( |
|
| 18 | + array( |
|
| 19 | 19 | 'content_profile_rule_1' => |
| 20 | - array ( |
|
| 20 | + array( |
|
| 21 | 21 | '#type' => 'rule', |
| 22 | 22 | '#set' => 'event_user_login', |
| 23 | 23 | '#label' => 'Redirect to profile creation page, if users have no profile.', |
| 24 | 24 | '#active' => 0, |
| 25 | 25 | '#weight' => '0', |
| 26 | 26 | '#conditions' => |
| 27 | - array ( |
|
| 27 | + array( |
|
| 28 | 28 | 0 => |
| 29 | - array ( |
|
| 29 | + array( |
|
| 30 | 30 | '#negate' => 1, |
| 31 | 31 | '#weight' => 0, |
| 32 | 32 | '#info' => |
| 33 | - array ( |
|
| 33 | + array( |
|
| 34 | 34 | 'label' => 'Logged in user has his Profile created', |
| 35 | 35 | 'arguments' => |
| 36 | - array ( |
|
| 36 | + array( |
|
| 37 | 37 | 'user' => |
| 38 | - array ( |
|
| 38 | + array( |
|
| 39 | 39 | 'type' => 'user', |
| 40 | 40 | 'label' => 'User', |
| 41 | 41 | ), |
@@ -44,10 +44,10 @@ discard block |
||
| 44 | 44 | ), |
| 45 | 45 | '#name' => 'content_profile_user_has_profile_condition', |
| 46 | 46 | '#settings' => |
| 47 | - array ( |
|
| 47 | + array( |
|
| 48 | 48 | 'type' => $type, |
| 49 | 49 | '#argument map' => |
| 50 | - array ( |
|
| 50 | + array( |
|
| 51 | 51 | 'account' => 'user', |
| 52 | 52 | ), |
| 53 | 53 | ), |
@@ -55,13 +55,13 @@ discard block |
||
| 55 | 55 | ), |
| 56 | 56 | ), |
| 57 | 57 | '#actions' => |
| 58 | - array ( |
|
| 58 | + array( |
|
| 59 | 59 | 0 => |
| 60 | - array ( |
|
| 60 | + array( |
|
| 61 | 61 | '#type' => 'action', |
| 62 | 62 | '#settings' => |
| 63 | - array ( |
|
| 64 | - 'path' => 'node/add/'. str_replace('_', '-', $type), |
|
| 63 | + array( |
|
| 64 | + 'path' => 'node/add/'.str_replace('_', '-', $type), |
|
| 65 | 65 | 'query' => '', |
| 66 | 66 | 'fragment' => '', |
| 67 | 67 | 'force' => 1, |
@@ -69,12 +69,12 @@ discard block |
||
| 69 | 69 | ), |
| 70 | 70 | '#name' => 'rules_action_drupal_goto', |
| 71 | 71 | '#info' => |
| 72 | - array ( |
|
| 72 | + array( |
|
| 73 | 73 | 'label' => 'Redirect to profile creation page', |
| 74 | 74 | 'label callback' => false, |
| 75 | 75 | 'module' => 'System', |
| 76 | 76 | 'eval input' => |
| 77 | - array ( |
|
| 77 | + array( |
|
| 78 | 78 | 0 => 'path', |
| 79 | 79 | 1 => 'query', |
| 80 | 80 | 2 => 'fragment', |
@@ -83,21 +83,21 @@ discard block |
||
| 83 | 83 | '#weight' => 0, |
| 84 | 84 | ), |
| 85 | 85 | 1 => |
| 86 | - array ( |
|
| 86 | + array( |
|
| 87 | 87 | '#weight' => 0, |
| 88 | 88 | '#info' => |
| 89 | - array ( |
|
| 89 | + array( |
|
| 90 | 90 | 'label' => 'Show a message', |
| 91 | 91 | 'label callback' => false, |
| 92 | 92 | 'module' => 'System', |
| 93 | 93 | 'eval input' => |
| 94 | - array ( |
|
| 94 | + array( |
|
| 95 | 95 | 0 => 'message', |
| 96 | 96 | ), |
| 97 | 97 | ), |
| 98 | 98 | '#name' => 'rules_action_drupal_message', |
| 99 | 99 | '#settings' => |
| 100 | - array ( |
|
| 100 | + array( |
|
| 101 | 101 | 'message' => 'You haven\'t filled out your profile information yet. Please do so now!', |
| 102 | 102 | 'error' => 1, |
| 103 | 103 | ), |
@@ -11,9 +11,9 @@ discard block |
||
| 11 | 11 | */ |
| 12 | 12 | function theme_content_profile_display_add_link($element) { |
| 13 | 13 | $type = $element['#content_type']; |
| 14 | - $uid = $element['#admin'] ? 'uid='. intval($element['#uid']) .'&' : ''; |
|
| 14 | + $uid = $element['#admin'] ? 'uid='.intval($element['#uid']).'&' : ''; |
|
| 15 | 15 | $text = t($element['#admin'] ? "Create the user's @profile_node." : "Create your @profile_node.", array('@profile_node' => node_get_types('name', $type))); |
| 16 | - return l($text, content_profile_get_add_path($type, $element['#uid']), array('query' => $uid . drupal_get_destination(), 'html' => TRUE)); |
|
| 16 | + return l($text, content_profile_get_add_path($type, $element['#uid']), array('query' => $uid.drupal_get_destination(), 'html' => TRUE)); |
|
| 17 | 17 | } |
| 18 | 18 | |
| 19 | 19 | /** |
@@ -22,9 +22,9 @@ discard block |
||
| 22 | 22 | function theme_content_profile_display_link($element) { |
| 23 | 23 | if ($node = content_profile_load($element['#content_type'], $element['#uid'])) { |
| 24 | 24 | if (node_access('view', $node)) { |
| 25 | - $output = l(node_get_types('name', $node->type), 'node/'. $node->nid); |
|
| 25 | + $output = l(node_get_types('name', $node->type), 'node/'.$node->nid); |
|
| 26 | 26 | if ($element['#edit_link'] && node_access('update', $node)) { |
| 27 | - $output .= ' '. l('['. t('edit') .']', content_profile_get_edit_path($node), array('query' => drupal_get_destination())); |
|
| 27 | + $output .= ' '.l('['.t('edit').']', content_profile_get_edit_path($node), array('query' => drupal_get_destination())); |
|
| 28 | 28 | } |
| 29 | 29 | return $output; |
| 30 | 30 | } |
@@ -41,7 +41,7 @@ discard block |
||
| 41 | 41 | $variables['uid'] = $element['#uid']; |
| 42 | 42 | $variables['type'] = $element['#content_type']; |
| 43 | 43 | |
| 44 | - $path = drupal_get_path('module', 'content_profile') .'/content_profile.css'; |
|
| 44 | + $path = drupal_get_path('module', 'content_profile').'/content_profile.css'; |
|
| 45 | 45 | drupal_add_css($path, 'module', 'all', FALSE); |
| 46 | 46 | |
| 47 | 47 | $variables['title'] = check_plain(node_get_types('name', $node->type)); |
@@ -61,7 +61,7 @@ discard block |
||
| 61 | 61 | * Themes the view tab |
| 62 | 62 | */ |
| 63 | 63 | function theme_content_profile_display_tab_view($node) { |
| 64 | - return l(t('View'), 'node/'. $node->nid); |
|
| 64 | + return l(t('View'), 'node/'.$node->nid); |
|
| 65 | 65 | } |
| 66 | 66 | |
| 67 | 67 | /** |
@@ -99,15 +99,15 @@ discard block |
||
| 99 | 99 | function content_profile_default_path_handler($action, $arg, $uid) { |
| 100 | 100 | $type = $action == 'add' ? $arg : $arg->type; |
| 101 | 101 | if (content_profile_get_settings($type, 'edit_tab') == 'top') { |
| 102 | - return 'user/'. $uid . '/profile/'. $type; |
|
| 102 | + return 'user/'.$uid.'/profile/'.$type; |
|
| 103 | 103 | } |
| 104 | 104 | elseif (content_profile_get_settings($type, 'edit_tab') == 'sub') { |
| 105 | - return 'user/'. $uid . '/edit/'. $type; |
|
| 105 | + return 'user/'.$uid.'/edit/'.$type; |
|
| 106 | 106 | } |
| 107 | 107 | elseif ($action == 'add') { |
| 108 | - return 'node/add/'. str_replace('_', '-', $arg); |
|
| 108 | + return 'node/add/'.str_replace('_', '-', $arg); |
|
| 109 | 109 | } |
| 110 | 110 | else { |
| 111 | - return 'node/'. $arg->nid .'/edit'; |
|
| 111 | + return 'node/'.$arg->nid.'/edit'; |
|
| 112 | 112 | } |
| 113 | 113 | } |
@@ -6,15 +6,15 @@ |
||
| 6 | 6 | * Pageroute intergration classes |
| 7 | 7 | */ |
| 8 | 8 | |
| 9 | -include_once(drupal_get_path('module', 'pageroute') . '/pageroute.page_edit.inc'); |
|
| 10 | -include_once(drupal_get_path('module', 'pageroute') . '/pageroute.page_view.inc'); |
|
| 9 | +include_once(drupal_get_path('module', 'pageroute').'/pageroute.page_edit.inc'); |
|
| 10 | +include_once(drupal_get_path('module', 'pageroute').'/pageroute.page_view.inc'); |
|
| 11 | 11 | |
| 12 | 12 | /** |
| 13 | 13 | * theme_content_profile_pageroute_empty generates a message, if there is no content profile for the user. |
| 14 | 14 | */ |
| 15 | 15 | function theme_content_profile_pageroute_empty($type_name) { |
| 16 | 16 | return '<div class="content-profile-empty">'. |
| 17 | - t('You have not created a @type yet. Go ahead and create one!', array('@type' => $type_name)) .'</div>'; |
|
| 17 | + t('You have not created a @type yet. Go ahead and create one!', array('@type' => $type_name)).'</div>'; |
|
| 18 | 18 | } |
| 19 | 19 | |
| 20 | 20 | /** |
@@ -32,12 +32,12 @@ discard block |
||
| 32 | 32 | $menu_block = variable_get('mobile_menu_block', FALSE); |
| 33 | 33 | $js_settings['mobile_menu_toggle'] = array( |
| 34 | 34 | 'default_menu' => $menu_default, |
| 35 | - 'css_class' => '#' . $menu_default, |
|
| 35 | + 'css_class' => '#'.$menu_default, |
|
| 36 | 36 | ); |
| 37 | 37 | |
| 38 | 38 | // Add #block-menu as a prefix to class if the menu will be loaded via block. |
| 39 | 39 | if ($menu_block) { |
| 40 | - $js_settings['mobile_menu_toggle']['css_class'] = '#block-menu-' . $menu_default; |
|
| 40 | + $js_settings['mobile_menu_toggle']['css_class'] = '#block-menu-'.$menu_default; |
|
| 41 | 41 | } |
| 42 | 42 | |
| 43 | 43 | if (!empty($css_class)) { |
@@ -56,7 +56,7 @@ discard block |
||
| 56 | 56 | $block = array(); |
| 57 | 57 | switch ($delta) { |
| 58 | 58 | case 0: |
| 59 | - drupal_add_js(drupal_get_path('module', 'mobile_menu_toggle') . '/mobile_menu_toggle.js'); |
|
| 59 | + drupal_add_js(drupal_get_path('module', 'mobile_menu_toggle').'/mobile_menu_toggle.js'); |
|
| 60 | 60 | $block['content'] = theme('mobile_menu_toggle'); |
| 61 | 61 | break; |
| 62 | 62 | } |
@@ -24,7 +24,7 @@ |
||
| 24 | 24 | |
| 25 | 25 | $url = privatemsg_get_link($account); |
| 26 | 26 | if (!empty($url)) { |
| 27 | - $variables['privatemsg'] = l('<span>' . t('Send PM') . '</span>', $url, array('attributes' => array('class' => 'author-pane-link', 'title' => t('Send @name a private message', array('@name' => $account_name))), 'html' => TRUE)); |
|
| 27 | + $variables['privatemsg'] = l('<span>'.t('Send PM').'</span>', $url, array('attributes' => array('class' => 'author-pane-link', 'title' => t('Send @name a private message', array('@name' => $account_name))), 'html' => TRUE)); |
|
| 28 | 28 | |
| 29 | 29 | // Early versions of the template used this variable so fill it for |
| 30 | 30 | // backwards compatability. |