Index: asset_bonus/asset_bonus.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/asset/asset_bonus/Attic/asset_bonus.module,v
retrieving revision 1.1.2.9
diff -u -r1.1.2.9 asset_bonus.module
--- asset_bonus/asset_bonus.module	29 Jan 2008 20:49:46 -0000	1.1.2.9
+++ asset_bonus/asset_bonus.module	30 Jan 2008 13:12:19 -0000
@@ -311,6 +311,7 @@
 function asset_bonus_mp3player_options($asset) {
   $form['width'] = array('#type' => 'hidden', '#value' => '290');
   $form['height'] = array('#type' => 'hidden', '#value' => '24');
+  $form['resizable'] = array();
   return $form;
 }
 
@@ -337,7 +338,7 @@
   $output = <<<OUT
   <div id="mp3player-{$asset->aid}" class="asset-swfobject">Audio placeholder</div>
   <script type="text/javascript">
-    var oSwf = new SWFObject("$swffile", "mp3player-object-{$asset->aid}", "190", "24", "7", "#FFFFFF");    
+    var oSwf = new SWFObject("$swffile", "mp3player-object-{$asset->aid}", "290", "24", "7", "#FFFFFF");
     oSwf.addVariable('playerID', '{$asset->aid}');
     oSwf.addVariable('soundFile', '{$asset->url}');
     $colorvars
Index: asset_wizard.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/asset/Attic/asset_wizard.inc,v
retrieving revision 1.1.2.8
diff -u -r1.1.2.8 asset_wizard.inc
--- asset_wizard.inc	19 Dec 2007 18:50:23 -0000	1.1.2.8
+++ asset_wizard.inc	30 Jan 2008 13:10:46 -0000
@@ -226,6 +226,10 @@
             '#title' => t('Height'),
             '#default_value' => !isset($_GET['height']) ? $asset->height : filter_xss($_GET['height']),
           );
+          $default_options['resizable'] = array(
+            '#type' => 'hidden',
+            '#value' => 'true',
+          );
       	}
       	else {
           $default_options['width'] = array(
@@ -280,7 +284,13 @@
           $preview = theme('imagecache', $preset, str_replace("//","/", $a->filepath));
         }
         else {
-          $asset = array(            'aid' => $macro['aid'],            'format' => 'image',            'formatter' => 'asset',            'width' => '120',            'height' => '80',          );
+          $asset = array(
+            'aid' => $macro['aid'],
+            'format' => 'image',
+            'formatter' => 'asset',
+            'width' => '120',
+            'height' => '80',
+          );
           $preview = asset_render_macro($asset);
         }
       }
@@ -633,9 +643,11 @@
     }
   }
   elseif($form_values['op'] == t('Select') && isset($_SESSION['asset_fieldname'])) {
-    $delta = split("-", $_SESSION['asset_fieldname']); // edit-field-assets-0-    $delta_count = count($delta);    $delta_count = $delta_count - 2; // we start counting at 0, not at 1
+    $delta = split("-", $_SESSION['asset_fieldname']); // edit-field-assets-0-
+    $delta_count = count($delta);
+    $delta_count = $delta_count - 2; // we start counting at 0, not at 1
     $delta = $delta[$delta_count];
-    $fieldname = str_replace(array("edit-field-", "-$delta-", "-"), array("", "", "_"), $_SESSION['asset_fieldname']);
+    $fieldname = str_replace(array("edit-field-", "-$delta-", "-"), array("", "", "_"), $_SESSION['asset_fieldname']);
     if(!$form_values['aid']) {
       form_set_error('aid', 'You need to select an asset before inserting it.');
       return;
@@ -652,7 +664,13 @@
         $preview = theme('imagecache', $preset, str_replace("//","/", $a->filepath));
       }
       else {
-        $asset = array(          'aid' => $form_values['aid'],          'format' => 'image',          'formatter' => 'asset',          'width' => '120',          'height' => '80',        );
+        $asset = array(
+          'aid' => $form_values['aid'],
+          'format' => 'image',
+          'formatter' => 'asset',
+          'width' => '120',
+          'height' => '80',
+        );
         $preview = asset_render_macro($asset);
       }
     }
@@ -998,4 +1016,22 @@
   return drupal_render($element);
 }
 
-function asset_rmdir($folder) {  if (is_dir($folder)){    foreach (scandir ( $folder )  as $value ) {      if ($value != "." && $value != "..") {        $value = $folder . "/" . $value;        if (is_dir($value)) {          asset_rmdir($value);        }        elseif (is_file($value)) {          @unlink ( $value );        }      }    }    return rmdir ( $folder );  }  else {    return FALSE;  }}
+function asset_rmdir($folder) {
+  if (is_dir($folder)){
+    foreach (scandir ( $folder )  as $value ) {
+      if ($value != "." && $value != "..") {
+        $value = $folder . "/" . $value;
+        if (is_dir($value)) {
+          asset_rmdir($value);
+        }
+        elseif (is_file($value)) {
+          @unlink ( $value );
+        }
+      }
+    }
+    return rmdir ( $folder );
+  }
+  else {
+    return FALSE;
+  }
+}
Index: modules/asset_imagecache.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/asset/modules/asset_imagecache.inc,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 asset_imagecache.inc
--- modules/asset_imagecache.inc	5 Jun 2007 21:37:23 -0000	1.1.2.1
+++ modules/asset_imagecache.inc	30 Jan 2008 13:11:40 -0000
@@ -41,7 +41,7 @@
       $size = image_get_info(file_create_path('imagecache/'.$attr['format'].'/'.$asset->filepath));
       $form['width'] = array('#type' => 'hidden', '#value' => $size['width']);        
       $form['height'] = array('#type' => 'hidden', '#value' => $size['height']);
-              
+      $form['resizable'] = array();
       $form['_width'] = array(
         '#type' => 'item',
         '#title' => t('Width, preset by imagecache'),