diff -urpN modulesOLD/wysiwyg_imageupload_shadowbox/wysiwyg_imageupload_shadowbox.info modules/wysiwyg_imageupload_shadowbox/wysiwyg_imageupload_shadowbox.info
--- modulesOLD/wysiwyg_imageupload_shadowbox/wysiwyg_imageupload_shadowbox.info	1970-01-01 10:00:00.000000000 +1000
+++ modules/wysiwyg_imageupload_shadowbox/wysiwyg_imageupload_shadowbox.info	2010-11-13 15:40:49.018572206 +1100
@@ -0,0 +1,8 @@
+; $Id$
+name = WYSIWYG Image upload - Shadowbox integration
+description = Image upload dialog for the most WYSIWYG Editors
+dependencies[] = wysiwyg_imageupload
+dependencies[] = shadowbox
+package = Drupal Wiki
+core = "6.x"
+project = "wysiwyg_imageupload_shadowbox
diff -urpN modulesOLD/wysiwyg_imageupload_shadowbox/wysiwyg_imageupload_shadowbox.install modules/wysiwyg_imageupload_shadowbox/wysiwyg_imageupload_shadowbox.install
--- modulesOLD/wysiwyg_imageupload_shadowbox/wysiwyg_imageupload_shadowbox.install	1970-01-01 10:00:00.000000000 +1000
+++ modules/wysiwyg_imageupload_shadowbox/wysiwyg_imageupload_shadowbox.install	2010-11-13 15:42:55.610315091 +1100
@@ -0,0 +1,43 @@
+<?php
+// $Id$
+
+function wysiwyg_imageupload_shadowbox_install() {
+  db_query("UPDATE {system} SET weight = 10 WHERE name = 'wysiwyg_imageupload_shadowbox'");
+  wysiwyg_imageupload_shadowbox_add_field();
+}
+
+/**
+ * Implementation of hook_schema().
+ */
+function wysiwyg_imageupload_shadowbox_add_field() {
+  $ret = array();
+
+  $shadowbox = array(
+    'type' => 'int',
+    'not null' => TRUE,
+    'default' => -1,
+    'description' => 'Use shadowbox integration or not',
+  );
+  db_add_field($ret, 'wysiwyg_imageupload_entity', 'shadowbox', $shadowbox);
+  return $ret;
+}
+
+function wysiwyg_imageupload_shadowbox_schema_alter(&$schema) {
+  // Add field to existing schema.
+  $schema['wysiwyg_imageupload_entity']['fields']['shadowbox'] = array(
+    'type' => int,
+    'not null' => TRUE,
+    'default' => -1,
+    'description' => 'Use shadowbox integration or not',
+  );
+}
+
+/**
+ * Implementation of hook_uninstall().
+ */
+function wysiwyg_imageupload_shadowbox_uninstall() {
+  // Remove tables.
+  db_drop_field($ret, 'wysiwyg_imageupload_entity', 'shadowbox');
+  // Remove variables.
+  db_query("DELETE FROM {variable} WHERE name LIKE 'wysiwyg_imageupload_shadowbox_%'");
+}
diff -urpN modulesOLD/wysiwyg_imageupload_shadowbox/wysiwyg_imageupload_shadowbox.module modules/wysiwyg_imageupload_shadowbox/wysiwyg_imageupload_shadowbox.module
--- modulesOLD/wysiwyg_imageupload_shadowbox/wysiwyg_imageupload_shadowbox.module	1970-01-01 10:00:00.000000000 +1000
+++ modules/wysiwyg_imageupload_shadowbox/wysiwyg_imageupload_shadowbox.module	2010-11-13 15:48:07.460090438 +1100
@@ -0,0 +1,145 @@
+<?php
+// $Id$
+// Copyright (c) 2010 KontextWork GbR
+// Author: Eugen Mayer
+
+/**
+ * Thats where we actually alter the form and add our extra meta data
+ * The loaded $img_obj hold your data dui to the hook_wysiwyg_imageupload_entity_load_alter
+ * We use the value to set our default value
+ */
+function wysiwyg_imageupload_shadowbox_form_alter(&$form, &$state, $form_id) {
+  if ( $form_id == 'wysiwyg_imageupload_edit_form') {
+    // You always find the IID here
+    $iid = $form['image_upload_details']['iid']['#value'];
+    $img_obj = _wysiwyg_imageupload_load_inline_entity($iid);
+
+    $default = variable_get('wysiwyg_imageupload_shadowbox_default', 1);
+    // only use the defaul if nothing set yet
+    if ($img_obj->shadowbox > -1) {
+      $default = $img_obj->shadowbox;
+    }
+
+    $form['image_upload_details']['extras']['shadowbox'] = array(
+      '#title' => t('Popup'),
+      '#description' => t('Preview original-size picture on click'),
+      '#type' => 'checkbox',
+      '#default_value' => $default,
+    );
+  }
+  elseif ($form_id == 'wysiwyg_imageupload_admin_settings') {
+    wysiwyg_imageupload_shadowbox_admin_settings($form);
+  }
+}
+
+function wysiwyg_imageupload_shadowbox_theme() {
+  return wysiwyg_imageupload_theme();
+}
+
+/**
+ * Implementation of hook_wysiwyg_imageupload_entity_save().
+ */
+function wysiwyg_imageupload_shadowbox_wysiwyg_imageupload_entity_save($post, $iid) {
+  // $post has the $form_state['values'], so we find our form element there (the value)
+  $update = array(
+    'iid',
+  );
+
+  $record = array(
+    'shadowbox' => $post['shadowbox'],
+    'iid' => $post['iid'],
+  );
+  drupal_write_record('wysiwyg_imageupload_entity', $record, $update);
+}
+
+/************* Everything below is optional ********************************************** */
+
+/**
+ * Implementation of hook_wysiwyg_imageupload_entity_load_alter().
+ * This is an example for how to load values if you stored the meta data in a different table
+ * them wysiwyg_imageupload_entity
+ * YOU DONT need to implement this if you actually store your meta data IN the wysiwyg_imageupload_entity
+ * table
+ */
+/*
+function wysiwyg_imageupload_shadowbox_wysiwyg_imageupload_entity_load_alter($entity, $iid) {
+  $result = db_fetch_object(db_query('SELECT shadowbox FROM {some_relation_table} WHERE iid=%d',$iid);
+  $entity->shadowbox = $result->shadowbox;
+}*/
+
+/**
+ * This is optional. We alter the wysiwyg_imageupload admin settings
+ * to provide some settings for our module. If you dont need those
+ * you dont need to implement thise
+ */
+function wysiwyg_imageupload_shadowbox_admin_settings(&$form) {
+  $presets = imagecache_presets();
+  $styles = array();
+  foreach ($presets as $preset) {
+    // We can use the presetid here (http://drupal.org/node/694188).
+    $styles[$preset['presetname']] = t("!preset", array('!preset' => $preset['presetname']));
+  }
+
+  $form['wysiwyg_imageupload_shadowbox_settings'] = array(
+    '#type' => 'fieldset',
+    '#title' => t('Shadowbox settings'),
+    '#description' => t('Only the selected presets are allowed to be chosen in the dialog'),
+    '#collapsed' => TRUE,
+    '#collapsible' => TRUE,
+    '#weight' => 0,
+  );
+
+  $form['wysiwyg_imageupload_shadowbox_settings']['wysiwyg_imageupload_shadowbox_preset'] = array(
+    '#type' => 'select',
+    '#title' => t('What preset to use for the popup?'),
+    '#description' => t('This preset will be used to show the image in the shadowbox'),
+    '#default_value' => variable_get('wysiwyg_imageupload_shadowbox_preset', 'wysiwyg_imageupload_shadowbox_preset'),
+    '#options' => $styles
+  );
+  $form['wysiwyg_imageupload_shadowbox_settings']['wysiwyg_imageupload_shadowbox_default'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Default value'),
+    '#description' => t('If checked, shadowbox integration will be checked in the image detail form by default'),
+    '#default_value' => variable_get('wysiwyg_imageupload_shadowbox_default', 1),
+  );
+}
+
+function wysiwyg_imageupload_shadowbox_wysiwyg_imageupload_rendered_image_alter(&$img, $img_obj) {
+  $default = variable_get('wysiwyg_imageupload_shadowbox_default', 1);
+  // only use the defaul if nothing set yet
+  if ($img_obj->shadowbox > -1) {
+    $default = $img_obj->shadowbox;
+  }
+
+  if ($default != 0) {
+    $transformed_path = imagecache_create_url(variable_get('wysiwyg_imageupload_shadowbox_preset', 'wysiwyg_imageupload_shadowbox_preset'), $img_obj->filepath);
+    $link_attributes = array(
+      'rel' => 'shadowbox[wysiwyg_imageupload_inline]',
+      'title' => $img_obj->title
+    );
+    $img = l($img, $transformed_path, array('html' => TRUE, 'attributes' => $link_attributes));
+  }
+}
+
+/**
+ *  Those presets are needed for the shadowbox
+ */
+function wysiwyg_imageupload_shadowbox_imagecache_default_presets() {
+  $presets = array();
+  $presets['wysiwyg_imageupload_shadowbox_preset'] = array(
+    'presetname' => 'wysiwyg_imageupload_shadowbox_preset',
+    'actions' => array(
+      0 => array(
+        'weight' => '0',
+        'module' => 'imagecache',
+        'action' => 'imagecache_scale',
+        'data' => array(
+          'height' => '768',
+          'width' => '1280',
+        ),
+      ),
+    )
+  );
+
+  return $presets;
+}