--- sites/all/modules/og_forum/og_forum.module	2009-02-01 01:17:28.000000000 -0700
+++ sites/all/modules/og_forum/og_forum_new_1b.module	2009-02-01 00:43:22.000000000 -0700
@@ -585,11 +585,12 @@ function og_forum_admin_settings() {
   );
   $current_default_name = variable_get('forum_default_name', 'General discussion');
   $form['default_forum_name'] = array(
-    '#type' => 'textfield',
+    '#type' => 'textarea',
     '#title' => t('Default forum name'),
     '#description' => t('When this module creates a container and default forum for a new group, this will be the name given to that group.'),
     '#default_value' => $current_default_name,
-  );
+    '#maxlength' => 510,
+  ); //J.Prentiss - update textfield to textarea for better use of longer fdesc's
   $form['container'] = array(
     '#type' => 'fieldset',
     '#title' => t('Group forum container'),
@@ -918,6 +919,17 @@ function og_forum_nodeapi($node, $op, $t
           // Updated 3-13-2008 - Added ability to use descriptions. Follow the container or 
           // forum number by a comma, then decription. e.g. Forum3, This is a description;Forum4
           //
+	 	  // 2-01-2009 Jesse Prentiss
+		  // Suggested changes: Prefix '-' on forum names, tag [OGFC] (og Forum Container) in desc
+		  // to allow for syntax e.g.
+		  // Forum1;-Forum2,Description of [OGFC] forum;C;Container2;-Forum3,Description of [OGFC] forum
+		  // to give the structure
+		  // Group Container
+		  // Forum 1
+		  // 'Group Container - Forum 2','Description of Group Container forum'
+		  // Container 2
+		  // ..'Container 2 - Forum 3','Description of Container 2 forum'
+		  //
           //Setup Main Container
           $edit = array('name' => $node->title, 'vid' => og_forum_get_vid());
           $status = taxonomy_save_term($edit);
@@ -959,9 +971,14 @@ function og_forum_nodeapi($node, $op, $t
               if ($is_container == '1'){
                 //Add New Container
                 $forum_names = explode(",",$fvalue); //Break out Name and Description
+		//Set prefix for forums to root container name (node->title - forumname)
+		if (substr($fvalue[0],0,1)=='-'){
+			$forum_names[0]=$node->title . ' - ' . substr($forum_names[0],1,strlen($forum_names[0]));		
+			}
                 if (count($forum_names) == 2){
                   $fname = $forum_names[0];
-                  $fdesc = $forum_names[1];
+                 //Use [OGFC] as a tag for inserting root container name into boilerplate descriptions
+                  $fdesc = str_replace('[OGFC]',$node->title,$forum_names[1]);
                 }else{
                   $fname = $forum_names[0];
                   unset($fdesc);
@@ -981,9 +998,14 @@ function og_forum_nodeapi($node, $op, $t
               else {
                //Add New Forum
                $forum_names = explode(",",$fvalue); //Break out Name and Description
+	       //Set prefix for forums to root container name (node->title - forumname)
+		if (substr($fvalue[0],0,1)=='-'){
+			$forum_names[0]=$node->title . ' - ' . substr($forum_names[0],1,strlen($forum_names[0]));		
+			}
                 if (count($forum_names) == 2){
                   $fname = $forum_names[0];
-                  $fdesc = $forum_names[1];
+                   //Use [OGFC] as a tag for inserting root container name into boilerplate descriptions
+                  $fdesc = str_replace('[OGFC]',$node->title,$forum_names[1]);
                 }else{
                   $fname = $forum_names[0];
                   unset($fdesc);