Merge branch 'master' into phplist4-restapi

Author: Sam Tuke

public_html/lists/admin/defaultconfig.php

@@ -98,15 +98,12 @@
         'allowempty'  => true,
         'category'    => 'general',
     ),
-
-    // how often to check for new versions of PHPlist
-    'check_new_version' => array(
-        'value'       => '7',
-        'description' => s('How often do you want to check for a new version of phplist (days)'),
-        'type'        => 'integer',
-        'min'         => 1,
-        'max'         => 180,
-        'category'    => 'security',
+    'rc_notification' => array(
+        'value'       => 0,
+        'description' => s('Show notification for Release Candidates'),
+        'type'        => 'boolean',
+        'allowempty'  => true,
+        'category'    => 'system',
     ),
 
     //# remote processing secret
@@ -543,7 +540,7 @@
         'value' =>
 'You have requested your personal location to update your details in our newsletter database.
 The location is below. Please make sure that you use the full line as mentioned below.
-Sometimes email programmes can wrap the line into multiple lines.
+Sometimes email programs wrap the link over multiple lines.
 
 Your personal location is:
 [PREFERENCESURL]

public_html/lists/admin/home.php

@@ -29,53 +29,6 @@
 //# trigger this somewhere else?
 refreshTlds();
 
-// check for latest version
-$checkinterval = sprintf('%d', getConfig('check_new_version'));
-if (empty($checkinterval)) {
-    $checkinterval = 7;
-}
-
-$showUpdateAvail = !empty($_GET['showupdate']); //# just to check the design
-$thisversion = VERSION;
-$thisversion = preg_replace("/[^\.\d]/", '', $thisversion);
-$latestversion = getConfig('updateavailable');
-$showUpdateAvail = $showUpdateAvail || (!empty($latestversion) && !versionCompare($thisversion, $latestversion));
-
-if (!$showUpdateAvail && $checkinterval) {
-
-    //#https://mantis.phplist.com/view.php?id=16815
-    $query = sprintf('select date_add(value, interval %d day) < now() as needscheck from %s where item = "updatelastcheck"',
-        $checkinterval, $tables['config']);
-    $needscheck = Sql_Fetch_Row_Query($query);
-    if ($needscheck[0] != '0') {
-        @ini_set('user_agent', NAME.' (phplist version '.VERSION.')');
-        @ini_set('default_socket_timeout', 5);
-        if ($fp = @fopen('https://www.phplist.com/files/LATESTVERSION', 'r')) {
-            $latestversion = fgets($fp);
-            $latestversion = preg_replace("/[^\.\d]/", '', $latestversion);
-            @fclose($fp);
-            if (!versionCompare($thisversion, $latestversion)) {
-                //# remember this, so we can remind about the update, without the need to check the phplist site
-                //# hmmm, this causes it to be "stuck" on the last version checked
-                SaveConfig('updateavailable', $latestversion, 0, true);
-                $showUpdateAvail = true;
-            }
-        }
-        SaveConfig('updatelastcheck', date('Y-m-d H:i:s', time()), 0, true);
-    }
-}
-
-if ($showUpdateAvail) {
-    echo '<div class="newversion note">';
-    echo s('A new version of phpList is available!');
-    echo '<br/>';
-    echo '<br/>'.s('The new version may have fixed security issues,<br/>so it is recommended to upgrade as soon as possible');
-    echo '<br/>'.s('Your version').': <b>'.$thisversion.'</b>';
-    echo '<br/>'.s('Latest version').': <b>'.$latestversion.'</b><br/>  ';
-    echo '<a href="https://www.phplist.com/latestchanges?utm_source=pl'.$thisversion.'&amp;utm_medium=updatenews&amp;utm_campaign=phpList" title="'.s('Read what has changed in the new version').'" target="_blank">'.$GLOBALS['I18N']->get('View what has changed').'</a>&nbsp;&nbsp;';
-    echo '<a href="https://www.phplist.com/download?utm_source=pl'.$thisversion.'&amp;utm_medium=updatedownload&amp;utm_campaign=phpList" title="'.s('Download the new version').'" target="_blank">'.$GLOBALS['I18N']->get('Download').'</a></div>';
-}
-
 echo '<div class="accordion">';
 
 $some = 0;

public_html/lists/admin/index.php

@@ -519,10 +519,38 @@ function mb_strtolower($string)
     if (TEST) {
         echo Info($GLOBALS['I18N']->get('Running in testmode, no emails will be sent. Check your config file.'));
     }
-    $updaterdir = __DIR__ . '/../updater';
-    if(file_exists($updaterdir) && ALLOW_UPDATER){
-        echo Info(s('Try automatic updater').' <a href="?page=redirecttoupdater" title="'.s('automatic updater').'">'.s('here').'</a>'.' ('.s('beta').')');
+
+    if (!strpos(VERSION, 'dev')){
+
+        $updaterdir = __DIR__ . '/../updater';
+
+        include 'updateLib.php';
+
+        if (showUpdateNotification()) {
+            try {
+
+                $updateNotif = checkForUpdate('init.php');
+
+            } catch (Exception $e) {
+
+                echo s('Error: '), $e->getMessage(), "\n";
+
+            }
+
+            $moreInfo = '<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>';
+
+            if (file_exists($updaterdir) && ALLOW_UPDATER) {
+
+                $moreInfo .= s(' or update') . ' <a href="?page=redirecttoupdater" title="' . s('automatic updater') . '">' . s('here.') . '</a>';
+            }
+
+            if ($updateNotif !== '') {
+
+                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.'));
     }

public_html/lists/admin/initialise.php

@@ -182,8 +182,6 @@ function output($message)
     output( s('Setting default configuration').'<br/>');
     // mark the database to be our current version
     SaveConfig('version', VERSION, 0);
-    // mark now to be the last time we checked for an update
-    SaveConfig('updatelastcheck', date('Y-m-d H:i:s', time()), 0, true);
     SaveConfig('admin_address', $adminemail, 1);
     SaveConfig('message_from_name', strip_tags($_REQUEST['adminname']), 1);
     SaveConfig('campaignfrom_default', "$adminemail ".strip_tags($_REQUEST['adminname']));
@@ -194,6 +192,7 @@ function output($message)
     SaveConfig('message_from_name', strip_tags($_REQUEST['adminname']));
     SaveConfig('message_replyto_address', $adminemail);
     SaveConfig('secret', bin2hex(random_bytes(20)));
+    SaveConfig('lastcheckupdate', date('m/d/Y h:i:s', time()), 0, true);
 
     if (!empty($_REQUEST['orgname'])) {
         SaveConfig('organisation_name', strip_tags($_REQUEST['orgname']), 1);
@@ -250,4 +249,4 @@ function output($message)
             s('Upgrade')).' '.s('instead?').'</li>
     <li>' .PageLinkButton('initialise', s('Force Initialisation'),
             'force=yes').' '.s('(will erase all data!)').' '."</li></ul></div>\n";
-}
+}

public_html/lists/admin/js/phplistapp.js

@@ -110,7 +110,7 @@ function openHelpDialog(url) {
     var destpage = urlParameter('page', url);
     url = url.replace(/page=/, 'origpage=');
     $("#dialog").load(url + '&ajaxed=true&page=pageaction&action=' + destpage);
-    $(".ui-widget-overlay").on('click', function () {
+    $(".ui-widget-overlay").on("click",function () {
         $("#dialog").dialog('close');
     });
 }
@@ -133,7 +133,7 @@ function totalSentUpdate(msgid) {
 }
 
 $(document).ready(function () {
-    $(".note .hide").on('click',function () {
+    $(".note .hide").on("click",function () {
         $(this).parents('.note').hide();
     });
 
@@ -143,7 +143,7 @@ $(document).ready(function () {
         }
     });
 
-    $("a.ajaxable").on('click',function () {
+    $("a.ajaxable").on("click",function () {
         var url = this.href;
         var thispage = urlParameter('page', window.location.href);
         if (thispage == "") {
@@ -161,7 +161,7 @@ $(document).ready(function () {
         return false;
     });
 
-    $("input:checkbox.checkallcheckboxes").on('click',function () {
+    $("input:checkbox.checkallcheckboxes").on("click",function () {
         if (this.checked) {
             $("input[type=checkbox]:not(:checked)").each(function () {
                 this.checked = true;
@@ -193,12 +193,12 @@ $(document).ready(function () {
         e.preventDefault();
     });
 
-    $(".closedialog").on('click',function () {
+    $(".closedialog").on("click",function () {
         $("#dialog").dialog('close');
     });
 
     //dropbuttons
-    $("div.dropButton img.arrow").on('click',function () {
+    $("div.dropButton img.arrow").on("click",function () {
         submenu = $(this).parent().parent().find("div.submenu");
         if (submenu.css('display') == "block") {
             submenu.hide();
@@ -239,47 +239,47 @@ $(document).ready(function () {
         $(".tabbed1").tabs();
     }
 
-    $("#subjectinput").trigger("focus",function () {
+    $("#subjectinput").on("focus",function () {
         if (this.value == '(no subject)') {
             this.value = "";
         }
     })
-    $("#subjectinput").on('blur',function () {
+    $("#subjectinput").on("blur",function () {
         if (this.value == "") {
             this.value = "(no subject)";
             return;
         }
     });
-    $("#campaigntitleinput").trigger("focus",function () {
+    $("#campaigntitleinput").on("focus",function () {
         if (this.value == '(no title)') {
             this.value = "";
         }
     })
-    $("#campaigntitleinput").on('blur',function () {
+    $("#campaigntitleinput").on("blur",function () {
         if (this.value == "") {
             this.value = "(no title)";
             return;
         }
     });
-    $("#remoteurlinput").trigger("focus",function () {
+    $("#remoteurlinput").on("focus",function () {
         if (this.value == 'e.g. https://www.phplist.com/testcampaign.html') {
             this.value = "";
         }
     })
-    $("#remoteurlinput").on('blur',function () {
+    $("#remoteurlinput").on("blur",function () {
         if (this.value == "") {
             this.value = "e.g. https://www.phplist.com/testcampaign.html";
             return;
         }
         $("#remoteurlstatus").html(busyImage);
         $("#remoteurlstatus").load("./?page=pageaction&action=checkurl&ajaxed=true&url=" + this.value);
     });
-    $("#filtertext").trigger("focus",function () {
+    $("#filtertext").on("focus",function () {
         if (this.value == ' --- filter --- ') {
             this.value = "";
         }
     })
-    $("#filtertext").on('blur',function () {
+    $("#filtertext").on("blur",function () {
         if (this.value == "") {
             this.value = " --- filter --- ";
             return;
@@ -298,7 +298,7 @@ $(document).ready(function () {
 
 
 
-    $("a.savechanges").on('click',function () {
+    $("a.savechanges").on("click",function () {
         if (changed) {
             document.sendmessageform.followupto.value = this.href;
             document.location.hash = ""
@@ -404,12 +404,12 @@ $(document).ready(function () {
     });
 });
 
-    $("#processexport").on('click',function () {
+    $("#processexport").on("click",function () {
         // for export, refresh underlying page, to get a new security token
         setTimeout("refreshExport()", 10000);
     })
 
-    $("#selectallcheckbox").on('click',function () {
+    $("#selectallcheckbox").on("click",function () {
         $(':checkbox').prop('checked', this.checked);
     })
 
@@ -422,14 +422,14 @@ $(document).ready(function () {
 //  $("#processqueueoutput").html('Processing queue, please wait<script type="text/javascript">alert(document.location)</script>');
     $("#spinner").html(busyImage);
 
-    $("#stopqueue").on('click', function () {
+    $("#stopqueue").on("click",function () {
         $("#processqueueoutput").html('Processing cancelled');
         $("#spinner").html('&nbsp;');
         $("#stopqueue").hide();
         $("#resumequeue").show();
     });
 
-    $(".updatepluginbutton").on('click',function () {
+    $(".updatepluginbutton").on("click",function () {
         if (!confirm("Are you sure you want to update this plugin? \nphpList does not currently check on compatibility of the update.\nThis will just fetch the latest version.\nPlease verify before upgrading.")) {
             return false;
         }