Merge branch 'master' into feature/dropE_STRICT

onli · web-flow · commit 6b6f9519a624 · 2025-02-26T19:29:31.000+01:00
diff --git a/.github/workflows/php_tests.yml b/.github/workflows/php_tests.yml
@@ -19,7 +19,7 @@ jobs:
     # for available versions see https://github.com/marketplace/actions/setup-php-action#tada-php-support
     strategy:
       matrix:
-        phpversion: ['7.4', '8.1', '8.2', '8.3']
+        phpversion: ['7.4', '8.1', '8.2', '8.3', '8.4']
 
     steps:
     - uses: actions/checkout@v4
diff --git a/.gitignore b/.gitignore
@@ -20,3 +20,4 @@ DEADJOE
 *.git
 tests/phpunit.xml
 vagrant/*
+*.orig
diff --git a/bundled-libs/XML/RPC.php b/bundled-libs/XML/RPC.php
@@ -1433,7 +1433,7 @@ function parseResponse($data = '')
 
         $encoding = $this->getEncoding($data);
         $parser_resource = xml_parser_create($encoding);
-        $parser = (int) $parser_resource;
+        $parser = 1;
 
         $XML_RPC_xh = array();
         $XML_RPC_xh[$parser] = array();
@@ -1590,7 +1590,7 @@ function addScalar($val, $type = 'string')
         }
         $typeof = $GLOBALS['XML_RPC_Types'][$type];
         if ($typeof != 1) {
-            $this->raiseError("Not a scalar type (${typeof})",
+            $this->raiseError("Not a scalar type ({$typeof})",
                               XML_RPC_ERROR_INVALID_TYPE);
             return 0;
         }
@@ -1723,16 +1723,16 @@ function serializedata($typ, $val)
         case 1:
             switch ($typ) {
             case $GLOBALS['XML_RPC_Base64']:
-                $rs .= "<${typ}>" . base64_encode($val) . "</${typ}>";
+                $rs .= "<{$typ}>" . base64_encode($val) . "</{$typ}>";
                 break;
             case $GLOBALS['XML_RPC_Boolean']:
-                $rs .= "<${typ}>" . ($val ? '1' : '0') . "</${typ}>";
+                $rs .= "<{$typ}>" . ($val ? '1' : '0') . "</{$typ}>";
                 break;
             case $GLOBALS['XML_RPC_String']:
-                $rs .= "<${typ}>" . serendipity_specialchars($val). "</${typ}>";
+                $rs .= "<{$typ}>" . serendipity_specialchars($val). "</{$typ}>";
                 break;
             default:
-                $rs .= "<${typ}>${val}</${typ}>";
+                $rs .= "<{$typ}>{$val}</{$typ}>";
             }
         }
         return $rs;
diff --git a/docs/NEWS b/docs/NEWS
@@ -3,6 +3,10 @@ Version 2.6-alpha1 ()
 
    * PHP 8.4 fix: Remove deprecated constant E_STRICT
 
+   * PHP 8 compatibility fixes for bundled XML/RPC.php
+
+   * Upgrade bundled jQuery to jQuery 3
+
    * Fix option to set a different theme as fallback option by setting
      Engine: $themename in a themes info.txt
 
diff --git a/include/admin/maintenance.inc.php b/include/admin/maintenance.inc.php
@@ -65,7 +65,7 @@
 
 
 $data['maintenance_mode'] = serendipity_db_bool(serendipity_get_config_var("maintenanceMode", false));
-$data['maintenance_mode_end'] = strftime('%d.%m.%y %T', serendipity_get_config_var("maintenanceModeEnd"));
+$data['maintenance_mode_end'] = serendipity_strftime('%d.%m.%y %T', serendipity_get_config_var("maintenanceModeEnd"));
 $data['maintenance_mode_active'] = $data['maintenance_mode'] && time() < serendipity_get_config_var("maintenanceModeEnd", 0);
 
 # php 8 compat section
diff --git a/include/functions_calendars.inc.php b/include/functions_calendars.inc.php
@@ -218,7 +218,7 @@ function persian_strftime_utf($format, $timestamp='') {
                     if(date('a',$timestamp)=='pm') $output_str.='بعد از ظهر'; else $output_str.='قبل از ظهر';
                     break;
                 case 'R':
-                    $output_str.=strftime('%R', $timestamp);
+                    $output_str.=PHP81_BC\strftime('%R', $timestamp);
                     break;
                 case 'S':
                     $output_str.=date('s', $timestamp);
@@ -251,7 +251,7 @@ function persian_strftime_utf($format, $timestamp='') {
                     break;
                 case 'z':
                 case 'Z':
-                    $output_str.=strftime('%z', $timestamp);
+                    $output_str.=PHP81_BC\strftime('%z', $timestamp);
                     break;
                 case '%':
                     $output_str.='%';
diff --git a/include/plugin_api.inc.php b/include/plugin_api.inc.php
@@ -67,6 +67,7 @@ function serendipity_plugin_api_frontend_header($event_name, &$bag, &$eventData,
     if (!$check && $serendipity['capabilities']['jquery']) {
 ?>
     <script src="<?php echo $serendipity['serendipityHTTPPath']; ?>templates/jquery.js"></script>
+    <script src="<?php echo $serendipity['serendipityHTTPPath']; ?>templates/jquery-migrate.js"></script>
 <?php
         if ($serendipity['capabilities']['jquery-noconflict']) {
 ?>
@@ -88,6 +89,7 @@ function serendipity_plugin_api_backend_header($event_name, &$bag, &$eventData,
     if (!$check && $serendipity['capabilities']['jquery_backend']) {
 ?>
     <script src="<?php echo $serendipity['serendipityHTTPPath']; ?>templates/jquery.js"></script>
+    <script src="<?php echo $serendipity['serendipityHTTPPath']; ?>templates/jquery-migrate.js"></script>
 <?php
     }
 }
@@ -1315,6 +1317,7 @@ static function load_language($path) {
         if (file_exists($probelang)) {
             include $probelang;
         }
+
         include $path . '/lang_en.inc.php';
         error_reporting($oldReportingLevel);
     }
diff --git a/plugins/serendipity_event_textile/ChangeLog b/plugins/serendipity_event_textile/ChangeLog
@@ -1,2 +1,8 @@
+2.0.1:
+     * Fix one PHP 8 warning
+     * Fix error when opening entries in blogs that had the prior version installed
+     * Link to textile-lang.com to explain the syntax below the comment form, instead of defunct
+       sites
+
 2.0: Remove old textile parsers and switch to netcarver/textile v4.1.3
      This will improve compatibility with current PHP version (8.x).
diff --git a/plugins/serendipity_event_textile/serendipity_event_textile.php b/plugins/serendipity_event_textile/serendipity_event_textile.php
@@ -19,7 +19,7 @@ function introspect(&$propbag)
         $propbag->add('description',   PLUGIN_EVENT_TEXTILE_DESC);
         $propbag->add('stackable',     false);
         $propbag->add('author',        'Serendipity Team', 'Lars Strojny');
-        $propbag->add('version',       '2.0');
+        $propbag->add('version',       '2.0.1');
         $propbag->add('requirements',  array(
             'serendipity' => '1.6',
             'smarty'      => '2.6.7',
@@ -112,6 +112,9 @@ function introspect_config_item($name, &$propbag)
                 $propbag->add('description', PLUGIN_EVENT_TEXTILE_UNESCAPE_DESC);
                 $propbag->add('default',     'false');
                 break;
+            case 'textile_version':
+                // For backwards compatibility, otherwise the constant call below will die
+                break;
 
             default:
                 $propbag->add('type',        'boolean');
@@ -165,7 +168,7 @@ function event_hook($event, &$bag, &$eventData, $addData = null)
 
                             /* textile it */
 
-                            if (serendipity_db_bool($this->get_config('unescape'))) {
+                            if (serendipity_db_bool($this->get_config('unescape')) && isset($eventData[$element])) {
                                 $eventData[$element] = str_replace('&quot;', '"', $eventData[$element]);
                             }
                             $eventData[$element] = $this->textile($eventData[$element] ?? null);
@@ -200,11 +203,8 @@ function event_hook($event, &$bag, &$eventData, $addData = null)
                     break;
 
                 case 'frontend_comment':
-                    if (serendipity_db_bool($this->get_config('COMMENT', 'true'))) {
-                        $url = $this->get_config('textile_version') == 1
-                                   ? 'http://www.textism.com/tools/textile/'
-                                   : 'http://txstyle.org/article/43/a-short-introduction';
-                        echo '<div class="serendipity_commentDirection serendipity_comment_textile">' . sprintf(PLUGIN_EVENT_TEXTILE_TRANSFORM, $url) . '</div>';
+                    if (serendipity_db_bool($this->get_config('COMMENT', 'true'))) {;
+                        echo '<div class="serendipity_commentDirection serendipity_comment_textile">' . sprintf(PLUGIN_EVENT_TEXTILE_TRANSFORM, 'https://textile-lang.com/') . '</div>';
                     }
                     break;
 
diff --git a/templates/jquery-migrate.js b/templates/jquery-migrate.js
diff --git a/templates/jquery.js b/templates/jquery.js

Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,7 @@ function serendipity_plugin_api_frontend_header($event_name, &$bag, &$eventData,`
`67`	`67`	`if (!$check && $serendipity['capabilities']['jquery']) {`
`68`	`68`	`?>`
`69`	`69`	`<script src="<?php echo $serendipity['serendipityHTTPPath']; ?>templates/jquery.js"></script>`
	`70`	`+ <script src="<?php echo $serendipity['serendipityHTTPPath']; ?>templates/jquery-migrate.js"></script>`
`70`	`71`	`<?php`
`71`	`72`	`if ($serendipity['capabilities']['jquery-noconflict']) {`
`72`	`73`	`?>`
`@@ -88,6 +89,7 @@ function serendipity_plugin_api_backend_header($event_name, &$bag, &$eventData,`
`88`	`89`	`if (!$check && $serendipity['capabilities']['jquery_backend']) {`
`89`	`90`	`?>`
`90`	`91`	`<script src="<?php echo $serendipity['serendipityHTTPPath']; ?>templates/jquery.js"></script>`
	`92`	`+ <script src="<?php echo $serendipity['serendipityHTTPPath']; ?>templates/jquery-migrate.js"></script>`
`91`	`93`	`<?php`
`92`	`94`	`}`
`93`	`95`	`}`
`@@ -1315,6 +1317,7 @@ static function load_language($path) {`
`1315`	`1317`	`if (file_exists($probelang)) {`
`1316`	`1318`	`include $probelang;`
`1317`	`1319`	`}`
	`1320`	`+`
`1318`	`1321`	`include $path . '/lang_en.inc.php';`
`1319`	`1322`	`error_reporting($oldReportingLevel);`
`1320`	`1323`	`}`