remove configurable image-type preference in favor to hardcoded one always prefering png over gif, also removed all .gif images which have a png counterpart

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: : PNG->JPG->GIF
-		{
+		$img_types = array('png','jpg','gif','ico');
-			// priority: GIF->JPG->PNG
-			$img_types = array('gif','jpg','png','ico');
-		}
-		else
-		{
-			// priority: : PNG->JPG->GIF
-			$img_types = array('png','jpg','gif','ico');
-		}
 		$map = array();
 		foreach(scandir(EGW_SERVER_ROOT) as $app)
 		{

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)

setup/templates/default/config.tpl

@@ -75,17 +75,6 @@
     </td>
    </tr>
 
-   <tr class="row_on">
-    <td>{lang_Image_type_selection_order}:</td>
-    <td>
-     <select name="newsettings[image_type]">
-      <option value="">GIF-&gt;JPG-&gt;PNG</option>
-      <option value="1"{selected_image_type_1}>PNG-&gt;JPG-&gt;GIF</option>
-      <option value="2"{selected_image_type_2}>PNG-&gt;JPG</option>
-     </select>
-    </td>
-   </tr>
-
    <tr class="row_on">
     <td>{lang_Complete_path_to_aspell_program}:</td>
     <td>
@@ -510,7 +499,7 @@
 			<option value="">{lang_No}</option>
 			<option value="tls"{selected_ads_connection_tls}>TLS</option>
 			<option value="ssl"{selected_ads_connection_ssl}>SSL</option>
-     	</select>	
+     	</select>
      </td>
    </tr>
    <tr class="row_on">