? 269578_early_cleanup.patch
Index: advanced_forum.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/advanced_forum/advanced_forum.module,v
retrieving revision 1.21.2.34
diff -u -p -r1.21.2.34 advanced_forum.module
--- advanced_forum.module	10 Jun 2008 20:49:19 -0000	1.21.2.34
+++ advanced_forum.module	12 Jun 2008 14:22:38 -0000
@@ -11,61 +11,53 @@
 /*****************************************************************************/
 
 /**
- * Implementation of hook_perm().
+ * Implementation of hook_init().
  */
-function advanced_forum_perm() {
-  return array('administer advanced forum');
+function advanced_forum_init() {
+  // load in the advanced forum theme if we're in a forum, or viewing a node.
+  if (arg(0) == 'forum' || ($node = menu_get_object())) {
+    foreach (array('advanced_forum-structure.css', 'advanced_forum.css') as $filename) {
+      $css_file = path_to_theme() . '/' . advanced_forum_get_forum_theme_directory() . '/' . $filename;
+
+      if (!file_exists($css_file)) {
+        $css_file = drupal_get_path('module', 'advanced_forum') . '/themes/advforum/' . $filename;
+      }
+
+      drupal_add_css($css_file);
+    }
+  }
 }
 
 /**
- * Implementation of hook_init().
+ * Implementation of hook_perm().
  */
-function advanced_forum_init() {
-  // Find the CSS files for the forums by looking first in the theme and then
-  // in the module.
-  $css_file = path_to_theme() . '/' . advanced_forum_get_forum_theme_directory() . '/advanced_forum-structure.css';
-  if (!file_exists($css_file)) {
-    $css_file = drupal_get_path('module', 'advanced_forum') . '/themes/advforum/advanced_forum-structure.css';
-  }
-  
-  drupal_add_css($css_file);
-
-  $css_file = path_to_theme() . '/' . advanced_forum_get_forum_theme_directory() . '/advanced_forum.css';
-  if (!file_exists($css_file)) {
-    $css_file = drupal_get_path('module', 'advanced_forum') . '/themes/advforum/advanced_forum.css';
-  }
-  
-  drupal_add_css($css_file);
+function advanced_forum_perm() {
+  return array('administer advanced forum');
 }
 
 /**
  * Implementation of hook_menu().
  */
 function advanced_forum_menu() {
-  // Mark as read functionality
   $items['forum/markasread'] = array(
-         'title' => 'Helper page to mark forums read.',
-         'page callback' => 'advanced_forum_markasread',
-         'access callback' => 'advanced_forum_markasread_access',
-         'type' => MENU_CALLBACK,
-         );
-
-  // Add menu entry for settings page
+    'access callback' => 'advanced_forum_markasread_access',
+    'page callback' => 'advanced_forum_markasread',
+    'type' => MENU_CALLBACK,
+  );
   $items['admin/settings/advanced-forum'] = array(
-         'title' => 'Advanced Forum',
-         'page callback' => 'drupal_get_form',
-         'page arguments' => array('advanced_forum_settings_page'),
-         'access callback' => 'user_access',
-         'access arguments' => array('administer advanced forum'),
-    );
-   return $items;
+    'access arguments' => array('administer advanced forum'),
+    'description' => 'Configure Advanced Forum with these settings.',
+    'page arguments' => array('advanced_forum_settings_page'),
+    'page callback' => 'drupal_get_form',
+    'title' => 'Advanced Forum',
+  );
+  return $items;
 }
 
 /**
  * Implementation of hook_theme().
  */
 function advanced_forum_theme() {
-  $items = array();
   $items['forum_user'] = array(
       'template' => 'advf-forum-user',
       'path' => drupal_get_path('module', 'advanced_forum') . '/themes/advforum',
@@ -95,12 +87,8 @@ function advanced_forum_theme_registry_a
   }
 }
 
-/*****************************************************************************/
-/*** SETTINGS PAGE ***********************************************************/
-/*****************************************************************************/
-
 /**
- * Defines settings form.
+ * Defines the Advanced Forum settings form.
  */
 function advanced_forum_settings_page() {
   $form['advanced_forum_themedir'] = array(
@@ -110,7 +98,7 @@ function advanced_forum_settings_page() 
     '#description' => t('Path from site theme directory to advanced forum theme directory. Defaults to "advforum"'),
     '#default_value' => variable_get('advanced_forum_themedir', 'advforum'),
   );
-  
+
   $form['advanced_forum_use_supplied_icons'] = array(
     '#type' => 'radios',
     '#title' => t('Use icons in module directory'),
@@ -129,7 +117,7 @@ function advanced_forum_settings_page() 
 
   // Send our form to Drupal to make a settings page
   return system_settings_form($form);
-} 
+}
 
 /*****************************************************************************/
 /*** TEMPLATE PREPROCESS *****************************************************/
@@ -802,10 +790,14 @@ function advanced_forum_markasread() {
   }
 }
 
+/**
+ * Access callback for menus and link display.
+ *
+ * This separate function is needed because the Drupal 6 menu system doesn't
+ * run hook_menu() every time and the logged-in status of the user can get
+ * cached and re-used for other users.
+ */
 function advanced_forum_markasread_access() {
-  // This separate function is needed because the new menu system doesn't run
-  // hook_menu() every time and the logged in status of the user can get cached
-  // and re-used for other users.
   global $user;
   return user_access('access content') && $user->uid;
 }