Increased curl timeout to avoid server timeout for update check and themes/plugins marketplace listing and display error message instead of exception on connect error

Author: givanz

admin/component/news.php

@@ -22,32 +22,31 @@
 
 namespace Vvveb\Component;
 
+use function Vvveb\getUrl;
 use Vvveb\System\Cache;
 use Vvveb\System\Component\ComponentBase;
 use Vvveb\System\Event;
 use Vvveb\System\Import\Rss;
-use function Vvveb\getUrl;
 
 class News extends ComponentBase {
 	protected $domain = 'https://blog.vvveb.com';
 
 	protected $url = '/feed/news';
 
 	public static $defaultOptions = [
-		'start' => 0,
+		'page'  => 0,
 		'limit' => 10,
 	];
 
 	public $options = [];
 
 	function getNews() {
-
-		$feed = getUrl($this->domain . $this->url, true, 604800, 1, false);
+		$feed = getUrl($this->domain . $this->url, true, 604800, 3, false);
 
 		if ($feed) {
 			$rss = new Rss($feed);
 
-			$result = $rss->get(1, $this->options['limit']);
+			$result = $rss->get($this->options['page'], $this->options['limit']);
 
 			return $result;
 		}
@@ -68,7 +67,7 @@ function results() {
 			'domain' => $this->domain,
 			'url'    => $this->url,
 			'news'   => $news,
-			'count'  => $this->options['limit'],
+			'count'  => count($news),
 		];
 
 		list($results) = Event::trigger(__CLASS__, __FUNCTION__, $results);

admin/controller/content/edit.php

@@ -226,6 +226,8 @@ function index() {
 		$template        = isset($post['template']) && $post['template'] ? $post['template'] : $defaultTemplate;
 		$themeFolder     = $this->getThemeFolder();
 
+		$design_url = '';
+
 		if (isset($post['url'])) {
 			$design_url         = \Vvveb\url(['module' => 'editor/editor', 'url' => $post['url'], 'template' => $template, 'host' => $this->global['site_url'] . $admin_path], false, false);
 			$post['design_url'] = $design_url;

admin/controller/plugin/market.php

@@ -107,8 +107,12 @@ function index() {
 			foreach ($plugins['plugins'] as &$plugin) {
 				$plugin['installed']  = isset($installed[$plugin['slug']]);
 			}
-		} catch (\ErrorException $e) {
-			$view->errors[] =  $e->getMessage();
+		} catch (\Exception $e) {
+			$view->warning[] =  __('Failed to connect to marketplace');
+
+			if (DEBUG) {
+				$view->errors[] =  $e->getMessage();
+			}
 		}
 
 		$admin_path       = \Vvveb\adminPath();

admin/controller/theme/market.php

@@ -100,8 +100,12 @@ function index() {
 			foreach ($themes['themes'] as &$theme) {
 				$theme['installed']  = isset($installed[$theme['slug']]);
 			}
-		} catch (\ErrorException $e) {
-			$view->errors[] =  $e->getMessage();
+		} catch (\Exception $e) {
+			$view->warning[] =  __('Failed to connect to marketplace');
+
+			if (DEBUG) {
+				$view->errors[] =  $e->getMessage();
+			}
 		}
 
 		$view->set($themes);

admin/controller/tools/update.php

@@ -164,12 +164,13 @@ function checkPermissions() {
 			$this->view->info[] = __('Permissions ok!');
 		} else {
 			$this->view->errors[] = sprintf(__('%s not writable!'), $result);
+
 			return false;
 		}
 
 		return $result;
-	}	
-	
+	}
+
 	function backup() {
 		$result = false;
 
@@ -355,35 +356,15 @@ function update() {
 	function index() {
 		$updateInfo = $this->checkUpdates();
 
+		if (isset($updateInfo['error']) && $updateInfo['error']) {
+			$this->view->errors[] = $updateInfo['error'];
+		}
+
 		$info = [
 			'core' => [
 				'current'   => V_VERSION,
 				'latest'    => $updateInfo['version'] ?? '',
-				'hasUpdate' => $updateInfo['hasUpdate'],
-			],
-			'themes' => [
-				[
-					'mytheme' => [
-						'current'               => V_VERSION,
-						'latest'                => V_VERSION,
-					],
-					'mytheme2' => [
-						'current'               => V_VERSION,
-						'latest'                => V_VERSION,
-					],
-				],
-			],
-			'plugins' => [
-				[
-					'myplugin' => [
-						'current'               => V_VERSION,
-						'latest'                => V_VERSION,
-					],
-					'myplugin2' => [
-						'current'               => V_VERSION,
-						'latest'                => V_VERSION,
-					],
-				],
+				'hasUpdate' => $updateInfo['hasUpdate'] ?? false,
 			],
 		];
 

system/functions.php

@@ -1496,7 +1496,7 @@ function download($url) {
 	return $result;
 }
 
-function getUrl($url, $cache = true, $expire = 604800, $timeout = 1, $exception = true) {
+function getUrl($url, $cache = true, $expire = 604800, $timeout = 5, $exception = true) {
 	$cacheDriver  = System\Cache :: getInstance();
 	$cacheKey     = md5($url);
 	$result       = false;

system/update.php

@@ -45,13 +45,19 @@ function checkUpdates($type = 'core', $force = false) {
 			$cacheDriver->delete('url', $cacheKey);
 		}
 
+		$error  = '';
+		$result = false;
 		//cache results for one week
 		try {
-			$result = getUrl($this->url, true, 604800, 1, false);
+			$result = getUrl($this->url, true);
 		} catch (\Exception $e) {
-			$result = '{}';
+			if (DEBUG) {
+				$error =  $e->getMessage();
+			}
 		}
 
+		$info = ['hasUpdate' => false];
+
 		if ($result) {
 			$info = json_decode($result, true);
 
@@ -62,7 +68,11 @@ function checkUpdates($type = 'core', $force = false) {
 			return $info;
 		}
 
-		return [];
+		if ($error) {
+			$info['error'] = $error;
+		}
+
+		return $info;
 	}
 
 	private function checkFolderPermissions($dir) {