validate filepath -> filePath in XML (#45)

joomla · Sep 29, 2019 · fe60e1b · fe60e1b
1 parent 206fe7a
commit fe60e1b
Show file tree

Hide file tree

Showing 29 changed files with 51 additions and 41 deletions.
diff --git a/administrator/components/com_banners/models/forms/banner.xml b/administrator/components/com_banners/models/forms/banner.xml
@@ -339,7 +339,7 @@
 				directory="banners"
 				hide_none="1"
 				size="40"
-				validate="filepath"
+				validate="filePath"
 			/>
 
 			<field

diff --git a/administrator/components/com_categories/models/forms/category.xml b/administrator/components/com_categories/models/forms/category.xml
@@ -263,7 +263,7 @@
 				type="media"
 				label="COM_CATEGORIES_FIELD_IMAGE_LABEL"
 				description="COM_CATEGORIES_FIELD_IMAGE_DESC"
-				validate="filepath"
+				validate="filePath"
 			/>
 
 			<field

diff --git a/administrator/components/com_config/model/form/application.xml b/administrator/components/com_config/model/form/application.xml
@@ -1080,7 +1080,7 @@
 			label="COM_CONFIG_FIELD_OFFLINE_IMAGE_LABEL"
 			description="COM_CONFIG_FIELD_OFFLINE_IMAGE_DESC"
 			showon="offline:1"
-			validate="filepath"
+			validate="filePath"
 		/>
 
 		<field

diff --git a/administrator/components/com_contact/config.xml b/administrator/components/com_contact/config.xml
@@ -291,7 +291,7 @@
 			description="COM_CONTACT_FIELD_PARAMS_IMAGE_DESC"
 			default=""
 			showon="show_info:1[AND]show_image:1"
-			validate="filepath"
+			validate="filePath"
 		/>
 
 		<field
@@ -468,7 +468,7 @@
 			hide_none="1"
 			default=""
 			showon="contact_icons:0"
-			validate="filepath"
+			validate="filePath"
 		/>
 
 		<field
@@ -479,7 +479,7 @@
 			hide_none="1"
 			default=""
 			showon="contact_icons:0"
-			validate="filepath"
+			validate="filePath"
 		/>
 
 		<field
@@ -490,7 +490,7 @@
 			hide_none="1"
 			default=""
 			showon="contact_icons:0"
-			validate="filepath"
+			validate="filePath"
 		/>
 
 		<field
@@ -501,7 +501,7 @@
 			hide_none="1"
 			default=""
 			showon="contact_icons:0"
-			validate="filepath"
+			validate="filePath"
 		/>
 
 		<field
@@ -512,7 +512,7 @@
 			hide_none="1"
 			default=""
 			showon="contact_icons:0"
-			validate="filepath"
+			validate="filePath"
 		/>
 
 		<field
@@ -523,7 +523,7 @@
 			hide_none="1"
 			default=""
 			showon="contact_icons:0"
-			validate="filepath"
+			validate="filePath"
 		/>
 	</fieldset>
 

diff --git a/administrator/components/com_content/models/forms/article.xml b/administrator/components/com_content/models/forms/article.xml
@@ -824,7 +824,7 @@
 			type="media"
 			label="COM_CONTENT_FIELD_INTRO_LABEL"
 			description="COM_CONTENT_FIELD_INTRO_DESC" 
-			validate="filepath"
+			validate="filePath"
 		/>
 
 		<field
@@ -866,7 +866,7 @@
 			type="media"
 			label="COM_CONTENT_FIELD_FULL_LABEL"
 			description="COM_CONTENT_FIELD_FULL_DESC"
-			validate="filepath"
+			validate="filePath"
 		/>
 
 		<field

diff --git a/administrator/components/com_menus/models/forms/item_alias.xml b/administrator/components/com_menus/models/forms/item_alias.xml
@@ -55,7 +55,7 @@
 				type="media"
 				label="COM_MENUS_ITEM_FIELD_MENU_IMAGE_LABEL"
 				description="COM_MENUS_ITEM_FIELD_MENU_IMAGE_DESC"
-				validate="filepath"
+				validate="filePath"
 			/>
 
 			<field

diff --git a/administrator/components/com_menus/models/forms/item_component.xml b/administrator/components/com_menus/models/forms/item_component.xml
@@ -23,7 +23,7 @@
 				type="media"
 				label="COM_MENUS_ITEM_FIELD_MENU_IMAGE_LABEL"
 				description="COM_MENUS_ITEM_FIELD_MENU_IMAGE_DESC" 
-				validate="filepath"
+				validate="filePath"
 			/>
 
 			<field 

diff --git a/administrator/components/com_menus/models/forms/item_heading.xml b/administrator/components/com_menus/models/forms/item_heading.xml
@@ -23,7 +23,7 @@
 				type="media"
 				label="COM_MENUS_ITEM_FIELD_MENU_IMAGE_LABEL"
 				description="COM_MENUS_ITEM_FIELD_MENU_IMAGE_DESC" 
-				validate="filepath"
+				validate="filePath"
 			/>
 
 			<field 

diff --git a/administrator/components/com_menus/models/forms/item_separator.xml b/administrator/components/com_menus/models/forms/item_separator.xml
@@ -17,7 +17,7 @@
 				type="media"
 				label="COM_MENUS_ITEM_FIELD_MENU_IMAGE_LABEL"
 				description="COM_MENUS_ITEM_FIELD_MENU_IMAGE_DESC" 
-				validate="filepath"
+				validate="filePath"
 			/>
 
 			<field 

diff --git a/administrator/components/com_menus/models/forms/item_url.xml b/administrator/components/com_menus/models/forms/item_url.xml
@@ -45,7 +45,7 @@
 				type="media"
 				label="COM_MENUS_ITEM_FIELD_MENU_IMAGE_LABEL"
 				description="COM_MENUS_ITEM_FIELD_MENU_IMAGE_DESC" 
-				validate="filepath"
+				validate="filePath"
 			/>
 
 			<field 

diff --git a/administrator/components/com_menus/models/forms/itemadmin_alias.xml b/administrator/components/com_menus/models/forms/itemadmin_alias.xml
@@ -41,7 +41,7 @@
 				type="media"
 				label="COM_MENUS_ITEM_FIELD_MENU_IMAGE_LABEL"
 				description="COM_MENUS_ITEM_FIELD_MENU_IMAGE_DESC"
-				validate="filepath"
+				validate="filePath"
 			/>
 
 			<field 

diff --git a/administrator/components/com_menus/models/forms/itemadmin_component.xml b/administrator/components/com_menus/models/forms/itemadmin_component.xml
@@ -24,7 +24,7 @@
 				type="media"
 				label="COM_MENUS_ITEM_FIELD_MENU_IMAGE_LABEL"
 				description="COM_MENUS_ITEM_FIELD_MENU_IMAGE_DESC" 
-				validate="filepath"
+				validate="filePath"
 			/>
 
 			<field 

diff --git a/administrator/components/com_menus/models/forms/itemadmin_container.xml b/administrator/components/com_menus/models/forms/itemadmin_container.xml
@@ -35,7 +35,7 @@
 				type="media"
 				label="COM_MENUS_ITEM_FIELD_MENU_IMAGE_LABEL"
 				description="COM_MENUS_ITEM_FIELD_MENU_IMAGE_DESC"
-				validate="filepath"
+				validate="filePath"
 			/>
 
 			<field 

diff --git a/administrator/components/com_menus/models/forms/itemadmin_heading.xml b/administrator/components/com_menus/models/forms/itemadmin_heading.xml
@@ -35,7 +35,7 @@
 				type="media"
 				label="COM_MENUS_ITEM_FIELD_MENU_IMAGE_LABEL"
 				description="COM_MENUS_ITEM_FIELD_MENU_IMAGE_DESC"
-				validate="filepath"
+				validate="filePath"
 			/>
 
 			<field 

diff --git a/administrator/components/com_menus/models/forms/itemadmin_url.xml b/administrator/components/com_menus/models/forms/itemadmin_url.xml
@@ -43,7 +43,7 @@
 				type="media"
 				label="COM_MENUS_ITEM_FIELD_MENU_IMAGE_LABEL"
 				description="COM_MENUS_ITEM_FIELD_MENU_IMAGE_DESC" 
-				validate="filepath"
+				validate="filePath"
 			/>
 
 			<field 

diff --git a/administrator/components/com_newsfeeds/models/forms/newsfeed.xml b/administrator/components/com_newsfeeds/models/forms/newsfeed.xml
@@ -279,7 +279,7 @@
 					type="media"
 					label="COM_NEWSFEEDS_FIELD_FIRST_LABEL"
 					description="COM_NEWSFEEDS_FIELD_FIRST_DESC"
-					validate="filepath"
+					validate="filePath"
 				/>
 
 				<field
@@ -321,7 +321,7 @@
 					type="media"
 					label="COM_NEWSFEEDS_FIELD_SECOND_LABEL"
 					description="COM_NEWSFEEDS_FIELD_SECOND_DESC"
-					validate="filepath"
+					validate="filePath"
 				/>
 
 				<field

diff --git a/administrator/components/com_tags/config.xml b/administrator/components/com_tags/config.xml
@@ -78,7 +78,7 @@
 			type="media"
 			label="COM_TAGS_TAG_LIST_MEDIA_LABEL"
 			description="COM_TAGS_TAG_LIST_MEDIA_DESC"
-			validate="filepath"
+			validate="filePath"
 		/>
 
 		<field

diff --git a/administrator/components/com_tags/models/forms/tag.xml b/administrator/components/com_tags/models/forms/tag.xml
@@ -258,7 +258,7 @@
 				label="COM_TAGS_FIELD_INTRO_LABEL"
 				description="COM_TAGS_FIELD_INTRO_DESC"
 				labelclass="control-label"
-				validate="filepath"
+				validate="filePath"
 			/>
 
 			<field
@@ -304,7 +304,7 @@
 				label="COM_TAGS_FIELD_FULL_LABEL"
 				description="COM_TAGS_FIELD_FULL_DESC"
 				labelclass="control-label"
-				validate="filepath"
+				validate="filePath"
 			/>
 
 			<field

diff --git a/administrator/templates/hathor/templateDetails.xml b/administrator/templates/hathor/templateDetails.xml
@@ -66,7 +66,7 @@
 					description="TPL_HATHOR_LOGO_DESC" 
 					class=""
 					default=""
-					validate="filepath"
+					validate="filePath"
 				/>
 
 				<field

diff --git a/administrator/templates/isis/templateDetails.xml b/administrator/templates/isis/templateDetails.xml
@@ -104,7 +104,7 @@
 					description="TPL_ISIS_LOGO_DESC"
 					class="" 
 					default=""
-					validate="filepath"
+					validate="filePath"
 				 />
 
 				<field 
@@ -114,7 +114,7 @@
 					description="TPL_ISIS_LOGIN_LOGO_DESC"
 					class="" 
 					default=""
-					validate="filepath"
+					validate="filePath"
 				 />
 
 				<field 

diff --git a/components/com_content/models/forms/article.xml b/components/com_content/models/forms/article.xml
@@ -239,7 +239,7 @@
 				type="media"
 				label="COM_CONTENT_FIELD_INTRO_LABEL"
 				description="COM_CONTENT_FIELD_INTRO_DESC" 
-				validate="filepath"
+				validate="filePath"
 			/>
 
 			<field 
@@ -278,7 +278,7 @@
 				type="media"
 				label="COM_CONTENT_FIELD_FULL_LABEL"
 				description="COM_CONTENT_FIELD_FULL_DESC" 
-				validate="filepath"
+				validate="filePath"
 			/>
 
 			<field 

diff --git a/components/com_tags/views/tag/tmpl/default.xml b/components/com_tags/views/tag/tmpl/default.xml
@@ -91,7 +91,7 @@
 				type="media"
 				label="COM_TAGS_TAG_LIST_MEDIA_LABEL"
 				description="COM_TAGS_TAG_LIST_MEDIA_DESC"
-				validate="filepath"
+				validate="filePath"
 			/>
 
 			<field

diff --git a/components/com_tags/views/tag/tmpl/list.xml b/components/com_tags/views/tag/tmpl/list.xml
@@ -90,7 +90,7 @@
 				type="media"
 				label="COM_TAGS_TAG_LIST_MEDIA_LABEL"
 				description="COM_TAGS_TAG_LIST_MEDIA_DESC"
-				validate="filepath"
+				validate="filePath"
 			/>
 
 			<field

diff --git a/components/com_tags/views/tags/tmpl/default.xml b/components/com_tags/views/tags/tmpl/default.xml
@@ -78,7 +78,7 @@
 				type="media"
 				label="COM_TAGS_ALL_TAGS_MEDIA_LABEL"
 				description="COM_TAGS_ALL_TAGS_MEDIA_DESC"
-				validate="filepath"
+				validate="filePath"
 			/>
 
 			<field

diff --git a/components/com_users/views/login/tmpl/default.xml b/components/com_users/views/login/tmpl/default.xml
@@ -83,7 +83,7 @@
 			type="media"
 			label="JFIELD_LOGIN_IMAGE_LABEL"
 			description="JFIELD_LOGIN_IMAGE_DESC"
-			validate="filepath"
+			validate="filePath"
 		/>
 
 		<field 
@@ -160,7 +160,7 @@
 			type="media"
 			label="JFIELD_LOGOUT_IMAGE_LABEL"
 			description="JFIELD_LOGOUT_IMAGE_DESC"
-			validate="filepath"
+			validate="filePath"
 		/>
 
 		</fieldset>

diff --git a/libraries/src/Form/Rule/FilePathRule.php b/libraries/src/Form/Rule/FilePathRule.php
@@ -39,6 +39,16 @@ class FilePathRule extends FormRule
 	 */
 	public function test(\SimpleXMLElement $element, $value, $group = null, Registry $input = null, Form $form = null)
 	{
+		$value = trim($value);
+
+		// If the field is empty and not required, the field is valid.
+		$required = ((string) $element['required'] == 'true' || (string) $element['required'] == 'required');
+
+		if (!$required && empty($value))
+		{
+			return true;
+		}
+
 		// Append the root path
 		$value = JPATH_ROOT . '/' . $value;
 

diff --git a/modules/mod_custom/mod_custom.xml b/modules/mod_custom/mod_custom.xml
@@ -43,7 +43,7 @@
 					type="media"
 					label="MOD_CUSTOM_FIELD_BACKGROUNDIMAGE_LABEL"
 					description="MOD_BACKGROUNDIMAGE_FIELD_LOGO_DESC"
-					validate="filepath"
+					validate="filePath"
 				/>
 			</fieldset>
 			<fieldset name="advanced">

diff --git a/templates/beez3/templateDetails.xml b/templates/beez3/templateDetails.xml
@@ -81,7 +81,7 @@
 					type="media"
 					label="TPL_BEEZ3_FIELD_LOGO_LABEL" 
 					description="TPL_BEEZ3_FIELD_LOGO_DESC" 
-					validate="filepath"
+					validate="filePath"
 				/>
 
 				<field 
@@ -144,7 +144,7 @@
 					label="TPL_BEEZ3_FIELD_HEADER_IMAGE_LABEL" 
 					description="TPL_BEEZ3_FIELD_HEADER_IMAGE_DESC" 
 					showon="templatecolor:image" 
-					validate="filepath"
+					validate="filePath"
 				/>
 
 				<field 

diff --git a/templates/protostar/templateDetails.xml b/templates/protostar/templateDetails.xml
@@ -77,7 +77,7 @@
 					description="TPL_PROTOSTAR_LOGO_DESC" 
 					class="" 
 					default=""
-					validate="filepath"
+					validate="filePath"
 				/>
 
 				<field