phpList
diff --git a/‎.github/workflows/build-release.yml‎
Lines changed: 1 addition & 1 deletion b/‎.github/workflows/build-release.yml‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎VERSION‎
Lines changed: 1 addition & 1 deletion b/‎VERSION‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎composer.json‎
Lines changed: 2 additions & 2 deletions b/‎composer.json‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎composer.lock‎
Lines changed: 146 additions & 149 deletions b/‎composer.lock‎
Lines changed: 146 additions & 149 deletions
diff --git a/‎docker/docker-phplist-config-dev.php‎
Lines changed: 3 additions & 0 deletions b/‎docker/docker-phplist-config-dev.php‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎docker/docker-phplist-config-live.php‎
Lines changed: 3 additions & 0 deletions b/‎docker/docker-phplist-config-live.php‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎public_html/lists/admin/Updater.php‎
Lines changed: 8 additions & 0 deletions b/‎public_html/lists/admin/Updater.php‎
Lines changed: 8 additions & 0 deletions
diff --git a/‎public_html/lists/admin/actions/processqueue.php‎
Lines changed: 54 additions & 54 deletions b/‎public_html/lists/admin/actions/processqueue.php‎
Lines changed: 54 additions & 54 deletions
diff --git a/‎public_html/lists/admin/connect.php‎
Lines changed: 4 additions & 4 deletions b/‎public_html/lists/admin/connect.php‎
Lines changed: 4 additions & 4 deletions
diff --git a/‎public_html/lists/admin/defaultplugin.php‎
Lines changed: 1 addition & 0 deletions b/‎public_html/lists/admin/defaultplugin.php‎
Lines changed: 1 addition & 0 deletions
@@ -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
 
@@ -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
@@ -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",
 
@@ -23,4 +23,7 @@
 
 $addonsUpdater = [
     'work' => '/var/tmp/phplistupdate',
+];
+$updaterConfig = [
+    'work' => '/var/tmp/phplistupdate',
 ];
@@ -17,4 +17,7 @@
 
 $addonsUpdater = [
     'work' => '/var/tmp/phplistupdate',
+];
+$updaterConfig = [
+    'work' => '/var/tmp/phplistupdate',
 ];
@@ -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
+{
+}
@@ -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);
         }
     }
 }
@@ -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);
Original file line number	Diff line number	Diff line change
`@@ -2416,9 +2416,9 @@ public function elapsed($seconds = 0)`
`2416`	`2416`	`$end = $now['sec'] * 1000000 + $now['usec'];`
`2417`	`2417`	`$elapsed = $end - $this->start;`
`2418`	`2418`	`if ($seconds) {`
`2419`		`- return sprintf('%0.10f', $elapsed / 1000000);`
	`2419`	`+ return sprintf('%0.10F', $elapsed / 1000000);`
`2420`	`2420`	`} else {`
`2421`		`- return sprintf('%0.10f', $elapsed);`
	`2421`	`+ return sprintf('%0.10F', $elapsed);`
`2422`	`2422`	`}`
`2423`	`2423`	`}`
`2424`	`2424`
`@@ -2434,9 +2434,9 @@ public function interval($seconds = 0)`
`2434`	`2434`	`$this->previous = $end;`
`2435`	`2435`
`2436`	`2436`	`if ($seconds) {`
`2437`		`- return sprintf('%0.10f', $elapsed / 1000000);`
	`2437`	`+ return sprintf('%0.10F', $elapsed / 1000000);`
`2438`	`2438`	`} else {`
`2439`		`- return sprintf('%0.10f', $elapsed);`
	`2439`	`+ return sprintf('%0.10F', $elapsed);`
`2440`	`2440`	`}`
`2441`	`2441`	`}`
`2442`	`2442`	`}`