Projet

Général

Profil

Révision c169e7c4

Ajouté par Assos Assos il y a presque 10 ans

Weekly update of contrib modules

Voir les différences:

drupal7/sites/all/modules/advanced_forum/CHANGELOG.txt
1 1

  
2 2
****************************** DRUPAL 7 - 2.x BRANCH ********************************
3 3

  
4
September 26, 2013
5
------------------
6
Issue #2097767 by troky: Fixed CSS path.
7

  
8

  
9
September 17, 2013
10
------------------
11
by troky: Added missing forum/search view.
12

  
4 13
July 07, 2013
5 14
-------------
6 15
7.x-2.3 RELEASE
drupal7/sites/all/modules/advanced_forum/advanced_forum.info
15 15

  
16 16
core = 7.x
17 17

  
18
; Information added by drupal.org packaging script on 2013-07-07
19
version = "7.x-2.3"
18
; Information added by Drupal.org packaging script on 2014-06-21
19
version = "7.x-2.4"
20 20
core = "7.x"
21 21
project = "advanced_forum"
22
datestamp = "1373223651"
22
datestamp = "1403371728"
23 23

  
drupal7/sites/all/modules/advanced_forum/advanced_forum.module
243 243

  
244 244
  // Don't let core do its basic preprocess for forums, as we want to do
245 245
  // other stuff now.
246
  foreach ($theme_registry['forums']['preprocess functions'] as $key => $value) {
247
    if ($value == 'template_preprocess_forums') {
248
      unset($theme_registry['forums']['preprocess functions'][$key]);
246
  if (isset($theme_registry['forums']['preprocess functions'])) {
247
    foreach ($theme_registry['forums']['preprocess functions'] as $key => $value) {
248
      if ($value == 'template_preprocess_forums') {
249
        unset($theme_registry['forums']['preprocess functions'][$key]);
250
      }
249 251
    }
250 252
  }
251 253

  
252 254
  // We duplicate all of core's forum list preprocessing so no need to run
253 255
  // it twice. Running twice also causes problems with & in forum name.
254
  foreach ($theme_registry['forum_list']['preprocess functions'] as $key => $value) {
255
    if ($value == 'template_preprocess_forum_list') {
256
      unset($theme_registry['forum_list']['preprocess functions'][$key]);
256
  if (isset($theme_registry['forum_list']['preprocess functions'])) {
257
    foreach ($theme_registry['forum_list']['preprocess functions'] as $key => $value) {
258
      if ($value == 'template_preprocess_forum_list') {
259
        unset($theme_registry['forum_list']['preprocess functions'][$key]);
260
      }
257 261
    }
258 262
  }
259 263

  
260 264
  // Views handles the topic list pages so remove the core template preprocess.
261
  foreach ($theme_registry['forum_topic_list']['preprocess functions'] as $key => $value) {
262
    if ($value == 'template_preprocess_forum_topic_list') {
263
      unset($theme_registry['forum_topic_list']['preprocess functions'][$key]);
265
  if (isset($theme_registry['forum_topic_list']['preprocess functions'])) {
266
    foreach ($theme_registry['forum_topic_list']['preprocess functions'] as $key => $value) {
267
      if ($value == 'template_preprocess_forum_topic_list') {
268
        unset($theme_registry['forum_topic_list']['preprocess functions'][$key]);
269
      }
264 270
    }
265 271
  }
266 272

  
......
323 329
          }
324 330
        }
325 331
        // Add in our new preprocess functions:
326
        array_splice($theme_registry[$template]['preprocess functions'], $position, 0, $preprocess);
332
        if (isset($theme_registry[$template]['preprocess functions'])) {
333
          array_splice($theme_registry[$template]['preprocess functions'], $position, 0, $preprocess);
334
        }
327 335
      }
328 336
    }
329 337
  }
330 338

  
331 339

  
332 340
  // temp workaround
333
  array_splice($theme_registry['views_view__advanced_forum_topic_list']['preprocess functions'], 1, 0, 'template_preprocess_views_view');
334
  array_splice($theme_registry['views_view__advanced_forum_group_topic_list']['preprocess functions'], 1, 0, 'template_preprocess_views_view');
341
  if (isset($theme_registry['views_view__advanced_forum_topic_list']['preprocess functions'])) {
342
    array_splice($theme_registry['views_view__advanced_forum_topic_list']['preprocess functions'], 1, 0, 'template_preprocess_views_view');
343
  }
344
  if (isset($theme_registry['views_view__advanced_forum_group_topic_list']['preprocess functions'])) {
345
    array_splice($theme_registry['views_view__advanced_forum_group_topic_list']['preprocess functions'], 1, 0, 'template_preprocess_views_view');
346
  }
335 347
  //array_splice($theme_registry['views_view_forum_topic_list__advanced_forum_topic_list']['preprocess functions'], 1, 0, 'template_preprocess_views_view_forum_topic_list');
336 348
}
337 349

  
......
441 453
  }
442 454
}
443 455

  
444
/**
445
 * Implementation of hook_comment_insert().
446
 */
447
function advanced_forum_comment_insert($comment) {
448
  if (!empty($comment->node_type) && ($comment->node_type == "comment_node_forum")) {
449
    advanced_forum_statistics_replies(1);
450
  }
451
}
452

  
453 456
/**
454 457
 * Implementation of hook_comment_update().
455 458
 */
......
1341 1344
  }
1342 1345

  
1343 1346
  $node_id = $node->nid;
1344
  $post_id = $comment->pid;
1347
  $post_id = $comment->cid;
1345 1348

  
1346 1349
  if (!isset($post_order[$node_id])) {
1347 1350
    // Initialize the spot for this node's list.
drupal7/sites/all/modules/advanced_forum/includes/core-overrides.inc
90 90

  
91 91

  
92 92
  // Return a cached forum tree if available.
93
  if (!isset($tid)) {
93
  if (empty($tid)) {
94 94
    $tid = 0;
95 95
  }
96 96
  if (isset($cache[$tid])) {
......
137 137
    $_forums = i18n_taxonomy_localize_terms($_forums);
138 138
  }
139 139

  
140
  if (count($_forums)) {
140
  if ($cached = cache_get('adv_forum_counts' . $tid, 'cache')) {
141
    if ($cached->expire > time()) {
142
      $counts = $cached->data;
143
    }
144
  }
145
  if (count($_forums) && empty($counts)) {
141 146
    $query = db_select('node', 'n');
142 147
    $query->join('node_comment_statistics', 'ncs', 'n.nid = ncs.nid');
143 148
    $query->join('forum_index', 'f', 'n.nid = f.nid');
......
173 178
        ->addTag('node_access')
174 179
        ->execute()
175 180
        ->fetchAllAssoc('tid');
181
    cache_set('adv_forum_counts' . $tid, $counts, 'cache', time() + 60*60); //1 hour
176 182
  }
177 183

  
184
  // get last nodes with comments for subquery SELECT optimization
185
  $subquery = db_select('node_comment_statistics', 'lnsc')
186
    ->fields('lnsc', array('nid'))
187
    ->distinct()
188
    ->orderBy('last_comment_timestamp', 'DESC')
189
    ->range(0, 1000); // should be moved to options or additionally calculated elsewhere
190

  
178 191
  foreach ($_forums as $forum) {
179 192
    // Determine if the child term is a container.
180 193
    if (in_array($forum->tid, variable_get('forum_containers', array()))) {
......
193 206

  
194 207
    // Query "Last Post" information for this forum.
195 208
    $query = db_select('node', 'n');
209
    $query->join($subquery, 'lastnodes', 'n.nid = lastnodes.nid');
196 210
    $query->join('forum_index', 'f', 'n.nid = f.nid AND f.tid = :tid', array(':tid' => $forum->tid));
197 211
    $query->join('node_comment_statistics', 'ncs', 'n.nid = ncs.nid');
198 212
    $query->join('users', 'u', 'ncs.last_comment_uid = u.uid');
drupal7/sites/all/modules/advanced_forum/includes/style.inc
412 412
        // style, look for the style specific CSS file first in the active
413 413
        // theme and then in the style directory.
414 414
        foreach ($lineage AS $key => $path) {
415
          $css_file = "/advanced-forum.$key.$css_type";
415
          $css_file = "advanced-forum.$key.$css_type";
416 416
          if (file_exists("$theme_path/$css_file")) {
417 417
            // If the style specific file is in the theme, use that.
418 418
            drupal_add_css("$theme_path/$css_file");
419 419
          }
420 420
          elseif (file_exists("$path/$css_file")) {
421 421
            // Otherwise look in the style for it.
422
            drupal_add_css("$path" . "$css_file");
422
            drupal_add_css("$path/$css_file");
423 423
          }
424 424
        }
425 425
      }
drupal7/sites/all/modules/advanced_forum/includes/views/advanced_forum_group_topic_list.view
1
<?php
2

  
3
// $Id$
4

  
5
/*
6
 * View 'advanced_forum_group_topic_list'
7
 */
8

  
9
if (module_exists('og')) {
10
  $view = new view;
11
  $view->name = 'advanced_forum_group_topic_list';
12
  $view->description = 'Shows the topics in a given group as if it were a forum';
13
  $view->tag = 'Advanced Forum';
14
  $view->base_table = 'node';
15
  $view->human_name = '';
16
  $view->core = 0;
17
  $view->api_version = '3.0-alpha1';
18
  $view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
19

  
20
  /* Display: Defaults */
21
  $handler = $view->new_display('default', 'Defaults', 'default');
22
  $handler->display->display_options['title'] = 'Group Name';
23
  $handler->display->display_options['access']['type'] = 'none';
24
  $handler->display->display_options['cache']['type'] = 'none';
25
  $handler->display->display_options['query']['type'] = 'views_query';
26
  $handler->display->display_options['exposed_form']['type'] = 'basic';
27
  $handler->display->display_options['pager']['type'] = 'full';
28
  $handler->display->display_options['pager']['options']['items_per_page'] = 20;
29
  $handler->display->display_options['style_plugin'] = 'forum_topic_list';
30
  $handler->display->display_options['style_options']['columns'] = array(
31
    'nid' => 'nid',
32
    'teaser' => 'teaser',
33
    'topic_icon' => 'topic_icon',
34
    'title' => 'title',
35
    'timestamp' => 'title',
36
    'topic_pager' => 'title',
37
    'name_1' => 'title',
38
    'created' => 'title',
39
    'comment_count' => 'comment_count',
40
    'new_comments' => 'comment_count',
41
    'totalcount' => 'totalcount',
42
    'last_comment_name' => 'last_updated',
43
    'last_updated' => 'last_updated',
44
    'sticky' => 'sticky',
45
    'comment' => 'comment',
46
  );
47
  $handler->display->display_options['style_options']['default'] = 'last_updated';
48
  $handler->display->display_options['style_options']['info'] = array(
49
    'nid' => array(
50
      'sortable' => 0,
51
      'separator' => '',
52
    ),
53
    'teaser' => array(
54
      'separator' => '',
55
    ),
56
    'topic_icon' => array(
57
      'separator' => '',
58
    ),
59
    'title' => array(
60
      'sortable' => 1,
61
      'separator' => ' ',
62
    ),
63
    'timestamp' => array(
64
      'separator' => '',
65
    ),
66
    'topic_pager' => array(
67
      'separator' => '',
68
    ),
69
    'name_1' => array(
70
      'sortable' => 0,
71
      'separator' => '',
72
    ),
73
    'created' => array(
74
      'sortable' => 0,
75
      'separator' => '',
76
    ),
77
    'comment_count' => array(
78
      'sortable' => 1,
79
      'separator' => '',
80
    ),
81
    'new_comments' => array(
82
      'separator' => '',
83
    ),
84
    'totalcount' => array(
85
      'sortable' => 1,
86
      'separator' => '',
87
    ),
88
    'last_comment_name' => array(
89
      'sortable' => 1,
90
      'separator' => '<br />',
91
    ),
92
    'last_updated' => array(
93
      'sortable' => 1,
94
      'separator' => '<br />',
95
    ),
96
    'sticky' => array(
97
      'sortable' => 0,
98
      'separator' => '',
99
    ),
100
    'comment' => array(
101
      'sortable' => 0,
102
      'separator' => '',
103
    ),
104
  );
105
  $handler->display->display_options['style_options']['override'] = 0;
106
  $handler->display->display_options['style_options']['sticky'] = 1;
107
  $handler->display->display_options['style_options']['order'] = 'desc';
108
  /* Empty text: Global: Text area */
109
  $handler->display->display_options['empty']['text']['id'] = 'area';
110
  $handler->display->display_options['empty']['text']['table'] = 'views';
111
  $handler->display->display_options['empty']['text']['field'] = 'area';
112
  $handler->display->display_options['empty']['text']['empty'] = FALSE;
113
  $handler->display->display_options['empty']['text']['content'] = 'No posts in this group.';
114
  $handler->display->display_options['empty']['text']['format'] = 'filtered_html';
115
  /* Field: Node: Nid */
116
  $handler->display->display_options['fields']['nid']['id'] = 'nid';
117
  $handler->display->display_options['fields']['nid']['table'] = 'node';
118
  $handler->display->display_options['fields']['nid']['field'] = 'nid';
119
  $handler->display->display_options['fields']['nid']['exclude'] = TRUE;
120
  $handler->display->display_options['fields']['nid']['alter']['alter_text'] = 0;
121
  $handler->display->display_options['fields']['nid']['alter']['make_link'] = 0;
122
  $handler->display->display_options['fields']['nid']['alter']['trim'] = 0;
123
  $handler->display->display_options['fields']['nid']['alter']['word_boundary'] = 1;
124
  $handler->display->display_options['fields']['nid']['alter']['ellipsis'] = 1;
125
  $handler->display->display_options['fields']['nid']['alter']['strip_tags'] = 0;
126
  $handler->display->display_options['fields']['nid']['alter']['html'] = 0;
127
  $handler->display->display_options['fields']['nid']['link_to_node'] = 0;
128
  /* Field: Fields: body */
129
  $handler->display->display_options['fields']['teaser']['id'] = 'teaser';
130
  $handler->display->display_options['fields']['teaser']['table'] = 'field_data_body';
131
  $handler->display->display_options['fields']['teaser']['field'] = 'entity_id';
132
  $handler->display->display_options['fields']['teaser']['label'] = 'Teaser';
133
  $handler->display->display_options['fields']['teaser']['exclude'] = TRUE;
134
  $handler->display->display_options['fields']['teaser']['alter']['alter_text'] = 0;
135
  $handler->display->display_options['fields']['teaser']['alter']['make_link'] = 0;
136
  $handler->display->display_options['fields']['teaser']['alter']['trim'] = 0;
137
  $handler->display->display_options['fields']['teaser']['alter']['max_length'] = '200';
138
  $handler->display->display_options['fields']['teaser']['alter']['word_boundary'] = 1;
139
  $handler->display->display_options['fields']['teaser']['alter']['ellipsis'] = 1;
140
  $handler->display->display_options['fields']['teaser']['alter']['strip_tags'] = 1;
141
  $handler->display->display_options['fields']['teaser']['alter']['html'] = 0;
142
  $handler->display->display_options['fields']['teaser']['hide_empty'] = 0;
143
  $handler->display->display_options['fields']['teaser']['type'] = 'text_summary_or_trimmed';
144
  $handler->display->display_options['fields']['teaser']['settings'] = array(
145
    'trim_length' => '600',
146
  );
147
  /* Field: Node: Topic Icon */
148
  $handler->display->display_options['fields']['topic_icon']['id'] = 'topic_icon';
149
  $handler->display->display_options['fields']['topic_icon']['table'] = 'node';
150
  $handler->display->display_options['fields']['topic_icon']['field'] = 'topic_icon';
151
  $handler->display->display_options['fields']['topic_icon']['label'] = '';
152
  $handler->display->display_options['fields']['topic_icon']['alter']['alter_text'] = 0;
153
  $handler->display->display_options['fields']['topic_icon']['alter']['make_link'] = 0;
154
  $handler->display->display_options['fields']['topic_icon']['alter']['trim'] = 0;
155
  $handler->display->display_options['fields']['topic_icon']['alter']['word_boundary'] = 1;
156
  $handler->display->display_options['fields']['topic_icon']['alter']['ellipsis'] = 1;
157
  $handler->display->display_options['fields']['topic_icon']['alter']['strip_tags'] = 0;
158
  $handler->display->display_options['fields']['topic_icon']['alter']['html'] = 0;
159
  $handler->display->display_options['fields']['topic_icon']['hot_topic_threshold'] = '15';
160
  /* Field: Node: Title */
161
  $handler->display->display_options['fields']['title']['id'] = 'title';
162
  $handler->display->display_options['fields']['title']['table'] = 'node';
163
  $handler->display->display_options['fields']['title']['field'] = 'title';
164
  $handler->display->display_options['fields']['title']['label'] = 'Topic / Topic starter';
165
  $handler->display->display_options['fields']['title']['alter']['alter_text'] = 1;
166
  $handler->display->display_options['fields']['title']['alter']['text'] = '<span class="forum-topic-title">[title]</span> ';
167
  $handler->display->display_options['fields']['title']['alter']['make_link'] = 1;
168
  $handler->display->display_options['fields']['title']['alter']['path'] = 'node/[nid]';
169
  $handler->display->display_options['fields']['title']['alter']['alt'] = '[teaser]';
170
  $handler->display->display_options['fields']['title']['alter']['trim'] = 0;
171
  $handler->display->display_options['fields']['title']['alter']['word_boundary'] = 1;
172
  $handler->display->display_options['fields']['title']['alter']['ellipsis'] = 1;
173
  $handler->display->display_options['fields']['title']['alter']['strip_tags'] = 0;
174
  $handler->display->display_options['fields']['title']['alter']['html'] = 0;
175
  $handler->display->display_options['fields']['title']['hide_empty'] = 0;
176
  $handler->display->display_options['fields']['title']['empty_zero'] = 0;
177
  $handler->display->display_options['fields']['title']['link_to_node'] = 0;
178
  /* Field: Has new content */
179
  $handler->display->display_options['fields']['timestamp']['id'] = 'timestamp';
180
  $handler->display->display_options['fields']['timestamp']['table'] = 'history';
181
  $handler->display->display_options['fields']['timestamp']['field'] = 'timestamp';
182
  $handler->display->display_options['fields']['timestamp']['ui_name'] = 'Has new content';
183
  $handler->display->display_options['fields']['timestamp']['alter']['alter_text'] = 1;
184
  $handler->display->display_options['fields']['timestamp']['alter']['text'] = '[timestamp] ';
185
  $handler->display->display_options['fields']['timestamp']['alter']['make_link'] = 0;
186
  $handler->display->display_options['fields']['timestamp']['alter']['absolute'] = 0;
187
  $handler->display->display_options['fields']['timestamp']['alter']['trim'] = 0;
188
  $handler->display->display_options['fields']['timestamp']['alter']['word_boundary'] = 1;
189
  $handler->display->display_options['fields']['timestamp']['alter']['ellipsis'] = 1;
190
  $handler->display->display_options['fields']['timestamp']['alter']['strip_tags'] = 0;
191
  $handler->display->display_options['fields']['timestamp']['alter']['html'] = 0;
192
  $handler->display->display_options['fields']['timestamp']['element_label_colon'] = 1;
193
  $handler->display->display_options['fields']['timestamp']['element_default_classes'] = 1;
194
  $handler->display->display_options['fields']['timestamp']['hide_empty'] = 0;
195
  $handler->display->display_options['fields']['timestamp']['link_to_node'] = 0;
196
  $handler->display->display_options['fields']['timestamp']['comments'] = 1;
197
  /* Field: Node: Topic Pager */
198
  $handler->display->display_options['fields']['topic_pager']['id'] = 'topic_pager';
199
  $handler->display->display_options['fields']['topic_pager']['table'] = 'node';
200
  $handler->display->display_options['fields']['topic_pager']['field'] = 'topic_pager';
201
  $handler->display->display_options['fields']['topic_pager']['alter']['alter_text'] = 0;
202
  $handler->display->display_options['fields']['topic_pager']['alter']['make_link'] = 0;
203
  $handler->display->display_options['fields']['topic_pager']['alter']['trim'] = 0;
204
  $handler->display->display_options['fields']['topic_pager']['alter']['word_boundary'] = 1;
205
  $handler->display->display_options['fields']['topic_pager']['alter']['ellipsis'] = 1;
206
  $handler->display->display_options['fields']['topic_pager']['alter']['strip_tags'] = 0;
207
  $handler->display->display_options['fields']['topic_pager']['alter']['html'] = 0;
208
  $handler->display->display_options['fields']['topic_pager']['total_pages_shown'] = '3';
209
  /* Field: User: Name */
210
  $handler->display->display_options['fields']['name_1']['id'] = 'name_1';
211
  $handler->display->display_options['fields']['name_1']['table'] = 'users';
212
  $handler->display->display_options['fields']['name_1']['field'] = 'name';
213
  $handler->display->display_options['fields']['name_1']['alter']['alter_text'] = 1;
214
  $handler->display->display_options['fields']['name_1']['alter']['text'] = '<br /> by [name_1] ';
215
  $handler->display->display_options['fields']['name_1']['alter']['make_link'] = 0;
216
  $handler->display->display_options['fields']['name_1']['alter']['trim'] = 0;
217
  $handler->display->display_options['fields']['name_1']['alter']['word_boundary'] = 1;
218
  $handler->display->display_options['fields']['name_1']['alter']['ellipsis'] = 1;
219
  $handler->display->display_options['fields']['name_1']['alter']['strip_tags'] = 0;
220
  $handler->display->display_options['fields']['name_1']['alter']['html'] = 0;
221
  $handler->display->display_options['fields']['name_1']['hide_empty'] = 0;
222
  $handler->display->display_options['fields']['name_1']['empty_zero'] = 0;
223
  $handler->display->display_options['fields']['name_1']['link_to_user'] = 1;
224
  $handler->display->display_options['fields']['name_1']['overwrite_anonymous'] = 0;
225
  /* Field: Node: Post date */
226
  $handler->display->display_options['fields']['created']['id'] = 'created';
227
  $handler->display->display_options['fields']['created']['table'] = 'node';
228
  $handler->display->display_options['fields']['created']['field'] = 'created';
229
  $handler->display->display_options['fields']['created']['alter']['alter_text'] = 1;
230
  $handler->display->display_options['fields']['created']['alter']['text'] = 'on [created]';
231
  $handler->display->display_options['fields']['created']['alter']['make_link'] = 0;
232
  $handler->display->display_options['fields']['created']['alter']['trim'] = 0;
233
  $handler->display->display_options['fields']['created']['alter']['word_boundary'] = 1;
234
  $handler->display->display_options['fields']['created']['alter']['ellipsis'] = 1;
235
  $handler->display->display_options['fields']['created']['alter']['strip_tags'] = 0;
236
  $handler->display->display_options['fields']['created']['alter']['html'] = 0;
237
  $handler->display->display_options['fields']['created']['hide_empty'] = 0;
238
  $handler->display->display_options['fields']['created']['empty_zero'] = 0;
239
  /* Field: Node: Comment count */
240
  $handler->display->display_options['fields']['comment_count']['id'] = 'comment_count';
241
  $handler->display->display_options['fields']['comment_count']['table'] = 'node_comment_statistics';
242
  $handler->display->display_options['fields']['comment_count']['field'] = 'comment_count';
243
  $handler->display->display_options['fields']['comment_count']['label'] = 'Replies';
244
  $handler->display->display_options['fields']['comment_count']['alter']['alter_text'] = 0;
245
  $handler->display->display_options['fields']['comment_count']['alter']['make_link'] = 0;
246
  $handler->display->display_options['fields']['comment_count']['alter']['trim'] = 0;
247
  $handler->display->display_options['fields']['comment_count']['alter']['word_boundary'] = 1;
248
  $handler->display->display_options['fields']['comment_count']['alter']['ellipsis'] = 1;
249
  $handler->display->display_options['fields']['comment_count']['alter']['strip_tags'] = 0;
250
  $handler->display->display_options['fields']['comment_count']['alter']['html'] = 0;
251
  $handler->display->display_options['fields']['comment_count']['empty'] = '0';
252
  $handler->display->display_options['fields']['comment_count']['hide_empty'] = 0;
253
  $handler->display->display_options['fields']['comment_count']['empty_zero'] = 1;
254
  /* Field: Node: New comments */
255
  $handler->display->display_options['fields']['new_comments']['id'] = 'new_comments';
256
  $handler->display->display_options['fields']['new_comments']['table'] = 'node';
257
  $handler->display->display_options['fields']['new_comments']['field'] = 'new_comments';
258
  $handler->display->display_options['fields']['new_comments']['alter']['alter_text'] = 0;
259
  $handler->display->display_options['fields']['new_comments']['alter']['make_link'] = 0;
260
  $handler->display->display_options['fields']['new_comments']['alter']['trim'] = 0;
261
  $handler->display->display_options['fields']['new_comments']['alter']['word_boundary'] = 1;
262
  $handler->display->display_options['fields']['new_comments']['alter']['ellipsis'] = 1;
263
  $handler->display->display_options['fields']['new_comments']['alter']['strip_tags'] = 0;
264
  $handler->display->display_options['fields']['new_comments']['alter']['html'] = 0;
265
  $handler->display->display_options['fields']['new_comments']['hide_empty'] = TRUE;
266
  $handler->display->display_options['fields']['new_comments']['prefix'] = ' View ';
267
  $handler->display->display_options['fields']['new_comments']['suffix'] = ' new';
268
  $handler->display->display_options['fields']['new_comments']['link_to_comment'] = 1;
269
  /* Field: Node statistics: Total views */
270
  $handler->display->display_options['fields']['totalcount']['id'] = 'totalcount';
271
  $handler->display->display_options['fields']['totalcount']['table'] = 'node_counter';
272
  $handler->display->display_options['fields']['totalcount']['field'] = 'totalcount';
273
  $handler->display->display_options['fields']['totalcount']['label'] = 'Views';
274
  $handler->display->display_options['fields']['totalcount']['alter']['alter_text'] = 0;
275
  $handler->display->display_options['fields']['totalcount']['alter']['make_link'] = 0;
276
  $handler->display->display_options['fields']['totalcount']['alter']['trim'] = 0;
277
  $handler->display->display_options['fields']['totalcount']['alter']['word_boundary'] = 1;
278
  $handler->display->display_options['fields']['totalcount']['alter']['ellipsis'] = 1;
279
  $handler->display->display_options['fields']['totalcount']['alter']['strip_tags'] = 0;
280
  $handler->display->display_options['fields']['totalcount']['alter']['html'] = 0;
281
  $handler->display->display_options['fields']['totalcount']['empty'] = '0';
282
  $handler->display->display_options['fields']['totalcount']['hide_empty'] = 0;
283
  $handler->display->display_options['fields']['totalcount']['empty_zero'] = 1;
284
  /* Field: Node: Last comment author */
285
  $handler->display->display_options['fields']['last_comment_name']['id'] = 'last_comment_name';
286
  $handler->display->display_options['fields']['last_comment_name']['table'] = 'node_comment_statistics';
287
  $handler->display->display_options['fields']['last_comment_name']['field'] = 'last_comment_name';
288
  $handler->display->display_options['fields']['last_comment_name']['alter']['alter_text'] = 1;
289
  $handler->display->display_options['fields']['last_comment_name']['alter']['text'] = 'by [last_comment_name]';
290
  $handler->display->display_options['fields']['last_comment_name']['alter']['make_link'] = 0;
291
  $handler->display->display_options['fields']['last_comment_name']['alter']['trim'] = 0;
292
  $handler->display->display_options['fields']['last_comment_name']['alter']['word_boundary'] = 1;
293
  $handler->display->display_options['fields']['last_comment_name']['alter']['ellipsis'] = 1;
294
  $handler->display->display_options['fields']['last_comment_name']['alter']['strip_tags'] = 0;
295
  $handler->display->display_options['fields']['last_comment_name']['alter']['html'] = 0;
296
  $handler->display->display_options['fields']['last_comment_name']['hide_empty'] = 0;
297
  $handler->display->display_options['fields']['last_comment_name']['empty_zero'] = 0;
298
  /* Field: Node: Updated/commented date */
299
  $handler->display->display_options['fields']['last_updated']['id'] = 'last_updated';
300
  $handler->display->display_options['fields']['last_updated']['table'] = 'node_comment_statistics';
301
  $handler->display->display_options['fields']['last_updated']['field'] = 'last_updated';
302
  $handler->display->display_options['fields']['last_updated']['label'] = 'Last post';
303
  $handler->display->display_options['fields']['last_updated']['alter']['alter_text'] = 0;
304
  $handler->display->display_options['fields']['last_updated']['alter']['make_link'] = 0;
305
  $handler->display->display_options['fields']['last_updated']['alter']['trim'] = 0;
306
  $handler->display->display_options['fields']['last_updated']['alter']['word_boundary'] = 1;
307
  $handler->display->display_options['fields']['last_updated']['alter']['ellipsis'] = 1;
308
  $handler->display->display_options['fields']['last_updated']['alter']['strip_tags'] = 0;
309
  $handler->display->display_options['fields']['last_updated']['alter']['html'] = 0;
310
  $handler->display->display_options['fields']['last_updated']['hide_empty'] = 0;
311
  $handler->display->display_options['fields']['last_updated']['empty_zero'] = 0;
312
  /* Field: Node: Sticky */
313
  $handler->display->display_options['fields']['sticky']['id'] = 'sticky';
314
  $handler->display->display_options['fields']['sticky']['table'] = 'node';
315
  $handler->display->display_options['fields']['sticky']['field'] = 'sticky';
316
  $handler->display->display_options['fields']['sticky']['exclude'] = TRUE;
317
  $handler->display->display_options['fields']['sticky']['alter']['alter_text'] = 0;
318
  $handler->display->display_options['fields']['sticky']['alter']['make_link'] = 0;
319
  $handler->display->display_options['fields']['sticky']['alter']['trim'] = 0;
320
  $handler->display->display_options['fields']['sticky']['alter']['word_boundary'] = 1;
321
  $handler->display->display_options['fields']['sticky']['alter']['ellipsis'] = 1;
322
  $handler->display->display_options['fields']['sticky']['alter']['strip_tags'] = 0;
323
  $handler->display->display_options['fields']['sticky']['alter']['html'] = 0;
324
  $handler->display->display_options['fields']['sticky']['not'] = 0;
325
  /* Field: Node: Comment status */
326
  $handler->display->display_options['fields']['comment']['id'] = 'comment';
327
  $handler->display->display_options['fields']['comment']['table'] = 'node';
328
  $handler->display->display_options['fields']['comment']['field'] = 'comment';
329
  $handler->display->display_options['fields']['comment']['exclude'] = TRUE;
330
  $handler->display->display_options['fields']['comment']['alter']['alter_text'] = 0;
331
  $handler->display->display_options['fields']['comment']['alter']['make_link'] = 0;
332
  $handler->display->display_options['fields']['comment']['alter']['trim'] = 0;
333
  $handler->display->display_options['fields']['comment']['alter']['word_boundary'] = 1;
334
  $handler->display->display_options['fields']['comment']['alter']['ellipsis'] = 1;
335
  $handler->display->display_options['fields']['comment']['alter']['strip_tags'] = 0;
336
  $handler->display->display_options['fields']['comment']['alter']['html'] = 0;
337
  /* Sort criterion: Node: Sticky */
338
  $handler->display->display_options['sorts']['sticky']['id'] = 'sticky';
339
  $handler->display->display_options['sorts']['sticky']['table'] = 'node';
340
  $handler->display->display_options['sorts']['sticky']['field'] = 'sticky';
341
  $handler->display->display_options['sorts']['sticky']['order'] = 'DESC';
342
  /* Contextual filter: Fields: Groups audience (group_audience) - gid */
343
  $handler->display->display_options['arguments']['group_audience_gid']['id'] = 'group_audience_gid';
344
  $handler->display->display_options['arguments']['group_audience_gid']['table'] = 'field_data_group_audience';
345
  $handler->display->display_options['arguments']['group_audience_gid']['field'] = 'group_audience_gid';
346
  $handler->display->display_options['arguments']['group_audience_gid']['default_action'] = 'default';
347
  $handler->display->display_options['arguments']['group_audience_gid']['default_argument_type'] = 'fixed';
348
  $handler->display->display_options['arguments']['group_audience_gid']['summary']['format'] = 'default_summary';
349
  $handler->display->display_options['arguments']['group_audience_gid']['break_phrase'] = 0;
350
  $handler->display->display_options['arguments']['group_audience_gid']['not'] = 0;
351
  /* Filter: Node: Published */
352
  $handler->display->display_options['filters']['status']['id'] = 'status';
353
  $handler->display->display_options['filters']['status']['table'] = 'node';
354
  $handler->display->display_options['filters']['status']['field'] = 'status';
355
  $handler->display->display_options['filters']['status']['value'] = '1';
356
  $handler->display->display_options['filters']['status']['expose']['operator'] = FALSE;
357
  $translatables['advanced_forum_group_topic_list'] = array(
358
    t('Defaults'),
359
    t('Group Name'),
360
    t('more'),
361
    t('Apply'),
362
    t('Reset'),
363
    t('Sort By'),
364
    t('Asc'),
365
    t('Desc'),
366
    t('Items per page'),
367
    t('- All -'),
368
    t('Offset'),
369
    t('No posts in this group.'),
370
    t('Nid'),
371
    t('Teaser'),
372
    t('Topic / Topic starter'),
373
    t('<span class="forum-topic-title">[title]</span> '),
374
    t('node/[nid]'),
375
    t('[teaser]'),
376
    t('Has new content'),
377
    t('[timestamp] '),
378
    t('Topic Pager'),
379
    t('Name'),
380
    t('<br /> by [name_1] '),
381
    t('Post date'),
382
    t('on [created]'),
383
    t('Replies'),
384
    t('.'),
385
    t(','),
386
    t('New comments'),
387
    t(' View '),
388
    t(' new'),
389
    t('Views'),
390
    t('Last comment author'),
391
    t('by [last_comment_name]'),
392
    t('Last post'),
393
    t('Sticky'),
394
    t('Comment status'),
395
    t('All'),
396
    t('%1'),
397
  );
398

  
399
  // Get rid of the views counter if statistics not enabled.
400
  if (!module_exists('statistics')) {
401
    unset($handler->display->display_options['fields']['totalcount']);
402
    unset($handler->display->display_options['style_options']['columns']['totalcount']);
403
  }
404
}
drupal7/sites/all/modules/advanced_forum/includes/views/advanced_forum_search.view
1
<?php
2

  
3
// $Id$
4

  
5
/*
6
 * View 'advanced_forum_search'
7
 */
8

  
9
$view = new view();
10
$view->name = 'advanced_forum_search';
11
$view->description = '';
12
$view->tag = 'default';
13
$view->base_table = 'node';
14
$view->human_name = 'Advanced Forum Search';
15
$view->core = 7;
16
$view->api_version = '3.0';
17
$view->disabled = FALSE; /* Edit this to true to make a default view disabled initially */
18

  
19
/* Display: Master */
20
$handler = $view->new_display('default', 'Master', 'default');
21
$handler->display->display_options['title'] = 'Advanced Forum Search';
22
$handler->display->display_options['use_more_always'] = FALSE;
23
$handler->display->display_options['access']['type'] = 'perm';
24
$handler->display->display_options['cache']['type'] = 'none';
25
$handler->display->display_options['query']['type'] = 'views_query';
26
$handler->display->display_options['exposed_form']['type'] = 'basic';
27
$handler->display->display_options['pager']['type'] = 'full';
28
$handler->display->display_options['pager']['options']['items_per_page'] = '25';
29
$handler->display->display_options['style_plugin'] = 'default';
30
$handler->display->display_options['row_plugin'] = 'fields';
31
/* Field: Content: Title */
32
$handler->display->display_options['fields']['title']['id'] = 'title';
33
$handler->display->display_options['fields']['title']['table'] = 'node';
34
$handler->display->display_options['fields']['title']['field'] = 'title';
35
$handler->display->display_options['fields']['title']['label'] = '';
36
$handler->display->display_options['fields']['title']['alter']['word_boundary'] = FALSE;
37
$handler->display->display_options['fields']['title']['alter']['ellipsis'] = FALSE;
38
/* Field: Content: Body */
39
$handler->display->display_options['fields']['body']['id'] = 'body';
40
$handler->display->display_options['fields']['body']['table'] = 'field_data_body';
41
$handler->display->display_options['fields']['body']['field'] = 'body';
42
$handler->display->display_options['fields']['body']['label'] = '';
43
$handler->display->display_options['fields']['body']['element_label_colon'] = FALSE;
44
$handler->display->display_options['fields']['body']['type'] = 'text_summary_or_trimmed';
45
$handler->display->display_options['fields']['body']['settings'] = array(
46
  'trim_length' => '600',
47
);
48
/* Sort criterion: Content: Post date */
49
$handler->display->display_options['sorts']['created']['id'] = 'created';
50
$handler->display->display_options['sorts']['created']['table'] = 'node';
51
$handler->display->display_options['sorts']['created']['field'] = 'created';
52
$handler->display->display_options['sorts']['created']['order'] = 'DESC';
53
/* Filter criterion: Content: Published */
54
$handler->display->display_options['filters']['status']['id'] = 'status';
55
$handler->display->display_options['filters']['status']['table'] = 'node';
56
$handler->display->display_options['filters']['status']['field'] = 'status';
57
$handler->display->display_options['filters']['status']['value'] = 1;
58
$handler->display->display_options['filters']['status']['group'] = 1;
59
$handler->display->display_options['filters']['status']['expose']['operator'] = FALSE;
60
/* Filter criterion: Search: Search Terms */
61
$handler->display->display_options['filters']['keys']['id'] = 'keys';
62
$handler->display->display_options['filters']['keys']['table'] = 'search_index';
63
$handler->display->display_options['filters']['keys']['field'] = 'keys';
64
$handler->display->display_options['filters']['keys']['exposed'] = TRUE;
65
$handler->display->display_options['filters']['keys']['expose']['operator_id'] = 'keys_op';
66
$handler->display->display_options['filters']['keys']['expose']['label'] = 'Search Terms';
67
$handler->display->display_options['filters']['keys']['expose']['operator'] = 'keys_op';
68
$handler->display->display_options['filters']['keys']['expose']['identifier'] = 'keys';
69
$handler->display->display_options['filters']['keys']['expose']['remember_roles'] = array(
70
  2 => '2',
71
  1 => 0,
72
  3 => 0,
73
);
74
/* Filter criterion: Content: Has taxonomy terms (with depth) */
75
$handler->display->display_options['filters']['term_node_tid_depth']['id'] = 'term_node_tid_depth';
76
$handler->display->display_options['filters']['term_node_tid_depth']['table'] = 'node';
77
$handler->display->display_options['filters']['term_node_tid_depth']['field'] = 'term_node_tid_depth';
78
$handler->display->display_options['filters']['term_node_tid_depth']['exposed'] = TRUE;
79
$handler->display->display_options['filters']['term_node_tid_depth']['expose']['operator_id'] = 'term_node_tid_depth_op';
80
$handler->display->display_options['filters']['term_node_tid_depth']['expose']['label'] = 'Has taxonomy terms (with depth)';
81
$handler->display->display_options['filters']['term_node_tid_depth']['expose']['operator'] = 'term_node_tid_depth_op';
82
$handler->display->display_options['filters']['term_node_tid_depth']['expose']['identifier'] = 'term_node_tid_depth';
83
$handler->display->display_options['filters']['term_node_tid_depth']['expose']['remember_roles'] = array(
84
  2 => '2',
85
  1 => 0,
86
  3 => 0,
87
);
88
$handler->display->display_options['filters']['term_node_tid_depth']['type'] = 'select';
89
$handler->display->display_options['filters']['term_node_tid_depth']['vocabulary'] = 'forums';
90
$handler->display->display_options['filters']['term_node_tid_depth']['hierarchy'] = 1;
91
$handler->display->display_options['filters']['term_node_tid_depth']['depth'] = '0';
92
/* Filter criterion: Content: Type */
93
$handler->display->display_options['filters']['type']['id'] = 'type';
94
$handler->display->display_options['filters']['type']['table'] = 'node';
95
$handler->display->display_options['filters']['type']['field'] = 'type';
96
$handler->display->display_options['filters']['type']['value'] = array(
97
  'forum' => 'forum',
98
);
99

  
100
/* Display: Page */
101
$handler = $view->new_display('page', 'Page', 'page');
102
$handler->display->display_options['path'] = 'forum/search';
103
$translatables['advanced_forum_search'] = array(
104
  t('Master'),
105
  t('Advanced Forum Search'),
106
  t('more'),
107
  t('Apply'),
108
  t('Reset'),
109
  t('Sort by'),
110
  t('Asc'),
111
  t('Desc'),
112
  t('Items per page'),
113
  t('- All -'),
114
  t('Offset'),
115
  t('« first'),
116
  t('‹ previous'),
117
  t('next ›'),
118
  t('last »'),
119
  t('Search Terms'),
120
  t('Has taxonomy terms (with depth)'),
121
  t('Page'),
122
);
123

  
drupal7/sites/all/modules/advanced_forum/styles/blue_lagoon/blue_lagoon.info
4 4
version = 2.x
5 5
base style = naked
6 6

  
7
; Information added by drupal.org packaging script on 2013-07-07
8
version = "7.x-2.3"
7
; Information added by Drupal.org packaging script on 2014-06-21
8
version = "7.x-2.4"
9 9
core = "7.x"
10 10
project = "advanced_forum"
11
datestamp = "1373223651"
11
datestamp = "1403371728"
12 12

  
drupal7/sites/all/modules/advanced_forum/styles/blue_lagoon_stacked/blue_lagoon_stacked.info
5 5
base style = blue_lagoon
6 6
extra style = naked_stacked
7 7

  
8
; Information added by drupal.org packaging script on 2013-07-07
9
version = "7.x-2.3"
8
; Information added by Drupal.org packaging script on 2014-06-21
9
version = "7.x-2.4"
10 10
core = "7.x"
11 11
project = "advanced_forum"
12
datestamp = "1373223651"
12
datestamp = "1403371728"
13 13

  
drupal7/sites/all/modules/advanced_forum/styles/cloudless_day/cloudless_day.info
4 4
version = 2.x
5 5
base style = naked
6 6

  
7
; Information added by drupal.org packaging script on 2013-07-07
8
version = "7.x-2.3"
7
; Information added by Drupal.org packaging script on 2014-06-21
8
version = "7.x-2.4"
9 9
core = "7.x"
10 10
project = "advanced_forum"
11
datestamp = "1373223651"
11
datestamp = "1403371728"
12 12

  
drupal7/sites/all/modules/advanced_forum/styles/cloudless_day_stacked/cloudless_day_stacked.info
5 5
base style = cloudless_day
6 6
extra style = naked_stacked
7 7

  
8
; Information added by drupal.org packaging script on 2013-07-07
9
version = "7.x-2.3"
8
; Information added by Drupal.org packaging script on 2014-06-21
9
version = "7.x-2.4"
10 10
core = "7.x"
11 11
project = "advanced_forum"
12
datestamp = "1373223651"
12
datestamp = "1403371728"
13 13

  
drupal7/sites/all/modules/advanced_forum/styles/naked/naked.info
3 3
description = Base style with no CSS except positioning. Meant as a starter style. Images are desaturated for easier recoloring.
4 4
version = 2.x
5 5

  
6
; Information added by drupal.org packaging script on 2013-07-07
7
version = "7.x-2.3"
6
; Information added by Drupal.org packaging script on 2014-06-21
7
version = "7.x-2.4"
8 8
core = "7.x"
9 9
project = "advanced_forum"
10
datestamp = "1373223651"
10
datestamp = "1403371728"
11 11

  
drupal7/sites/all/modules/advanced_forum/styles/naked_stacked/naked_stacked.info
3 3
description = Same as Naked except the Author Pane is on top.
4 4
version = 2.x
5 5
base style = naked
6
; Information added by drupal.org packaging script on 2013-07-07
7
version = "7.x-2.3"
6
; Information added by Drupal.org packaging script on 2014-06-21
7
version = "7.x-2.4"
8 8
core = "7.x"
9 9
project = "advanced_forum"
10
datestamp = "1373223651"
10
datestamp = "1403371728"
11 11

  
drupal7/sites/all/modules/advanced_forum/styles/silver_bells/silver_bells.info
4 4
version = 2.x
5 5
base style = naked
6 6

  
7
; Information added by drupal.org packaging script on 2013-07-07
8
version = "7.x-2.3"
7
; Information added by Drupal.org packaging script on 2014-06-21
8
version = "7.x-2.4"
9 9
core = "7.x"
10 10
project = "advanced_forum"
11
datestamp = "1373223651"
11
datestamp = "1403371728"
12 12

  
drupal7/sites/all/modules/advanced_forum/styles/silver_bells_stacked/silver_bells_stacked.info
6 6
extra style = naked_stacked
7 7

  
8 8

  
9
; Information added by drupal.org packaging script on 2013-07-07
10
version = "7.x-2.3"
9
; Information added by Drupal.org packaging script on 2014-06-21
10
version = "7.x-2.4"
11 11
core = "7.x"
12 12
project = "advanced_forum"
13
datestamp = "1373223651"
13
datestamp = "1403371728"
14 14

  
drupal7/sites/all/modules/colorbox/colorbox.info
6 6

  
7 7
files[] = views/colorbox_handler_field_colorbox.inc
8 8

  
9
; Information added by Drupal.org packaging script on 2014-05-28
10
version = "7.x-2.6"
9
; Information added by Drupal.org packaging script on 2014-06-25
10
version = "7.x-2.7"
11 11
core = "7.x"
12 12
project = "colorbox"
13
datestamp = "1401278628"
13
datestamp = "1403692729"
14 14

  
drupal7/sites/all/modules/colorbox/colorbox.module
396 396
 * Validate function for colorbox_gallery_custom.
397 397
 */
398 398
function colorbox_gallery_custom_validate($element, &$form_state) {
399
  if ($form_state['values']['fields']['field_image']['settings_edit_form']['settings']['colorbox_gallery'] == 'custom' && !preg_match('!^[a-z0-9_-]+$!', $element['#value'])) {
399
  if (!empty($element['#value']) && !preg_match('!^[a-z0-9_-]+$!', $element['#value'])) {
400 400
    form_error($element, t('%name must only contain lowercase letters, numbers, hyphen and underscores.', array('%name' => $element['#title'])));
401 401
  }
402 402
}

Formats disponibles : Unified diff