/ - Diff - Club Drupal - Forge Centrale Marseille

Révision 13c3c9b4

Ajouté par Assos Assos il y a environ 9 ans

ID 13c3c9b4233a81eade56adc92ac93ebf3b289cbe
Parent bfb52287
Enfant e5461e73

Weekly update of contrib modules

     name = Advanced Forum
     description = Enables the look and feel of other popular forum software.
     version = 7.x-2.x-dev
     core = 7.x
     package = Advanced Forum
     dependencies[] = forum
     dependencies[] = ctools
     dependencies[] = views
-...
     files[] = includes/views/advanced_forum_handler_field_node_topic_pager.inc
     files[] = includes/views/advanced_forum_plugin_style_forum_topic_list.inc
     core = 7.x
     ; Tests
     files[] = tests/af.test
     ; Information added by Drupal.org packaging script on 2014-06-21
     version = "7.x-2.4"
     ; Information added by Drupal.org packaging script on 2015-02-10
     version = "7.x-2.5"
     core = "7.x"
     project = "advanced_forum"
     datestamp = "1403371728"
     datestamp = "1423590792"

      * @file
      * Installation code for Advanced Forum.
      */
     /**
      * Implements hook_install().
      */
     function advanced_forum_install() {
       db_update('system')
           ->fields(array('weight' => 15))
-...
           ->execute();
+    }
     /**
      * Implements hook_uninstall().
      */
     function advanced_forum_uninstall() {
       db_delete('variable')
           ->condition('name', "advanced_forum_%", "LIKE")
-...
       cache_clear_all('variables', 'cache_bootstrap');
+    }
     /**
      * Implements hook_update_N().
      */
     function advanced_forum_update_5000() {
       db_update('system')
           ->fields(array('weight' => 10))
-...
           ->execute();
+    }
     /**
      * Implements hook_update_N().
      */
     function advanced_forum_update_5003() {
       db_drop_table('advforum_last_post');
+    }
     /**
      * Implements hook_update_N().
      */
     function advanced_forum_update_5005() {
       db_update('system')
           ->fields(array('weight' => 15))
-...
           ->execute();
+    }
     /**
      * Implements hook_update_N().
      */
     function advanced_forum_update_7200() {
       if (variable_get('advanced_forum_forum_disabled') == NULL) {
         variable_set('advanced_forum_forum_disabled', FALSE);
+      }
+    }
+    }

      * @file
      * Enables the look and feel of other popular forum software.
      */
     // DRUPAL HOOKS **************************************************************/
     /**
      * Implementation of hook_perm().
-...
     function advanced_forum_permission() {
       return array(
         'administer advanced forum' => array(
           'title' => t('Administer Advanced Forum')
           'title' => t('Administer Advanced Forum'),
         ),
         'view forum statistics' => array(
           'title' => t('View Advanced Forum statistics')
           'title' => t('View Advanced Forum statistics'),
         ),
         'view last edited notice' => array(
           'title' => t('View last edited notice')
           'title' => t('View last edited notice'),
+        )
       );
+    }
     /**
      * Implementation of hook_menu().
      * Implements hook_menu().
      */
     function advanced_forum_menu() {
       $items['admin/config/content/advanced-forum'] = array(
-...
         'page arguments' => array('advanced_forum_settings_page'),
         'page callback' => 'drupal_get_form',
         'title' => 'Advanced Forum',
         'file' => 'includes/settings.inc'
         'file' => 'includes/settings.inc',
       );
       $items['forum/markasread'] = array(
-...
+    }
     /**
      * Implementation of hook_cron().
      * Implements hook_cron().
      */
     function advanced_forum_cron() {
       // ensure the reply stats are up-to-date
       // Ensure the reply stats are up-to-date.
       advanced_forum_statistics_replies(NULL, TRUE);
+    }
     /**
      * Implementation of hook_menu_alter().
      * Implements hook_menu_alter().
      */
     function advanced_forum_menu_alter(&$items) {
       // Take over the forum page creation so we can add more information.
-...
       $items['forum']['module'] = 'advanced_forum';
       unset($items['forum']['file']);
       // Take over forum/%forum_forum page because we want advanced_forum_forum_load
       // is called instead of core forum_forum_load
       $items['forum/%advanced_forum_forum'] = $items['forum/%forum_forum'];
-...
+    }
     /**
      * Implementation of hook_module_implements_alter().
      * Implements hook_module_implements_alter().
+     *
      * We don't want forum_menu_local_tasks_alter() to be called and mess with our links.
+     *
      */
     function advanced_forum_module_implements_alter(&$implementations, $hook) {
       if ($hook == 'menu_local_tasks_alter') {
-...
+    }
     /**
      * Implementation of hook_theme().
      * Implements hook_theme().
      */
     function advanced_forum_theme() {
       advanced_forum_load_style_includes();
       // Bulk read all available (active) style templates
       // Bulk read all available (active) style templates.
       $existing_items = advanced_forum_find_style_templates();
       $items['advanced_forum_l'] = array(
-...
           'path' => NULL,
           'options' => array(),
           'button_class' => NULL,
+        )
         ),
       );
       $items['advanced_forum_topic_header'] = array(
         'variables' => array(
           'node' => NULL,
           'comment_count' => NULL,
+        )
         ),
       );
       $items['advanced_forum_active_poster'] = array(
-...
           'posts' => NULL,
           'topics' => NULL,
           'last_post' => NULL,
+        )
         ),
       );
       $items['advanced_forum_user_picture'] = array(
         'variables' => array(
           'account' => NULL,
+        )
         ),
       );
       $items['advanced_forum_reply_link'] = array(
         'variables' => array(
           'node' => NULL,
+        )
         ),
       );
       $items['advanced_forum_topic_pager'] = array(
         'variables' => array(
           'pagecount' => NULL,
           'topic' => NULL,
+        )
         ),
       );
       $items['advanced_forum_shadow_topic'] = array(
-...
           'title' => NULL,
           'nid' => NULL,
           'new_forum' => NULL,
+        )
         ),
       );
       $items['advanced_forum_subforum_list'] = array(
         'variables' => array(
           'subforum_list' => NULL,
+        )
         ),
       );
       $items['advanced_forum_subcontainer_list'] = array(
         'variables' => array(
           'subcontainer_list' => NULL,
+        )
         ),
       );
       $items['advanced_forum_simple_author_pane'] = array(
         'variables' => array(
           'context' => NULL,
+        )
         ),
       );
       $items['advanced_forum_post_edited'] = array(
-...
           'who' => NULL,
           'when' => NULL,
           'why' => NULL,
+        )
         ),
       );
       $items['advanced_forum_node_type_create_list'] = array(
         'variables' => array(
           'forum_id' => NULL,
+        )
         ),
       );
       /*
         // Templates for features added by Views
       // Templates for features added by Views
         // style
         $items['views_view_forum_topic_list__advanced_forum_topic_list'] = array(
         'variables' => array('view' => NULL, 'options' => NULL, 'rows' => NULL, 'title' => NULL),
         'template' => 'advanced-forum-topic-list-view',
         //'base hook' => 'views_view_forum_topic_list',
         );
       // style
       $items['views_view_forum_topic_list__advanced_forum_topic_list'] = array(
       'variables' => array('view' => NULL, 'options' => NULL, 'rows' => NULL, 'title' => NULL),
       'template' => 'advanced-forum-topic-list-view',
       //'base hook' => 'views_view_forum_topic_list',
       );
        */
       //display
       // Display.
       $items['views_view__advanced_forum_topic_list'] = array(
         'variables' => array('view' => NULL),
         'template' => 'advanced-forum-topic-list-outer-view',
           //'base hook' => 'views_view',
       );
       //display group
       // Display group.
       $items['views_view__advanced_forum_group_topic_list'] = array(
         'variables' => array('view' => NULL),
         'template' => 'advanced-forum-group-topic-list-outer-view',
           //'base hook' => 'views_view',
       );
       // Return merged items found in style folder with new ones
       // array_merge_recursive doesn't work as desired
       // array_merge_recursive doesn't work as desired.
       foreach ($items as $key => $item) {
         if (array_key_exists($key, $existing_items)) {
           $existing_items[$key] += $item;
-...
+    }
     /**
      * Implementation of hook_theme_registry_alter().
      * Implements hook_theme_registry_alter().
      */
     function advanced_forum_theme_registry_alter(&$theme_registry) {
       advanced_forum_load_style_includes();
-...
       // --- for the given templates can be found first in the (sub)theme directory
       // --- then in ancestor themes, if any, then in the active style directory
       // --- for advanced forum or any ancestor styles.
       // Affected templates
       // Affected templates.
       $templates = array(
         'node',
         'comment',
-...
             'advanced_forum_active_poster', */
       );
       // Get the sequence of styles to look in for templates
       // Get the sequence of styles to look in for templates.
       $lineage = advanced_forum_style_lineage();
       if (!array_key_exists('naked', $lineage)) {
-...
         $lineage['naked'] = drupal_get_path('module', 'advanced_forum') . '/styles/naked';
+      }
       // Get theme engine extension
       // Get theme engine extension.
       global $theme_engine;
       $extension = '.tpl.php';
       if (isset($theme_engine)) {
-...
+        }
+      }
       // temp workaround
       // Temp workaround.
       if (isset($theme_registry['views_view__advanced_forum_topic_list']['preprocess functions'])) {
         array_splice($theme_registry['views_view__advanced_forum_topic_list']['preprocess functions'], 1, 0, 'template_preprocess_views_view');
+      }
       if (isset($theme_registry['views_view__advanced_forum_group_topic_list']['preprocess functions'])) {
         array_splice($theme_registry['views_view__advanced_forum_group_topic_list']['preprocess functions'], 1, 0, 'template_preprocess_views_view');
+      }
       //array_splice($theme_registry['views_view_forum_topic_list__advanced_forum_topic_list']['preprocess functions'], 1, 0, 'template_preprocess_views_view_forum_topic_list');
+    }
     /**
      * Own link alteration implementaion because there are no
      * hook_link nor hook_link_alter in D7
      * Own link alteration implementation because there are no hook_link nor hook_link_alter in D7.
+     *
      * Name changed intentionally to avoid confusion with hook_link_alter!
      */
     function advanced_forum_links_alter(&$object, $view_mode, $object_type = 'node') {
       // Don't alter anything if in preview mode
       // Don't alter anything if in preview mode.
       if (!empty($object->in_preview)) {
         return;
+      }
-...
         $links['comment-add']['href'] = "comment/reply/$node->nid";
+      }
       // List the keys we are interested in.
       $affected_keys = array('post-edit', 'comment-edit', 'post-delete', 'comment-delete', 'quote', 'comment-add', 'comment-reply');
       $affected_keys = array(
         'post-edit',
         'comment-edit',
         'post-delete',
         'comment-delete',
         'quote',
         'comment-add',
         'comment-reply',
       );
       // Add extra span tags for image replacement.
       foreach ($links AS $key => $link) {
       foreach ($links as $key => $link) {
         if (in_array($key, $affected_keys)) {
           $links[$key]['attributes']['class'][] = "af-button-small";
           $links[$key]['title'] = '<span>' . $links[$key]['title'] . '</span>';
-...
+        }
+      }
       // we want to put comment links last
       // We want to put comment links last.
       unset($object->content['links']['comment']);
       $object->content['links']['comment'] = $comment_links;
       // put links back
       // Put links back.
       $object->content['links']['comment']['#links'] = $links;
+    }
     /**
      * Implementation of hook_node_view().
      * Implements hook_node_view().
+     *
      * hook_link() and hook_link_alter() functionalty implemented here
      * hook_link() and hook_link_alter() functionality implemented here
      */
     function advanced_forum_node_view($node, $view_mode, $langcode) {
       advanced_forum_links_alter($node, $view_mode, 'node');
+    }
     /**
      * Implementation of hook_comment_view().
      * Implements hook_comment_view().
      */
     function advanced_forum_comment_view($comment, $view_mode, $langcode) {
       advanced_forum_links_alter($comment, $view_mode, 'comment');
+    }
     /**
      * Implementation of hook_comment_delete().
      * Implements hook_comment_delete().
      */
     function advanced_forum_comment_delete($comment) {
       if (!empty($comment->node_type) && ($comment->node_type == "comment_node_forum")) {
-...
+    }
     /**
      * Implementation of hook_comment_update().
      * Implements hook_comment_update().
      */
     function advanced_forum_comment_update($comment) {
       if (!empty($comment->node_type) && ($comment->node_type == "comment_node_forum")) {
         // comment unpublished?
         // Comment unpublished?
         if (!$comment->status) {
           advanced_forum_statistics_replies(-1);
+        }
-...
+    }
     /**
      * Implementation of hook_comment_publish().
      * Implements hook_comment_publish().
      */
     function advanced_forum_comment_publish($comment) {
       if (!empty($comment->node_type) && ($comment->node_type == "comment_node_forum")) {
-...
+    }
     /**
      * Implementation of hook_form_alter().
      * Implements hook_form_alter().
      */
     function advanced_forum_form_alter(&$form, &$form_state, $form_id) {
       if (!empty($form['#node']->type) && advanced_forum_type_is_in_forum($form['#node']) && isset($form['body_field']) && isset($form['body_field']['#after_build'])) {
-...
+      }
+    }
     // MAKE VIEWS BITS WORK *****************************************************/
     /**
      * Implements hook_views_api().
      */
     function advanced_forum_views_api() {
       return array(
         'api' => '3.0-alpha1',
-...
       );
+    }
     // MAKE CTOOLS BITS WORK *****************************************************/
     /**
      * Tell CTools about what plugins we support.
      */
-...
+      }
+    }
     /**
      * Implements hook_ctools_plugin_api().
      */
     function advanced_forum_ctools_plugin_api($module, $api) {
       if ($module == 'page_manager' && $api = 'pages_default') {
         return array(
-...
     module_load_include('inc', 'advanced_forum', 'includes/mark-read');
     // VIEWS RELATED GOODIES ******************************************************/
     /**
      * Post render a view and replace any advanced forum tokens.
      */
-...
         // Replace the Author Pane token with the actual Author Pane.
         if (preg_match_all('/<!--post:author-pane-([\d]+)-->/us', $output, $matches)) {
           foreach ($matches[1] as $match => $uid) {
             $token = $matches[0][$match]; // This is the exact string that matched.
             // This is the exact string that matched.
             $token = $matches[0][$match];
             if (!isset($tokens[$token])) {
               $account = user_load($uid);
               $tokens[$token] = theme('author_pane', array(
-...
         // Replace the Post edited token.
         if (preg_match_all('/<!--post:post-edited-([\d]+)-->/us', $output, $matches)) {
           foreach ($matches[1] as $match => $nid) {
             $token = $matches[0][$match]; // This is the exact string that matched.
             // This is the exact string that matched.
             $token = $matches[0][$match];
             if (!isset($tokens[$token])) {
               if (user_access('view last edited notice')) {
                 $sql = 'SELECT uid, log, timestamp FROM {node_revision} WHERE nid = %d ORDER BY timestamp DESC';
-...
         // Replace the core Signature token.
         if (preg_match_all('/<!--post:signature-core-([\d]+)-->/us', $output, $matches)) {
           foreach ($matches[1] as $match => $uid) {
             $token = $matches[0][$match]; // This is the exact string that matched.
             // This is the exact string that matched.
             $token = $matches[0][$match];
             if (!isset($tokens[$token])) {
               $account = user_load($uid);
               if ($account->signature) {
-...
+    }
     /**
      * Display the "sort" widget. This is a specially hacked widget that only
      * Display the "sort" widget.
+     *
      * This is a specially hacked widget that only
      * works with tablesorting. Tablesorting MUST be on for these widgets
      * to appear.
      */
-...
       return drupal_render($form);
+    }
     /**
      * Sort form.
      */
     function advanced_forum_forum_topic_list_sort_form($form_state) {
       $view = views_get_view('advanced_forum_topic_list');
       $view->set_display('default');
-...
+    }
     // STATISTICS *****************************************************************/
     /**
      * Count total amount of forum threads.
      */
-...
+    }
     /**
      * Counts total amount of replies. Initial posts are added to this total
      * in the calling function.
      * Counts total amount of replies.
+     *
      * Initial posts are added to this total in the calling function.
+     *
      * @param $delta
      * @param int|null $delta
      *   if not NULL, a numerical delta which should be applied to the count
      * @param $refresh
      * @param $refresh
+     *
      * @param bool $refresh
      *   TRUE if the stored count should be updated.
      * @return
+     *
      * @return int
      *   Total number of replies in the forum.
      */
     function advanced_forum_statistics_replies($delta = NULL, $refresh = FALSE) {
-...
         $total_replies = $cache->data;
+      }
       if (!empty($delta) && is_numeric($delta)) {
         $total_replies += $delta;
         cache_set('advanced_forum_stats_replies', $total_replies);
-...
      * Return the newest X active (not blocked) users, linked to their profiles.
      */
     function advanced_forum_statistics_latest_users() {
       $number_to_fetch = 5; // @TODO: Make this a setting.
       // @TODO: Make this a setting.
       $number_to_fetch = 5;
       $query = db_select("users", "u")
           ->fields("u", array("uid", "name"))
-...
       return $list;
+    }
     /**
      * Returns session count.
      */
     function advanced_forum_session_count($anonymous = TRUE) {
       $interval = REQUEST_TIME - variable_get('user_block_seconds_online', 900);
-...
       return $list;
+    }
     // CALCULATING LINKS - New, Last, Etc *****************************************/
     /**
      * Calculating links - New, Last, Etc.
      */
     function advanced_forum_get_reply_link($node) {
       $reply_link = array();
-...
         $allowed = FALSE;
         if (module_exists('forum_access')) {
           // get tid
           // Get tid.
           if (!empty($node->taxonomy_forums)) {
             reset($node->taxonomy_forums);
             $langcode = key($node->taxonomy_forums);
-...
             $reply_link['href'] = $_GET['q'];
             $reply_link['options']['fragment'] = $fragment;
             $current_page = isset($_GET['page']) ? $_GET['page'] : 0;
             if ($current_page)
             if ($current_page) {
               $reply_link['options']['query'] = array('page' => $current_page);
+            }
             $reply_link['class'] = 'reply-allowed';
             $reply_link['title'] = t('Quick reply');
-...
     /**
      * Get a link to the last post in a topic.
+     *
      * @param $node
      * @param object $node
      *   Node object
      * @return
+     *
      * @return string
      *   Text linking to the last post in a topic.
      */
     function advanced_forum_last_post_link($node) {
       $last_comment_id = advanced_forum_last_post_in_topic($node->nid);
       // Return empty link if post doesn't have comments.
       if (empty($last_comment_id))
       if (empty($last_comment_id)) {
         return '';
+      }
       $last_page = advanced_forum_get_last_page($node);
       if ($last_page > 0)
       if ($last_page > 0) {
         $query = array('page' => $last_page);
+      }
       $options = array(
         'html' => TRUE,
-...
     /**
      * Returns a link directly to the first new post in a topic.
+     *
      * @param $node
      * @param object $node
      *   Node object
      * @param $comment_count
+     *
      * @param int $comment_count
      *   Number of comments on passed node.
      * @return
+     *
      * @return string
      *   Link to the first unread post.
      */
     function advanced_forum_first_new_post_link($node, $comment_count) {
-...
         $options = array(
           'html' => TRUE,
           'query' => $page_of_first_new,
           'fragment' => "comment-$cid_of_first_new"
           'fragment' => "comment-$cid_of_first_new",
         );
         return theme('advanced_forum_l', array(
           'text' => t('First unread'),
           'path' => "node/$nid",
           'options' => $options,
           'button_class' => 'large'
           'button_class' => 'large',
         ));
+      }
+    }
-...
       static $number_new_for_node = array();
       // $nid is empty if new topic in preview.
       if (empty($nid))
       if (empty($nid)) {
         return 0;
+      }
       if (empty($number_new_for_node[$nid])) {
         global $user;
         $node = node_load($nid);
         // We must also check the forum post itself to see if we have viewed it
         $viewed = 0; // If not told otherwise, it has been viewed before
         // We must also check the forum post itself to see if we have viewed it.
         // If not told otherwise, it has been viewed before.
         $viewed = 0;
         if ($user->uid) {
           $viewed = node_last_viewed($nid);
           // Set it to 1 if it has not been viewed before.
-...
     /**
      * Get the comment id of the last post in a topic.
+     *
      * @param $node
      *   Node object
      * @return
      * @param int $nid
      *   Node id.
+     *
      * @return int
      *   cid of last post.
      */
     function advanced_forum_last_post_in_topic($nid) {
       // $nid is empty if new topic in preview.
       if (empty($nid))
       if (empty($nid)) {
         return NULL;
+      }
       $node = node_load($nid);
       // Comment module version
       // Comment module version.
       $query = 'SELECT c.cid
                 FROM {comment} c
                 WHERE c.nid = :nid AND c.status = :status
-...
     /**
      * Returns the ID of the first unread comment.
+     *
      * @param $nid
      * @param int $nid
      *   Node ID
      * @param $timestamp
+     *
      * @param int $timestamp
      *   Date/time used to override when the user last viewed the node.
      * @return
+     *
      * @return int
      *   Comment ID
      */
     function advanced_forum_first_new_comment($nid, $timestamp = 0) {
-...
           $timestamp = node_last_viewed($nid);
+        }
         // Set the timestamp to the limit if the node was last read past the cutoff
         // Set the timestamp to the limit if the node was last read past the cutoff.
         $timestamp = ($timestamp > NODE_NEW_LIMIT ? $timestamp : NODE_NEW_LIMIT);
         // Use the timestamp to retrieve the oldest new comment.
-...
+    }
     // GENERAL UTILITY FUNCTIONS *************************************************/
     /**
      * Return an array of node types allowed in a given vocabulary or term ID.
      */
-...
     function advanced_forum_type_is_in_forum($node, $tid = 0) {
       $vid = (empty($vid)) ? variable_get('forum_nav_vocabulary', 0) : $vid;
       if (!empty($node->taxonomy_forums)) {
         // Check for language used
         // Check for language used.
         if (!isset($node->taxonomy_forums[$node->language])) {
           $langcode = LANGUAGE_NONE;
+        }
-...
           if (!isset($tforum['taxonomy_term'])) {
             continue;
+          }
           if (($tforum['taxonomy_term']->vid == $vid) || ($tforum['taxonomy_term']->tid == $tid))
           if (($tforum['taxonomy_term']->vid == $vid) || ($tforum['taxonomy_term']->tid == $tid)) {
             return TRUE;
+          }
+        }
+      }
       return FALSE;
-...
     /**
      * Creates a pager to place on each multi-page topic of the topic listing page.
+     *
      * @param $max_pages_to_display
      * @param int $max_pages_to_display
      *   Number of pages to include on the pager.
      * @param $topic
+     *
      * @param object $topic
      *   Topic object to create a pager for.
      * @return
+     *
      * @return object
      *   Object containing the linked pages ready assembly by the theme function.
      */
     function advanced_forum_create_topic_pager($max_pages_to_display, $topic) {
-...
         // first page because that doesn't have a query.
         $pager_array = array();
         $current_display_page = 1;
         // @codingStandardsIgnoreStart
         $pager_array[0] = l('1', "node/$topic->nid");
         // @codingStandardsIgnoreEnd
         // Find the ending point. The pager URL is always 1 less than
         // the number being displayed because the first page is 0.
-...
         // Add pages until we run out or until we hit the max to show.
         while (($current_display_page < $last_display_page) && ($current_display_page < $max_pages_to_display)) {
           // Move to the next page
           // Move to the next page.
           $current_display_page++;
           // The page number we link to is 1 less than what's displayed
           // The page number we link to is 1 less than what's displayed.
           $link_to_page = $current_display_page - 1;
           // Add the link to the array
           // Add the link to the array.
           $pager_array[$link_to_page] = l($current_display_page, "node/$topic->nid", array('query' => array('page' => $link_to_page)));
+        }
         // Move to the next page
         // Move to the next page.
         $current_display_page++;
         if ($current_display_page == $last_display_page) {
-...
+    }
     /**
      * Create a drop down list of forum hierarchy
      * Create a drop down list of forum hierarchy.
      */
     function advanced_forum_forum_jump($tid = 0) {
       global $user;
-...
           $select[url("forum/" . $forum->tid)] = str_repeat("-", $forum->depth) . $forum->name;
+        }
+      }
       else {
         // nothing
+      }
       $options['choose'] = t("- Select a forum -");
-...
+    }
     /**
      * Calculates the number of unread replies for each forum and returns the
      * count for the requested forum.
      * Calculates the number of unread replies for each forum and returns the count for the requested forum.
      */
     function advanced_forum_unread_replies_in_forum($tid, $uid) {
       static $result_cache = NULL;
-...
         $query = db_select("comment", "c");
         $f_alias = $query->join("forum", "f", "c.nid = f.nid");
         //$n_alias = $query->join("node", "n", "f.vid = n.vid");
         $h_alias = $query->leftJoin("history", "h", "c.nid = h.nid AND h.uid = :uid", array(":uid" => $uid));
         $query->addExpression("COUNT(DISTINCT(c.cid))", "count");
         $query->addField($f_alias, "tid");
-...
         if (($index = array_search($post_id, $post_order[$node_id])) !== FALSE) {
           $post_position = $index;
           // We need to add 2 because the array starts at 0 and also because the topic
           // node is post #1 on display but is not included in the index.
           $post_position = $post_position + 2;
           $advanced_forum_styled_node_types = variable_get('advanced_forum_styled_node_types', array('forum'));
           // We need to add 1 because the topic node is post #1 on display but is not included in the index.
           if (in_array($node->type, $advanced_forum_styled_node_types)) {
             $post_position = $post_position + 1;
+          }
+        }
+      }

      * Holds the contents of a preprocess function moved into its own file
      * to ease memory requirements and having too much code in one file.
      */
     /**
      * Preprocess comment.
      */
     function _advanced_forum_preprocess_comment(&$variables) {
       /* Easy links to the comment and parent node */
       $comment = $variables['comment'];
-...
       /* Determine the template file to use for the comment. */
       if (arg(1) == 'reply' || arg(2) == 'edit') {
         // Use the preview version
         // Use the preview version.
         advanced_forum_add_template_suggestions("post-preview", $variables);
+      }
       else {
         // Use our combined node/comment template file
         // Use our combined node/comment template file.
         advanced_forum_add_template_suggestions("post", $variables);
+      }
       // Add in our classes overwriting existing.
       $variables['classes_array'] = array();
       if (!variable_get('advanced_forum_keep_classes', FALSE) || !is_array($variables['classes_array'])) {
         // Add in our classes overwriting existing.
         $variables['classes_array'] = array();
+      }
       $variables['classes_array'][] = 'forum-post clearfix';
       // Add the current language to the classes for image handling.
-...
         $variables['classes_array'][] = $language->language;
+      }
       // Add the poster's UID
       // Add the poster's UID.
       $variables['classes_array'][] = "posted-by-$comment->uid";
       // Add class if the poster is the viewer.
-...
         $variables['classes_array'][] = "post-by-starter";
+      }
       // Set the post ID for theming / targetting
       // Set the post ID for theming / targetting.
       $variables['post_id'] = "post-$comment->cid";
       $num_comments = $node->comment_count;
       $posts_per_page = variable_get('comment_default_per_page_' . $node->type, 50);
       $page_number = !empty($_GET['page']) ? $_GET['page'] : 0;
       // page_number sanity check
       if ($page_number > floor($num_comments / $posts_per_page))
       // Page_number sanity check.
       if ($page_number > floor($num_comments / $posts_per_page)) {
         $page_number = floor($num_comments / $posts_per_page);
+      }
       if (!$page_number) {
         $page_number = 0;
+      }
       /* Linked post number */
       if (!isset($post_number)) {
         static $post_number = 1;
+      }
       // check if node type is forum
       // Check if node type is forum.
       $topic_id = advanced_forum_node_is_styled($variables['node']);
       $post_number_delta = ($topic_id) ? 1 : 0;
       $linktext = '#' . (($page_number * $posts_per_page) + $post_number + $post_number_delta);
       $post_number++;
       // Permalink
       //  You can erase next 3 lines if you wish to use built-in Permalink.
       //  Template adjusted: $post_link -> $permalink
       // Permalink.
       // You can erase next 3 lines if you wish to use built-in Permalink.
       // Template adjusted: $post_link -> $permalink.
       $uri = entity_uri('comment', $comment);
       $uri['options'] += array('attributes' => array('class' => array('permalink'), 'rel' => 'bookmark'));
       $variables['permalink'] = l($linktext, $uri['path'], $uri['options']);
-...
         if ($post_position > 0) {
           // Find the page the post is on. We need to compensate for the topic node
           // being #1 which puts an extra post on the first page but not on the rest.
           $page_number = floor(($post_position - 2) / $posts_per_page);
           $page_number = floor(($post_position - 1) / $posts_per_page);
           // Assemble the link.
           $fragment = 'comment-' . $comment->pid;
           if ($page_number)
           if ($page_number) {
             $query = array('page' => $page_number);
+          }
           $linktext = t("(Reply to #!post_position)", array('!post_position' => $post_position));
           $linkpath = "node/$node->nid";
-...
       /* Title */
       if (variable_get('comment_subject_field_' . $node->type, 1) == 0) {
         // if comment titles are disabled, don't display it.
         // If comment titles are disabled, don't display it.
         $variables['title'] = '';
+      }
       else {
-...
         $variables['account']->email = empty($comment->email) ? "" : $comment->email;
+      }
       else {
         // Load up the real user object
         // Load up the real user object.
         $variables['account'] = user_load($comment->uid);
+      }
       // Create the author pane
       // Create the author pane.
       if (module_exists('author_pane')) {
         $variables['author_pane'] = theme('author_pane', array(
           'account' => $variables['account'],
-...
       /* Content */
       // Helpful $content variable for templates.
       foreach (element_children($variables['elements']) as $key) {
         // Adjust content vriable to suit post template
         if ($key == 'comment_body')
         // Adjust content vriable to suit post template.
         if ($key == 'comment_body') {
           $variables['content']['body'] = $variables['elements'][$key];
         else
+        }
         else {
           $variables['content'][$key] = $variables['elements'][$key];
+        }
+      }
       // Adjust comment timestamp to match node template
       // Adjust comment timestamp to match node template.
       $variables['date'] = $variables['created'];
       /* Post edited */
       $variables['post_edited'] = (isset($variables['comment_edited'])) ? $variables['comment_edited'] : "";
+    }
+    }

      * Holds the contents of a preprocess function moved into its own file
      * to ease memory requirements and having too much code in one file.
      */
     /**
      * Preprocess forum list.
      */
     function _advanced_forum_preprocess_forum_list(&$variables) {
       advanced_forum_add_template_suggestions("forum_list", $variables);
       // Added variable for default collapsed configuration
       // Added variable for default collapsed configuration.
       $variables['collapsed_main_list'] = variable_get('advanced_forum_default_collapsed_list', array());
       // Add needed items for the collapsible containers.
-...
         $table_counter = 0;
+      }
       // workaround for container-less forums on main page
       // Workaround for container-less forums on main page.
       $depth_offset = 0;
       foreach ($items as $id => $item) {
         // Get a handle on the parent of this item.
-...
               // container. Start a new generic one. We need a tid so just grab
               // the tid of the current forum for it.
               $table_counter++;
               if (!isset($tables[$table_counter]['table_info']))
               if (!isset($tables[$table_counter]['table_info'])) {
                 $tables[$table_counter]['table_info'] = new stdClass();
+              }
               $tables[$table_counter]['table_info']->name = t('Forums');
               $tables[$table_counter]['table_info']->description = '';
               $tables[$table_counter]['table_info']->tid = $item->tid;
               // Reset the striping.
               advanced_forum_stripe(TRUE);
               $depth_offset = 1;
+            }
             $depth_offset = 1;
             // Set the variable to control the row striping.
             $item->zebra = advanced_forum_stripe();
-...
       unset($variables['zebra']);
+    }
     /**
      * Forum stripe.
      */
     function advanced_forum_stripe($reset = FALSE) {
       static $stripe = 'odd';
-...
       unset($forum->last_post);
       $forum->last_post = theme('forum_submitted', array('topic' => $last_post));
       // Display forum images using Field API
       // Display forum images using Field API.
       $entity = entity_load('taxonomy_term', array($forum->tid));
       $field_name = variable_get('advanced_forum_forum_image_field', '');

      * to ease memory requirements and having too much code in one file.
      */
     /**
      * Preprocess forum.
      */
     function _advanced_forum_preprocess_forums(&$variables) {
       $variables['forums_defined'] = count($variables['forums']) || count($variables['parents']);
-...
         $variables['forum_legend'] = theme('advanced_forum_forum_legend');
+      }
       else {
         // Grab the forum description and make it available to the template file
         // Grab the forum description and make it available to the template file.
         $forum = taxonomy_term_load($tid);
         $variables['forum_description'] = $forum->description;

      * to ease memory requirements and having too much code in one file.
      */
     /**
      * Preprocess node.
      */
     function _advanced_forum_preprocess_node(&$variables) {
       /* Shortcut variables */
       $node = $variables['node'];
-...
         // We send this to a special .tpl so people can adjust it to their needs.
         advanced_forum_add_template_suggestions("post-repeated", $variables);
+      }
       elseif (arg(1) == 'reply' || (arg(0) == 'node' && arg(1) == 'add') || !empty($node->in_preview) ) {
       elseif (arg(1) == 'reply' || (arg(0) == 'node' && arg(1) == 'add') || !empty($node->in_preview)) {
         // 'reply' deals with the first post being shown when adding a comment.
         // 'node/add' is when previewing a new forum post.
         advanced_forum_add_template_suggestions("post-preview", $variables);
+      }
       else {
         // Use our combined node/comment template file
         // Use our combined node/comment template file.
         advanced_forum_add_template_suggestions("post", $variables);
+      }
       /* Topic header */
       $variables['top_post'] = TRUE;
       // Build the topic header
       // Build the topic header.
       $variables['topic_header'] = theme('advanced_forum_topic_header', array(
         'node' => $node,
         'comment_count' => isset($variables['comment_count']) ? $variables['comment_count'] : 0,
         ));
       // Add in our classes merging with existing.
       if (!is_array($variables['classes_array'])) {
       if (!variable_get('advanced_forum_keep_classes', FALSE) || !is_array($variables['classes_array'])) {
         // Add in our classes overwriting existing.
         $variables['classes_array'] = array();
+      }
       $variables['classes_array'] = array('forum-post clearfix');
       $variables['classes_array'][] = 'forum-post clearfix';
       // Add the current language to the classes for image handling.
       global $language;
-...
         $variables['classes_array'][] = $language->language;
+      }
        // Add the poster's UID
       // Add the poster's UID.
       $variables['classes_array'][] = "posted-by-$node->uid";
       /* Post ID */
       // Set the post ID for theming / targetting
       // Set the post ID for theming/targetting.
       $variables['post_id'] = "post-$node->nid";
       /* Linked post number */
-...
       $page_number = !empty($_GET['page']) ? $_GET['page'] : 0;
       // If this is the topic starting node, we need to start off the numbering.
       // variable changed from post_link to permalink to match core variable
       // Variable changed from post_link to permalink to match core variable.
       // @codingStandardsIgnoreStart
       $variables['permalink'] = l('#1', "node/$node->nid");
       // @codingStandardsIgnoreEnd
       /* In reply to */
       $variables['in_reply_to'] = "";
-...
         /* Signatures */
         if (variable_get('user_signatures', 0)) {
           $variables['signature'] =  '<!--post:signature-core-' . $node->uid . '-->';
           $variables['signature'] = '<!--post:signature-core-' . $node->uid . '-->';
+        }
         /* User specific node theming class */
-...
           $variables['post_edited'] = theme('advanced_forum_post_edited', array(
             'who' => $variables['revision_uid'],
             'when' => $variables['revision_timestamp'],
             'why' => $variables['log']
             'why' => $variables['log'],
           ));
+        }

         $forum_term = advanced_forum_forum_load(0);
+      }
       // Set tid for <root> container
       // Set tid for <root> container.
       if (!isset($forum_term->tid)) {
         $forum_term->tid = 0;
+      }
-...
         $title = $vocabulary->name;
+      }
       if (!variable_get('advanced_forum_disable_breadcrumbs', FALSE)) {
         drupal_set_breadcrumb($breadcrumb);
+      }
-...
         'parents' => $forum_term->parents,
         'tid' => $forum_term->tid,
         'sortby' => $sortby,
         'forums_per_page' => $forum_per_page
         'forums_per_page' => $forum_per_page,
       ));
+    }
-...
+     *
      * This is copied from the forum module and adapted.
+     *
      * @param $tid
      *    (optional) Taxonomy ID of the forum, if not givin all forums will be returned.
      * @return
      * @param int|null $tid
      *   (optional) Taxonomy ID of the forum, if not givin all forums will be returned.
+     *
      * @return object
      *   A tree of taxonomy objects, with the following additional properties:
      *    - 'num_topics': Number of topics in the forum
      *    - 'num_posts': Total number of posts in all topics
-...
     function advanced_forum_forum_load($tid = NULL) {
       $cache = &drupal_static(__FUNCTION__, array());
       global $language;
       // Return a cached forum tree if available.
       if (empty($tid)) {
-...
       // If $tid is 0, create an empty object to hold the child terms.
       elseif ($tid === 0) {
         $forum_term = (object) array(
               'tid' => 0,
           'tid' => 0,
         );
+      }
-...
         $_forums = i18n_taxonomy_localize_terms($_forums);
+      }
       if ($cached = cache_get('adv_forum_counts' . $tid, 'cache')) {
       if ($cached = cache_get('adv_forum_counts' . $tid . ':' . $language->language, 'cache')) {
         if ($cached->expire > time()) {
           $counts = $cached->data;
+        }
-...
           if (!empty($node_types)) {
             $query->condition('type', $node_types, 'IN');
+          }
           $query->condition('language', array(LANGUAGE_NONE, $language->language));
+        }
         $counts = $query
-...
             ->addTag('node_access')
             ->execute()
             ->fetchAllAssoc('tid');
         cache_set('adv_forum_counts' . $tid, $counts, 'cache', time() + 60*60); //1 hour
         // 1 hour.
         cache_set('adv_forum_counts' . $tid, $counts, 'cache', time() + 60 * 60);
+      }
       // get last nodes with comments for subquery SELECT optimization
       // Get last nodes with comments for subquery SELECT optimization.
       $subquery = db_select('node_comment_statistics', 'lnsc')
         ->fields('lnsc', array('nid'))
         ->distinct()
         ->orderBy('last_comment_timestamp', 'DESC')
         ->range(0, 1000); // should be moved to options or additionally calculated elsewhere
         ->range(0, 1000);
       // Should be moved to options or additionally calculated elsewhere.
       foreach ($_forums as $forum) {
         // Determine if the child term is a container.
         if (in_array($forum->tid, variable_get('forum_containers', array()))) {
-...
       return $forum_term;
+    }
     /**
      * Update parent post count.
      */
     function _advanced_forum_update_parent_post_count(&$forums, $forum) {
       foreach ($forum->parents as $parent_tid) {
         if (!empty($forums[$parent_tid])) {
           $forums[$parent_tid]->num_topics += $forum->num_topics;
           $forums[$parent_tid]->num_posts += $forum->num_posts;
           // recursive loop to update all parents
           // Recursive loop to update all parents/
           if (!empty($forums[$parent_tid]->parents)) {
             _advanced_forum_update_parent_post_count($forums, $forums[$parent_tid]);
+          }
-...
       $term = taxonomy_term_load($tid);
       drupal_add_feed('taxonomy/term/' . $tid . '/feed', 'RSS - ' . check_plain($term->name));
       // Views handles this page
       // Views handles this page.
       $view = views_get_view('advanced_forum_topic_list');
       $view->set_items_per_page($forum_per_page);
       $view->sort_form = $sort_form;
       return $view->preview('default', array($tid));
+    }

     <?php
     /**
      * @file
      * Holds functions relating to the Mark Forum/All Read functionality.
-...
       if (isset($tid)) {
         $query_node->condition('f.tid', $tid);
+      }
       $query_node->condition('t.vid', $vid);
       $query_node->addField('n', 'nid');
       // Select query objects are one-shot, so clone for INSERT below.
-...
       global $user;
       return user_access('access content') && $user->uid;
+    }

drupal7/sites/all/modules/advanced_forum/includes/panels/advanced_forum.pages_default.inc
25	25	}
26	26	}
27	27	}
28
	28
29	29	return $handlers;
30	30	}

     <?php
     /**
      * @file
      * Allows modules to contribute styles.
      */
     // -----------------------------------------------------------------------
     // REQUEST FUNCTIONS
     /**
      * Fetch an advanced forum style plugin
      * Fetch an advanced forum style plugin.
+     *
      * @param $style
      * @param string $style
      *   Name of the style plugin
+     *
      * @return
      * @return array
      *   An array with information about the requested style plugin.
      */
     function advanced_forum_get_style($style) {
-...
     /**
      * Collate information about all available advanced_forum styles.
+     *
      * @return
      * @return array
      *   An array with information about the requested forum style.
      */
     function advanced_forum_get_styles() {

... Ce différentiel a été tronqué car il excède la taille maximale pouvant être affichée.

Formats disponibles : Unified diff

Projet

Général

Profil

Club Drupal

Révision 13c3c9b4

Ajouté par Assos Assos il y a environ 9 ans