--- a/ad.module	Mon Jul 20 13:54:40 2009 +0000
+++ b/ad.module	Fri Sep 11 11:10:20 2009 +0000
@@ -1,5 +1,5 @@
 <?php
-// $Id: ad.module,v 1.2.2.29.2.83.2.16.2.23 2009/07/06 21:47:49 jeremy Exp $
+// $Id: ad.module,v 1.2.2.29.2.83.2.16.2.26 2009/08/05 00:13:36 jeremy Exp $
 
 /**
  * @file
@@ -185,12 +185,7 @@
   }
 
   if (user_access('show advertisements')) {
-    if (isset($options['div']) && $options['div'] !== FALSE) {
-      return theme('ad_display', $group, $output, $options['ad_display']);
-    }
-    else {
-      return theme('ad_display', $group, $output, 'raw');
-    }
+    return theme('ad_display', $group, $output, $options['ad_display']);
   }
   else {
     return theme('ad_display', 'none', "<!-- Enable 'show advertisements' permission if you wish to display ads here. -->");
@@ -599,27 +594,30 @@
     '#required' => TRUE,
     '#default_value' => isset($node->title) ? $node->title : '',
   );
-  $form['body_filter']['body'] = array(
-    '#type' => 'textarea',
-    '#title' => t('Description'),
-    '#default_value' => isset($node->body) ? $node->body : '',
-    '#rows' => 3
-  );
+  if ($type->has_body) {
+    $form['body_filter']['body'] = array(
+      '#type' => 'textarea',
+      '#title' => t('Description'),
+      '#default_value' => isset($node->body) ? $node->body : '',
+      '#rows' => 3
+    );
+  }
   $form['body_filter']['format'] = filter_form($node->format);
 
   // determine the current ad type
   if (!isset($adtype)) {
     $adtypes = ad_get_types();
-    if (sizeof($adtypes) == 1) {
+    if (count($adtypes) == 1) {
       $adtype = key($adtypes);
     }
-    else if (!sizeof($adtypes)) {
+    else if (!count($adtypes)) {
       drupal_set_message(t('At least one ad type module must be enabled before you can create advertisements.  For example, try <a href="!url">enabling</a> the ad_text or ad_image module.', array('!url' => url('admin/build/modules'))), 'error');
     }
   }
 
   // display ad type switch
-  if (!isset($node->adtype) || isset($node->adtype_select)) {
+  if ((!isset($node->adtype) || isset($node->adtype_select)) &&
+       count($adtypes) >1) {
     $adtypes = array(0 => '---');
     $adtypes += ad_get_types('name');
     $form['select'] = array(
@@ -646,10 +644,13 @@
     );
   }
   // display type-specific options
-  if (isset($node->adtype) && $node->adtype) {
+  if ((isset($node->adtype) && $node->adtype) || count($adtypes) == 1) {
     if (isset($node->adtype_select) && $node->adtype_select && ($node->adtype_select != $node->adtype)) {
       $node->adtype = $node->adtype_select;
     }
+    if (count($adtypes) == 1) {
+      $node->adtype = $adtype;
+    }
     ad_form_add_adtype_elements($form, $node->adtype, $node);
     // add ahah wrapper
     $form['adtype_elements']['#prefix'] = '<div id="adtype-ahah-wrapper">';