@@ -1,5 +1,5 @@ |
||
1 | 1 | <?php |
2 | - /** |
|
2 | +/** |
|
3 | 3 | * This template is used to print a single field in a view. It is not |
4 | 4 | * actually used in default Views, as this is registered as a theme |
5 | 5 | * function which has better performance. For single overrides, the |
@@ -56,28 +56,28 @@ |
||
56 | 56 | <div class="view-content"> |
57 | 57 | <?php |
58 | 58 | |
59 | - $team_forum_id = arg(4); |
|
60 | - $team_forum = boincteam_forum_load($team_forum_id); |
|
59 | + $team_forum_id = arg(4); |
|
60 | + $team_forum = boincteam_forum_load($team_forum_id); |
|
61 | 61 | |
62 | - // Grab a sample forum topic node to get the forum vocabulary name |
|
63 | - $sample = db_result(db_query(" |
|
62 | + // Grab a sample forum topic node to get the forum vocabulary name |
|
63 | + $sample = db_result(db_query(" |
|
64 | 64 | SELECT nid FROM {node} WHERE type = 'forum' LIMIT 1" |
65 | - )); |
|
66 | - $forum_node = node_load($sample); |
|
67 | - // Get vocabulary name and use that as the page title |
|
68 | - $taxonomy = taxonomy_get_term($forum_node->tid); |
|
65 | + )); |
|
66 | + $forum_node = node_load($sample); |
|
67 | + // Get vocabulary name and use that as the page title |
|
68 | + $taxonomy = taxonomy_get_term($forum_node->tid); |
|
69 | + if (module_exists('internationalization')) { |
|
70 | + $imv = i18ntaxonomy_localize_terms(array($taxonomy)); |
|
71 | + $taxonomy = reset($imv); |
|
72 | + } |
|
73 | + if ($forum_vocab = taxonomy_vocabulary_load($taxonomy->vid)) { |
|
69 | 74 | if (module_exists('internationalization')) { |
70 | - $imv = i18ntaxonomy_localize_terms(array($taxonomy)); |
|
71 | - $taxonomy = reset($imv); |
|
72 | - } |
|
73 | - if ($forum_vocab = taxonomy_vocabulary_load($taxonomy->vid)) { |
|
74 | - if (module_exists('internationalization')) { |
|
75 | - $forum_vocab->name = i18ntaxonomy_translate_vocabulary_name($forum_vocab); |
|
76 | - } |
|
77 | - drupal_set_title($forum_vocab->name); |
|
75 | + $forum_vocab->name = i18ntaxonomy_translate_vocabulary_name($forum_vocab); |
|
78 | 76 | } |
77 | + drupal_set_title($forum_vocab->name); |
|
78 | + } |
|
79 | 79 | |
80 | - ?> |
|
80 | + ?> |
|
81 | 81 | |
82 | 82 | <h1 class="title"><?php print $forum_vocab->name; ?></h1> |
83 | 83 |
@@ -56,49 +56,49 @@ discard block |
||
56 | 56 | ?> |
57 | 57 | <div class="<?php print $classes; ?> clearfix"> |
58 | 58 | <?php |
59 | - static $authors; |
|
60 | - if (_ignore_user_ignored_user($comment->uid)) { |
|
61 | - if (!$authors[$comment->uid]) { |
|
62 | - $authors[$comment->uid] = user_load(array('uid' => $comment->uid)); |
|
63 | - } |
|
64 | - // Remove the wrapper the Ignore User module puts around node->content. |
|
65 | - // It should be around the whole comment, not one part... |
|
66 | - // Absurd nested functions to remove wrappers are as follows. |
|
67 | - $wrapper = explode('<div class="ignore-user-content">', $content); |
|
68 | - $wrapper = end($wrapper); |
|
69 | - $content = strstr($wrapper, '</div></div>', TRUE); |
|
70 | - print '<div class="ignore-user-container">'; |
|
71 | - print bts('!username is on your !ignore_list. Click !here to view this post.', |
|
72 | - array( |
|
73 | - '!username' => theme('username', $authors[$comment->uid]), |
|
74 | - '!ignore_list' => l(bts('ignore list'), 'ignore_user/list'), |
|
75 | - '!here' => l(bts('here'), "node/{$comment->nid}#comment-{$comment->cid}", |
|
76 | - array('attributes' => array('class' => 'ignore-user-content-link'))) |
|
77 | - ) |
|
78 | - ); |
|
79 | - print '<div class="ignore-user-content">'; |
|
80 | - } |
|
81 | - ?> |
|
59 | + static $authors; |
|
60 | + if (_ignore_user_ignored_user($comment->uid)) { |
|
61 | + if (!$authors[$comment->uid]) { |
|
62 | + $authors[$comment->uid] = user_load(array('uid' => $comment->uid)); |
|
63 | + } |
|
64 | + // Remove the wrapper the Ignore User module puts around node->content. |
|
65 | + // It should be around the whole comment, not one part... |
|
66 | + // Absurd nested functions to remove wrappers are as follows. |
|
67 | + $wrapper = explode('<div class="ignore-user-content">', $content); |
|
68 | + $wrapper = end($wrapper); |
|
69 | + $content = strstr($wrapper, '</div></div>', TRUE); |
|
70 | + print '<div class="ignore-user-container">'; |
|
71 | + print bts('!username is on your !ignore_list. Click !here to view this post.', |
|
72 | + array( |
|
73 | + '!username' => theme('username', $authors[$comment->uid]), |
|
74 | + '!ignore_list' => l(bts('ignore list'), 'ignore_user/list'), |
|
75 | + '!here' => l(bts('here'), "node/{$comment->nid}#comment-{$comment->cid}", |
|
76 | + array('attributes' => array('class' => 'ignore-user-content-link'))) |
|
77 | + ) |
|
78 | + ); |
|
79 | + print '<div class="ignore-user-content">'; |
|
80 | + } |
|
81 | + ?> |
|
82 | 82 | |
83 | 83 | <div class="user"> |
84 | 84 | <?php |
85 | - $account = user_load(array('uid' => $comment->uid)); |
|
86 | - $user_image = boincuser_get_user_profile_image($comment->uid); |
|
87 | - if ($user_image) { |
|
88 | - print '<div class="picture">'; |
|
89 | - if (is_array($user_image) AND $user_image['image']['filepath']) { |
|
90 | - //print theme('imagecache', 'thumbnail', $user_image['image']['filepath'], $user_image['alt'], $user_image['alt']); |
|
91 | - print theme('imagefield_image', $user_image['image'], $user_image['alt'], $user_image['alt'], array(), false); |
|
92 | - } |
|
93 | - elseif (is_string($user_image)) { |
|
94 | - print '<img src="' . $user_image . '"/>'; |
|
95 | - } |
|
96 | - print '</div>'; |
|
85 | + $account = user_load(array('uid' => $comment->uid)); |
|
86 | + $user_image = boincuser_get_user_profile_image($comment->uid); |
|
87 | + if ($user_image) { |
|
88 | + print '<div class="picture">'; |
|
89 | + if (is_array($user_image) AND $user_image['image']['filepath']) { |
|
90 | + //print theme('imagecache', 'thumbnail', $user_image['image']['filepath'], $user_image['alt'], $user_image['alt']); |
|
91 | + print theme('imagefield_image', $user_image['image'], $user_image['alt'], $user_image['alt'], array(), false); |
|
97 | 92 | } |
98 | - // Generate ignore user link |
|
99 | - $ignore_link = ignore_user_link('comment', $comment); |
|
100 | - //echo '<pre>' . print_r($links, TRUE) . '</pre>'; |
|
101 | - ?> |
|
93 | + elseif (is_string($user_image)) { |
|
94 | + print '<img src="' . $user_image . '"/>'; |
|
95 | + } |
|
96 | + print '</div>'; |
|
97 | + } |
|
98 | + // Generate ignore user link |
|
99 | + $ignore_link = ignore_user_link('comment', $comment); |
|
100 | + //echo '<pre>' . print_r($links, TRUE) . '</pre>'; |
|
101 | + ?> |
|
102 | 102 | <div class="name"><?php print $author; ?></div> |
103 | 103 | <?php if ($account->uid): ?> |
104 | 104 | <div class="join-date">Joined: <?php print date('j M y', $account->created); ?></div> |
@@ -108,15 +108,15 @@ discard block |
||
108 | 108 | |
109 | 109 | <div class="user-links"> |
110 | 110 | <div class="ignore-link"><?php print l($ignore_link['ignore_user']['title'], |
111 | - $ignore_link['ignore_user']['href'], |
|
112 | - array('query' => $ignore_link['ignore_user']['query'])); ?> |
|
111 | + $ignore_link['ignore_user']['href'], |
|
112 | + array('query' => $ignore_link['ignore_user']['query'])); ?> |
|
113 | 113 | </div> |
114 | 114 | <div class="pm-link"><?php |
115 | - if ($user->uid AND ($user->uid != $account->uid)) { |
|
116 | - print l(bts('Send message'), |
|
117 | - privatemsg_get_link(array($account)), |
|
118 | - array('query' => drupal_get_destination())); |
|
119 | - } ?> |
|
115 | + if ($user->uid AND ($user->uid != $account->uid)) { |
|
116 | + print l(bts('Send message'), |
|
117 | + privatemsg_get_link(array($account)), |
|
118 | + array('query' => drupal_get_destination())); |
|
119 | + } ?> |
|
120 | 120 | </div> |
121 | 121 | </div> |
122 | 122 | <?php endif; ?> |
@@ -142,22 +142,22 @@ discard block |
||
142 | 142 | </div> |
143 | 143 | <div class="comment-id"> |
144 | 144 | <?php echo l(bts('Message @id', array('@id' => $comment->cid)), |
145 | - "goto/comment/{$comment->cid}"); ?> |
|
145 | + "goto/comment/{$comment->cid}"); ?> |
|
146 | 146 | <?php |
147 | - if ($comment->pid): |
|
148 | - $parent = _comment_load($comment->pid); |
|
149 | - if ($parent->status == COMMENT_PUBLISHED) { |
|
150 | - $parent_link = l(bts('message @id', array('@id' => $comment->pid)), |
|
151 | - "goto/comment/{$comment->pid}"); |
|
152 | - } |
|
153 | - else { |
|
154 | - $parent_link = '(' . bts('parent removed') . ')'; |
|
155 | - } |
|
156 | - echo bts(' in response to !parent', array( |
|
157 | - '!parent' => $parent_link |
|
158 | - )); |
|
159 | - endif; |
|
160 | - ?> |
|
147 | + if ($comment->pid): |
|
148 | + $parent = _comment_load($comment->pid); |
|
149 | + if ($parent->status == COMMENT_PUBLISHED) { |
|
150 | + $parent_link = l(bts('message @id', array('@id' => $comment->pid)), |
|
151 | + "goto/comment/{$comment->pid}"); |
|
152 | + } |
|
153 | + else { |
|
154 | + $parent_link = '(' . bts('parent removed') . ')'; |
|
155 | + } |
|
156 | + echo bts(' in response to !parent', array( |
|
157 | + '!parent' => $parent_link |
|
158 | + )); |
|
159 | + endif; |
|
160 | + ?> |
|
161 | 161 | </div> |
162 | 162 | <div class="standard-links"> |
163 | 163 | <?php print $links; ?> |
@@ -180,11 +180,11 @@ discard block |
||
180 | 180 | </div> <!-- /.comment-body --> |
181 | 181 | |
182 | 182 | <?php |
183 | - if (_ignore_user_ignored_user($comment->uid)) { |
|
184 | - print '</div> <!-- /.ignore-user-content -->'; |
|
185 | - print '</div> <!-- /.ignore-user-container -->'; |
|
186 | - } |
|
187 | - ?> |
|
183 | + if (_ignore_user_ignored_user($comment->uid)) { |
|
184 | + print '</div> <!-- /.ignore-user-content -->'; |
|
185 | + print '</div> <!-- /.ignore-user-container -->'; |
|
186 | + } |
|
187 | +?> |
|
188 | 188 | |
189 | 189 | </div> <!-- /.comment --> |
190 | 190 |