Index: README.txt
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/og_forum/README.txt,v
retrieving revision 1.4
diff -u -p -r1.4 README.txt
--- README.txt	7 Aug 2006 18:26:35 -0000	1.4
+++ README.txt	21 Feb 2007 20:04:38 -0000
@@ -17,7 +17,7 @@ KNOWN ISSUES:
 - the next/previous topic links can take you outside the current forum?
 - NOT COMPATIBLE with regular 'everyone can see' style forums. choose one or the other for your site.
 
-Original author: Károly Négyesi
+Original author: Károly Négyesi
 
 Special thanks to:
 Evan Leeson of Catalyst Creative for sponsorship of 4.7 port and 
Index: og_forum.info
===================================================================
RCS file: og_forum.info
diff -N og_forum.info
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ og_forum.info	21 Feb 2007 20:04:38 -0000
@@ -0,0 +1,7 @@
+; $Id$
+name = OG forum
+description = Creates forums within organic groups.
+dependencies = og forum
+package = Organic groups
+version = "$Name$"
+
Index: og_forum.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/og_forum/og_forum.module,v
retrieving revision 1.9
diff -u -p -r1.9 og_forum.module
--- og_forum.module	6 Jun 2006 23:10:43 -0000	1.9
+++ og_forum.module	21 Feb 2007 20:04:39 -0000
@@ -31,6 +31,15 @@ function og_forum_menu($may_cache) {
 
   if ($may_cache) {
     $items[] = array(
+      'path' => 'admin/og/og_forum',
+      'title' => t('OG forum'),
+      'description' => t('Configure organic group forums.'),
+      'callback' => 'drupal_get_form',
+      'callback arguments' => array('og_forum_admin_settings'),
+      'access' => user_access('administer site configuration'),
+      'type' => MENU_NORMAL_ITEM,
+    );
+    $items[] = array(
       'path' => 'og_forum',
       'callback' => 'og_forum_page',
       'type' => MENU_CALLBACK,
@@ -53,9 +62,9 @@ function og_forum_page($forum) {
 }
 
 /**
- * Implementation of hook_settings().
+ * Menu callback; configure organic group forums.
  */
-function og_forum_settings() {
+function og_forum_admin_settings() {
   $form['#submit']['og_forum_settings_submit'] = array(); // custom submit handler
   $form['#submit']['system_settings_form_submit'] = array(); // form.inc never calls the $callback if a submit handler is defined
 
@@ -69,7 +78,7 @@ function og_forum_settings() {
     '#type' => 'submit',
     '#value' => t('Update old groups'),
   );
-  return $form;
+  return system_settings_form($form);
 }
 
 /**
@@ -238,31 +247,5 @@ function og_forum_form_alter($form_id, &
       $form['taxonomy'][$vid]['#default_value'] = $term;
     }
   }
-
-  // Dependency checker
-  if ($form_id == 'system_modules' && !$_POST) {
-    og_forum_system_module_validate($form);
-  }
 }
 
-/**
- * Validates module dependencies for the module.
- */
-function og_forum_system_module_validate(&$form) {
-  $module = 'og_forum';
-  $dependencies = array('og', 'forum', 'taxonomy', 'comment');
-
-  foreach ($dependencies as $dependency) {
-      if (!in_array($dependency, $form['status']['#default_value'])) {
-        $missing_dependency = TRUE;
-        $missing_dependency_list[] = $dependency;
-      }
-  }
-
-  if (in_array($module, $form['status']['#default_value']) && isset($missing_dependency)) {
-    db_query("UPDATE {system} SET status = 0 WHERE type = 'module' AND name = '%s'", $module);
-    $key = array_search($module, $form['status']['#default_value']);
-    unset($form['status']['#default_value'][$key]);
-    drupal_set_message(t('The module %module was deactivated--it requires the following disabled/non-existant modules to function properly: %dependencies', array('%module' => $module, '%dependencies' => implode(', ', $missing_dependency_list))), 'error');
-  }
-}