move category images to api, fixes PHP Fatal in admin_categories, if phpgwapi is not installed

admin/inc/class.admin_categories.inc.php

@@ -34,7 +34,7 @@ class admin_categories
 	/**
 	 * Path where the icons are stored (relative to webserver_url)
 	 */
-	const ICON_PATH = '/phpgwapi/images';
+	const ICON_PATH = '/api/images';
 
 	protected $appname = 'admin';
 	protected $get_rows = 'admin.admin_categories.get_rows';
@@ -332,25 +332,26 @@ class admin_categories
 	}
 
 	/**
-	 * Return icons from /phpgwapi/images
+	 * Return icons from /api/images
 	 *
 	 * @return array filename => label
 	 */
 	static function get_icons()
 	{
-		$dir = dir(EGW_SERVER_ROOT.self::ICON_PATH);
 		$icons = array();
-		$matches = null;
+		if (file_exists($image_dir=EGW_SERVER_ROOT.self::ICON_PATH) && ($dir = dir($image_dir)))
-		while(($file = $dir->read()))
 		{
-			if (preg_match('/^(.*)\\.(png|gif|jpe?g)$/i',$file,$matches))
+			$matches = null;
+			while(($file = $dir->read()))
 			{
-				$icons[$file] = ucfirst($matches[1]);
+				if (preg_match('/^(.*)\\.(png|gif|jpe?g)$/i',$file,$matches))
+				{
+					$icons[$file] = ucfirst($matches[1]);
+				}
 			}
+			$dir->close();
+			asort($icons);
 		}
-		$dir->close();
-		asort($icons);
-
 		return $icons;
 	}
 

api/src/Etemplate/Widget/Nextmatch.php

@@ -85,6 +85,11 @@ use EGroupware\Api;
  */
 class Nextmatch extends Etemplate\Widget
 {
+	/**
+	 * Path where the icons are stored (relative to webserver_url)
+	 */
+	const ICON_PATH = '/api/images';
+
 	public function __construct($xml='')
 	{
 		if($xml) {
@@ -935,9 +940,9 @@ class Nextmatch extends Etemplate\Widget
 					'no_lang' => true,
 				);
 				// add category icon
-				if ($cat['data']['icon'] && file_exists(EGW_SERVER_ROOT.'/phpgwapi/images/'.basename($cat['data']['icon'])))
+				if ($cat['data']['icon'] && file_exists(EGW_SERVER_ROOT.self::ICON_PATH.'/'.basename($cat['data']['icon'])))
 				{
-					$cat_actions[$cat['id']]['iconUrl'] = $GLOBALS['egw_info']['server']['webserver_url'].'/phpgwapi/images/'.$cat['data']['icon'];
+					$cat_actions[$cat['id']]['iconUrl'] = $GLOBALS['egw_info']['server']['webserver_url'].self::ICON_PATH.'/'.$cat['data']['icon'];
 				}
 			}
 		}
@@ -974,9 +979,9 @@ class Nextmatch extends Etemplate\Widget
 					'prefix' => $prefix,
 				);
 				// add category icon
-				if ($cat['data']['icon'] && file_exists(EGW_SERVER_ROOT.'/phpgwapi/images/'.basename($cat['data']['icon'])))
+				if ($cat['data']['icon'] && file_exists(EGW_SERVER_ROOT.self::ICON_PATH.'/'.basename($cat['data']['icon'])))
 				{
-					$cat_actions[$cat['id']]['iconUrl'] = $GLOBALS['egw_info']['server']['webserver_url'].'/phpgwapi/images/'.$cat['data']['icon'];
+					$cat_actions[$cat['id']]['iconUrl'] = $GLOBALS['egw_info']['server']['webserver_url'].self::ICON_PATH.'/'.$cat['data']['icon'];
 				}
 				unset($cats[$key]);
 			}

etemplate/inc/class.nextmatch_widget.inc.php

@@ -77,6 +77,11 @@
  */
 class nextmatch_widget
 {
+	/**
+	 * Path where the icons are stored (relative to webserver_url)
+	 */
+	const ICON_PATH = '/api/images';
+
 	/**
 	 * Prefix for custom field names
 	 *
@@ -810,9 +815,9 @@ class nextmatch_widget
 					'no_lang' => true,
 				);
 				// add category icon
-				if ($cat['data']['icon'] && file_exists(EGW_SERVER_ROOT.'/phpgwapi/images/'.basename($cat['data']['icon'])))
+				if ($cat['data']['icon'] && file_exists(EGW_SERVER_ROOT.self::ICON_PATH.'/'.basename($cat['data']['icon'])))
 				{
-					$cat_actions[$cat['id']]['iconUrl'] = $GLOBALS['egw_info']['server']['webserver_url'].'/phpgwapi/images/'.$cat['data']['icon'];
+					$cat_actions[$cat['id']]['iconUrl'] = $GLOBALS['egw_info']['server']['webserver_url'].self::ICON_PATH.'/'.$cat['data']['icon'];
 				}
 			}
 		}
@@ -849,9 +854,9 @@ class nextmatch_widget
 					'prefix' => $prefix,
 				);
 				// add category icon
-				if ($cat['data']['icon'] && file_exists(EGW_SERVER_ROOT.'/phpgwapi/images/'.basename($cat['data']['icon'])))
+				if ($cat['data']['icon'] && file_exists(EGW_SERVER_ROOT.self::ICON_PATH.'/'.basename($cat['data']['icon'])))
 				{
-					$cat_actions[$cat['id']]['iconUrl'] = $GLOBALS['egw_info']['server']['webserver_url'].'/phpgwapi/images/'.$cat['data']['icon'];
+					$cat_actions[$cat['id']]['iconUrl'] = $GLOBALS['egw_info']['server']['webserver_url'].self::ICON_PATH.'/'.$cat['data']['icon'];
 				}
 				unset($cats[$key]);
 			}

resources/inc/class.resources_bo.inc.php

@@ -23,6 +23,11 @@ use EGroupware\Api\Vfs;
  */
 class resources_bo
 {
+	/**
+	 * Path where the icons are stored (relative to webserver_url)
+	 */
+	const ICON_PATH = '/api/images';
+
 	const DELETED = 'deleted';
 	const PICTURE_NAME = '.picture.jpg';
 	var $resource_icons = '/resources/templates/default/images/resource_icons/';
@@ -833,7 +838,7 @@ class resources_bo
 				$picture = Api\Categories::id2name($resource['cat_id'], 'data');
 				if($picture['icon'])
 				{
-					$picture = !$fullsize?$GLOBALS['egw_info']['server']['webserver_url'].'/phpgwapi/images/'.$picture['icon']:'/phpgwapi/images/'.$picture['icon'];
+					$picture = !$fullsize?$GLOBALS['egw_info']['server']['webserver_url'].self::ICON_PATH.'/'.$picture['icon']:self::ICON_PATH.'/'.$picture['icon'];
 					break;
 				}
 				// fall through