Add [AOPEN] [ACLOSE] placeholders + webp compatibility

Author: instantflorian

functions.inc.php

@@ -16,7 +16,7 @@
 }
 
 global $allowed_suffixes;
-$allowed_suffixes = array('jpg','jpeg','gif','png');
+$allowed_suffixes = array('jpg','jpeg','gif','png','webp');
 
 $mod_nwi_file_dir = WB_PATH.MEDIA_DIRECTORY.'/.news_img/';
 $mod_nwi_thumb_dir = WB_PATH.MEDIA_DIRECTORY.'/.news_img/thumb/';
@@ -101,7 +101,7 @@ function mod_nwi_get_groups(int $section_id) : array
                 $group['id_key'] = $group['group_id'];
             }
                 $group['image'] = '';
-            foreach(array_values(array('png','jpg','jpeg','gif')) as $suffix) {
+            foreach(array_values(array('png','jpg','jpeg','gif','webp')) as $suffix) {
                 if (file_exists(WB_PATH.MEDIA_DIRECTORY.'/.news_img/image'.$group['group_id'].'.'.$suffix)) {
                     $group['image'] = WB_URL.MEDIA_DIRECTORY.'/.news_img/image'.$group['group_id'].'.'.$suffix;
                 }
@@ -1206,10 +1206,14 @@ function mod_nwi_posts_render($section_id,$posts,$posts_per_page=0)
         $images = mod_nwi_img_get_by_post($post['post_id'],false);
         $anz_post_img = count($images);
 		$post_href_link = 'href="'. $post['post_link'].'"';
+		$post_a_open_tag = '<a '.$post_href_link.'>';
+		$post_a_close_tag = '</a>';
         // no "read more" link if no long content
         if ( (strlen($post['content_long']) < 9) && ($anz_post_img < 1)) {
             $post['post_link'] = '#" onclick="javascript:void(0);return false;" style="cursor:no-drop;';
 			$post_href_link ='';
+			$post_a_open_tag ='';
+			$post_a_close_tag ='';
         }
 
         // set replacements for current line
@@ -1223,6 +1227,8 @@ function mod_nwi_posts_render($section_id,$posts,$posts_per_page=0)
                 'SHORT'           => $post['content_short'],
                 'LINK'            => $post['post_link'],
 				'HREF'			  => $post_href_link,
+				'AOPEN'			  => $post_a_open_tag,
+				'ACLOSE'		  => $post_a_close_tag,	
                 'MODI_DATE'       => $post['post_date'],
                 'MODI_TIME'       => $post['post_time'],
                 'TAGS'            => implode(" ", $tags),
@@ -1889,6 +1895,17 @@ function mod_nwi_image_resize($src, $dst, $width, $height, $crop=0)
                 }
             }
             break;
+		case 'webp':
+            if(!function_exists('imagecreatefromwebp')) {
+                return 2;
+            } else {
+                try{
+                    $img = imagecreatefromwebp($src);
+                } catch (\Exception $e) {
+                    return 2;
+                }
+            }
+            break;	
         default: return 2;
     }
 
@@ -1927,6 +1944,7 @@ function mod_nwi_image_resize($src, $dst, $width, $height, $crop=0)
         case 'gif': imagegif($new, $dst); break;
         case 'jpg': imagejpeg($new, $dst); break;
         case 'png': imagepng($new, $dst); break;
+		case 'webp': imagewebp($new, $dst); break;
     }
     return true;
 }
@@ -1957,6 +1975,8 @@ function mod_nwi_replacements()
         'IMAGES',                       // gallery images
         'LINK',                         // "read more" link
 		'HREF',							// link to post detail including href=""
+		'AOPEN',						// complete <a href=""> if long text or gallery exists
+		'ACLOSE',						// closing </a> if long text or gallery exists
         'MODI_DATE',                    // post modification date
         'MODI_TIME',                    // post modification time
         'NEXT_LINK',                    // next link
@@ -2267,10 +2287,14 @@ function mod_nwi_get_news_items($options=array())
             $images = mod_nwi_img_get_by_post($post['post_id'],false);
             $anz_post_img = count($images);
 			$post_href_link = 'href="'. $post['post_link'].'"';
+			$post_a_open_tag = '<a '.$post_href_link.'>';
+			$post_a_close_tag = '</a>';
             // no "read more" link if no long content
             if ( (strlen($post['content_long']) < 9) && ($anz_post_img < 1)) {
                 $post['post_link'] = '#" onclick="javascript:void(0);return false;" style="cursor:no-drop;';
 				$post_href_link = '';
+				$post_a_open_tag ='';
+				$post_a_close_tag ='';
             }
             $posts[] = mod_nwi_post_process($post, $post['section_id'], $users);
         }

info.php

@@ -16,13 +16,17 @@
 $module_directory   = 'news_img';
 $module_name        = 'News with Images';
 $module_function    = 'page';
-$module_version     = '5.0.13';
+$module_version     = '5.0.14';
 $module_platform    = '1.4';
 $module_author      = 'Ryan Djurovich, Rob Smith, Silvia Reins, Martin Hecht, Florian Meerwinck, Bianka Martinovic';
 $module_license     = 'GNU General Public License';
 $module_description = 'This page type is designed for making a news page with Images and Lightboxeffect.';
 
 /**
+ *
+ * v5.0.14 - 2022-02-08
+ *			- florian
+ *			* Add [AOPEN] [ACLOSE] placeholders + webp compatibility
  *
  * v5.0.13 - 2021-12-25
  *			- gchriz

readme.html

@@ -226,7 +226,9 @@ <h4 id="d722">Beitrag Schleife</h4>
 <li>[IMAGE] Beitragsbild (&lt;img src=... /&gt;),</li>
 <li>[SHORT] Kurztext,</li>
 <li>[LINK] Link zur Beitrags-Detailansicht,</li>
-<li>[HREF] gibt den Link zum Beitrag inkl. href="" aus, also z.B. <code>href="beitrag.php"</code>. Gibt es keinen Langtext und keine Galerie, wird nichts ausgegeben. Mit <code>&lt;a [HREF]&gt; ... &lt;/a&gt;</code> ist es dann möglich, den jeweiligen Beitragslink nur dann klickbar zu machen, wenn es auch tatsächlich einen Langtext und/oder eine Galerie gibt.</li>
+<li>[HREF] gibt den Link zum Beitrag inkl. href="" aus, also z.B. <code>href="beitrag.php"</code>. Gibt es keinen Langtext und keine Galerie, wird nichts ausgegeben. Mit <code>&lt;a [HREF]&gt; ... &lt;/a&gt;</code> ist es dann möglich, den jeweiligen Beitragslink nur dann klickbar zu machen, wenn es auch tatsächlich einen Langtext und/oder eine Galerie gibt,</li>
+<li>[AOPEN] Der komplette &lt;a href="beitrag.php"&gt; Tag, wenn es Langtext oder Galeriebilder gibt, sonst leer,</li>
+<li>[ACLOSE] Der schließende &lt;/a&gt; - Tag zu [AOPEN],</li>
 <li>[MODI_DATE] Datum der letzten Änderung des Beitrags,</li>
 <li>[MODI_TIME] Zeitpunkt (Uhrzeit) der letzten Änderung des Beitrags,</li>
 <li>[CREATED_DATE] Datum, wann der Beitrag erstellt wurde,</li>
@@ -409,7 +411,9 @@ <h4>post loop</h4>
 <li>[IMAGE] post image (&lt;img src = ... /&gt;),</li>
 <li>[SHORT] short text,</li>
 <li>[LINK] Link to the article detail view,</li>
-<li>[HREF] Link to the detail view including href="" (i.e. <code>href="example-post.php"</code>). If no long content or gallery exists, this placeholder will return an empty string. Depending on the page settings (using <code>&lt;a [HREF]&gt; ... &lt;/a&gt;</code>) links to the detail view are only clickable if some displayable content exists.</li>
+<li>[HREF] Link to the detail view including href="" (i.e. <code>href="example-post.php"</code>). If no long content or gallery exists, this placeholder will return an empty string. Depending on the page settings (using <code>&lt;a [HREF]&gt; ... &lt;/a&gt;</code>) links to the detail view are only clickable if some displayable content exists,</li>
+<li>[AOPEN]The whole &lt;a href="beitrag.php"&gt; tag, if long text or gallery images exist, otherwise empty,</li>
+<li>[ACLOSE] the closing &lt;/a&gt; tag to [AOPEN],</li>
 <li>[MODI_DATE] date of the last change of the post,</li>
 <li>[MODI_TIME] Time (time) of the last change of the post,</li>
 <li>[CREATED_DATE] Date when the post was created,</li>

upgrade.php

@@ -16,7 +16,7 @@
 
 if(defined('WB_URL'))
 {
-    function nwi_create_new_post($filename, $filetime=NULL, $content )
+    function nwi_create_new_post($filename, $filetime=NULL, $content='' )
     {
         global $page_id, $section_id, $post_id;
     	// The depth of the page directory in the directory hierarchy