diff Desktop/imagepicker/imagepicker.admin.inc Desktop/drupal-6.4/modules/imagepicker/imagepicker.admin.inc
15,16c15
<   // default settings
<   $form['imagepicker_defaults'] = array(
---
>   $form['imagepicker_settings'] = array(
22,38c21
<   $form['imagepicker_defaults']['imagepicker_default_thumbnail_size'] = array(
<     '#type' => 'textfield',
<     '#title' => t('Default Thumbnail Size'),
<     '#size' => 10,
<     '#required' => TRUE,
<     '#default_value' => variable_get('imagepicker_default_thumbnail_size', 100),
<     '#description' => t('Configure the default thumbnail size'),
<   );
<   $form['imagepicker_defaults']['imagepicker_default_scale'] = array(
<     '#type' => 'textfield',
<     '#title' => t('Default Scale'),
<     '#size' => 10,
<     '#required' => FALSE,
<     '#default_value' => variable_get('imagepicker_default_scale', ''),
<     '#description' => t('Configure the default scale. leave empty for no default scale'),
<   );
<   $form['imagepicker_defaults']['imagepicker_default_browser_thumbnail_size'] = array(
---
>   $form['imagepicker_settings']['imagepicker_default_browser_thumbnail_size'] = array(
47c30
<   $form['imagepicker_defaults']['imagepicker_node_types_enabled'] = array(
---
>   $form['imagepicker_settings']['imagepicker_node_types_enabled'] = array(
55c38
<     $form['imagepicker_defaults']['imagepicker_comment_enabled'] = array(
---
>     $form['imagepicker_settings']['imagepicker_comment_enabled'] = array(
63c46
<   $form['imagepicker_defaults']['imagepicker_default_pagelink'] = array(
---
>   $form['imagepicker_settings']['imagepicker_default_pagelink'] = array(
70c53
<   $form['imagepicker_defaults']['imagepicker_account_enabled'] = array(
---
>   $form['imagepicker_settings']['imagepicker_account_enabled'] = array(
76a60,132
> 
>   // default options
>   $form['imagepicker_defaults'] = array(
>     '#type' => 'fieldset',
>     '#title' => t('Set imagepicker defaults'),
>     '#collapsible' => TRUE,
>     '#collapsed' => FALSE,
>   );
>   $form['imagepicker_defaults']['imagepicker_default_thumbnail_size'] = array(
>     '#type' => 'textfield',
>     '#title' => t('Default Thumbnail Size'),
>     '#size' => 10,
>     '#required' => TRUE,
>     '#default_value' => variable_get('imagepicker_default_thumbnail_size', 100),
>     '#description' => t('Configure the default thumbnail size'),
>   );
>   $form['imagepicker_defaults']['imagepicker_default_scale'] = array(
>     '#type' => 'textfield',
>     '#title' => t('Default Scale'),
>     '#size' => 10,
>     '#required' => FALSE,
>     '#default_value' => variable_get('imagepicker_default_scale', ''),
>     '#description' => t('Configure the default scale. leave empty for no default scale'),
>   );
>   
>   // ====== Begin changes ========
>   
>   $form['imagepicker_insert_defaults'] = array(
>     '#type' => 'fieldset',
>     '#title' => t('Set imagepicker insert defaults'),
>     '#collapsible' => TRUE,
>     '#collapsed' => FALSE,
>     '#description' => ''
>   );
>   $showoptions = array('full' => t('Full size'), 'thumb' => t('Thumbnail'), 'title' => t('Title'));
>   $linkoptions = array('none' => t('None'), 'file' => t('File'), 'page' => t('Page') );
>   if (module_exists('lightbox2') && variable_get('imagepicker_lightbox2_enable', 1) ) {
>     $linkoptions['lightbox'] = t('Lightbox');
>   }
> 
>   $alignoptions = array('none' => t('None'), 'fleft' => t('Float Left'), 'fright' => t('Float right'));
>   $form['imagepicker_insert_defaults']['imagepicker_insert_defaults_align'] = array(
>     '#type' => 'radios',
>     '#title' => t('Align'),
>     '#default_value' => 'none',
>     '#options' => $alignoptions,
>     '#description' => '',
>     '#default_value' => variable_get('imagepicker_insert_defaults_align', 'none'),
>   );
> 
>   $form['imagepicker_insert_defaults']['imagepicker_insert_defaults_show'] = array(
>     '#type' => 'radios',
>     '#id' => 'show',
>     '#title' => t('Show'),
>     '#default_value' => 'full',
>     '#options' => $showoptions,
>     '#description' => '',
>     '#default_value' => variable_get('imagepicker_insert_defaults_show', 'full'),
>   );
>   $form['imagepicker_insert_defaults']['imagepicker_insert_defaults_link'] = array(
>     '#type' => 'radios',
>     '#title' => t('Link'),
>     '#default_value' => 'none',
>     '#options' => $linkoptions,
>     '#description' => '',
>     '#default_value' => variable_get('imagepicker_insert_defaults_link', 'none'),
>   );
>   
>   // ====== End changes ==========
>   
>   
>   
>   
226a283,291
>   if (! drupal_strlen($form_state['values']['imagepicker_insert_defaults_align'])) {
>     form_set_error('imagepicker_insert_defaults_align', t('You must fill in the default align field'));
>   }
>   if (! drupal_strlen($form_state['values']['imagepicker_insert_defaults_show'])) {
>     form_set_error('imagepicker_insert_defaults_show', t('You must fill in the default show field'));
>   }
>   if (! drupal_strlen($form_state['values']['imagepicker_insert_defaults_link'])) {
>     form_set_error('imagepicker_insert_defaults_link', t('You must fill in the default link field'));
>   }
Only in Desktop/drupal-6.4/modules/imagepicker/: imagepicker.admin.inc~
diff Desktop/imagepicker/imagepicker.module Desktop/drupal-6.4/modules/imagepicker/imagepicker.module
178c178
< 
---
>       $form['body_field']['#prefix'] = '<a name="body_hash"></a>' . $form['body_field']['#prefix'];
248c248
<       '#default_value' => 'none',
---
>       '#default_value' => variable_get('imagepicker_insert_defaults_align', 'none'),
259c259
<     '#default_value' => 'full',
---
>     '#default_value' => variable_get('imagepicker_insert_defaults_show', 'full'),
268c268
<     '#default_value' => 'none',
---
>     '#default_value' => variable_get('imagepicker_insert_defaults_link', 'none'),
465d464
< 
569c568,569
<       var isTinyMCE = win.document.getElementById('mce_editor_0');
---
>       //var isTinyMCE = win.document.getElementById('mce_editor_0'); // buggy
>       var isTinyMCE = win.tinyMCE; // Will be undefined if tinyMCE isn't loaded. This isn't a sure-proof way of knowing if tinyMCE is loaded into a field, but it works.
582a583
>       win.location.hash='body_hash';
Only in Desktop/drupal-6.4/modules/imagepicker/: imagepicker.module~