diff --git a/phpgwapi/inc/class.common.inc.php b/phpgwapi/inc/class.common.inc.php
index e4f1d7e371..2b91da8309 100644
--- a/phpgwapi/inc/class.common.inc.php
+++ b/phpgwapi/inc/class.common.inc.php
@@ -817,7 +817,7 @@ class common
* Scan filesystem for images of all apps
*
* For each application and image-name (without extension) one full path is returned.
- * The path takes template-set and image-type-priority ($GLOBALS['egw_info']['server']['image_type']) into account.
+ * The path takes template-set and image-type-priority (now fixed to: png, jpg, gif, ico) into account.
*
* VFS image directory is treated like an application named 'vfs'.
*
@@ -836,16 +836,8 @@ class common
}
$starttime = microtime(true);
- if (!$GLOBALS['egw_info']['server']['image_type'])
- {
- // priority: GIF->JPG->PNG
- $img_types = array('gif','jpg','png','ico');
- }
- else
- {
- // priority: : PNG->JPG->GIF
- $img_types = array('png','jpg','gif','ico');
- }
+ // priority: : PNG->JPG->GIF
+ $img_types = array('png','jpg','gif','ico');
$map = array();
foreach(scandir(EGW_SERVER_ROOT) as $app)
{
diff --git a/phpgwapi/setup/default_records.inc.php b/phpgwapi/setup/default_records.inc.php
index e9f953599d..b122b7a025 100644
--- a/phpgwapi/setup/default_records.inc.php
+++ b/phpgwapi/setup/default_records.inc.php
@@ -159,7 +159,6 @@ foreach(array(
foreach(array(
'sessions_checkip' => 'True',
- 'image_type' => '1',
'asyncservice' => 'fallback',
'install_id' => md5(microtime(true).common::randomstring(15)),
) as $name => $value)
diff --git a/phpgwapi/templates/default/images/about.gif b/phpgwapi/templates/default/images/about.gif
deleted file mode 100644
index 7c15294dee..0000000000
Binary files a/phpgwapi/templates/default/images/about.gif and /dev/null differ
diff --git a/phpgwapi/templates/default/images/attach.gif b/phpgwapi/templates/default/images/attach.gif
deleted file mode 100644
index 2fc4efd0db..0000000000
Binary files a/phpgwapi/templates/default/images/attach.gif and /dev/null differ
diff --git a/phpgwapi/templates/default/images/bg_filler.gif b/phpgwapi/templates/default/images/bg_filler.gif
deleted file mode 100755
index cd08764de6..0000000000
Binary files a/phpgwapi/templates/default/images/bg_filler.gif and /dev/null differ
diff --git a/phpgwapi/templates/default/images/close.button.gif b/phpgwapi/templates/default/images/close.button.gif
deleted file mode 100755
index 5a8b28b8e9..0000000000
Binary files a/phpgwapi/templates/default/images/close.button.gif and /dev/null differ
diff --git a/phpgwapi/templates/default/images/delete.gif b/phpgwapi/templates/default/images/delete.gif
deleted file mode 100644
index 3189726870..0000000000
Binary files a/phpgwapi/templates/default/images/delete.gif and /dev/null differ
diff --git a/phpgwapi/templates/default/images/down.button.gif b/phpgwapi/templates/default/images/down.button.gif
deleted file mode 100755
index 2d8fc00537..0000000000
Binary files a/phpgwapi/templates/default/images/down.button.gif and /dev/null differ
diff --git a/phpgwapi/templates/default/images/down.gif b/phpgwapi/templates/default/images/down.gif
deleted file mode 100644
index 4d87b1c93a..0000000000
Binary files a/phpgwapi/templates/default/images/down.gif and /dev/null differ
diff --git a/phpgwapi/templates/default/images/edit.button.gif b/phpgwapi/templates/default/images/edit.button.gif
deleted file mode 100755
index 5a01a5f889..0000000000
Binary files a/phpgwapi/templates/default/images/edit.button.gif and /dev/null differ
diff --git a/phpgwapi/templates/default/images/edit.gif b/phpgwapi/templates/default/images/edit.gif
deleted file mode 100644
index 871bb491e6..0000000000
Binary files a/phpgwapi/templates/default/images/edit.gif and /dev/null differ
diff --git a/phpgwapi/templates/default/images/first-grey.gif b/phpgwapi/templates/default/images/first-grey.gif
deleted file mode 100644
index 92bc78b9b9..0000000000
Binary files a/phpgwapi/templates/default/images/first-grey.gif and /dev/null differ
diff --git a/phpgwapi/templates/default/images/first.gif b/phpgwapi/templates/default/images/first.gif
deleted file mode 100644
index 107fb7a88e..0000000000
Binary files a/phpgwapi/templates/default/images/first.gif and /dev/null differ
diff --git a/phpgwapi/templates/default/images/grauer_pfeil.gif b/phpgwapi/templates/default/images/grauer_pfeil.gif
deleted file mode 100644
index ef8978d8a3..0000000000
Binary files a/phpgwapi/templates/default/images/grauer_pfeil.gif and /dev/null differ
diff --git a/phpgwapi/templates/default/images/home.gif b/phpgwapi/templates/default/images/home.gif
deleted file mode 100644
index 19f02f86b7..0000000000
Binary files a/phpgwapi/templates/default/images/home.gif and /dev/null differ
diff --git a/phpgwapi/templates/default/images/last-grey.gif b/phpgwapi/templates/default/images/last-grey.gif
deleted file mode 100644
index 0d276d26e4..0000000000
Binary files a/phpgwapi/templates/default/images/last-grey.gif and /dev/null differ
diff --git a/phpgwapi/templates/default/images/last.gif b/phpgwapi/templates/default/images/last.gif
deleted file mode 100644
index 6322ea4beb..0000000000
Binary files a/phpgwapi/templates/default/images/last.gif and /dev/null differ
diff --git a/phpgwapi/templates/default/images/left-grey.gif b/phpgwapi/templates/default/images/left-grey.gif
deleted file mode 100644
index 7466dca0b7..0000000000
Binary files a/phpgwapi/templates/default/images/left-grey.gif and /dev/null differ
diff --git a/phpgwapi/templates/default/images/left.gif b/phpgwapi/templates/default/images/left.gif
deleted file mode 100644
index 5123440c26..0000000000
Binary files a/phpgwapi/templates/default/images/left.gif and /dev/null differ
diff --git a/phpgwapi/templates/default/images/logout.gif b/phpgwapi/templates/default/images/logout.gif
deleted file mode 100644
index 0ef6f081f9..0000000000
Binary files a/phpgwapi/templates/default/images/logout.gif and /dev/null differ
diff --git a/phpgwapi/templates/default/images/new.gif b/phpgwapi/templates/default/images/new.gif
deleted file mode 100644
index 7403709a28..0000000000
Binary files a/phpgwapi/templates/default/images/new.gif and /dev/null differ
diff --git a/phpgwapi/templates/default/images/nonav.gif b/phpgwapi/templates/default/images/nonav.gif
deleted file mode 100644
index 695310f3b1..0000000000
Binary files a/phpgwapi/templates/default/images/nonav.gif and /dev/null differ
diff --git a/phpgwapi/templates/default/images/question.button.gif b/phpgwapi/templates/default/images/question.button.gif
deleted file mode 100755
index 1a406e2329..0000000000
Binary files a/phpgwapi/templates/default/images/question.button.gif and /dev/null differ
diff --git a/phpgwapi/templates/default/images/right-grey.gif b/phpgwapi/templates/default/images/right-grey.gif
deleted file mode 100644
index 3073986d34..0000000000
Binary files a/phpgwapi/templates/default/images/right-grey.gif and /dev/null differ
diff --git a/phpgwapi/templates/default/images/right.gif b/phpgwapi/templates/default/images/right.gif
deleted file mode 100644
index df3b770a43..0000000000
Binary files a/phpgwapi/templates/default/images/right.gif and /dev/null differ
diff --git a/phpgwapi/templates/default/images/roter_pfeil.gif b/phpgwapi/templates/default/images/roter_pfeil.gif
deleted file mode 100644
index 865153c3a4..0000000000
Binary files a/phpgwapi/templates/default/images/roter_pfeil.gif and /dev/null differ
diff --git a/phpgwapi/templates/default/images/tabs-bg0.gif b/phpgwapi/templates/default/images/tabs-bg0.gif
deleted file mode 100644
index 4a15b82ad0..0000000000
Binary files a/phpgwapi/templates/default/images/tabs-bg0.gif and /dev/null differ
diff --git a/phpgwapi/templates/default/images/tabs-bg1.gif b/phpgwapi/templates/default/images/tabs-bg1.gif
deleted file mode 100644
index 05ca0c92de..0000000000
Binary files a/phpgwapi/templates/default/images/tabs-bg1.gif and /dev/null differ
diff --git a/phpgwapi/templates/default/images/tabs-end0.gif b/phpgwapi/templates/default/images/tabs-end0.gif
deleted file mode 100644
index 1f4cc71483..0000000000
Binary files a/phpgwapi/templates/default/images/tabs-end0.gif and /dev/null differ
diff --git a/phpgwapi/templates/default/images/tabs-end1.gif b/phpgwapi/templates/default/images/tabs-end1.gif
deleted file mode 100644
index 896bb2817a..0000000000
Binary files a/phpgwapi/templates/default/images/tabs-end1.gif and /dev/null differ
diff --git a/phpgwapi/templates/default/images/tabs-ext.gif b/phpgwapi/templates/default/images/tabs-ext.gif
deleted file mode 100644
index dcc8490d96..0000000000
Binary files a/phpgwapi/templates/default/images/tabs-ext.gif and /dev/null differ
diff --git a/phpgwapi/templates/default/images/tabs-l0.gif b/phpgwapi/templates/default/images/tabs-l0.gif
deleted file mode 100644
index 736f558afe..0000000000
Binary files a/phpgwapi/templates/default/images/tabs-l0.gif and /dev/null differ
diff --git a/phpgwapi/templates/default/images/tabs-l1.gif b/phpgwapi/templates/default/images/tabs-l1.gif
deleted file mode 100644
index 44043ec23f..0000000000
Binary files a/phpgwapi/templates/default/images/tabs-l1.gif and /dev/null differ
diff --git a/phpgwapi/templates/default/images/tabs-r0.gif b/phpgwapi/templates/default/images/tabs-r0.gif
deleted file mode 100644
index 050a5ab987..0000000000
Binary files a/phpgwapi/templates/default/images/tabs-r0.gif and /dev/null differ
diff --git a/phpgwapi/templates/default/images/tabs-r1.gif b/phpgwapi/templates/default/images/tabs-r1.gif
deleted file mode 100644
index 9f16c2e1d6..0000000000
Binary files a/phpgwapi/templates/default/images/tabs-r1.gif and /dev/null differ
diff --git a/phpgwapi/templates/default/images/tabs-sepl.gif b/phpgwapi/templates/default/images/tabs-sepl.gif
deleted file mode 100644
index e9462064ae..0000000000
Binary files a/phpgwapi/templates/default/images/tabs-sepl.gif and /dev/null differ
diff --git a/phpgwapi/templates/default/images/tabs-sepm.gif b/phpgwapi/templates/default/images/tabs-sepm.gif
deleted file mode 100644
index 4088991bdf..0000000000
Binary files a/phpgwapi/templates/default/images/tabs-sepm.gif and /dev/null differ
diff --git a/phpgwapi/templates/default/images/tabs-sepr.gif b/phpgwapi/templates/default/images/tabs-sepr.gif
deleted file mode 100644
index 407351a32f..0000000000
Binary files a/phpgwapi/templates/default/images/tabs-sepr.gif and /dev/null differ
diff --git a/phpgwapi/templates/default/images/tabs-start0.gif b/phpgwapi/templates/default/images/tabs-start0.gif
deleted file mode 100644
index 6cdb2b8b8c..0000000000
Binary files a/phpgwapi/templates/default/images/tabs-start0.gif and /dev/null differ
diff --git a/phpgwapi/templates/default/images/tabs-start1.gif b/phpgwapi/templates/default/images/tabs-start1.gif
deleted file mode 100644
index bcd7a9d849..0000000000
Binary files a/phpgwapi/templates/default/images/tabs-start1.gif and /dev/null differ
diff --git a/phpgwapi/templates/default/images/up.button.gif b/phpgwapi/templates/default/images/up.button.gif
deleted file mode 100755
index 13e21d5612..0000000000
Binary files a/phpgwapi/templates/default/images/up.button.gif and /dev/null differ
diff --git a/phpgwapi/templates/default/images/up.gif b/phpgwapi/templates/default/images/up.gif
deleted file mode 100644
index c3abd65172..0000000000
Binary files a/phpgwapi/templates/default/images/up.gif and /dev/null differ
diff --git a/phpgwapi/templates/default/images/view.gif b/phpgwapi/templates/default/images/view.gif
deleted file mode 100644
index 3f23f00b19..0000000000
Binary files a/phpgwapi/templates/default/images/view.gif and /dev/null differ
diff --git a/phpgwapi/templates/idots/images/tabs-bg0.gif b/phpgwapi/templates/idots/images/tabs-bg0.gif
deleted file mode 100644
index 99ac54563e..0000000000
Binary files a/phpgwapi/templates/idots/images/tabs-bg0.gif and /dev/null differ
diff --git a/phpgwapi/templates/idots/images/tabs-bg1.gif b/phpgwapi/templates/idots/images/tabs-bg1.gif
deleted file mode 100755
index 5391aa8c0c..0000000000
Binary files a/phpgwapi/templates/idots/images/tabs-bg1.gif and /dev/null differ
diff --git a/phpgwapi/templates/idots/images/tabs-end0.gif b/phpgwapi/templates/idots/images/tabs-end0.gif
deleted file mode 100755
index 1f4cc71483..0000000000
Binary files a/phpgwapi/templates/idots/images/tabs-end0.gif and /dev/null differ
diff --git a/phpgwapi/templates/idots/images/tabs-end1.gif b/phpgwapi/templates/idots/images/tabs-end1.gif
deleted file mode 100755
index 896bb2817a..0000000000
Binary files a/phpgwapi/templates/idots/images/tabs-end1.gif and /dev/null differ
diff --git a/phpgwapi/templates/idots/images/tabs-ext.gif b/phpgwapi/templates/idots/images/tabs-ext.gif
deleted file mode 100755
index dcc8490d96..0000000000
Binary files a/phpgwapi/templates/idots/images/tabs-ext.gif and /dev/null differ
diff --git a/phpgwapi/templates/idots/images/tabs-l0.gif b/phpgwapi/templates/idots/images/tabs-l0.gif
deleted file mode 100755
index 736f558afe..0000000000
Binary files a/phpgwapi/templates/idots/images/tabs-l0.gif and /dev/null differ
diff --git a/phpgwapi/templates/idots/images/tabs-l1.gif b/phpgwapi/templates/idots/images/tabs-l1.gif
deleted file mode 100755
index 44043ec23f..0000000000
Binary files a/phpgwapi/templates/idots/images/tabs-l1.gif and /dev/null differ
diff --git a/phpgwapi/templates/idots/images/tabs-r0.gif b/phpgwapi/templates/idots/images/tabs-r0.gif
deleted file mode 100755
index 050a5ab987..0000000000
Binary files a/phpgwapi/templates/idots/images/tabs-r0.gif and /dev/null differ
diff --git a/phpgwapi/templates/idots/images/tabs-r1.gif b/phpgwapi/templates/idots/images/tabs-r1.gif
deleted file mode 100755
index 9f16c2e1d6..0000000000
Binary files a/phpgwapi/templates/idots/images/tabs-r1.gif and /dev/null differ
diff --git a/phpgwapi/templates/idots/images/tabs-sepl.gif b/phpgwapi/templates/idots/images/tabs-sepl.gif
deleted file mode 100755
index e9462064ae..0000000000
Binary files a/phpgwapi/templates/idots/images/tabs-sepl.gif and /dev/null differ
diff --git a/phpgwapi/templates/idots/images/tabs-sepm.gif b/phpgwapi/templates/idots/images/tabs-sepm.gif
deleted file mode 100755
index 4088991bdf..0000000000
Binary files a/phpgwapi/templates/idots/images/tabs-sepm.gif and /dev/null differ
diff --git a/phpgwapi/templates/idots/images/tabs-sepr.gif b/phpgwapi/templates/idots/images/tabs-sepr.gif
deleted file mode 100755
index 407351a32f..0000000000
Binary files a/phpgwapi/templates/idots/images/tabs-sepr.gif and /dev/null differ
diff --git a/phpgwapi/templates/idots/images/tabs-start0.gif b/phpgwapi/templates/idots/images/tabs-start0.gif
deleted file mode 100755
index 6cdb2b8b8c..0000000000
Binary files a/phpgwapi/templates/idots/images/tabs-start0.gif and /dev/null differ
diff --git a/phpgwapi/templates/idots/images/tabs-start1.gif b/phpgwapi/templates/idots/images/tabs-start1.gif
deleted file mode 100755
index bcd7a9d849..0000000000
Binary files a/phpgwapi/templates/idots/images/tabs-start1.gif and /dev/null differ
diff --git a/setup/templates/default/config.tpl b/setup/templates/default/config.tpl
index 483f95e497..ba0b73e904 100644
--- a/setup/templates/default/config.tpl
+++ b/setup/templates/default/config.tpl
@@ -75,17 +75,6 @@
-
- | {lang_Image_type_selection_order}: |
-
-
- |
-
-
| {lang_Complete_path_to_aspell_program}: |
@@ -510,7 +499,7 @@
-
+
|