Dolibarr / dolibarr

htdocs/admin/remotestore/class/externalModules.class.php

Spacing +29 added lines, -29 removed lines

@@ -149,9 +149,9 @@ 
 		$this->url       = DOL_URL_ROOT.'/admin/modules.php?mode=marketplace';
 
 		// For dolistore modules
-		$this->dolistore_api_url = getDolGlobalString('MAIN_MODULE_DOLISTORE_API_SRV', 'https://www.dolistore.com/api/');	// 'https://www.dolistore.com/api/', 'https://admin2.dolibarr.org/api/index.php/marketplace/'
+		$this->dolistore_api_url = getDolGlobalString('MAIN_MODULE_DOLISTORE_API_SRV', 'https://www.dolistore.com/api/'); // 'https://www.dolistore.com/api/', 'https://admin2.dolibarr.org/api/index.php/marketplace/'
 		$this->dolistore_api_key = getDolGlobalString('MAIN_MODULE_DOLISTORE_API_KEY', 'dolistorepublicapi');
-		$this->shop_url  = getDolGlobalString('MAIN_MODULE_DOLISTORE_SHOP_URL', 'https://www.dolistore.com');
+		$this->shop_url = getDolGlobalString('MAIN_MODULE_DOLISTORE_SHOP_URL', 'https://www.dolistore.com');
 
 		// For community modules
 		$this->file_source_url = "https://raw.githubusercontent.com/Dolibarr/dolibarr-community-modules/refs/heads/main/index.yaml";
@@ -215,12 +215,12 @@ 
 			$httpheader[] = 'Authorization: Basic '.base64_encode($basicAuthLogin.':'.$basicAuthPassword);
 		}
 
-		$url = $this->dolistore_api_url . (preg_match('/\/$/', $this->dolistore_api_url) ? '' : '/') . $resource;
+		$url = $this->dolistore_api_url.(preg_match('/\/$/', $this->dolistore_api_url) ? '' : '/').$resource;
 
 		$options['apikey'] = $this->dolistore_api_key;
 
 		if ($options) {
-			$url .= '?' . http_build_query($options);
+			$url .= '?'.http_build_query($options);
 		}
 
 		$response = getURLContent($url, 'GET', '', 1, $httpheader, array('https'), 0, -1, 5, 5);
@@ -262,13 +262,13 @@ 
 		$modules = array();
 
 		if (!empty($this->cache_file) && file_exists($this->cache_file)) {
-			dol_syslog(__METHOD__ . " - Loading cache file: " . $this->cache_file, LOG_DEBUG);
+			dol_syslog(__METHOD__." - Loading cache file: ".$this->cache_file, LOG_DEBUG);
 
 			$content = file_get_contents($this->cache_file);
 			if ($content !== false) {
 				$modules = $this->readYaml($content);
 			} else {
-				dol_syslog(__METHOD__ . " - Error reading cache file", LOG_ERR);
+				dol_syslog(__METHOD__." - Error reading cache file", LOG_ERR);
 			}
 		}
 
@@ -296,20 +296,20 @@ 
 		if (isset($resCategories['response']) && is_array($resCategories['response'])) {
 			$organized_tree = $resCategories['response'];
 		} else {
-			return $html ;
+			return $html;
 		}
 
 		$html = '';
 		foreach ($organized_tree as $key => $value) {
 			if ($value['label'] != "Versions" && $value['label'] != "Specials") {
-				$html .= '<li' . ($current == $value['rowid'] ? ' class="active"' : '') . '>';
-				$html .= '<a href="?mode=marketplace&categorie=' . $value['rowid'] . '">' . $value['label'] . '</a>';
+				$html .= '<li'.($current == $value['rowid'] ? ' class="active"' : '').'>';
+				$html .= '<a href="?mode=marketplace&categorie='.$value['rowid'].'">'.$value['label'].'</a>';
 				if (isset($value['children'])) {
 					$html .= '<ul>';
 					usort($value['children'], $this->buildSorter('position'));
 					foreach ($value['children'] as $key_children => $value_children) {
-						$html .= '<li' . ($current == $value_children['rowid'] ? ' class="active"' : '') . '>';
-						$html .= '<a href="?mode=marketplace&categorie=' . $value_children['rowid'] . '" title="' . dol_escape_htmltag(strip_tags($value_children['description'])) . '">' . $value_children['label'] . '</a>';
+						$html .= '<li'.($current == $value_children['rowid'] ? ' class="active"' : '').'>';
+						$html .= '<a href="?mode=marketplace&categorie='.$value_children['rowid'].'" title="'.dol_escape_htmltag(strip_tags($value_children['description'])).'">'.$value_children['label'].'</a>';
 						$html .= '</li>';
 					}
 					$html .= '</ul>';
@@ -334,7 +334,7 @@ 
 
 		$html       = "";
 		$last_month = dol_now() - (30 * 24 * 60 * 60);
-		$dolibarrversiontouse = DOL_VERSION;	// full string with version
+		$dolibarrversiontouse = DOL_VERSION; // full string with version
 
 		$this->products = array();
 
@@ -343,7 +343,7 @@ 
 		$this->no_page  = $options['no_page'] ?? 1;
 		$this->search    = $options['search'] ?? '';
 
-		$this->per_page = 11;	// We fix number of products per page to 11
+		$this->per_page = 11; // We fix number of products per page to 11
 
 		// Length of $search must be at least 2 characters
 		if (!empty($this->search) && strlen(str_replace(' ', '', (string) $this->search)) < 2) {
@@ -404,7 +404,7 @@ 
 		$fileProducts = array();
 		$fileProductsTotal = 0;
 		if (!empty($this->githubFileStatus) && getDolGlobalInt('MAIN_ENABLE_EXTERNALMODULES_COMMUNITY')) {
-			$fileProducts = $this->fetchModulesFromFile($data);			// Return an array with all modules from the cache filecontent in $data
+			$fileProducts = $this->fetchModulesFromFile($data); // Return an array with all modules from the cache filecontent in $data
 
 			$fileProducts = $this->adaptData($fileProducts, 'githubcommunity');
 
@@ -495,7 +495,7 @@ 
 					$download_link .= img_picto('', 'file-code', 'class="size2x paddingright colorgrey"');
 					$download_link .= '</a>';
 
-					$urlview = $product["dolistore-download"];		// In a future, we will have the download to the zip file
+					$urlview = $product["dolistore-download"]; // In a future, we will have the download to the zip file
 					if ($urlview) {
 						$download_link .= '<a class="paddingleft paddingright" target="_blank" title="'.$langs->trans("View").'" href="'.$urlview.'" rel="noopener noreferrer">';
 						$download_link .= img_picto('', 'url', 'class="size2x"');
@@ -514,7 +514,7 @@ 
 					}
 				} elseif ($product['source'] === 'dolistore') {
 					$urlview = $this->shop_url.'/product.php?id='.((int) $product["id"]);
-					$urldownload = 'https://www.dolistore.com/_service_download.php?t=free&p=' . $product['id'];
+					$urldownload = 'https://www.dolistore.com/_service_download.php?t=free&p='.$product['id'];
 					$download_link = '<a class="paddingleft paddingright" target="_blank" title="'.$langs->trans("View").'" href="'.$urlview.'">';
 					$download_link .= img_picto('', 'url', 'class="size2x"');
 					$download_link .= '</a>';
@@ -578,7 +578,7 @@ 
 
 			// Logo
 			$html .= '<td class="center width150"><div class="newAppParent">';
-			$html .= $newapp.$images;	// No dol_escape_htmltag, it is already escape html
+			$html .= $newapp.$images; // No dol_escape_htmltag, it is already escape html
 			$html .= '</div></td>';
 
 			// Description
@@ -594,7 +594,7 @@ 
 				$html .= '</small>';
 			}
 			$html .= '<br><small>';
-			$html .= $version;			// Version Dolibarr. No dol_escape_htmltag, it is already escape html
+			$html .= $version; // Version Dolibarr. No dol_escape_htmltag, it is already escape html
 			$html .= '</small>';
 			$html .= '</h2>';
 
@@ -671,7 +671,7 @@ 
 		 * @param array<string, mixed> $b
 		 * @return int
 		 */
-		function (array $a, array $b) use ($key) {
+		function(array $a, array $b) use ($key) {
 			$valA = isset($a[$key]) && is_scalar($a[$key]) ? (string) $a[$key] : '';
 			$valB = isset($b[$key]) && is_scalar($b[$key]) ? (string) $b[$key] : '';
 
@@ -832,7 +832,7 @@ 
 				$pagelist .= '<li class="pagination">';
 				$pagelist .= '<label for="page_input">Page </label>';
 				if ($this->categorie != 0) {
-					$pagelist .= '<input type="hidden" name="categorie" value="' . $this->categorie . '">';
+					$pagelist .= '<input type="hidden" name="categorie" value="'.$this->categorie.'">';
 				}
 				$pagelist .= '<input type="text" id="page_input" name="no_page" value="'.($page).'" min="1" max="'.$nbpages.'" class="width40 page_input right" oninput="if(this.value > '.$nbpages.') this.value='.$nbpages.'">';
 				$pagelist .= ' / '.$nbpages;
@@ -882,17 +882,17 @@ 
 		}
 
 		// Get the predefined error message or use a default one
-		$error_message = $error_messages[$request['status_code']] ?? 'Unexpected HTTP status: ' . $request['status_code'];
+		$error_message = $error_messages[$request['status_code']] ?? 'Unexpected HTTP status: '.$request['status_code'];
 
 		// Append error details if available
 		if (!empty($request['response']) && isset($request['response']['errors']) && is_array($request['response']['errors'])) {
 			foreach ($request['response']['errors'] as $error) {
-				$error_message .= ' - (Code ' . $error['code'] . '): ' . $error['message'];
+				$error_message .= ' - (Code '.$error['code'].'): '.$error['message'];
 			}
 		}
 
 		if (!empty($request['curl_error_msg'])) {
-			$error_message .= ' - ' . $request['curl_error_msg'];
+			$error_message .= ' - '.$request['curl_error_msg'];
 		}
 
 		// Return the formatted error message
@@ -920,12 +920,12 @@ 
 		if (!file_exists($cache_file) || filemtime($cache_file) < (dol_now() - $cache_time)) {
 			// We get remote url
 			$addheaders = array();
-			$result = getURLContent($file_source_url, 'GET', '', 1, $addheaders);	// TODO Force timeout to 5 s on both connect and response.
+			$result = getURLContent($file_source_url, 'GET', '', 1, $addheaders); // TODO Force timeout to 5 s on both connect and response.
 			if (!empty($result) && $result['http_code'] == 200) {
 				$yaml = $result['content'];
 				$result = file_put_contents($cache_file, $yaml);
 				if ($result === false) {
-					$this->error = 'Failed to create cache file: ' . $cache_file;
+					$this->error = 'Failed to create cache file: '.$cache_file;
 				}
 			}
 		} else {
@@ -1037,7 +1037,7 @@ 
 
 				$adaptedPackage = [
 					'id' => $id,
-					'ref' => str_replace(' ', '', $package['modulename'] . '-' . $package['current_version'] . '@' .
+					'ref' => str_replace(' ', '', $package['modulename'].'-'.$package['current_version'].'@'.
 						(array_key_exists('author', $package) ? $package['author'] : 'unkownauthor')),
 					'label' => !empty($package['label'][substr($this->lang, 0, 2)])
 						? $package['label'][substr($this->lang, 0, 2)]
@@ -1153,7 +1153,7 @@ 
 			 *
 			 * @return int
 			 */
-			static function ($a, $b) {
+			static function($a, $b) {
 				return strtotime($b['datec'] ?? '0') - strtotime($a['datec'] ?? '0');
 			}
 		);
@@ -1168,7 +1168,7 @@ 
 				 *
 				 * @return bool
 				 */
-				static function ($package) use ($options) {
+				static function($package) use ($options) {
 					return stripos($package['label'], $options['search']) !== false || stripos($package['description'], $options['search']) !== false;
 				}
 			);
@@ -1184,7 +1184,7 @@ 
 				 *
 				 * @return bool
 				 */
-				static function ($package) use ($options) {
+				static function($package) use ($options) {
 					return in_array($options['categorieid'], $package['category']);
 				}
 			);

htdocs/user/class/api_users.class.php

Braces +3 added lines, -2 removed lines

@@ -347,8 +347,9 @@
 		}
 
 		// check mandatory fields
-		if (!isset($request_data["login"]))
-			throw new RestException(500, "login field missing");
+		if (!isset($request_data["login"])) {
+					throw new RestException(500, "login field missing");
+		}
 		/*if (!isset($request_data["password"]))
 			throw new RestException(400, "password field missing");
 		if (!isset($request_data["lastname"]))