Revert "[mod_articles_news] Option Intro/Full Images of the article"

This reverts commit 6d5ae14.
joomla · Apr 14, 2018 · f02831d · f02831d
1 parent 6d5ae14
commit f02831d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 33 deletions.
diff --git a/language/en-GB/en-GB.mod_articles_news.ini b/language/en-GB/en-GB.mod_articles_news.ini
@@ -7,7 +7,7 @@ MOD_ARTICLES_NEWS="Articles - Newsflash"
 MOD_ARTICLES_NEWS_FIELD_FEATURED_DESC="Show or hide articles marked as featured."
 MOD_ARTICLES_NEWS_FIELD_FEATURED_LABEL="Featured Articles"
 MOD_ARTICLES_NEWS_FIELD_CATEGORY_DESC="Select Articles from a specific Category or a set of Categories. If no selection will show all categories as default."
-MOD_ARTICLES_NEWS_FIELD_IMAGES_DESC="Display article intro or full image."
+MOD_ARTICLES_NEWS_FIELD_IMAGES_DESC="Display Article images."
 MOD_ARTICLES_NEWS_FIELD_IMAGES_LABEL="Show Images"
 MOD_ARTICLES_NEWS_FIELD_ITEMS_DESC="The number of Articles to display within this module."
 MOD_ARTICLES_NEWS_FIELD_ITEMS_LABEL="Number of Articles"
@@ -30,8 +30,6 @@ MOD_ARTICLES_NEWS_FIELD_TRIGGEREVENTS_DESC="Triggers additional plugin events to
 MOD_ARTICLES_NEWS_FIELD_TRIGGEREVENTS_LABEL="Trigger Plugin Events"
 MOD_ARTICLES_NEWS_FIELD_SHOWINTROTEXT_DESC="Show or hide the article intro text."
 MOD_ARTICLES_NEWS_FIELD_SHOWINTROTEXT_LABEL="Show Intro Text"
-MOD_ARTICLES_NEWS_OPTION_INTROIMAGE="Intro image"
-MOD_ARTICLES_NEWS_OPTION_FULLIMAGE="Full Article Image"
 MOD_ARTICLES_NEWS_READMORE="Read more ..."
 MOD_ARTICLES_NEWS_READMORE_REGISTER="Register to Read More"
 MOD_ARTICLES_NEWS_TITLE_HEADING="Header Level"

diff --git a/modules/mod_articles_news/helper.php b/modules/mod_articles_news/helper.php
@@ -119,32 +119,9 @@ public static function getList(&$params)
 
 			$item->introtext = JHtml::_('content.prepare', $item->introtext, '', 'mod_articles_news.content');
 
-			// Get the data of the image, if it is going to be shown
-			if ($params->get('image') != "none")
+			if (!$params->get('image'))
 			{
-				$images = json_decode($item->images);
-				$item->imageSrc = "";
-				$item->imageAlt = "";
-				$item->imageCaption = "";
-				if ($params->get('image') == "intro" && isset($images->image_intro) && !empty($images->image_intro))
-				{
-					$item->imageSrc = htmlspecialchars($images->image_intro, ENT_COMPAT, 'UTF-8');
-					$item->imageAlt = htmlspecialchars($images->image_intro_alt, ENT_COMPAT, 'UTF-8');
-					if ($images->image_intro_caption) 
-					{
-						$item->imageCaption = htmlspecialchars($images->image_intro_caption, ENT_COMPAT, 'UTF-8');
-					}					
-				}				
-				else if ($params->get('image') == "full" && isset($images->image_fulltext) && !empty($images->image_fulltext))
-				{
-					$item->imageSrc = htmlspecialchars($images->image_fulltext, ENT_COMPAT, 'UTF-8');
-					$item->imageAlt = htmlspecialchars($images->image_fulltext_alt, ENT_COMPAT, 'UTF-8');
-					if ($images->image_intro_caption) 
-					{
-						$item->imageCaption = htmlspecialchars($images->image_fulltext_caption, ENT_COMPAT, 'UTF-8');
-					}
-
-				}
+				$item->introtext = preg_replace('/<img[^>]*>/', '', $item->introtext);
 			}
 
 			if ($triggerEvents)

diff --git a/modules/mod_articles_news/mod_articles_news.xml b/modules/mod_articles_news/mod_articles_news.xml
@@ -46,14 +46,14 @@
 
 				<field
 					name="image"
-					type="list"
+					type="radio"
 					label="MOD_ARTICLES_NEWS_FIELD_IMAGES_LABEL"
 					description="MOD_ARTICLES_NEWS_FIELD_IMAGES_DESC"
-					default="1"
+					class="btn-group btn-group-yesno"
+					default="0"
 					>
-					<option value="intro">MOD_ARTICLES_NEWS_OPTION_INTROIMAGE</option> 
-					<option value="full">MOD_ARTICLES_NEWS_OPTION_FULLIMAGE</option>
-					<option value="null">JNO</option>
+					<option value="1">JYES</option>
+					<option value="0">JNO</option>
 				</field>
 
 				<field