Release 3.6.13 (#960)

* Avoid php 8.2 warnings (#930) * Avoid php warnings when run from command line * Avoid php warning when template does not exist * Avoid php 8 deprecation regarding string interpolation * Improve handling of unknown admin to avoid php warnings and deprecations * Avoid php 8.2 warning about dynamic properties * Make the results of the timer class use period as the decimal point (#931) * set DEFAULT_MESSAGE to 8 days (#932) * Tidy-up output of processqueue (#935) * Correct parameters to processQueueOutput() * Replace $GLOBALS['I18N']->get() by s() * Replace sprintf(s()) calls with simply s() * remove obsolete files (#936) * Allow gap between async requests (#937) * Allow gap between async requests * Include explanation of ASYNC_REQUEST_INTERVAL in config_extended.php * When including a message in a template use the content of the body element if it is present instead of the complete message. (#938) * Allow a plugin to update phplist (#946) * Allow a plugin to update the phplist code * When a new release is available link to a plugin if available in preference to the updater * Revert "Use <wbr> element instead of zero-width space character to allow wrapping of an email address or URL (#926)" (#949) This reverts commit 74682b0. * Use <wbr> element instead of zero-width space character to allow wrapping of an email address or URL (#952) Co-authored-by: Duncan Cameron <phplist@dcameron.me.uk> * Update the Common, CKEditor, and Segment plugins (#951) * fix bash issue * Translations for 3.6.13 (#947) * Translated using Weblate (English) Currently translated at 91.2% (1944 of 2131 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/en/ * Translated using Weblate (Polish) Currently translated at 99.5% (2121 of 2131 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/pl/ * Translated using Weblate (Portuguese) Currently translated at 100.0% (2131 of 2131 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/pt/ * Translated using Weblate (French) Currently translated at 99.9% (2129 of 2131 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/fr/ * Translated using Weblate (French) Currently translated at 100.0% (2131 of 2131 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/fr/ * Translated using Weblate (French) Currently translated at 100.0% (2131 of 2131 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/fr/ * Translated using Weblate (French) Currently translated at 100.0% (2131 of 2131 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/fr/ * Translated using Weblate (French) Currently translated at 100.0% (2131 of 2131 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/fr/ * Translated using Weblate (French) Currently translated at 100.0% (2131 of 2131 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/fr/ * Translated using Weblate (Galician) Currently translated at 15.8% (338 of 2131 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/gl/ * Translated using Weblate (Galician) Currently translated at 20.7% (442 of 2131 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/gl/ * Translated using Weblate (Galician) Currently translated at 24.8% (530 of 2131 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/gl/ * Translated using Weblate (Galician) Currently translated at 25.8% (551 of 2131 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/gl/ * Translated using Weblate (Galician) Currently translated at 36.7% (784 of 2131 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/gl/ * Translated using Weblate (Spanish) Currently translated at 98.9% (2108 of 2131 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/es/ * Translated using Weblate (Galician) Currently translated at 41.3% (882 of 2131 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/gl/ * Translated using Weblate (Galician) Currently translated at 44.5% (949 of 2131 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/gl/ * Translated using Weblate (Galician) Currently translated at 47.3% (1008 of 2131 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/gl/ * Translated using Weblate (Galician) Currently translated at 49.6% (1059 of 2131 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/gl/ * Translated using Weblate (Galician) Currently translated at 72.6% (1549 of 2131 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/gl/ * Translated using Weblate (Galician) Currently translated at 75.1% (1601 of 2131 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/gl/ * Translated using Weblate (Galician) Currently translated at 76.4% (1630 of 2131 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/gl/ * Translated using Weblate (Galician) Currently translated at 92.9% (1980 of 2131 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/gl/ * Translated using Weblate (Galician) Currently translated at 97.1% (2070 of 2131 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/gl/ * Translated using Weblate (Galician) Currently translated at 97.1% (2071 of 2131 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/gl/ * Translated using Weblate (Galician) Currently translated at 97.2% (2072 of 2131 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/gl/ * Translated using Weblate (Galician) Currently translated at 100.0% (2131 of 2131 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/gl/ * Translated using Weblate (English) Currently translated at 91.2% (1945 of 2131 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/en/ * Update dependencies (#895) * Translated using Weblate (English) Currently translated at 91.2% (1946 of 2132 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/en/ * Translated using Weblate (Chinese (Simplified)) Currently translated at 38.9% (830 of 2132 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/zh_Hans/ * Translated using Weblate (Chinese (Simplified)) Currently translated at 39.7% (848 of 2132 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/zh_Hans/ * Translated using Weblate (Chinese (Traditional)) Currently translated at 53.7% (1146 of 2132 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/zh_Hant/ * Translated using Weblate (Chinese (Simplified)) Currently translated at 81.0% (1727 of 2132 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/zh_Hans/ * Translated using Weblate (Chinese (Simplified)) Currently translated at 82.1% (1751 of 2132 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/zh_Hans/ * Translated using Weblate (Dutch) Currently translated at 99.2% (2116 of 2132 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/nl/ * Translated using Weblate (French) Currently translated at 100.0% (2132 of 2132 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/fr/ * Translated using Weblate (English) Currently translated at 91.3% (1948 of 2132 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/en/ * Translated using Weblate (German) Currently translated at 95.2% (2030 of 2132 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/de/ * Translated using Weblate (Chinese (Simplified)) Currently translated at 82.0% (1749 of 2132 strings) Translation: phpList/phpList3 Translate-URL: http://translate.phplist.org/projects/phplist/phplist3/zh_Hans/ --------- Co-authored-by: Duncan Cameron <phplist@dcameron.me.uk> Co-authored-by: rysiek_d <ryszard.d79@gmail.com> Co-authored-by: cflores <carlos.florest@gmail.com> Co-authored-by: Alain Rihs <alainrihs@sunrise.ch> Co-authored-by: dinahosting <comunicacion@dinahosting.com> Co-authored-by: Michiel <michiel@phplist.com> Co-authored-by: Duncan Cameron <3147688+bramley@users.noreply.github.com> Co-authored-by: dayadiguo <dayadiguo@gmail.com> * update version * update to use the updater plugin --------- Co-authored-by: Duncan Cameron <3147688+bramley@users.noreply.github.com> Co-authored-by: Michiel Dethmers <michiel@phplist.com> Co-authored-by: Duncan Cameron <phplist@dcameron.me.uk> Co-authored-by: rysiek_d <ryszard.d79@gmail.com> Co-authored-by: cflores <carlos.florest@gmail.com> Co-authored-by: Alain Rihs <alainrihs@sunrise.ch> Co-authored-by: dinahosting <comunicacion@dinahosting.com> Co-authored-by: dayadiguo <dayadiguo@gmail.com>
phpList · May 24, 2023 · 3209434 · 3209434
1 parent a638455
commit 3209434
Show file tree

Hide file tree

Showing 28 changed files with 417 additions and 484 deletions.
diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
@@ -25,7 +25,7 @@ jobs:
 
       - name: Show the discovered version
         run: |
-          if [[ ${{ secrets.BUILD_TEST }} ]]; then
+          if [[ ! -z "${{ secrets.BUILD_TEST }}" ]]; then
             echo "RELEASE_VERSION=build-testing-RC1" >> $GITHUB_ENV
           fi
           echo \$RELEASE_VERSION = $RELEASE_VERSION

diff --git a/VERSION b/VERSION
@@ -1,4 +1,4 @@
 # file that keeps track of the latest tag in cvs and the corresponding version
 # this automates publishing a new version, when it's tagged
 # if you don't understand this, don't worry. You don't need this file
-VERSION=3.6.6-RC2
+VERSION=3.6.13
diff --git a/composer.json b/composer.json
@@ -88,7 +88,7 @@
       },
       {
             "type": "vcs",
-            "url": "https://github.com/michield/phplist-plugin-addons.git"
+            "url": "https://github.com/bramley/phplist-plugin-updater.git"
       }
     ],
   "extra": {
@@ -128,7 +128,7 @@
     "bramley/phplist-plugin-ckeditor": "dev-master",
     "bramley/phplist-plugin-segment": "dev-master",
     "phplist/phplist-plugin-subjectlineplaceholders": "dev-master",
-    "michield/phplist-plugin-addons": "dev-master"
+    "bramley/phplist-plugin-updater": "dev-main"
   },
   "require-dev": {
     "behat/behat": "@stable",

diff --git a/composer.lock b/composer.lock
diff --git a/docker/docker-phplist-config-dev.php b/docker/docker-phplist-config-dev.php
@@ -23,4 +23,7 @@
 
 $addonsUpdater = [
     'work' => '/var/tmp/phplistupdate',
+];
+$updaterConfig = [
+    'work' => '/var/tmp/phplistupdate',
 ];
diff --git a/docker/docker-phplist-config-live.php b/docker/docker-phplist-config-live.php
@@ -17,4 +17,7 @@
 
 $addonsUpdater = [
     'work' => '/var/tmp/phplistupdate',
+];
+$updaterConfig = [
+    'work' => '/var/tmp/phplistupdate',
 ];
diff --git a/public_html/lists/admin/Updater.php b/public_html/lists/admin/Updater.php
@@ -0,0 +1,8 @@
+<?php
+/**
+ * A plugin should implement this interface if it wants to be responsible for updating phpList.
+ * It should implement an admin page with the name "update".
+ */
+interface Updater
+{
+}
diff --git a/public_html/lists/admin/actions/processqueue.php b/public_html/lists/admin/actions/processqueue.php
diff --git a/public_html/lists/admin/connect.php b/public_html/lists/admin/connect.php
@@ -2416,9 +2416,9 @@ public function elapsed($seconds = 0)
         $end = $now['sec'] * 1000000 + $now['usec'];
         $elapsed = $end - $this->start;
         if ($seconds) {
-            return sprintf('%0.10f', $elapsed / 1000000);
+            return sprintf('%0.10F', $elapsed / 1000000);
         } else {
-            return sprintf('%0.10f', $elapsed);
+            return sprintf('%0.10F', $elapsed);
         }
     }
 
@@ -2434,9 +2434,9 @@ public function interval($seconds = 0)
         $this->previous = $end;
 
         if ($seconds) {
-            return sprintf('%0.10f', $elapsed / 1000000);
+            return sprintf('%0.10F', $elapsed / 1000000);
         } else {
-            return sprintf('%0.10f', $elapsed);
+            return sprintf('%0.10F', $elapsed);
         }
     }
 }
diff --git a/public_html/lists/admin/defaultplugin.php b/public_html/lists/admin/defaultplugin.php
@@ -20,6 +20,7 @@ class phplistPlugin
     public $documentationUrl = ''; //# link to documentation for this plugin (eg https://resources.phplist.com/plugin/pluginname
     public $enabled = 1; // use directly, can be privitsed later and calculated with __get and __set
     public $system_root = ''; //# root dir of the phpList admin directory
+    public $dependencyFailure;
 
     //@@Some ideas to implement this:
     // * Start each method with if (!$this->enabled) return parent :: parentMethod($args);

diff --git a/public_html/lists/admin/gchart.php b/public_html/lists/admin/gchart.php
diff --git a/public_html/lists/admin/index.php b/public_html/lists/admin/index.php
@@ -523,24 +523,25 @@ function mb_strtolower($string)
         echo Info($GLOBALS['I18N']->get('Running in testmode, no emails will be sent. Check your config file.'));
     }
 
- #   if (!DEVVERSION) { ## why not, quite useful to see
-    if (ALLOW_UPDATER) {
+    if (ALLOW_UPDATER || $updaterplugin) {
         $updaterdir = __DIR__ . '/../updater';
 
         include 'updateLib.php';
         $updateNotif = checkForUpdate();
-        $moreInfo = ' <ul><li><a href="https://www.phplist.com/download?utm_source=pl' . VERSION . '&amp;utm_medium=updatedownload&amp;utm_campaign=phpList" title="' . s('Download the new version') . '" target="_blank">' . s('Download the new version') . '</a></li>';
 
-        if (file_exists($updaterdir)) {
-            $moreInfo .= '<li>'.s('or use the %sphpList Updater%s','<a href="?page=update" title="' . s('automatic updater') . '">','</a>');
-        }
-        $moreInfo .= '</ul>';
+        if ($updateNotif !== '' && $_GET['page'] !== 'update') {
+            $moreInfo = ' <ul><li><a href="https://www.phplist.com/download?utm_source=pl' . VERSION . '&amp;utm_medium=updatedownload&amp;utm_campaign=phpList" title="' . s('Download the new version') . '" target="_blank">' . s('Download the new version') . '</a></li>';
 
-        if ($updateNotif !== '') {
+            if ($updaterplugin) {
+                $class = get_class($updaterplugin);
+                $moreInfo .= '<li>'.s('or use the %sphpList Updater%s', sprintf('<a href="?page=update&amp;pi=%s" title="', $class) . s('automatic updater') . '">','</a>');
+            } elseif (file_exists($updaterdir)) {
+                $moreInfo .= '<li>'.s('or use the %sphpList Updater%s','<a href="?page=update" title="' . s('automatic updater') . '">','</a>');
+            }
+            $moreInfo .= '</ul>';
             Info($updateNotif . '' . $moreInfo);
         }
     }
-#   }
 
     if (version_compare(PHP_VERSION, '5.3.3', '<') && WARN_ABOUT_PHP_SETTINGS) {
         Error(s('Your PHP version is out of date. phpList requires PHP version 5.3.3 or higher.'));

diff --git a/public_html/lists/admin/init.php b/public_html/lists/admin/init.php
@@ -597,8 +597,8 @@
     define('MAX_AVATAR_SIZE', 2000);
 }
 if (!defined('DEFAULT_MESSAGEAGE')) {
-    define('DEFAULT_MESSAGEAGE', 604800);
-} //# 7 days in seconds
+    define('DEFAULT_MESSAGEAGE', 691200);
+} //# 8 days in seconds
 if (!defined('ADD_EMAIL_THROTTLE')) {
     define('ADD_EMAIL_THROTTLE', 1);
 } //# seconds between addemail ajax requests
@@ -786,10 +786,14 @@
 }
 if (!defined('HTTP_PROXY_HOST')) {
     define('HTTP_PROXY_HOST', false);
-} 
+}
 if (!defined('HTTP_PROXY_PORT')) {
     define('HTTP_PROXY_PORT', false);
 }
+// interval in milliseconds between asynchronous requests
+if (!defined('ASYNC_REQUEST_INTERVAL')) {
+    define('ASYNC_REQUEST_INTERVAL', 0);
+}
 
 if (!isset($GLOBALS['export_mimetype'])) {
     $GLOBALS['export_mimetype'] = 'application/csv';

diff --git a/public_html/lists/admin/js/phplistapp.js b/public_html/lists/admin/js/phplistapp.js
@@ -77,8 +77,12 @@ function loadDivContent(index) {
         div = asyncLoadDiv[index];
         url = asyncLoadUrl[index];
         $("#"+div).html(busyImage + '<span class="loadingprogressbanner"></span>');
-        $("#"+div).load(url, function() {
-            loadDivContent(index + 1);
+        $("#"+div).load(url, function(response, status, xhr) {
+            if (status == "error") {
+                $("#"+div).html('');
+            } else {
+                setTimeout(() => loadDivContent(index + 1), asyncRequestInterval);
+            }
         });
     }
 }

diff --git a/public_html/lists/admin/lib.php b/public_html/lists/admin/lib.php
@@ -1971,15 +1971,36 @@ function shortenText($text, $max = 30)
  * mostly used for columns in listings to retrict the width, particularly on mobile devices
  * it will show the full text as the title tip but restrict the size of the output
  *
- * will also place a space after / and @ to facilitate wrapping in the browser
- *
  */
 function shortenTextDisplay($text, $max = 30)
+{
+    $display = shortenText($text, $max);
+
+    return sprintf('<span title="%s">%s</span>', htmlspecialchars($text), $display);
+}
+/*
+ * shortenEmailDisplay
+ *
+ * Similar to shortenTextDisplay() but adds a wbr element after @ to allow wrapping
+ */
+function shortenEmailDisplay($text, $max = 30)
+{
+    $display = shortenText($text, $max);
+    $display = str_replace('@', '@<wbr>', $display);
+
+    return sprintf('<span title="%s">%s</span>', htmlspecialchars($text), $display);
+}
+
+/*
+ * shortenUrlDisplay
+ *
+ * Similar to shortenTextDisplay() but adds a wbr element after each / to allow wrapping
+ */
+function shortenUrlDisplay($text, $max = 30)
 {
     $display = preg_replace('!^https?://!i', '', $text);
     $display = shortenText($display, $max);
-    $display = str_replace('/', '/&#x200b;', $display);
-    $display = str_replace('@', '@&#x200b;', $display);
+    $display = str_replace('/', '/<wbr>', $display);
 
     return sprintf('<span title="%s">%s</span>', htmlspecialchars($text), $display);
 }
@@ -2385,6 +2406,7 @@ function asyncLoadContentDiv($url,$divname)
         if (typeof asyncLoadDiv == "undefined") {
             var asyncLoadDiv = new Array();
             var asyncLoadUrl = new Array();
+            var asyncRequestInterval = ' . ASYNC_REQUEST_INTERVAL . ';
         }
         asyncLoadDiv[asyncLoadDiv.length] = "'.$divname.'";
         asyncLoadUrl[asyncLoadUrl.length] = "'.$url.'";
@@ -2453,7 +2475,11 @@ function getClientIP()
         }
     }
 
-    $the_ip = filter_var($_SERVER['REMOTE_ADDR'], FILTER_VALIDATE_IP);
+    if (isset($_SERVER['REMOTE_ADDR'])) {
+        $the_ip = filter_var($_SERVER['REMOTE_ADDR'], FILTER_VALIDATE_IP);
+    } else {
+        $the_ip = '';
+    }
     //logEvent("REMOTE_ADDR ip=".$the_ip);
 
     return $the_ip;

diff --git a/public_html/lists/admin/locale/de/phplist.po b/public_html/lists/admin/locale/de/phplist.po
@@ -1,12 +1,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: German (phpList)\n"
-"Report-Msgid-Bugs-To: \n"
+"Report-Msgid-Bugs-To: info@phplist.com\n"
 "POT-Creation-Date: 2021-02-12 19:03+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2023-02-23 08:29+0000\n"
+"Last-Translator: Duncan Cameron <phplist@dcameron.me.uk>\n"
 "Language-Team: German <http://translate.phplist.org/projects/phplist/"
-"phplist-languages/de/>\n"
+"phplist3/de/>\n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -2440,9 +2440,9 @@ msgstr ""
 
 # Suggested in Weblate: Versende in Stapeln von %s Nachrichten
 #: public_html/lists/admin/actions/processqueue.php:534
-#, fuzzy, php-format
+#, php-format
 msgid "Sending in batches of %s messages"
-msgstr "Versende in Stapeln von %d Nachrichten"
+msgstr "Versende in Stapeln von %s Nachrichten"
 
 #: public_html/lists/admin/processbounces.php:412,
 #: public_html/lists/admin/processbounces.php:413

diff --git a/public_html/lists/admin/locale/en/phplist.po b/public_html/lists/admin/locale/en/phplist.po
@@ -3,8 +3,8 @@ msgstr ""
 "Project-Id-Version: English (phpList)\n"
 "Report-Msgid-Bugs-To: info@phplist.com\n"
 "POT-Creation-Date: 2021-02-12 19:38+0000\n"
-"PO-Revision-Date: 2022-10-24 12:40+0000\n"
-"Last-Translator: Michiel <michiel@phplist.com>\n"
+"PO-Revision-Date: 2023-02-23 08:29+0000\n"
+"Last-Translator: Duncan Cameron <phplist@dcameron.me.uk>\n"
 "Language-Team: English <http://translate.phplist.org/projects/phplist/"
 "phplist3/en/>\n"
 "Language: en\n"
@@ -2448,9 +2448,9 @@ msgid "Processing has been suspended by your ISP, please try again later"
 msgstr "Processing has been suspended by your ISP, please try again later"
 
 #: public_html/lists/admin/actions/processqueue.php:534
-#, fuzzy, php-format
+#, php-format
 msgid "Sending in batches of %s messages"
-msgstr "Sending in batches of %d messages"
+msgstr "Sending in batches of %s messages"
 
 #: public_html/lists/admin/actions/processqueue.php:540
 #, php-format
@@ -2460,9 +2460,9 @@ msgid ""
 msgstr ""
 
 #: public_html/lists/admin/actions/processqueue.php:544
-#, fuzzy, php-format
+#, php-format
 msgid "Sending in batches of %s emails"
-msgstr "Sending in batches of %d emails"
+msgstr "Sending in batches of %s emails"
 
 #: public_html/lists/admin/actions/processqueue.php:547
 #, php-format

diff --git a/public_html/lists/admin/locale/zh_CN/phplist.po b/public_html/lists/admin/locale/zh_CN/phplist.po
@@ -3,7 +3,7 @@ msgstr ""
 "Project-Id-Version: Chinese (Simplified) (phpList)\n"
 "Report-Msgid-Bugs-To: info@phplist.com\n"
 "POT-Creation-Date: 2021-02-12 19:05+0000\n"
-"PO-Revision-Date: 2022-11-06 16:49+0000\n"
+"PO-Revision-Date: 2023-02-23 08:29+0000\n"
 "Last-Translator: dayadiguo <dayadiguo@gmail.com>\n"
 "Language-Team: Chinese (Simplified) <http://translate.phplist.org/projects/"
 "phplist/phplist3/zh_Hans/>\n"
@@ -3064,7 +3064,7 @@ msgstr ""
 
 #: public_html/databasestructure.php:102
 msgid "Status of message"
-msgstr "讯息状态"
+msgstr "信息状态"
 
 #: public_html/lists/admin/members.php:390,
 #: public_html/lists/admin/members.php:427

diff --git a/public_html/lists/admin/mclicks.php b/public_html/lists/admin/mclicks.php
@@ -140,7 +140,7 @@
     );
 
     if (!$download) {
-        $element = shortenTextDisplay($row['url']);
+        $element = shortenUrlDisplay($row['url']);
     } else {
         $element = $row['url'];
     }