Release phpwcms v1.9.39, the legacy release

Merge branch 'v1.9-dev' into phpwcms-legacy

Author: slackero

README.md

@@ -1,15 +1,10 @@
 [![phpwcms](https://www.phpwcms.org/indeximg/phpwcms-logo.svg)](https://www.phpwcms.org)
 =========
 
-**phpwcms** is a flexible, fast, robust, customer and developer friendly
+**phpwcms** is a very flexible, fast, robust, customer and developer friendly
 but yet powerful web based content management system and cms framework running
 under PHP and MySQL/MariaDB. phpwcms is created and maintained by
-[Oliver Georgi](http://twitter.com/slackero). None of the fancy systems but working since more 
-than 20 years! Yeah!
-
-Version 1.9.38 is the legacy version of **phpwcms** (version > 1.9.36 and < 1.10).
-I will try to keep this on par as long as possible to the newest version
-of **phpwcms** v1.10+ — if you can try to upgrade existing installations.
+[Oliver Georgi](http://twitter.com/slackero).
 
 To get started, checkout [phpwcms.org](https://www.phpwcms.org) or the community driven
 [HowTo Wiki](https://wiki.phpwcms.org/) (snapshot). Most questions are yet
@@ -31,9 +26,10 @@ root or sub folder. Link your browser to the related URL and follow the install
 Server system requirements
 --------------------------
 
-**phpwcms** version 1.9.38 requires a web server with PHP 7.4 or newer.
+**phpwcms** version 1.9.39 requires a web server with PHP 7.4 or newer.
 and a MySQL/MariaDB database (minimum version 5.1, recommend 5.5+).
-Always check the [supported versions of PHP](https://www.php.net/supported-versions.php).
+If you already use PHP v8.x you can use the latest version of
+[**phpwcms v1.10.3**](https://github.com/slackero/phpwcms/releases/tag/v1.10.3).
 
 
 Known problems
@@ -42,22 +38,25 @@ Known problems
 Because of the project history there are several probable problems regarding the database. 
 MySQL changed the time and date related default values over the last years. Check to setup
 the related config values to connect to the database in a more compatible way. MySQL Strict
-is no good option for **phpwcms** < 1.10. But **phpwcms** has a db related
-[config setting](https://github.com/slackero/phpwcms/blob/master/include/config/dist.conf.inc.php#L25) 
-to force MySQL into a more lax mode.
+is no good option. I work on this to [solve the problems](https://github.com/slackero/phpwcms/issues/275)
+soon.
 
 
-Support an issue (bug)
-----------------------
+Bug tracker
+-----------
 
-Did you find a bug or miss something? Please create an [issue on GitHub](https://github.com/slackero/phpwcms/issues).
+Did you find a bug? Please create an **[issue here](https://github.com/slackero/phpwcms/issues)** on GitHub
+that conforms with [necolas's guidelines](https://github.com/necolas/issue-guidelines).
 
 
 Share with us
 -------------
 
-Keep up to date on announcements and more by following **phpwcms** on
-[Github](https://github.com/slackero/phpwcms).
+Keep up to date on announcements and more by following **phpwcms** on Twitter
+[@phpwcms](https://twitter.com/phpwcms) or on
+[Facebook](https://www.facebook.com/pages/phpwcms/162275020999).
+*(We are no longer active there, better you stay in touch with **phpwcms** on
+[Github](https://github.com/slackero/phpwcms))*
 
 
 Creator
@@ -66,6 +65,7 @@ Creator
 **Oliver Georgi**
 
 - <https://github.com/slackero>
+- <https://webverbund.de>
 - <https://www.linkedin.com/in/olivergeorgi>
 - <https://twitter.com/slackero>
 
@@ -77,9 +77,8 @@ Copyright 2002-2024 [Oliver Georgi](mailto:og@phpwcms.org?subject=phpwcms)
 
 Licensed under the GNU General Public License, Version 2 (the "License");
 you may not use this work except in compliance with the License.
-You may obtain a copy of the License in the LICENSE file, or at:
-
-   <https://opensource.org/licenses/GPL-2.0>
+You may obtain a copy of the License in the LICENSE file, or at:  
+<https://opensource.org/licenses/GPL-2.0>
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License
@@ -92,7 +91,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program; if not, write to the
-    Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston,
-    MA 02110-1301, USA.
+along with this program; if not, write to the  
+Free Software Foundation, Inc.,
+51 Franklin Street, Fifth Floor, Boston,
+MA 02110-1301,
+USA.

composer.json

@@ -8,22 +8,23 @@
     },
     "require": {
         "php": ">=7.4",
-        "algo26-matthias/idna-convert": "^v3.1.0",
-        "enshrined/svg-sanitize": "^0.16.0",
-        "netcarver/textile": "v4.0.0",
+        "algo26-matthias/idna-convert": "^v3.1.1",
+        "enshrined/svg-sanitize": "^0.19.0",
+        "netcarver/textile": "v4.1.1",
         "erusev/parsedown": "^v2.0.0-beta-1",
         "erusev/parsedown-extra": "^v2.0.0-beta-1",
-        "openpsa/universalfeedcreator": "^v1.8.5",
-        "phpmailer/phpmailer": "^v6.8.1",
+        "openpsa/universalfeedcreator": "^v1.9.0",
+        "phpmailer/phpmailer": "^v6.9.1",
         "phpoffice/phpspreadsheet": "^1.29.0",
         "simplepie/simplepie": "@dev",
         "ext-intl": "*",
         "html2text/html2text": "^4.3.1",
         "ext-gd": "*",
         "ext-mysqli": "*",
         "ext-mbstring": "*",
-        "symfony/polyfill-php80": "^v1.28.0",
-        "symfony/polyfill-php81": "^v1.28.0",
-        "symfony/polyfill-php82": "^v1.28.0"
+        "symfony/polyfill-mbstring": "^v1.30.0",
+        "symfony/polyfill-php80": "^v1.30.0",
+        "symfony/polyfill-php81": "^v1.30.0",
+        "symfony/polyfill-php82": "^v1.30.0"
     }
 }

include/config/dist.conf.inc.php

@@ -75,7 +75,7 @@
 $phpwcms['allow_remote_URL']     = 0; // 0 = no remote URL in {PHP:...} replacement tag allowed, 1 = allowed
 $phpwcms['jpg_quality']          = 85; // JPG Quality Range 25-100
 $phpwcms['webp_enable']          = 1; // Render all images as WebP if the client browser supports it
-$phpwcms['webp_quality']         = 85; // Set the WebP quality
+$phpwcms['webp_quality']         = 85; // Set the WebP quality, 0-100
 $phpwcms['resize_animated_gif']  = true; // Try to resize animated GIF, this can lead to bigger file sizes
 $phpwcms['sharpen_level']        = 1; // Sharpen Level - only ImageMagick: 0, 1, 2, 3, 4, 5 -- 0 = no, 5 = extra sharp
 $phpwcms['allow_ext_init']       = 1; // allow including of custom external scripts at frontend initialization

include/inc_front/content.article.inc.php

@@ -867,15 +867,15 @@
 }
 
 // Set robots meta tag if noindex or nofollow
-$row['article_meta']['robots'] = array();
+$_article_meta_robots = array();
 if(!empty($row['article_meta']['noindex'])) {
-    $row['article_meta']['robots'][] = 'noindex';
+    $_article_meta_robots[] = 'noindex';
 }
 if(!empty($row['article_meta']['nofollow'])) {
-    $row['article_meta']['robots'][] = 'nofollow';
+    $_article_meta_robots[] = 'nofollow';
 }
-if($row['article_meta']['robots']) {
-    $row['article_meta']['robots'] = implode(',', $row['article_meta']['robots']);
-    set_meta('robots', $row['article_meta']['robots']);
-    header('X-Robots-Tag: ' . $row['article_meta']['robots']);
+if(count($_article_meta_robots)) {
+    $_article_meta_robots = implode(',', $_article_meta_robots);
+    set_meta('robots', $_article_meta_robots);
+    header('X-Robots-Tag: ' . $_article_meta_robots);
 }

include/inc_front/content/cnt21.article.inc.php

@@ -33,17 +33,28 @@
     $crow['attr_class_id_close'] = '';
 }
 
-$CNT_TMP .= headline($crow["acontent_title"], $crow["acontent_subtitle"], $template_default["article"]);
-$content['page_file'] = @unserialize($crow["acontent_form"]);
-if($content["page_file"]['source']) {
-	$CNT_TMP .= include_url($content['page_file']['pfile']);
-} elseif(!empty($phpwcms['enable_inline_php'])) {
-	$content['page_file']['pfile'] = include_ext_php($content['page_file']['pfile'], 1);
-	if(preg_match('/.*?<body[^>]*?>(.*?)<\/body>.*?/si', $content['page_file']['pfile'], $content['page_file']['match'])) {
-		$CNT_TMP .= $content['page_file']['match'][1];
-	} else {
-		$CNT_TMP .= $content['page_file']['pfile'];
-	}
+$CNT_TMP .= headline($crow['acontent_title'], $crow['acontent_subtitle'], $template_default['article']);
+$content['page_file'] = @unserialize($crow['acontent_form']);
+if(!empty($content['page_file']['source'])) {
+	$CNT_TMP .= empty($content['page_file']['pfile']) ? '' : include_url($content['page_file']['pfile']);
+} elseif(!empty($content['page_file']['pfile'])) {
+    if (!empty($phpwcms['enable_inline_php'])) {
+        $content['page_file']['pfile'] = include_ext_php($content['page_file']['pfile'], 1);
+    } elseif (is_file(PHPWCMS_ROOT .'/' . $content['page_file']['pfile'])) {
+        $content['page_file']['pfile'] = file_get_contents(PHPWCMS_ROOT .'/' . $content['page_file']['pfile']);
+    } else {
+        $content['page_file']['pfile'] = '';
+    }
+    $content['page_file']['pfile'] = trim($content['page_file']['pfile']);
+    if ($content['page_file']['pfile']) {
+        if (preg_match('/.*?<body[^>]*?>(.*?)<\/body>.*?/si', $content['page_file']['pfile'], $content['page_file']['match'])) {
+            $CNT_TMP .= $content['page_file']['match'][1];
+        } elseif (preg_match('/<[a-z][\s\S]*>/i', $content['page_file']['pfile'])) {
+            $CNT_TMP .= $content['page_file']['pfile'];
+        } else {
+            $CNT_TMP .= html($content['page_file']['pfile']);
+        }
+    }
 }
 $CNT_TMP .= $crow['attr_class_id_close'];
 unset($content['page_file']);

include/inc_front/content/cnt32.article.inc.php

@@ -60,9 +60,13 @@
         $tabs['fieldgroup'] =& $template_default['settings']['tabs_custom_fields'][ $tabs['tab_fieldgroup'] ]['fields'];
     }
 
-    foreach($tabs['tabs'] as $key => $entry) {
+    $tabs['total_entries'] = count($tabs['tabs']);
 
-        $tabs['entries'][$key] = str_replace('{TABID}', ($key+1), $tabs['tmpl_entry']);
+    foreach($tabs['tabs'] as $key => $entry) {
+        $tab_id = $key+1;
+        $tabs['entries'][$key] = str_replace('{TABID}', $tab_id, $tabs['tmpl_entry']);
+        $tabs['entries'][$key] = render_cnt_template($tabs['entries'][$key], 'FIRST', $tab_id > 1 ? '' : $tab_id);
+        $tabs['entries'][$key] = render_cnt_template($tabs['entries'][$key], 'LAST', $tab_id === $tabs['total_entries'] ? $tab_id : '');
         $tabs['entries'][$key] = render_cnt_template($tabs['entries'][$key], 'TABTITLE', $entry['tabtitle'] === '-' ? '' : html_specialchars($entry['tabtitle']));
         $tabs['entries'][$key] = render_cnt_template($tabs['entries'][$key], 'TABCONTENT', trim($entry['tabheadline'].$entry['tabtext']) === '' ? '' : LF);
         $tabs['entries'][$key] = render_cnt_template($tabs['entries'][$key], 'TABHEADLINE', html_specialchars($entry['tabheadline']));
@@ -167,6 +171,7 @@
     $tabs['entries_count'] = count($tabs['entries']);
     $tabs['template'] = render_cnt_template($tabs['template'], 'TABS_ENTRIES', $tabs['entries_count'] ? implode('', $tabs['entries']) : '');
     $tabs['template'] = str_replace('{TAB_COUNT}', $tabs['entries_count'], $tabs['template']);
+    $CNT_TMP .= str_replace('{ID}', $crow['acontent_id'], $tabs['template']);
 
 } else {
 
@@ -175,6 +180,4 @@
 
 }
 
-$CNT_TMP .= str_replace('{ID}', $crow['acontent_id'], $tabs['template']);
-
 unset($tabs);

include/inc_front/js.inc.php

@@ -26,16 +26,23 @@
 $block['js_ondomready']     = array();
 $block['js_inline']         = array();
 
-// set default JS library
+// Set default JS library
 if(empty($block['jslib'])) {
     $block['jslib'] = key($phpwcms['js_lib']);
 }
+// Sanitize the JavaScript library
+$block['jslib'] = preg_replace('/[^a-z0-9-.]/', '', $block['jslib']);
 
 // set if CDN can be used
 define('PHPWCMS_USE_CDN', empty($block['googleapi']) ? FALSE : TRUE);
 
-// include the related JavaScript Library wrapper
-@include PHPWCMS_ROOT.'/include/inc_front/lib/js.'.$block['jslib'].'.inc.php';
+// Check if the selected JavaScript library exists
+if (!is_file(PHPWCMS_ROOT . '/include/inc_front/lib/js.' . $block['jslib'] . '.inc.php')) {
+    // Set fallback to latest jQuery migrate
+    $block['jslib'] = 'jquery-3.7-migrate-1';
+}
+// include the related JavaScript library wrapper
+@include PHPWCMS_ROOT . '/include/inc_front/lib/js.' . $block['jslib'] . '.inc.php';
 
 // check if selected JavaScript should be loaded permanently
 if(!empty($block['jslibload'])) {

include/inc_front/lib/js.jquery-3.7-migrate-1.inc.php

@@ -11,7 +11,7 @@
 
 require_once(PHPWCMS_ROOT.'/include/inc_front/lib/js.jquery.default.php');
 
-define('PHPWCMS_JSLIB', 'jquery-3.6-migrate-1');
+define('PHPWCMS_JSLIB', 'jquery-3.7-migrate-1');
 
 /**
  * Init jQuery 3.7.x + jQuery Migrate 1.4.x & 3.4.x Library

include/inc_lang/backend/de/lang.inc.php

@@ -771,6 +771,7 @@
 $BL['be_cnt_pages_manually'] = 'Eigene Pfad/Datei oder URL';
 $BL['be_cnt_pages_cust'] = 'Datei/URL';
 $BL['be_cnt_pages_from'] = 'Herkunft';
+$BL['be_cnt_pages_php_render_warning'] = 'Inline PHP <code>$phpwcms[&#39;enable_inline_php&#39;]</code> ist deaktiviert.';
 
 // added: 24-05-2004
 $BL['be_ctype_reference'] = 'Bilderwechsel';

include/inc_lang/backend/en/lang.inc.php

@@ -776,6 +776,7 @@
 $BL['be_cnt_pages_manually']            = 'custom path/file or URL';
 $BL['be_cnt_pages_cust']                = 'file/URL';
 $BL['be_cnt_pages_from']                = 'source';
+$BL['be_cnt_pages_php_render_warning']  = 'inline PHP <code>$phpwcms[&#39;enable_inline_php&#39;]</code> is disabled';
 
 // added: 24-05-2004
 $BL['be_ctype_reference']               = 'rollover images';