Dolibarr / dolibarr

htdocs/delivery/card.php

Spacing +9 added lines, -9 removed lines

@@ -118,10 +118,10 @@ 
  */
 
 $parameters = array();
-$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action);       // Note that $action and $object may have been modified by some hooks
+$reshook = $hookmanager->executeHooks('doActions', $parameters, $object, $action); // Note that $action and $object may have been modified by some hooks
 // Delete Link
 $permissiondellink = $user->hasRight('expedition', 'delivery', 'supprimer'); // Used by the include of actions_dellink.inc.php
-include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php';     // Must be 'include', not 'include_once'
+include DOL_DOCUMENT_ROOT.'/core/actions_dellink.inc.php'; // Must be 'include', not 'include_once'
 
 if ($action == 'add' && $permissiontoadd) {
 	$array_options = array();
@@ -129,7 +129,7 @@ 
 
 	$object->date_delivery = dol_now();
 	$object->note_private  = GETPOST("note", 'restricthtml');
-	$object->note          = $object->note_private;	// deprecated
+	$object->note          = $object->note_private; // deprecated
 	$object->commande_id   = GETPOSTINT("commande_id");
 	$object->fk_incoterms  = GETPOSTINT('incoterm_id');
 	// $object->entrepot_id = GETPOST('entrepot_id', 'int');	entrepot_id does not exists on delivery note, only on shipment document
@@ -218,7 +218,7 @@ 
 
 // Update extrafields
 if ($action == 'update_extras' && $permissiontoeditextra) {
-	$object->oldcopy = dol_clone($object, 2);  // @phan-suppress-current-line PhanTypeMismatchProperty
+	$object->oldcopy = dol_clone($object, 2); // @phan-suppress-current-line PhanTypeMismatchProperty
 
 	$attribute_name = GETPOST('attribute', 'aZ09');
 
@@ -285,8 +285,8 @@ 
 $paramname = 'id';
 $autocopy = 'MAIN_MAIL_AUTOCOPY_DELIVERY_TO';
 $mode = 'emailfromdelivery';
-$trackid = 'del' . $object->id;
-include DOL_DOCUMENT_ROOT . '/core/actions_sendmails.inc.php';
+$trackid = 'del'.$object->id;
+include DOL_DOCUMENT_ROOT.'/core/actions_sendmails.inc.php';
 
 
 /*
@@ -366,7 +366,7 @@ 
 			$morehtmlref = '<div class="refidno">';
 			// Ref customer shipment
 			$morehtmlref .= $form->editfieldkey("RefCustomer", '', $expedition->ref_customer, $expedition, $user->hasRight('expedition', 'creer'), 'string', '', 0, 1);
-			$morehtmlref .= $form->editfieldval("RefCustomer", '', $expedition->ref_customer, $expedition, $user->hasRight('expedition', 'creer'), 'string'.(getDolGlobalString('THIRDPARTY_REF_INPUT_SIZE') ? ':' . getDolGlobalString('THIRDPARTY_REF_INPUT_SIZE') : ''), '', null, null, '', 1);
+			$morehtmlref .= $form->editfieldval("RefCustomer", '', $expedition->ref_customer, $expedition, $user->hasRight('expedition', 'creer'), 'string'.(getDolGlobalString('THIRDPARTY_REF_INPUT_SIZE') ? ':'.getDolGlobalString('THIRDPARTY_REF_INPUT_SIZE') : ''), '', null, null, '', 1);
 			$morehtmlref .= '<br>'.$langs->trans("RefDeliveryReceipt").' : '.$object->ref;
 			// Thirdparty
 			$morehtmlref .= '<br>'.$expedition->thirdparty->getNomUrl(1);
@@ -758,8 +758,8 @@ 
 	// Presend form
 	$modelmail = 'delivery_send';
 	$defaulttopic = 'SendDeliveryRef';
-	$diroutput = $conf->expedition->dir_output . '/receipt';
-	$trackid = 'del' . $object->id;
+	$diroutput = $conf->expedition->dir_output.'/receipt';
+	$trackid = 'del'.$object->id;
 
 	include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
 }

htdocs/api/class/api_documents.class.php

Spacing +34 added lines, -34 removed lines

@@ -218,7 +218,7 @@ 
 				throw new RestException(500, 'Error generating document');
 			}
 		} elseif ($modulepart == 'facture_fournisseur' || $modulepart == 'invoice_supplier') {
-			require_once DOL_DOCUMENT_ROOT . '/fourn/class/fournisseur.facture.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/fourn/class/fournisseur.facture.class.php';
 			$tmpobject = new FactureFournisseur($this->db);
 			$result = $tmpobject->fetch(0, preg_replace('/\.[^\.]+$/', '', basename($original_file)));
 			if (!$result) {
@@ -255,7 +255,7 @@ 
 				throw new RestException(500, 'Error generating document');
 			}
 		} elseif ($modulepart == 'contrat' || $modulepart == 'contract') {
-			require_once DOL_DOCUMENT_ROOT . '/contrat/class/contrat.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 
 			$tmpobject = new Contrat($this->db);
 			$result = $tmpobject->fetch(0, preg_replace('/\.[^\.]+$/', '', basename($original_file)));
@@ -271,7 +271,7 @@ 
 				throw new RestException(500, 'Error generating document missing doctemplate parameter');
 			}
 		} elseif ($modulepart == 'expedition' || $modulepart == 'shipment') {
-			require_once DOL_DOCUMENT_ROOT . '/expedition/class/expedition.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
 
 			$tmpobject = new Expedition($this->db);
 			$result = $tmpobject->fetch(0, preg_replace('/\.[^\.]+$/', '', basename($original_file)));
@@ -287,7 +287,7 @@ 
 				throw new RestException(500, 'Error generating document missing doctemplate parameter');
 			}
 		} elseif ($modulepart == 'mrp') {
-			require_once DOL_DOCUMENT_ROOT . '/mrp/class/mo.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/mrp/class/mo.class.php';
 
 			$tmpobject = new Mo($this->db);
 			$result = $tmpobject->fetch(0, preg_replace('/\.[^\.]+$/', '', basename($original_file)));
@@ -312,7 +312,7 @@ 
 				throw new RestException(404, 'Exepnse report not found');
 			}
 		} elseif ($modulepart == 'product') {
-			require_once DOL_DOCUMENT_ROOT . '/product/class/product.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
 			$tmpobject = new Product($this->db);
 			$result = $tmpobject->fetch(0, preg_replace('/\.[^\.]+$/', '', basename($original_file)));
@@ -416,7 +416,7 @@ 
 				throw new RestException(404, 'User not found');
 			}
 
-			$upload_dir = getMultidirOutput($object) . '/'.get_exdir(0, 0, 0, 0, $object, 'user').'/'.$object->id;
+			$upload_dir = getMultidirOutput($object).'/'.get_exdir(0, 0, 0, 0, $object, 'user').'/'.$object->id;
 		} elseif ($modulepart == 'adherent' || $modulepart == 'member') {
 			require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
 
@@ -430,7 +430,7 @@ 
 				throw new RestException(404, 'Member not found');
 			}
 
-			$upload_dir = getMultidirOutput($object) . "/".get_exdir(0, 0, 0, 1, $object, 'member');
+			$upload_dir = getMultidirOutput($object)."/".get_exdir(0, 0, 0, 1, $object, 'member');
 		} elseif ($modulepart == 'propal' || $modulepart == 'proposal') {
 			require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
 
@@ -472,7 +472,7 @@ 
 				throw new RestException(404, 'Order not found');
 			}
 
-			$upload_dir = getMultidirOutput($object). "/".get_exdir(0, 0, 0, 1, $object, 'commande');
+			$upload_dir = getMultidirOutput($object)."/".get_exdir(0, 0, 0, 1, $object, 'commande');
 		} elseif ($modulepart == 'commande_fournisseur' || $modulepart == 'supplier_order') {
 			$modulepart = 'supplier_order';
 
@@ -488,7 +488,7 @@ 
 				throw new RestException(404, 'Purchase order not found');
 			}
 
-			$upload_dir = getMultidirOutput($object) . "/commande/".dol_sanitizeFileName($object->ref);
+			$upload_dir = getMultidirOutput($object)."/commande/".dol_sanitizeFileName($object->ref);
 		} elseif ($modulepart == 'shipment' || $modulepart == 'expedition') {
 			require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
 
@@ -502,7 +502,7 @@ 
 				throw new RestException(404, 'Shipment not found');
 			}
 
-			$upload_dir = getMultidirOutput($object) . "/sending/".get_exdir(0, 0, 0, 1, $object, 'shipment');
+			$upload_dir = getMultidirOutput($object)."/sending/".get_exdir(0, 0, 0, 1, $object, 'shipment');
 		} elseif ($modulepart == 'facture' || $modulepart == 'invoice') {
 			require_once DOL_DOCUMENT_ROOT.'/compta/facture/class/facture.class.php';
 
@@ -516,7 +516,7 @@ 
 				throw new RestException(404, 'Invoice not found');
 			}
 
-			$upload_dir = getMultidirOutput($object) . "/".get_exdir(0, 0, 0, 1, $object, 'invoice');
+			$upload_dir = getMultidirOutput($object)."/".get_exdir(0, 0, 0, 1, $object, 'invoice');
 		} elseif ($modulepart == 'facture_fournisseur' || $modulepart == 'supplier_invoice') {
 			$modulepart = 'supplier_invoice';
 
@@ -532,7 +532,7 @@ 
 				throw new RestException(404, 'Invoice not found');
 			}
 
-			$upload_dir = getMultidirOutput($object) . "/".get_exdir($object->id, 2, 0, 0, $object, 'invoice_supplier').dol_sanitizeFileName($object->ref);
+			$upload_dir = getMultidirOutput($object)."/".get_exdir($object->id, 2, 0, 0, $object, 'invoice_supplier').dol_sanitizeFileName($object->ref);
 		} elseif ($modulepart == 'produit' || $modulepart == 'product' || $modulepart == 'service') {
 			require_once DOL_DOCUMENT_ROOT.'/product/class/product.class.php';
 
@@ -562,7 +562,7 @@ 
 				throw new RestException(404, 'Event not found');
 			}
 
-			$upload_dir = getMultidirOutput($object) . '/'.dol_sanitizeFileName($object->ref);
+			$upload_dir = getMultidirOutput($object).'/'.dol_sanitizeFileName($object->ref);
 		} elseif ($modulepart == 'expensereport') {
 			require_once DOL_DOCUMENT_ROOT.'/expensereport/class/expensereport.class.php';
 
@@ -576,7 +576,7 @@ 
 				throw new RestException(404, 'Expense report not found');
 			}
 
-			$upload_dir = getMultidirOutput($object) . '/'.dol_sanitizeFileName($object->ref);
+			$upload_dir = getMultidirOutput($object).'/'.dol_sanitizeFileName($object->ref);
 		} elseif ($modulepart == 'ticket') {
 			require_once DOL_DOCUMENT_ROOT.'/ticket/class/ticket.class.php';
 
@@ -604,7 +604,7 @@ 
 				throw new RestException(404, 'KM article not found');
 			}
 
-			$upload_dir = getMultidirOutput($object) . '/knowledgerecord/'.dol_sanitizeFileName($object->ref);
+			$upload_dir = getMultidirOutput($object).'/knowledgerecord/'.dol_sanitizeFileName($object->ref);
 		} elseif ($modulepart == 'categorie' || $modulepart == 'category') {
 			require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 
@@ -637,7 +637,7 @@ 
 			// $recursive = 0;
 		} elseif ($modulepart == 'contrat' || $modulepart == 'contract') {
 			$modulepart = 'contrat';
-			require_once DOL_DOCUMENT_ROOT . '/contrat/class/contrat.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 
 			$object = new Contrat($this->db);
 			$result = $object->fetch($id, $ref);
@@ -645,10 +645,10 @@ 
 				throw new RestException(404, 'Contract not found');
 			}
 
-			$upload_dir = getMultidirOutput($object) . "/" . get_exdir(0, 0, 0, 1, $object, 'contract');
+			$upload_dir = getMultidirOutput($object)."/".get_exdir(0, 0, 0, 1, $object, 'contract');
 		} elseif ($modulepart == 'intervention' || $modulepart == 'ficheinter') {
 			$modulepart = 'ficheinter';
-			require_once DOL_DOCUMENT_ROOT . '/fichinter/class/fichinter.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
 
 			$object = new Fichinter($this->db);
 			$result = $object->fetch($id, $ref);
@@ -656,20 +656,20 @@ 
 				throw new RestException(404, 'Interventional not found');
 			}
 
-			$upload_dir = $conf->ficheinter->dir_output . "/" . get_exdir(0, 0, 0, 1, $object, 'ficheinter');
+			$upload_dir = $conf->ficheinter->dir_output."/".get_exdir(0, 0, 0, 1, $object, 'ficheinter');
 		} elseif ($modulepart == 'projet' || $modulepart == 'project') {
 			$modulepart = 'project';
-			require_once DOL_DOCUMENT_ROOT . '/projet/class/project.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/projet/class/project.class.php';
 
 			$object = new Project($this->db);
 			$result = $object->fetch($id, $ref);
 			if (!$result) {
 				throw new RestException(404, 'Project not found');
 			}
-			$upload_dir = $conf->project->dir_output . "/" . get_exdir(0, 0, 0, 1, $object, 'project');
+			$upload_dir = $conf->project->dir_output."/".get_exdir(0, 0, 0, 1, $object, 'project');
 		} elseif ($modulepart == 'task' || $modulepart == 'project_task') {
 			$modulepart = 'project_task';
-			require_once DOL_DOCUMENT_ROOT . '/projet/class/task.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
 
 			if (!DolibarrApiAccess::$user->hasRight('projet', 'lire')) {
 				throw new RestException(403);
@@ -687,10 +687,10 @@ 
 				throw new RestException(500, 'Error while fetching project for task');
 			}
 
-			$upload_dir = $conf->project->dir_output . "/" . dol_sanitizeFileName($object->project->ref) . "/" . dol_sanitizeFileName($object->ref);
+			$upload_dir = $conf->project->dir_output."/".dol_sanitizeFileName($object->project->ref)."/".dol_sanitizeFileName($object->ref);
 		} elseif ($modulepart == 'mrp') {
 			$modulepart = 'mrp';
-			require_once DOL_DOCUMENT_ROOT . '/mrp/class/mo.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/mrp/class/mo.class.php';
 
 			$object = new Mo($this->db);
 			$result = $object->fetch($id, $ref);
@@ -698,23 +698,23 @@ 
 				throw new RestException(404, 'MO not found');
 			}
 
-			$upload_dir = getMultidirOutput($object) . "/" . get_exdir(0, 0, 0, 1, $object, 'mrp');
+			$upload_dir = getMultidirOutput($object)."/".get_exdir(0, 0, 0, 1, $object, 'mrp');
 		} elseif ($modulepart == 'contact' || $modulepart == 'socpeople') {
 			$modulepart = 'contact';
 			require_once DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php';
 
 			$object = new Contact($this->db);
-			$result = $object->fetch($id?$id:$ref);
+			$result = $object->fetch($id ? $id : $ref);
 			if (!$result) {
 				throw new RestException(404, 'Contact not found');
 			}
-			$upload_dir = $conf->societe->multidir_output[$object->entity ?? $conf->entity] . "/contact/" . get_exdir(0, 0, 0, 1, $object, 'contact');
+			$upload_dir = $conf->societe->multidir_output[$object->entity ?? $conf->entity]."/contact/".get_exdir(0, 0, 0, 1, $object, 'contact');
 		} else {
 			throw new RestException(500, 'Modulepart '.$modulepart.' not implemented yet.');
 		}
 
 		$objectType = $modulepart;
-		if (! empty($object->id) && ! empty($object->table_element)) {
+		if (!empty($object->id) && !empty($object->table_element)) {
 			$objectType = $object->table_element;
 		}
 
@@ -732,7 +732,7 @@ 
 					throw new RestException(503, 'Error when retrieve ecm list : '.$this->db->lasterror());
 				} elseif (is_array($ecmfile->lines) && count($ecmfile->lines) > 0) {
 					$count = count($filearray);
-					for ($i = 0 ; $i < $count ; $i++) {
+					for ($i = 0; $i < $count; $i++) {
 						foreach ($ecmfile->lines as $line) {
 							unset($line->db);
 							if ($filearray[$i]['name'] == $line->filename) {
@@ -912,7 +912,7 @@ 
 				$object = new Propal($this->db);
 			} elseif ($modulepart == 'agenda' || $modulepart == 'action' || $modulepart == 'event') {
 				$modulepart = 'agenda';
-				require_once DOL_DOCUMENT_ROOT . '/comm/action/class/actioncomm.class.php';
+				require_once DOL_DOCUMENT_ROOT.'/comm/action/class/actioncomm.class.php';
 				$object = new ActionComm($this->db);
 			} elseif ($modulepart == 'contact' || $modulepart == 'socpeople') {
 				$modulepart = 'contact';
@@ -924,23 +924,23 @@ 
 				require_once DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php';
 				$object = new Societe($this->db);
 				$fetchbyid = true;
-			} elseif ($modulepart == 'knowledgemanagement' ) {
+			} elseif ($modulepart == 'knowledgemanagement') {
 				$modulepart = 'knowledgemanagement';
 				require_once DOL_DOCUMENT_ROOT.'/knowledgemanagement/class/knowledgerecord.class.php';
 				$object = new KnowledgeRecord($this->db);
 				$fetchbyid = true;
-			} elseif ($modulepart == 'ticket' ) {
+			} elseif ($modulepart == 'ticket') {
 				$modulepart = 'ticket';
 				require_once DOL_DOCUMENT_ROOT.'/ticket/class/ticket.class.php';
 				$object = new Ticket($this->db);
 				$fetchbyid = true;
 			} elseif ($modulepart == 'contrat' || $modulepart == 'contract') {
 				$modulepart = 'contrat';
-				require_once DOL_DOCUMENT_ROOT . '/contrat/class/contrat.class.php';
+				require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
 				$object = new Contrat($this->db);
 			} elseif ($modulepart == 'mrp') {
 				$modulepart = 'mrp';
-				require_once DOL_DOCUMENT_ROOT . '/mrp/class/mo.class.php';
+				require_once DOL_DOCUMENT_ROOT.'/mrp/class/mo.class.php';
 				$object = new Mo($this->db);
 			} elseif ($modulepart == 'ecm') {
 				throw new RestException(500, 'Using a non empty "ref" is not compatible with using modulepart = '.$modulepart);

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 {
 					dolChmod($cache_file);
 				}
@@ -1039,7 +1039,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)]
@@ -1155,7 +1155,7 @@ 
 			 *
 			 * @return int
 			 */
-			static function ($a, $b) {
+			static function($a, $b) {
 				return strtotime($b['datec'] ?? '0') - strtotime($a['datec'] ?? '0');
 			}
 		);
@@ -1170,7 +1170,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;
 				}
 			);
@@ -1186,7 +1186,7 @@ 
 				 *
 				 * @return bool
 				 */
-				static function ($package) use ($options) {
+				static function($package) use ($options) {
 					return in_array($options['categorieid'], $package['category']);
 				}
 			);

htdocs/admin/modules.php

Spacing +10 added lines, -10 removed lines

@@ -88,9 +88,9 @@ 
 }
 
 // MAIN_ENABLE_EXTERNALMODULES_DOLISTORE is 1 if we enabled the dolistore modules
-$options['search_source_dolistore']	= getDolGlobalInt('MAIN_ENABLE_EXTERNALMODULES_DOLISTORE');
+$options['search_source_dolistore'] = getDolGlobalInt('MAIN_ENABLE_EXTERNALMODULES_DOLISTORE');
 // MAIN_ENABLE_EXTERNALMODULES_COMMUNITY is 1 if we enabled the community modules
-$options['search_source_github']	= getDolGlobalInt('MAIN_ENABLE_EXTERNALMODULES_COMMUNITY');
+$options['search_source_github'] = getDolGlobalInt('MAIN_ENABLE_EXTERNALMODULES_COMMUNITY');
 
 if (!$user->admin) {
 	accessforbidden();
@@ -340,7 +340,7 @@ 
 				//var_dump($modulenamearrays);exit;
 
 				// Lop on each packages (can have several if package is a metapackage)
-				if (! $error) {
+				if (!$error) {
 					foreach ($modulenamearrays as $modulenameval) {
 						if (strpos($modulenameval, '#') === 0) {
 							continue; // Discard comments
@@ -399,7 +399,7 @@ 
 			'search_version' => '-1'
 		);
 		$queryString = http_build_query($searchParams);
-		$redirectUrl = DOL_URL_ROOT . '/admin/modules.php?' . $queryString;
+		$redirectUrl = DOL_URL_ROOT.'/admin/modules.php?'.$queryString;
 
 		$message = $langs->trans("SetupIsReadyForUse", $redirectUrl, $langs->transnoentitiesnoconv("Home").' - '.$langs->transnoentitiesnoconv("Setup").' - '.$langs->transnoentitiesnoconv("Modules"));
 
@@ -452,7 +452,7 @@ 
 	header("Location: ".$_SERVER["PHP_SELF"]."?mode=".$mode.$param.($page_y ? '&page_y='.$page_y : ''));
 	exit;
 } elseif (getDolGlobalInt("MAIN_FEATURES_LEVEL") > 1 && $action == 'reload' && $user->admin && GETPOST('confirm') == 'yes') {
-	$result = unActivateModule($value, 0, 'newboxdefonly');		// unactivate all module features but for widget, we reload only definition and we do not change position or setup
+	$result = unActivateModule($value, 0, 'newboxdefonly'); // unactivate all module features but for widget, we reload only definition and we do not change position or setup
 	dolibarr_set_const($db, "MAIN_IHM_PARAMS_REV", getDolGlobalInt('MAIN_IHM_PARAMS_REV') + 1, 'chaine', 0, '', $conf->entity);
 	if ($result) {
 		setEventMessages($result, null, 'errors');
@@ -602,7 +602,7 @@ 
 								} else {
 									$familykey = $objMod->family;
 								}
-								'@phan-var-force string $familykey';  // if not, phan considers $familykey may be null
+								'@phan-var-force string $familykey'; // if not, phan considers $familykey may be null
 
 								$moduleposition = ($objMod->module_position ? $objMod->module_position : '50');
 								if ($objMod->isCoreOrExternalModule() == 'external' && $moduleposition < 100000) {
@@ -708,7 +708,7 @@ 
 print load_fiche_titre($langs->trans("ModulesSetup"), '', 'title_setup');
 
 // Start to show page
-$deschelp  = '';
+$deschelp = '';
 if ($mode == 'common' || $mode == 'commonkanban') {
 	$desc = $langs->trans("ModulesDesc", '{picto}');
 	$desc .= ' '.$langs->trans("ModulesDesc2", '{picto2}');
@@ -992,7 +992,7 @@ 
 		}
 
 		if ($objMod->isCoreOrExternalModule() == 'external' && $action == 'checklastversion' && !getDolGlobalString('DISABLE_CHECK_ON_MALWARE_MODULES')) {
-			$checkRes = $objMod->checkForCompliance();	// Check if module is reported as non compliant with Dolibarr rules and law
+			$checkRes = $objMod->checkForCompliance(); // Check if module is reported as non compliant with Dolibarr rules and law
 			if (!is_numeric($checkRes) && $checkRes != '') {
 				$langs->load("errors");
 				setEventMessages($objMod->getName().' : '.$langs->trans($checkRes), null, 'errors');
@@ -1372,9 +1372,9 @@ 
 
 		//print '<span class="opacitymedium hideonsmartphone">'.$langs->trans('DOLISTOREdescriptionLong').'</span><br><br>';
 
-		$categories_tree = $remotestore->getCategories($options['categorie']);		// Call API to get the categories
+		$categories_tree = $remotestore->getCategories($options['categorie']); // Call API to get the categories
 
-		$products_list = $remotestore->getProducts($options);	// Get list of product from all sources
+		$products_list = $remotestore->getProducts($options); // Get list of product from all sources
 
 		$previouslink = $remotestore->get_previous_link();
 

htdocs/core/lib/modulebuilder.lib.php

Spacing +28 added lines, -28 removed lines

@@ -283,22 +283,22 @@ 
 	// Edit .sql file
 	if ($moduletype == 'internal') {
 		$pathoffiletoeditsrc = '/../install/mysql/tables/llx_'.strtolower($module).'_'.strtolower($objectname).'.sql';
-		if (! dol_is_file($readdir.$pathoffiletoeditsrc)) {
+		if (!dol_is_file($readdir.$pathoffiletoeditsrc)) {
 			$pathoffiletoeditsrc = '/../install/mysql/tables/llx_'.strtolower($module).'_'.strtolower($objectname).'-'.strtolower($module).'.sql';
-			if (! dol_is_file($readdir.$pathoffiletoeditsrc)) {
+			if (!dol_is_file($readdir.$pathoffiletoeditsrc)) {
 				$pathoffiletoeditsrc = '/../install/mysql/tables/llx_'.strtolower($module).'-'.strtolower($module).'.sql';
-				if (! dol_is_file($readdir.$pathoffiletoeditsrc)) {
+				if (!dol_is_file($readdir.$pathoffiletoeditsrc)) {
 					$pathoffiletoeditsrc = '/../install/mysql/tables/llx_'.strtolower($module).'.sql';
 				}
 			}
 		}
 	} else {
 		$pathoffiletoeditsrc = '/sql/llx_'.strtolower($module).'_'.strtolower($objectname).'.sql';
-		if (! dol_is_file($readdir.$pathoffiletoeditsrc)) {
+		if (!dol_is_file($readdir.$pathoffiletoeditsrc)) {
 			$pathoffiletoeditsrc = '/sql/llx_'.strtolower($module).'_'.strtolower($objectname).'-'.strtolower($module).'.sql';
-			if (! dol_is_file($readdir.$pathoffiletoeditsrc)) {
+			if (!dol_is_file($readdir.$pathoffiletoeditsrc)) {
 				$pathoffiletoeditsrc = '/sql/llx_'.strtolower($module).'-'.strtolower($module).'.sql';
-				if (! dol_is_file($readdir.$pathoffiletoeditsrc)) {
+				if (!dol_is_file($readdir.$pathoffiletoeditsrc)) {
 					$pathoffiletoeditsrc = '/sql/llx_'.strtolower($module).'.sql';
 				}
 			}
@@ -741,7 +741,7 @@ 
 {
 
 	// stock all properties in array
-	$attributesUnique = array('type','label', 'enabled', 'position', 'notnull', 'visible', 'noteditable', 'index', 'default' , 'foreignkey', 'arrayofkeyval', 'alwayseditable','validate', 'searchall','comment', 'isameasure', 'css', 'cssview','csslist', 'help', 'showoncombobox','picto' );
+	$attributesUnique = array('type', 'label', 'enabled', 'position', 'notnull', 'visible', 'noteditable', 'index', 'default', 'foreignkey', 'arrayofkeyval', 'alwayseditable', 'validate', 'searchall', 'comment', 'isameasure', 'css', 'cssview', 'csslist', 'help', 'showoncombobox', 'picto');
 
 	$start = "public \$fields = array(";
 	$end = ");";
@@ -811,8 +811,8 @@ 
 				$valuesModif[$attUnique] = $values[$attUnique];
 			}
 		}
-		$table .= "|*" . $field[0] . "*|";
-		$table .= implode("|", $valuesModif) . "\n";
+		$table .= "|*".$field[0]."*|";
+		$table .= implode("|", $valuesModif)."\n";
 	}
 
 	// end table
@@ -843,14 +843,14 @@ 
 
 		$str = file_get_contents($file);
 
-		$search = '/' . preg_quote($start, '/') . '(.*?)' . preg_quote($end, '/') . '/s';
+		$search = '/'.preg_quote($start, '/').'(.*?)'.preg_quote($end, '/').'/s';
 		$new_contents = preg_replace($search, '', $str);
 		file_put_contents($file, $new_contents);
 		dolChmod($file);
 
 		//perms If Exist
 		$perms = "|*".strtolower($objectname)."*|";
-		$search_pattern_perms = '/' . preg_quote($perms, '/') . '.*?\n/';
+		$search_pattern_perms = '/'.preg_quote($perms, '/').'.*?\n/';
 		$new_contents = preg_replace($search_pattern_perms, '', $new_contents);
 		file_put_contents($file, $new_contents);
 		dolChmod($file);
@@ -923,7 +923,7 @@ 
 	$string = "[options='header',grid=rows,width=60%,caption=Organisation]\n";
 	$string .= "|===\n";
 	// header for table
-	$header = array($langs->trans('Objects'),$langs->trans('Permission'));
+	$header = array($langs->trans('Objects'), $langs->trans('Permission'));
 	foreach ($header as $h) {
 		$string .= "|".$h;
 	}
@@ -1005,7 +1005,7 @@ 
 	}
 
 	$now = dol_now();
-	$content = file($file);	// $content is an array
+	$content = file($file); // $content is an array
 
 	$includeClass = "dol_include_once\(\'\/\w+\/class\/\w+\.class\.php\'\);";
 	$props = 'public\s+\$\w+;';
@@ -1017,23 +1017,23 @@ 
 		if (preg_match('/'.$varcommented.'/', $lineContent)) {
 			$lineContent = '';
 			foreach ($objects as $objectname) {
-				$lineContent .= "\t * @var ".$objectname." \$".strtolower($objectname)." {@type ".$objectname."}". PHP_EOL;
+				$lineContent .= "\t * @var ".$objectname." \$".strtolower($objectname)." {@type ".$objectname."}".PHP_EOL;
 			}
 			//var_dump($lineContent);exit;
 		} elseif (preg_match('/'.$props.'/', $lineContent)) {
 			$lineContent = '';
 			foreach ($objects as $objectname) {
-				$lineContent .= "\t/*".PHP_EOL."\t * @var mixed TODO: set type".PHP_EOL."\t */".PHP_EOL."\tpublic \$".strtolower($objectname).";". PHP_EOL;
+				$lineContent .= "\t/*".PHP_EOL."\t * @var mixed TODO: set type".PHP_EOL."\t */".PHP_EOL."\tpublic \$".strtolower($objectname).";".PHP_EOL;
 			}
 		} elseif (preg_match('/'.$constructObj.'/', $lineContent)) {
 			$lineContent = '';
 			foreach ($objects as $objectname) {
-				$lineContent .= "\t\t\$this->".strtolower($objectname)." = new ".$objectname."(\$this->db);". PHP_EOL;
+				$lineContent .= "\t\t\$this->".strtolower($objectname)." = new ".$objectname."(\$this->db);".PHP_EOL;
 			}
 		} elseif (preg_match('/'.$includeClass.'/', $lineContent)) {
 			$lineContent = '';
 			foreach ($objects as $objectname) {
-				$lineContent .= "dol_include_once('/".strtolower($modulename)."/class/".strtolower($objectname).".class.php');". PHP_EOL;
+				$lineContent .= "dol_include_once('/".strtolower($modulename)."/class/".strtolower($objectname).".class.php');".PHP_EOL;
 			}
 		}
 	}
@@ -1088,7 +1088,7 @@ 
 		return -1;
 	}
 
-	$content = file($file);	// $content is an array
+	$content = file($file); // $content is an array
 
 	$includeClass = "dol_include_once\(\'\/\w+\/class\/".strtolower($objectname)."\.class\.php\'\);";
 	$props = 'public\s+\$'.strtolower($objectname);
@@ -1258,33 +1258,33 @@ 
 				 * @param	bool|string|int	$val
 				 * @return	string|int
 				 */
-				static function ($val) use ($module) {
+				static function($val) use ($module) {
 					return is_bool($val) ? "isModEnabled('$module')" : $val;
 				},
 				$value
 			);
-			$dicData .= "array(" . implode(", ", $conditions) . ")";
+			$dicData .= "array(".implode(", ", $conditions).")";
 		} elseif ($key === 'tabhelp') {
 			$helpItems = array();
 			foreach ($value as $helpValue) {
 				$helpItems[] = "array('code' => \$langs->trans('".$helpValue['code']."'), 'field2' => 'field2tooltip')";
 			}
-			$dicData .= "array(" . implode(",", $helpItems) . ")";
+			$dicData .= "array(".implode(",", $helpItems).")";
 		} else {
 			if (is_array($value)) {
-				$dicData .= "array(" . implode(
+				$dicData .= "array(".implode(
 					",",
 					array_map(
 						/**
 						 * @param	string	$val
 						 * @return	string
 						 */
-						static function ($val) {
+						static function($val) {
 							return "'$val'";
 						},
 						$value
 					)
-				) . ")";
+				).")";
 			} else {
 				$dicData .= "'$value'";
 			}
@@ -1373,7 +1373,7 @@ 
 	$dictionnaires['tabfieldvalue'][] = (array_key_exists('code', $columns) && array_key_exists('label', $columns) ? 'code,label' : '');
 	$dictionnaires['tabfieldinsert'][] = (array_key_exists('code', $columns) && array_key_exists('label', $columns) ? 'code,label' : '');
 	$dictionnaires['tabrowid'][] = $primaryKey;
-	$dictionnaires['tabcond'][] = isModEnabled('$modulename');  // @phan-suppress-current-line UnknownModuleName
+	$dictionnaires['tabcond'][] = isModEnabled('$modulename'); // @phan-suppress-current-line UnknownModuleName
 	$dictionnaires['tabhelp'][] = (array_key_exists('code', $columns) ? array('code' => $langs->trans('CodeTooltipHelp'), 'field2' => 'field2tooltip') : '');
 
 	// Build the dictionary string
@@ -1427,7 +1427,7 @@ 
 
 	// build format asciidoc for urls in table
 	if (!$error) {
-		$asciiDocTable = "[options=\"header\"]\n|===\n|Object | URLs\n";  // phpcs:ignore
+		$asciiDocTable = "[options=\"header\"]\n|===\n|Object | URLs\n"; // phpcs:ignore
 		foreach ($groupedUrls as $objectName => $urls) {
 			$urlsList = implode(" +\n*", $urls);
 			$asciiDocTable .= "|$objectName | \n*$urlsList +\n";
@@ -1460,9 +1460,9 @@ 
 
 	foreach ($allFilesAndDirs as $item) {
 		if ($item != '.' && $item != '..') {
-			if ($type == 1 && is_file($path . DIRECTORY_SEPARATOR . $item) && strpos($item, '.back') === false) {
+			if ($type == 1 && is_file($path.DIRECTORY_SEPARATOR.$item) && strpos($item, '.back') === false) {
 				$count++;
-			} elseif ($type == 2 && is_dir($path . DIRECTORY_SEPARATOR . $item)) {
+			} elseif ($type == 2 && is_dir($path.DIRECTORY_SEPARATOR.$item)) {
 				$count++;
 			}
 		}

htdocs/core/lib/website2.lib.php

Spacing +48 added lines, -48 removed lines

@@ -154,7 +154,7 @@ 
 	if (dol_is_file($filetpl)) {
 		if ($backupold) {
 			$result = archiveOrBackupFile($filetpl);
-			if (! $result) {
+			if (!$result) {
 				return false;
 			}
 		} else {
@@ -354,48 +354,48 @@ 
 		if ($objectpage->type_container == 'setup') {
 			$content = '<div id="websitetemplateconfigpage">'."\n";
 			$content .= '<?php'."\n";
-			$content .= '/*' . "\n";
-			$content .= ' * Actions' . "\n";
-			$content .= ' */' . "\n";
-			$content .= '$websitetemplateconf = GETPOSTINT(\'websitetemplateconf\');' . "\n";
-			$content .= 'include DOL_DOCUMENT_ROOT.\'/core/actions_setmoduleoptions.inc.php\';' . "\n";
-			$content .= '' . "\n";
-			$content .= '/*' . "\n";
-			$content .= ' * View' . "\n";
-			$content .= ' */' . "\n";
-			$content .= 'print load_fiche_titre($langs->trans(\'SetupAndProperties\'), \'\', \'title_setup\');' . "\n";
-			$content .= '' . "\n";
-			$content .= 'if (!empty($message)) {' . "\n";
-			$content .= '    print $message;' . "\n";
-			$content .= '}' . "\n";
-			$content .= '' . "\n";
-			$content .= 'if (!empty($formSetup->items)) {' . "\n";
-			$content .= '    $html = \'\';' . "\n";
-			$content .= '' . "\n";
-			$content .= '    $html .= \'<form action="config.php" method="POST">\';' . "\n";
-			$content .= '    // Generate hidden values from $formSetup->formHiddenInputs' . "\n";
-			$content .= '    if (!empty($formSetup->formHiddenInputs) && is_array($formSetup->formHiddenInputs)) {' . "\n";
-			$content .= '        foreach ($formSetup->formHiddenInputs as $hiddenKey => $hiddenValue) {' . "\n";
-			$content .= '            $html .= \'<input type="hidden" name="\' . dol_escape_htmltag($hiddenKey) . \'" value="\' . dol_escape_htmltag($hiddenValue) . \'">\';' . "\n";
-			$content .= '        }' . "\n";
-			$content .= '    }' . "\n";
-			$content .= '' . "\n";
-			$content .= '    // Generate output table' . "\n";
-			$content .= '    $html .= $formSetup->generateTableOutput(true);' . "\n";
-			$content .= '' . "\n";
-			$content .= '    // Submit button' . "\n";
-			$content .= '    $html .= \'<input type="hidden" name="action" value="preview">\';' . "\n";
-			$content .= '    $html .= \'<input type="hidden" name="websitetemplateconf" value="1">\';' . "\n";
-			$content .= '    $html .= \'<br>\';' . "\n";
-			$content .= '    $html .= \'<div class="form-setup-button-container center">\';' . "\n";
-			$content .= '    $html .= \'<input class="button button-submit" type="submit" value="\' . $langs->trans("Save") . \'">\';' . "\n";
-			$content .= '    $html .= \'</div>\';' . "\n";
-			$content .= '    $html .= \'</form>\';' . "\n";
-			$content .= '' . "\n";
-			$content .= '    print $html;' . "\n";
-			$content .= '}' . "\n";
-			$content .= '?>' . "\n";
-			$content .= '</div>' . "\n";
+			$content .= '/*'."\n";
+			$content .= ' * Actions'."\n";
+			$content .= ' */'."\n";
+			$content .= '$websitetemplateconf = GETPOSTINT(\'websitetemplateconf\');'."\n";
+			$content .= 'include DOL_DOCUMENT_ROOT.\'/core/actions_setmoduleoptions.inc.php\';'."\n";
+			$content .= ''."\n";
+			$content .= '/*'."\n";
+			$content .= ' * View'."\n";
+			$content .= ' */'."\n";
+			$content .= 'print load_fiche_titre($langs->trans(\'SetupAndProperties\'), \'\', \'title_setup\');'."\n";
+			$content .= ''."\n";
+			$content .= 'if (!empty($message)) {'."\n";
+			$content .= '    print $message;'."\n";
+			$content .= '}'."\n";
+			$content .= ''."\n";
+			$content .= 'if (!empty($formSetup->items)) {'."\n";
+			$content .= '    $html = \'\';'."\n";
+			$content .= ''."\n";
+			$content .= '    $html .= \'<form action="config.php" method="POST">\';'."\n";
+			$content .= '    // Generate hidden values from $formSetup->formHiddenInputs'."\n";
+			$content .= '    if (!empty($formSetup->formHiddenInputs) && is_array($formSetup->formHiddenInputs)) {'."\n";
+			$content .= '        foreach ($formSetup->formHiddenInputs as $hiddenKey => $hiddenValue) {'."\n";
+			$content .= '            $html .= \'<input type="hidden" name="\' . dol_escape_htmltag($hiddenKey) . \'" value="\' . dol_escape_htmltag($hiddenValue) . \'">\';'."\n";
+			$content .= '        }'."\n";
+			$content .= '    }'."\n";
+			$content .= ''."\n";
+			$content .= '    // Generate output table'."\n";
+			$content .= '    $html .= $formSetup->generateTableOutput(true);'."\n";
+			$content .= ''."\n";
+			$content .= '    // Submit button'."\n";
+			$content .= '    $html .= \'<input type="hidden" name="action" value="preview">\';'."\n";
+			$content .= '    $html .= \'<input type="hidden" name="websitetemplateconf" value="1">\';'."\n";
+			$content .= '    $html .= \'<br>\';'."\n";
+			$content .= '    $html .= \'<div class="form-setup-button-container center">\';'."\n";
+			$content .= '    $html .= \'<input class="button button-submit" type="submit" value="\' . $langs->trans("Save") . \'">\';'."\n";
+			$content .= '    $html .= \'</div>\';'."\n";
+			$content .= '    $html .= \'</form>\';'."\n";
+			$content .= ''."\n";
+			$content .= '    print $html;'."\n";
+			$content .= '}'."\n";
+			$content .= '?>'."\n";
+			$content .= '</div>'."\n";
 			$tplcontent .= $content."\n";
 		}
 
@@ -405,7 +405,7 @@ 
 
 		$tplcontent .= '<?php // BEGIN PHP'."\n";
 		$tplcontent .= '} catch(Exception $e) { print $e->getMessage(); }'."\n";
-		$tplcontent .= '$tmp = ob_get_contents(); ob_end_clean();'."\n";	// replace with ob_get_clean ?
+		$tplcontent .= '$tmp = ob_get_contents(); ob_end_clean();'."\n"; // replace with ob_get_clean ?
 
 		$tplcontent .= "// Now fix the content for SEO or multilanguage\n";
 		// Old method for custom SEO
@@ -545,7 +545,7 @@ 
 						$indexcontent .= "	require_once DOL_DOCUMENT_ROOT.'/core/website.inc.php';\n";
 						$indexcontent .= '	redirectToContainer($_GET[\'pageref\'], $_GET[\'pagealiasalt\'], $_GET[\'pageid\']);'."\n";
 						$indexcontent .= "}\n";
-						$indexcontent .= "include_once '".$relpath."/".basename($filetpl)."'\n";	// use .. instead of .
+						$indexcontent .= "include_once '".$relpath."/".basename($filetpl)."'\n"; // use .. instead of .
 						$indexcontent .= '// END PHP ?>'."\n";
 						$result = file_put_contents($fileindexsub, $indexcontent);
 						if ($result === false) {
@@ -804,7 +804,7 @@ 
 					dol_delete_file($dest.'.zip');
 
 					// Compress it
-					global $errormsg;	// Used by dol_compress_dir
+					global $errormsg; // Used by dol_compress_dir
 					$errormsg = '';
 					$result = dol_compress_dir($src, $dest.'.zip', 'zip');
 					if ($result < 0) {
@@ -985,7 +985,7 @@ 
 		//$forbiddenphpfunctions = array_merge($forbiddenphpfunctions, array("require", "include", "require_once", "include_once"));
 		if (!getDolGlobalString('WEBSITE_PHP_ALLOW_EXEC')) {    // If option is not on, we disallow functions to execute commands
 			$forbiddenphpfunctions = array_merge($forbiddenphpfunctions, array("exec", "passthru", "shell_exec", "system", "proc_open", "popen"));
-			$forbiddenphpfunctions = array_merge($forbiddenphpfunctions, array("dol_eval", "executeCLI", "verifCond"));	// native dolibarr functions
+			$forbiddenphpfunctions = array_merge($forbiddenphpfunctions, array("dol_eval", "executeCLI", "verifCond")); // native dolibarr functions
 			$forbiddenphpfunctions = array_merge($forbiddenphpfunctions, array("eval", "create_function", "assert", "mb_ereg_replace")); // function with eval capabilities
 		}
 		if (!getDolGlobalString('WEBSITE_PHP_ALLOW_WRITE')) {    // If option is not on, we disallow functions to write files
@@ -999,7 +999,7 @@ 
 
 		//$forbiddenphpfunctions = array_merge($forbiddenphpfunctions, array("require", "include"));
 
-		$forbiddenphpmethods = array('invoke', 'invokeArgs');	// Method of ReflectionFunction to execute a function
+		$forbiddenphpmethods = array('invoke', 'invokeArgs'); // Method of ReflectionFunction to execute a function
 
 		foreach ($forbiddenphpstrings as $forbiddenphpstring) {
 			if (preg_match('/'.preg_quote($forbiddenphpstring, '/').'/ims', $phpfullcodestring)) {

htdocs/core/class/reddithandler.class.php

Spacing +7 added lines, -7 removed lines

@@ -105,9 +105,9 @@ 
 		];
 
 		$headers = [
-			'Authorization: Basic ' . base64_encode($this->clientId . ':' . $this->clientSecret),
+			'Authorization: Basic '.base64_encode($this->clientId.':'.$this->clientSecret),
 			'Content-Type: application/x-www-form-urlencoded',
-			'User-Agent: ' . $this->userAgent
+			'User-Agent: '.$this->userAgent
 		];
 
 		$result = getURLContent($this->getAuthUrl(), 'POST', http_build_query($authData), 1, $headers, ['http', 'https'], 0);
@@ -143,7 +143,7 @@ 
 			return false;
 		}
 
-		$cacheFile = $cacheDir . '/' . dol_hash($urlAPI, '3');
+		$cacheFile = $cacheDir.'/'.dol_hash($urlAPI, '3');
 		$foundInCache = false;
 		$data = null;
 
@@ -158,8 +158,8 @@ 
 
 		if (!$foundInCache) {
 			$headers = [
-				'Authorization: Bearer ' . $this->accessToken,
-				'User-Agent: ' . $this->userAgent,
+				'Authorization: Bearer '.$this->accessToken,
+				'User-Agent: '.$this->userAgent,
 			];
 
 			$result = getURLContent($urlAPI, 'GET', '', 1, $headers, ['http', 'https'], 0);
@@ -173,7 +173,7 @@ 
 					dolChmod($cacheFile);
 				}
 			} else {
-				$this->error = 'Error retrieving URL ' . $urlAPI;
+				$this->error = 'Error retrieving URL '.$urlAPI;
 				return false;
 			}
 		}
@@ -219,7 +219,7 @@ 
 			'id' => $postData['id'] ?? '',
 			'content' => $postData['title'] ?? '',
 			'created_at' => $this->formatDate($postData['created'] ?? ''),
-			'url' => 'https://www.reddit.com' . ($postData['permalink'] ?? ''),
+			'url' => 'https://www.reddit.com'.($postData['permalink'] ?? ''),
 			'media_url' => $postData['thumbnail'] ?? '',
 		];
 	}

htdocs/core/class/diasporahandler.class.php

Spacing +3 added lines, -3 removed lines

@@ -103,7 +103,7 @@ 
 
 		if (!$foundInCache) {
 			$headers = [
-				'Cookie: ' . $this->getCookieFromParams(),
+				'Cookie: '.$this->getCookieFromParams(),
 				'Accept: application/json'
 			];
 
@@ -116,7 +116,7 @@ 
 					dolChmod($cacheFile);
 				}
 			} else {
-				$this->error = 'Error retrieving URL ' . $urlAPI;
+				$this->error = 'Error retrieving URL '.$urlAPI;
 				return false;
 			}
 		}
@@ -161,7 +161,7 @@ 
 			'id' => $postData['guid'] ?? '',
 			'content' => strip_tags($postData['text'] ?? $postData['title'] ?? ''),
 			'created_at' => $this->formatDate($postData['created_at'] ?? ''),
-			'url' => 'https://diaspora-fr.org/posts/' . ($postData['guid'] ?? ''),            'media_url' => !empty($postData['photos']) && isset($postData['photos'][0]['url']) ? $postData['photos'][0]['url'] : '',
+			'url' => 'https://diaspora-fr.org/posts/'.($postData['guid'] ?? ''), 'media_url' => !empty($postData['photos']) && isset($postData['photos'][0]['url']) ? $postData['photos'][0]['url'] : '',
 			'author_name' => $postData['author']['name'] ?? '',
 			'author_avatar' => $postData['author']['avatar']['small'] ?? ''
 		];

htdocs/core/class/mastodonhandler.class.php

Spacing +2 added lines, -2 removed lines

@@ -109,7 +109,7 @@ 
 
 		if (!$foundInCache) {
 			$headers = [
-				'Authorization: Bearer ' . $this->accessToken,
+				'Authorization: Bearer '.$this->accessToken,
 				'Content-Type: application/json'
 			];
 
@@ -124,7 +124,7 @@ 
 					dolChmod($cacheFile);
 				}
 			} else {
-				$this->error = 'Error retrieving URL ' . $urlAPI;
+				$this->error = 'Error retrieving URL '.$urlAPI;
 				return false;
 			}
 		}