 | ';
+ print ' | ';
print ''.$langs->trans("DoliStoreDesc").' | '; - print ''.$url.' | '; - print '' . $remotestore->libStatut($remotestore->dolistoreApiStatus).' | '; + print ''.img_picto('', 'url', 'class="pictofixedwidth"').''.$url.' | '; + print '';
+ if (!getDolGlobalString('MAIN_DISABLE_DOLISTORE_SEARCH') && getDolGlobalInt('MAIN_ENABLE_DOLISTORE')) {
+ $messagetoadd = '';
+ if ($remotestore->dolistoreApiStatus <= 0) {
+ $messagetoadd = ' '.$remotestore->dolistoreApiError.' Failed to login to: '.$remotestore->dolistore_api_url; + $messagetoadd .= ' using API public key: '.$remotestore->dolistore_api_key; + // Add basic auth if needed + $basicAuthLogin = getDolGlobalString('MAIN_MODULE_DOLISTORE_BASIC_LOGIN'); + $basicAuthPassword = getDolGlobalString('MAIN_MODULE_DOLISTORE_BASIC_PASSWORD'); + if ($basicAuthLogin) { + $messagetoadd .= ' using basic auth login: base64('.$basicAuthLogin.':'.$basicAuthPassword.')'; + } + } + print $remotestore->libStatus($remotestore->dolistoreApiStatus, 2, $messagetoadd); + } + print ' | ';
print '
 | ';
+ print ' | ';
print ''.$langs->trans("CommunityModulesDesc").' | '; - print ''.$url.' | '; - print '' . $remotestore->libStatut($remotestore->githubFileStatus) . ' | '; + print ''.img_picto('', 'url', 'class="pictofixedwidth"').''.$url.' | '; + print '';
+ if (!getDolGlobalString('MAIN_DISABLE_DOLISTORE_SEARCH') && getDolGlobalInt('MAIN_ENABLE_COMMUNITY_REPO')) {
+ print $remotestore->libStatus($remotestore->githubFileStatus, 2, ' Content of repository file '.$remotestore->file_source_url.' is in the cache file '.$remotestore->cache_file.''); + } + print ' | ';
print '
'.$langs->trans('Free').'
'; - if ($product['source'] === 'Dolistore') { - $download_link = '
';
- $download_link .= '
';
- }
- if ($product['source'] === 'Github') {
+ if ($product['source'] === 'githubcommunity') {
$download_link = '';
- $download_link .= '';
+ if (!empty($product['direct-download']) && $product['direct-download'] == 'yes') {
+ $urldownload = $product["dolistore-download"]; // In a future, we will have the download to the zip file
+ $reg = array();
+ if (preg_match('/https:.*\?id=(\d+)$/', $urldownload, $reg)) {
+ $urldownload = 'https://www.dolistore.com/_service_download.php?t=free&p='.$reg[1];
+ }
+ $download_link .= '';
+ }
+ }
+
+ if ($product['source'] === 'dolistore') {
+ $download_link = '';
+ if (!empty($product['direct-download']) && $product['direct-download'] == 'yes') {
+ $download_link .= '';
+ }
}
}
@@ -428,7 +427,15 @@ static function ($a, $b) {
$html .= ''; $html .= $version; // No dol_escape_htmltag, it is already escape html $html .= ''; - $html .= ' '.dol_print_date(dol_stringtotime($product['tms']), 'day').' - '.$langs->trans('Ref').': '.dol_escape_htmltag($product["ref"]).' - '.dol_escape_htmltag($langs->trans('Id')).': '.((int) $product["id"]).'
'; + $html .= ' '; + if (empty($product['tms'])) { + $html .= ''.$langs->trans("DateCreation").': '.$langs->trans("Unknown").''; + } else { + $html .= dol_print_date(dol_stringtotime($product['tms']), 'day'); + } + $html .= ' - '.$langs->trans('Ref').' '.dol_escape_htmltag($product["ref"]); + //$html .= ' - '.dol_escape_htmltag($langs->trans('Id')).': '.((int) $product["id"]); + $html .= '
'; $html .= ''.$langs->trans('Source').': '.$product["source"].'
'; $html .= '
'.dol_escape_htmltag(dol_string_nohtmltag($product["description"])); $html .= ''; @@ -632,11 +639,11 @@ protected function checkStatusCode($request) } /** - * get YAML file from remote source and put it in cache file for one day - * @param string $file_source_url URL of the remote source - * @param int $cache_time Cache time + * Get YAML file from remote source and put it into the cache file * - * @return string Uri of the cache file + * @param string $file_source_url URL of the remote source + * @param int $cache_time Cache time + * @return string Uri of the cache file */ public function getRemoteYamlFile($file_source_url, $cache_time) { @@ -649,13 +656,17 @@ public function getRemoteYamlFile($file_source_url, $cache_time) } if (!file_exists($cache_file) || filemtime($cache_file) < (dol_now() - $cache_time)) { - $yaml = file_get_contents($file_source_url); - if (!empty($yaml)) { + // We get remote url + $result = getURLContent($file_source_url); + if (!empty($result) && $result['http_code'] == 200) { + $yaml = $result['content']; file_put_contents($cache_file, $yaml); } + } else { + $yaml = file_get_contents($cache_file); } - return $cache_file; + return $yaml; } @@ -680,6 +691,7 @@ public function readYaml($yaml) } // Match a new package entry (e.g., "- modulename: 'helloasso'") + $matches = array(); if (preg_match('/^\s*-\s*modulename:\s*["\']?(.*?)["\']?$/', $trimmedLine, $matches)) { if ($currentPackage !== null) { $data[] = $currentPackage; @@ -740,7 +752,7 @@ public function adaptData($data, $source) return $adaptedData; } - if ($source === 'github') { + if ($source === 'githubcommunity') { foreach ($data as $package) { if (empty($package['modulename'])) { continue; @@ -766,6 +778,12 @@ public function adaptData($data, $source) 'dolibarr_max' => !empty($package['dolibarrmax']) ? $package['dolibarrmax'] : 'unknown', + 'phpmin' => !empty($package['phpmin']) + ? $package['phpmin'] + : 'unknown', + 'phpmax' => !empty($package['phpmax']) + ? $package['phpmax'] + : 'unknown', 'module_version' => !empty($package['current_version']) ? $package['current_version'] : 'unknown', @@ -778,7 +796,13 @@ public function adaptData($data, $source) 'link' => !empty($package['git']) ? $package['git'] : '#', - 'source' => 'Github' + 'source' => 'githubcommunity', + 'direct-download' => !empty($package['direct-download']) + ? $package['direct-download'] + : '', + 'dolistore-download' => !empty($package['dolistore-download']) + ? $package['dolistore-download'] + : '', ]; $adaptedData[] = $adaptedPackage; @@ -797,9 +821,11 @@ public function adaptData($data, $source) 'price_ttc' => $package['price_ttc'], 'dolibarr_min' => $package['dolibarr_min'], 'dolibarr_max' => $package['dolibarr_max'], + 'phpmin' => $package['phpmin'], + 'phpmax' => $package['phpmax'], 'module_version' => $package['module_version'], 'cover_photo_url' => $urldolibarrmodules.$package['cover_photo_url'], - 'source' => 'Dolistore' + 'source' => 'dolistore' ]; $adaptedData[] = $adaptedPackage; @@ -881,7 +907,6 @@ static function ($package) use ($options) { */ public function checkApiStatus() { - $testRequest = $this->callApi('categories'); if (!isset($testRequest['response']) || !is_array($testRequest['response']) || ($testRequest['status_code'] != 200 && $testRequest['status_code'] != 201)) { @@ -894,28 +919,29 @@ public function checkApiStatus() /** * Retrieve the status icon - * @param mixed $status Status - * @param mixed $mode Mode * - * @return string + * @param mixed $status Status + * @param mixed $mode Mode + * @param string $moretext More text to show on tooltip + * @return string */ - public function libStatut($status, $mode = 3) + public function libStatus($status, $mode = 3, $moretext = '') { global $langs; $statusType = 'status4'; if ($status == 0) { - $statusType = 'status6'; + $statusType = 'status8'; } $labelStatus = []; $labelStatusShort = []; - $labelStatus[0] = $this->dolistoreApiError; + $labelStatus[0] = $langs->transnoentitiesnoconv("offline"); $labelStatus[1] = $langs->transnoentitiesnoconv("online"); - $labelStatusShort[0] = $this->dolistoreApiError; + $labelStatusShort[0] = $langs->transnoentitiesnoconv("offline"); $labelStatusShort[1] = $langs->transnoentitiesnoconv("online"); - return dolGetStatus($labelStatus[$status], $labelStatusShort[$status], '', $statusType, $mode); + return dolGetStatus($labelStatus[$status], $labelStatusShort[$status], '', $statusType, $mode, '', array('badgeParams' => array('attr' => array('class' => 'classfortooltip', 'title' => $labelStatusShort[$status].$moretext)))); } } diff --git a/htdocs/theme/dolibarr_logo.svg b/htdocs/theme/dolibarr_logo.svg index 9c9259d0b3305..72795dfbbe7fd 100644 --- a/htdocs/theme/dolibarr_logo.svg +++ b/htdocs/theme/dolibarr_logo.svg @@ -2,39 +2,49 @@ + id="layer1" + transform="translate(-11.600433,-16.785229)">