Merge pull request #525 from phpList/notification-logic

Improve notification logic

Author: Sam Tuke

public_html/lists/admin/index.php

@@ -521,23 +521,15 @@ function mb_strtolower($string)
         echo Info($GLOBALS['I18N']->get('Running in testmode, no emails will be sent. Check your config file.'));
     }
 
-    if (!strpos(VERSION, 'dev')){
+    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";
-
-            }
+        if (showUpdateNotification() && (getCurrentphpListVersion() !== false) && extension_loaded('curl')) {
 
+            $updateNotif = checkForUpdate('init.php');
             $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) {

public_html/lists/admin/updateLib.php

@@ -3,8 +3,7 @@
  * Get Current phpList Version.
  *
  * @param string $path Production version location
- * @return mixed
- * @throws Exception
+ * @return string|bool
  */
 function getCurrentphpListVersion($path = '')
 {
@@ -13,11 +12,10 @@ function getCurrentphpListVersion($path = '')
     preg_match_all('/define\(\"VERSION\",\"(.*)\"\);/', $version, $matches);
 
     if (isset($matches[1][0])) {
-
         return $matches[1][0];
+    } else {
+        return false;
     }
-
-    throw new Exception(s('No production version found.'));
 }
 
 /**