From 7794927a64218d67849f0738557b4a6a6bec345d Mon Sep 17 00:00:00 2001
From: ATM john <john.botella@atm-consulting.fr>
Date: Sun, 18 Apr 2021 20:12:24 +0200
Subject: [PATCH] New check update for modules

---
 htdocs/admin/modules.php                      | 33 ++++++-----
 htdocs/core/lib/functions.lib.php             | 17 +++++-
 htdocs/core/modules/DolibarrModules.class.php | 58 ++++++++++++++++++-
 htdocs/langs/en_US/admin.lang                 |  5 +-
 htdocs/langs/en_US/errors.lang                |  1 +
 htdocs/theme/eldy/btn.inc.php                 |  5 ++
 htdocs/theme/eldy/info-box.inc.php            |  8 ++-
 htdocs/theme/md/info-box.inc.php              |  4 +-
 8 files changed, 106 insertions(+), 25 deletions(-)

diff --git a/htdocs/admin/modules.php b/htdocs/admin/modules.php
index fbe1ae98619..8380756bee5 100644
--- a/htdocs/admin/modules.php
+++ b/htdocs/admin/modules.php
@@ -518,11 +518,13 @@ if ($mode == 'common' || $mode == 'commonkanban') {
 
 	print $deschelp;
 
-	$moreforfilter = '<div class="valignmiddle">';
+	$moreforfilter = '<div class="valignmiddle ">';
 
-	$moreforfilter .= '<div class="floatright right pagination"><ul><li>';
-	$moreforfilter .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=commonkanban'.$param, '', 1, array('morecss'=>'reposition'.($mode == 'common' ? '' : ' btnTitleSelected')));
-	$moreforfilter .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-list-alt imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.$param, '', 1, array('morecss'=>'reposition'.($mode == 'commonkanban' ? '' : ' btnTitleSelected')));
+	$moreforfilter .= '<div class="floatright right pagination --module-list"><ul><li>';
+	$moreforfilter .= dolGetButtonTitle($langs->trans('CheckForModuleUpdate'), $langs->trans('CheckForModuleUpdateHelp'), 'fa fa-check-double ', $_SERVER["PHP_SELF"].'?action=checklastversion&token='.newToken().'&mode='.$mode.$param, '', 1, array('morecss'=>'reposition'));
+	$moreforfilter .= '</li><li>'.dolGetButtonTitleSeparator();
+	$moreforfilter .= dolGetButtonTitle($langs->trans('ViewKanban'), '', 'fa fa-th-list imgforviewmode', $_SERVER["PHP_SELF"].'?mode=commonkanban'.$param, '', ($mode == 'commonkanban' ? 2 : 1), array('morecss'=>'reposition'));
+	$moreforfilter .= dolGetButtonTitle($langs->trans('ViewList'), '', 'fa fa-list-alt imgforviewmode', $_SERVER["PHP_SELF"].'?mode=common'.$param, '', ($mode == 'common' ? 2 : 1), array('morecss'=>'reposition'));
 	$moreforfilter .= '</li></ul></div>';
 
 	//$moreforfilter .= '<div class="floatright center marginrightonly hideonsmartphone" style="padding-top: 3px"><span class="paddingright">'.$moreinfo.'</span> '.$moreinfo2.'</div>';
@@ -583,7 +585,7 @@ if ($mode == 'common' || $mode == 'commonkanban') {
 	// Show list of modules
 	$oldfamily = '';
 	$linenum = 0;
-
+	$numOfModuleToUpdate = 0;
 	foreach ($orders as $key => $value) {
 		$linenum++;
 		$tab = explode('_', $value);
@@ -591,6 +593,8 @@ if ($mode == 'common' || $mode == 'commonkanban') {
 		$module_position = $tab[2];
 
 		$modName = $filename[$key];
+
+		/** @var DolibarrModules $objMod */
 		$objMod = $modules[$modName];
 
 		//print $objMod->name." - ".$key." - ".$objMod->version."<br>";
@@ -856,7 +860,7 @@ if ($mode == 'common' || $mode == 'commonkanban') {
 
 		if ($mode == 'commonkanban') {
 			// Output Kanban
-			print $objMod->getKanbanView($codeenabledisable, $codetoconfig);
+			print $objMod->getKanbanView($codeenabledisable, $codetoconfig, $action == 'checklastversion'?1:0);
 		} else {
 			print '<tr class="oddeven">'."\n";
 			if (!empty($conf->global->MAIN_MODULES_SHOW_LINENUMBERS)) {
@@ -894,15 +898,14 @@ if ($mode == 'common' || $mode == 'commonkanban') {
 			// Version
 			print '<td class="center nowrap" width="120px">';
 			print $versiontrans;
-			if (!empty($conf->global->CHECKLASTVERSION_EXTERNALMODULE)) {	// This is a bad practice to activate a synch external access during building of a page. 1 external module can hang the application.
-				require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
-				if (!empty($objMod->url_last_version)) {
-					$newversion = getURLContent($objMod->url_last_version, 'GET', '', 1, array(), array('http', 'https'), 0);	// Accept http or https links on external remote server only
-					if (isset($newversion['content'])) {
-						if (version_compare($newversion['content'], $versiontrans) > 0) {
-							print "&nbsp;<span class='butAction' title='".$langs->trans('LastStableVersion')."'>".$newversion['content']."</span>";
-						}
-					}
+			if (!empty($conf->global->CHECKLASTVERSION_EXTERNALMODULE) || $action == 'checklastversion') {	// This is a bad practice to activate a synch external access during building of a page. 1 external module can hang the application.
+				$checkRes = $objMod->checkForUpdate();
+				if ($checkRes > 0) {
+					setEventMessage($objMod->getName().' : '.$versiontrans.' -> '.$objMod->lastVersion);
+					print '&nbsp;<span class="badge badge-success" title="'.dol_escape_htmltag($langs->trans('LastStableVersion')).'">'.$objMod->lastVersion.'</span>';
+				}
+				elseif ($checkRes < 0) {
+					setEventMessage($objMod->getName().' '.$langs->trans('CheckVersionFail'), 'warnings');
 				}
 			}
 			print "</td>\n";
diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index ce3b89d7805..1b12dd75d4d 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -9710,6 +9710,16 @@ function dolGetButtonAction($label, $html = '', $actionType = 'default', $url =
 	return '<div class="inline-block divButAction"><'.$tag.' '.$compiledAttributes.'>'.$html.'</'.$tag.'></div>';
 }
 
+/**
+ * Add space between dolGetButtonTitle
+ *
+ * @return string html of title separator
+ */
+function dolGetButtonTitleSeparator($moreClass = "")
+{
+	return '<span class="button-title-separator '.$moreClass.'" ></span>';
+}
+
 /**
  * Function dolGetButtonTitle : this kind of buttons are used in title in list
  *
@@ -9718,7 +9728,7 @@ function dolGetButtonAction($label, $html = '', $actionType = 'default', $url =
  * @param string    $iconClass  class for icon element (Example: 'fa fa-file')
  * @param string    $url        the url for link
  * @param string    $id         attribute id of button
- * @param int       $status     0 no user rights, 1 active, -1 Feature Disabled, -2 disable Other reason use helpText as tooltip
+ * @param int       $status     0 no user rights, 1 active, 2 current action or selected, -1 Feature Disabled, -2 disable Other reason use helpText as tooltip
  * @param array     $params     various params for future : recommended rather than adding more function arguments
  * @return string               html button
  */
@@ -9753,7 +9763,10 @@ function dolGetButtonTitle($label, $helpText = '', $iconClass = 'fa fa-file', $u
 		$useclassfortooltip = 0;
 	}
 
-	if ($status <= 0) {
+	if ($status == 2) {
+		$attr['class'] .= ' btnTitleSelected';
+	}
+	elseif ($status <= 0) {
 		$attr['class'] .= ' refused';
 
 		$attr['href'] = '';
diff --git a/htdocs/core/modules/DolibarrModules.class.php b/htdocs/core/modules/DolibarrModules.class.php
index b92937cdada..44fc64e0fd8 100644
--- a/htdocs/core/modules/DolibarrModules.class.php
+++ b/htdocs/core/modules/DolibarrModules.class.php
@@ -192,6 +192,18 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 	 */
 	public $version;
 
+	/**
+	 * Module last version
+	 * @var string $lastVersion
+	 */
+	public $lastVersion = '';
+
+	/**
+	 * true indicate this module need update
+	 * @var bool $needUpdate
+	 */
+	public $needUpdate = false;
+
 	/**
 	 * @var string Module description (short text)
 	 *
@@ -2215,10 +2227,14 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 	 * @param	string	$codetoconfig			HTML code to go to config page
 	 * @return 	string							HTML code of Kanban view
 	 */
-	public function getKanbanView($codeenabledisable = '', $codetoconfig = '')
+	public function getKanbanView($codeenabledisable = '', $codetoconfig = '', $checkUpdate = false)
 	{
 		global $conf, $langs;
 
+		if ($this->isCoreOrExternalModule() == 'external' && $checkUpdate) {
+			$this->checkForUpdate();
+		}
+
 		// Define imginfo
 		$imginfo = "info";
 		if ($this->isCoreOrExternalModule() == 'external') {
@@ -2239,8 +2255,13 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 			$versiontrans .= 'warning';
 		}
 
+		$versiontrans .= ' --need-update classfortooltip';
 		print '
-    	<div class="box-flex-item info-box-module'.(empty($conf->global->$const_name) ? ' info-box-module-disabled' : '').($this->isCoreOrExternalModule() == 'external' ? ' info-box-module-external' : '').'">
+    	<div class="box-flex-item info-box-module'
+			.(empty($conf->global->$const_name) ? ' --disabled' : '')
+			.($this->isCoreOrExternalModule() == 'external' ? ' --external' : '')
+			.($this->needUpdate ? ' --need-update' : '')
+			.'">
 	    <div class="info-box info-box-sm info-box-module">
 	    <div class="info-box-icon'.(empty($conf->global->$const_name) ? '' : ' info-box-icon-module-enabled'.($versiontrans ? ' info-box-icon-module-warning' : '')).'">';
 
@@ -2258,7 +2279,13 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 		}
 
 		if ($this->isCoreOrExternalModule() == 'external' || preg_match('/development|experimental|deprecated/i', $version)) {
-			print '<span class="info-box-icon-version'.($versiontrans ? ' '.$versiontrans : '').'" title="'.$langs->trans("Version").' '.$this->getVersion(1).'">';
+
+			$versionTitle =  $langs->trans("Version").' '.$this->getVersion(1);
+			if ($this->needUpdate){
+				$versionTitle.= '<br/>'.$langs->trans('ModuleUpdateAvailable').' : '.$this->lastVersion;
+			}
+
+			print '<span class="info-box-icon-version'.($versiontrans ? ' '.$versiontrans : '').'" title="'.dol_escape_js($versionTitle).'" >';
 			print $this->getVersion(1);
 			print '</span>';
 		}
@@ -2287,4 +2314,29 @@ class DolibarrModules // Can not be abstract, because we need to instantiate it
 	    </div><!-- /.info-box -->
 	    </div>';
 	}
+
+	/**
+	 * check for module update
+	 * @return int <0 if Error, 0 == no update needed,  >0 if need update
+	 */
+	function checkForUpdate(){
+		require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
+		if (!empty($this->url_last_version)) {
+			$lastVersion = getURLContent($this->url_last_version, 'GET', '', 1, array(), array('http', 'https'), 0);	// Accept http or https links on external remote server only
+			if (isset($lastVersion['content'])) {
+				$this->lastVersion = $lastVersion['content'];
+				if (version_compare($lastVersion['content'], $this->version) > 0) {
+					$this->needUpdate = true;
+					return 1;
+				}else{
+					$this->needUpdate = false;
+					return 0;
+				}
+			}
+			else{
+				return -1;
+			}
+		}
+		return 0;
+	}
 }
diff --git a/htdocs/langs/en_US/admin.lang b/htdocs/langs/en_US/admin.lang
index b103d0082ba..7f37655012c 100644
--- a/htdocs/langs/en_US/admin.lang
+++ b/htdocs/langs/en_US/admin.lang
@@ -2121,4 +2121,7 @@ YouShouldDisablePHPFunctions=You should disable PHP functions
 IfCLINotRequiredYouShouldDisablePHPFunctions=Except if you need to run system commands (for the module Scheduled job, or to run the external command line Anti-virus for example), you shoud disable PHP functions
 NoWritableFilesFoundIntoRootDir=No writable files or directories of the common programs were found into your root directory (Good)
 RecommendedValueIs=Recommended: %s
-ARestrictedPath=A restricted path
\ No newline at end of file
+ARestrictedPath=A restricted path
+CheckForModuleUpdate=Check for modules updates
+CheckForModuleUpdateHelp=Check for modules updates.<br/>This action will connect to modules editors to check if a new version is available.
+ModuleUpdateAvailable=An update is available for this module
diff --git a/htdocs/langs/en_US/errors.lang b/htdocs/langs/en_US/errors.lang
index 002aa63fa62..89aa9b77662 100644
--- a/htdocs/langs/en_US/errors.lang
+++ b/htdocs/langs/en_US/errors.lang
@@ -296,3 +296,4 @@ WarningAvailableOnlyForHTTPSServers=Available only if using HTTPS secured connec
 WarningModuleXDisabledSoYouMayMissEventHere=Module %s has not been enabled. So you may miss a lot of event here.
 ErrorActionCommPropertyUserowneridNotDefined=User's owner is required
 ErrorActionCommBadType=Selected event type (id: %n, code: %s) do not exist in Event Type dictionary
+CheckVersionFail=Version check fail
diff --git a/htdocs/theme/eldy/btn.inc.php b/htdocs/theme/eldy/btn.inc.php
index 3e3ab1d3b01..92715b774ce 100644
--- a/htdocs/theme/eldy/btn.inc.php
+++ b/htdocs/theme/eldy/btn.inc.php
@@ -279,6 +279,11 @@ div.pagination li:first-child a.btnTitle{
 	margin-left: 10px;
 }
 
+.button-title-separator{
+	display: inline-block;
+	clear: both;
+	width: 20px;
+}
 
 .imgforviewmode {
 	color: #aaa;
diff --git a/htdocs/theme/eldy/info-box.inc.php b/htdocs/theme/eldy/info-box.inc.php
index 3eda0c40ee7..dc2dbb3f4d3 100644
--- a/htdocs/theme/eldy/info-box.inc.php
+++ b/htdocs/theme/eldy/info-box.inc.php
@@ -9,10 +9,14 @@ if (!defined('ISLOADEDBYSTEELSHEET')) {
  * -------------------
  */
 
-.info-box-module-external span.info-box-icon-version {
+.info-box-module.--external span.info-box-icon-version {
 	background: #bbb;
 }
 
+.info-box-module.--external.--need-update span.info-box-icon-version{
+	background: #bc9525;
+}
+
 .info-box {
 	display: block;
 	position: relative;
@@ -153,7 +157,7 @@ a.info-box-text-a i.fa.fa-exclamation-triangle {
 	-webkit-transition: opacity 0.5s, visibility 0s 0.5s;
 	transition: opacity 0.5s, visibility 0s 0.5s;
 }
-.box-flex-item.info-box-module.info-box-module-disabled {
+.box-flex-item.info-box-module.--disabled {
 	/* opacity: 0.6; */
 }
 
diff --git a/htdocs/theme/md/info-box.inc.php b/htdocs/theme/md/info-box.inc.php
index 0946315391a..a363475c409 100644
--- a/htdocs/theme/md/info-box.inc.php
+++ b/htdocs/theme/md/info-box.inc.php
@@ -119,7 +119,7 @@ if (GETPOSTISSET('THEME_SATURATE_RATIO')) {
 }
 
 
-.info-box-module-external span.info-box-icon-version {
+.info-box-module.--external span.info-box-icon-version {
 	background: #bbb;
 }
 
@@ -250,7 +250,7 @@ a.info-box-text-a i.fa.fa-exclamation-triangle {
 	transition: opacity 0.5s, visibility 0s 0.5s;
 }
 
-.box-flex-item.info-box-module.info-box-module-disabled {
+.box-flex-item.info-box-module.--disabled {
 	/* opacity: 0.6; */
 }