Dolibarr / dolibarr

htdocs/categories/class/categorie.class.php

Spacing +11 added lines, -11 removed lines

@@ -1328,14 +1328,14 @@ 
 					|| preg_match('/'.$keyfilter3.'/', $fullpath) || preg_match('/'.$keyfilter4.'/', $fullpath));
 
 				if (($test && !$include) || (!$test && $include)) {
-					unset($this->cats[$key]);  // @phpstan-ignore-line
+					unset($this->cats[$key]); // @phpstan-ignore-line
 				}
 			}
 		}
 
 		dol_syslog(get_class($this)."::get_full_arbo dol_sort_array", LOG_DEBUG);
 
-		$this->cats = dol_sort_array($this->cats, 'fulllabel', 'asc', 1, 0, 1);		// Sort on full label like "Label 1 >> Sublabel a >> Subsublabel"
+		$this->cats = dol_sort_array($this->cats, 'fulllabel', 'asc', 1, 0, 1); // Sort on full label like "Label 1 >> Sublabel a >> Subsublabel"
 
 		return $this->cats;
 	}
@@ -1526,15 +1526,15 @@ 
 				}
 
 				if ($url == '') {
-					$link = '<a href="'.DOL_URL_ROOT.'/categories/viewcat.php?id='.((int) $cat->id).'&type='.urlencode($cat->type).'" class="'.($i < count($way) ? 'small ': '').$forced_color.'">';
+					$link = '<a href="'.DOL_URL_ROOT.'/categories/viewcat.php?id='.((int) $cat->id).'&type='.urlencode($cat->type).'" class="'.($i < count($way) ? 'small ' : '').$forced_color.'">';
 					$linkend = '</a>';
 					$w[] = $link.(($addpicto && $i == 1) ? img_object('', 'category', 'class="paddingright"') : '').$cat->label.$linkend;
 				} elseif ($url == 'none') {
-					$link = '<span class="'.($i < count($way) ? 'small ': '').$forced_color.'">';
+					$link = '<span class="'.($i < count($way) ? 'small ' : '').$forced_color.'">';
 					$linkend = '</span>';
 					$w[] = $link.(($addpicto && $i == 1) ? img_object('', 'category', 'class="paddingright"') : '').$cat->label.$linkend;
 				} else {
-					$w[] = '<a class="'.($i < count($way) ? 'small ': '').$forced_color.'" href="'.DOL_URL_ROOT.'/'.$url.'?catid='.((int) $cat->id).'">'.($addpicto ? img_object('', 'category') : '').$cat->label.'</a>';
+					$w[] = '<a class="'.($i < count($way) ? 'small ' : '').$forced_color.'" href="'.DOL_URL_ROOT.'/'.$url.'?catid='.((int) $cat->id).'">'.($addpicto ? img_object('', 'category') : '').$cat->label.'</a>';
 				}
 			}
 			$newcategwithpath = preg_replace('/colortoreplace/', $forced_color, implode('<span class="inline-block valignmiddle paddingleft paddingright '.$forced_color.'">'.$sep.'</span>', $w));
@@ -1593,7 +1593,7 @@ 
 		$parents = $this->get_meres();
 		if (is_array($parents)) {
 			foreach ($parents as $parent) {
-				$all_ways = $parent->get_all_ways();	// recursivity. TODO Add a protection for infinite loop
+				$all_ways = $parent->get_all_ways(); // recursivity. TODO Add a protection for infinite loop
 				foreach ($all_ways as $way) {
 					$w = $way;
 					$w[] = $this;
@@ -1753,10 +1753,10 @@ 
 	 */
 	public function isAnyPhotoAvailable($sdir)
 	{
-		include_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
-		include_once DOL_DOCUMENT_ROOT . '/core/lib/images.lib.php';
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
+		include_once DOL_DOCUMENT_ROOT.'/core/lib/images.lib.php';
 
-		$sdir .= '/' . get_exdir($this->id, 2, 0, 0, $this, 'category') . $this->id . "/photos/";
+		$sdir .= '/'.get_exdir($this->id, 2, 0, 0, $this, 'category').$this->id."/photos/";
 
 		$dir_osencoded = dol_osencode($sdir);
 		if (file_exists($dir_osencoded)) {
@@ -1766,7 +1766,7 @@ 
 					if (!utf8_check($file)) {
 						$file = mb_convert_encoding($file, 'UTF-8', 'ISO-8859-1'); // To be sure data is stored in UTF8 in memory
 					}
-					if (dol_is_file($sdir . $file) && image_format_supported($file) >= 0) {
+					if (dol_is_file($sdir.$file) && image_format_supported($file) >= 0) {
 						return true;
 					}
 				}
@@ -1889,7 +1889,7 @@ 
 		$result .= $linkend;
 
 		global $action;
-		$hookmanager->initHooks(array($this->element . 'dao'));
+		$hookmanager->initHooks(array($this->element.'dao'));
 		$parameters = array('id' => $this->id, 'getnomurl' => &$result);
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
 		if ($reshook > 0) {

htdocs/societe/class/societe.class.php

Spacing +33 added lines, -33 removed lines

@@ -1082,8 +1082,8 @@ 
 			$sql .= ", '".$this->db->escape($this->ip)."'";
 			if (!getDolGlobalString('MAIN_COMPANY_PERENTITY_SHARED')) {
 				$sql .= ", ".(empty($this->vat_reverse_charge) ? '0' : '1');
-				$sql .= ", '" . $this->db->escape($this->accountancy_code_buy) . "'";
-				$sql .= ", '" . $this->db->escape($this->accountancy_code_sell) . "'";
+				$sql .= ", '".$this->db->escape($this->accountancy_code_buy)."'";
+				$sql .= ", '".$this->db->escape($this->accountancy_code_sell)."'";
 			}
 			$sql .= ")";
 
@@ -1136,7 +1136,7 @@ 
 				}
 
 				if ($ret >= 0) {
-					if (! $notrigger) {
+					if (!$notrigger) {
 						// Call trigger
 						$result = $this->call_trigger('COMPANY_CREATE', $user);
 						if ($result < 0) {
@@ -1384,7 +1384,7 @@ 
 						if ($this->id_prof_exists($keymin, $vallabel, ($this->id > 0 ? $this->id : 0))) {
 							$langs->loadLangs(array("errors", 'compta'));
 							$error++;
-							$this->errors[] = $langs->trans('CustomerAccountancyCodeShort') . " " . $langs->trans("ErrorProdIdAlreadyExist", $vallabel) . ' (' . $langs->trans("ForbiddenBySetupRules") . ')';
+							$this->errors[] = $langs->trans('CustomerAccountancyCodeShort')." ".$langs->trans("ErrorProdIdAlreadyExist", $vallabel).' ('.$langs->trans("ForbiddenBySetupRules").')';
 						}
 					}
 
@@ -1392,7 +1392,7 @@ 
 					if (getDolGlobalString('SOCIETE_ACCOUNTANCY_CODE_CUSTOMER_MANDATORY') && (!isset($vallabel) || trim($vallabel) === '')) {
 						$langs->loadLangs(array("errors", 'compta'));
 						$error++;
-						$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv('CustomerAccountancyCodeShort')) . ' (' . $langs->trans("ForbiddenBySetupRules") . ')';
+						$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv('CustomerAccountancyCodeShort')).' ('.$langs->trans("ForbiddenBySetupRules").')';
 					}
 				} elseif ($key == 'ACCOUNTANCY_CODE_SUPPLIER' && !empty($this->fournisseur)) {
 					// Check for unicity
@@ -1400,7 +1400,7 @@ 
 						if ($this->id_prof_exists($keymin, $vallabel, ($this->id > 0 ? $this->id : 0))) {
 							$langs->loadLangs(array("errors", 'compta'));
 							$error++;
-							$this->errors[] = $langs->trans('SupplierAccountancyCodeShort') . " " . $langs->trans("ErrorProdIdAlreadyExist", $vallabel) . ' (' . $langs->trans("ForbiddenBySetupRules") . ')';
+							$this->errors[] = $langs->trans('SupplierAccountancyCodeShort')." ".$langs->trans("ErrorProdIdAlreadyExist", $vallabel).' ('.$langs->trans("ForbiddenBySetupRules").')';
 						}
 					}
 
@@ -1408,7 +1408,7 @@ 
 					if (getDolGlobalString('SOCIETE_ACCOUNTANCY_CODE_SUPPLIER_MANDATORY') && (!isset($vallabel) || trim($vallabel) === '')) {
 						$langs->loadLangs(array("errors", 'compta'));
 						$error++;
-						$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv('SupplierAccountancyCodeShort')) . ' (' . $langs->trans("ForbiddenBySetupRules") . ')';
+						$this->errors[] = $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv('SupplierAccountancyCodeShort')).' ('.$langs->trans("ForbiddenBySetupRules").')';
 					}
 				}
 			}
@@ -1458,17 +1458,17 @@ 
 		$now = dol_now();
 
 		// Clean parameters
-		$this->id 			= $id;
-		$this->entity 		= ((isset($this->entity) && is_numeric($this->entity)) ? $this->entity : $conf->entity);
+		$this->id = $id;
+		$this->entity = ((isset($this->entity) && is_numeric($this->entity)) ? $this->entity : $conf->entity);
 		$this->name 		= $this->name ? trim($this->name) : trim((string) $this->nom);
 		$this->nom 			= $this->name; // For backward compatibility
-		$this->name_alias 	= trim((string) $this->name_alias);
+		$this->name_alias = trim((string) $this->name_alias);
 		$this->ref_ext		= (empty($this->ref_ext) ? '' : trim($this->ref_ext));
 		$this->address		= trim((string) $this->address);
 		$this->zip 			= trim((string) $this->zip);
 		$this->town 		= trim((string) $this->town);
-		$this->state_id 	= (is_numeric($this->state_id)) ? (int) $this->state_id : 0;
-		$this->country_id 	= ($this->country_id > 0) ? $this->country_id : 0;
+		$this->state_id = (is_numeric($this->state_id)) ? (int) $this->state_id : 0;
+		$this->country_id = ($this->country_id > 0) ? $this->country_id : 0;
 		$this->phone		= trim((string) $this->phone);
 		$this->phone		= preg_replace("/\s/", "", $this->phone);
 		$this->phone		= preg_replace("/\./", "", $this->phone);
@@ -1478,7 +1478,7 @@ 
 		$this->fax			= trim((string) $this->fax);
 		$this->fax			= preg_replace("/\s/", "", $this->fax);
 		$this->fax			= preg_replace("/\./", "", $this->fax);
-		$this->email		= trim((string) $this->email);
+		$this->email = trim((string) $this->email);
 		$this->url			= $this->url ? clean_url($this->url, 0) : '';
 		$this->note_private = (empty($this->note_private) ? '' : trim($this->note_private));
 		$this->note_public  = (empty($this->note_public) ? '' : trim($this->note_public));
@@ -1647,7 +1647,7 @@ 
 			$sql .= ",tva_assuj = ".($this->tva_assuj != '' ? "'".$this->db->escape((string) $this->tva_assuj)."'" : "null");
 			$sql .= ",tva_intra = '".$this->db->escape($this->tva_intra)."'";
 			if (!getDolGlobalString('MAIN_COMPANY_PERENTITY_SHARED')) {
-				$sql .= ",vat_reverse_charge = " . ($this->vat_reverse_charge != '' ? "'" . $this->db->escape((string) $this->vat_reverse_charge) . "'" : 0);
+				$sql .= ",vat_reverse_charge = ".($this->vat_reverse_charge != '' ? "'".$this->db->escape((string) $this->vat_reverse_charge)."'" : 0);
 			}
 			$sql .= ",status = ".((int) $this->status);
 
@@ -1708,8 +1708,8 @@ 
 			$sql .= ",supplier_order_min_amount= ".($this->supplier_order_min_amount != '' ? $this->supplier_order_min_amount : 'null');
 			$sql .= ",fk_prospectlevel='".$this->db->escape($this->fk_prospectlevel)."'";
 			if (!getDolGlobalString('MAIN_COMPANY_PERENTITY_SHARED')) {
-				$sql .= ", accountancy_code_buy = '" . $this->db->escape($this->accountancy_code_buy) . "'";
-				$sql .= ", accountancy_code_sell= '" . $this->db->escape($this->accountancy_code_sell) . "'";
+				$sql .= ", accountancy_code_buy = '".$this->db->escape($this->accountancy_code_buy)."'";
+				$sql .= ", accountancy_code_sell= '".$this->db->escape($this->accountancy_code_sell)."'";
 				if ($customer) {
 					$sql .= ", accountancy_code_customer_general = ".(!empty($this->accountancy_code_customer_general) ? "'".$this->db->escape($this->accountancy_code_customer_general)."'" : "null");
 					$sql .= ", code_compta = ".(!empty($this->code_compta_client) ? "'".$this->db->escape($this->code_compta_client)."'" : "null");
@@ -2107,7 +2107,7 @@ 
 					$this->vat_reverse_charge = 0;
 				}
 
-				$this->status				= $obj->status;
+				$this->status = $obj->status;
 
 				// Local Taxes
 				$this->localtax1_assuj      = $obj->localtax1_assuj;
@@ -2134,7 +2134,7 @@ 
 
 				$this->mode_reglement_id 	= $obj->mode_reglement;
 				$this->cond_reglement_id 	= $obj->cond_reglement;
-				$this->deposit_percent		= $obj->deposit_percent;
+				$this->deposit_percent = $obj->deposit_percent;
 				$this->transport_mode_id 	= $obj->transport_mode;
 				$this->mode_reglement_supplier_id 	= $obj->mode_reglement_supplier;
 				$this->cond_reglement_supplier_id 	= $obj->cond_reglement_supplier;
@@ -2700,7 +2700,7 @@ 
 			$sortfield = 'u.lastname,u.firstname';
 		}
 		if (empty($sortorder)) {
-			$sortorder = str_repeat('ASC,', count(explode(',', $sortfield)) - 1) . 'ASC';
+			$sortorder = str_repeat('ASC,', count(explode(',', $sortfield)) - 1).'ASC';
 		}
 		$sql .= $this->db->order($sortfield, $sortorder);
 
@@ -2717,10 +2717,10 @@ 
 					$reparray[$i]['firstname'] = $obj->firstname;
 					$reparray[$i]['email'] = $obj->email;
 					$reparray[$i]['phone'] = $obj->office_phone;
-					$reparray[$i]['office_phone'] = $obj->office_phone;			// Pro phone
+					$reparray[$i]['office_phone'] = $obj->office_phone; // Pro phone
 					$reparray[$i]['office_fax'] = $obj->office_fax;
-					$reparray[$i]['user_mobile'] = $obj->user_mobile;			// Pro mobile
-					$reparray[$i]['personal_mobile'] = $obj->personal_mobile;	// Personal mobile
+					$reparray[$i]['user_mobile'] = $obj->user_mobile; // Pro mobile
+					$reparray[$i]['personal_mobile'] = $obj->personal_mobile; // Personal mobile
 					$reparray[$i]['job'] = $obj->job;
 					$reparray[$i]['statut'] = $obj->status; // deprecated
 					$reparray[$i]['status'] = $obj->status;
@@ -2933,7 +2933,7 @@ 
 			$datas['status'] = ' '.$this->getLibStatut(5);
 		}
 		if (isset($this->client) && isset($this->fournisseur)) {
-			$datas['type'] = ' &nbsp; ' . $this->getTypeUrl(1, '', 0, 'span');
+			$datas['type'] = ' &nbsp; '.$this->getTypeUrl(1, '', 0, 'span');
 		}
 		$datas['name'] = '<br><b>'.$langs->trans('Name').':</b> '.dol_escape_htmltag(dol_string_nohtmltag($this->name));
 		if (!empty($this->name_alias) && empty($noaliasinname)) {
@@ -3001,9 +3001,9 @@ 
 		}
 		// show categories for this record only in ajax to not overload lists
 		if (!$nofetch && isModEnabled('category') && $this->client) {
-			require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 			$form = new Form($this->db);
-			$datas['categories_customer'] = '<br>' . $form->showCategories($this->id, Categorie::TYPE_CUSTOMER, 1, 1);
+			$datas['categories_customer'] = '<br>'.$form->showCategories($this->id, Categorie::TYPE_CUSTOMER, 1, 1);
 		}
 		if (!empty($this->code_fournisseur) && $this->fournisseur) {
 			$datas['suppliercode'] = '<br><b>'.$langs->trans('SupplierCode').':</b> '.$this->code_fournisseur;
@@ -3014,9 +3014,9 @@ 
 		}
 		// show categories for this record only in ajax to not overload lists
 		if (!$nofetch && isModEnabled('category') && $this->fournisseur) {
-			require_once DOL_DOCUMENT_ROOT . '/categories/class/categorie.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/categories/class/categorie.class.php';
 			$form = new Form($this->db);
-			$datas['categories_supplier'] = '<br>' . $form->showCategories($this->id, Categorie::TYPE_SUPPLIER, 1, 1);
+			$datas['categories_supplier'] = '<br>'.$form->showCategories($this->id, Categorie::TYPE_SUPPLIER, 1, 1);
 		}
 
 		$datas['divclose'] = '</div>';
@@ -3564,7 +3564,7 @@ 
 	{
 		// phpcs:enable
 		require_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
-		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_rib WHERE type = 'ban' AND default_rib = 1 AND fk_soc = ". (int) $this->id;
+		$sql = "SELECT rowid FROM ".MAIN_DB_PREFIX."societe_rib WHERE type = 'ban' AND default_rib = 1 AND fk_soc = ".(int) $this->id;
 		$resql = $this->db->query($sql);
 		if (!$resql) {
 			$this->error = $this->db->lasterror();
@@ -3954,7 +3954,7 @@ 
 		global $langs;
 
 		if ($company_id > 0) {
-			$sql = "SELECT parent FROM " . MAIN_DB_PREFIX . "societe WHERE rowid = ".((int) $company_id);
+			$sql = "SELECT parent FROM ".MAIN_DB_PREFIX."societe WHERE rowid = ".((int) $company_id);
 			$resql = $this->db->query($sql);
 			if ($resql) {
 				if ($obj = $this->db->fetch_object($resql)) {
@@ -4251,7 +4251,7 @@ 
 	public function isACompany()
 	{
 		// Define if third party is treated as company (or not) when nature is unknown
-		$isACompany = getDolGlobalInt('MAIN_UNKNOWN_CUSTOMERS_ARE_COMPANIES', 1);	// default if not set is 1 because it was like this in all past versions
+		$isACompany = getDolGlobalInt('MAIN_UNKNOWN_CUSTOMERS_ARE_COMPANIES', 1); // default if not set is 1 because it was like this in all past versions
 
 		// Now try to guess using different tips
 		if (!empty($this->tva_intra)) {
@@ -4585,7 +4585,7 @@ 
 		$country_code = $country_label = '';
 		if (getDolGlobalString('MAIN_INFO_SOCIETE_COUNTRY')) {
 			$tmp = explode(':', getDolGlobalString('MAIN_INFO_SOCIETE_COUNTRY'));
-			$country_id =  (is_numeric($tmp[0])) ? (int) $tmp[0] : 0;
+			$country_id = (is_numeric($tmp[0])) ? (int) $tmp[0] : 0;
 			if (!empty($tmp[1])) {   // If $conf->global->MAIN_INFO_SOCIETE_COUNTRY is "id:code:label"
 				$country_code = $tmp[1];
 				$country_label = $tmp[2];
@@ -5462,7 +5462,7 @@ 
 		if (method_exists($this, 'getLibStatut')) {
 			$return .= '<br><div class="info-box-status">'.$this->getLibStatut(3).'</div>';
 		}
-		$return .= '</div>';	// end info-box-content
+		$return .= '</div>'; // end info-box-content
 		$return .= '</div>';
 		$return .= '</div>';
 
@@ -5565,7 +5565,7 @@ 
 		global $conf, $langs, $hookmanager, $user, $action;
 
 		$error = 0;
-		$soc_origin = new Societe($this->db);		// The thirdparty that we will delete
+		$soc_origin = new Societe($this->db); // The thirdparty that we will delete
 
 		dol_syslog("mergeCompany merge thirdparty id=".$soc_origin_id." (will be deleted) into the thirdparty id=".$this->id);
 

htdocs/api/class/api_documents.class.php

Spacing +15 added lines, -15 removed lines

@@ -200,7 +200,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) {
@@ -237,7 +237,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)));
@@ -253,7 +253,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)));
@@ -269,7 +269,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)));
@@ -572,7 +572,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);
@@ -580,10 +580,10 @@ 
 				throw new RestException(404, 'Contract not found');
 			}
 
-			$upload_dir = $conf->contrat->dir_output . "/" . get_exdir(0, 0, 0, 1, $object, 'contract');
+			$upload_dir = $conf->contrat->dir_output."/".get_exdir(0, 0, 0, 1, $object, 'contract');
 		} 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);
@@ -591,10 +591,10 @@ 
 				throw new RestException(404, 'Project not found');
 			}
 
-			$upload_dir = $conf->projet->dir_output . "/" . get_exdir(0, 0, 0, 1, $object, 'project');
+			$upload_dir = $conf->projet->dir_output."/".get_exdir(0, 0, 0, 1, $object, 'project');
 		} 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);
@@ -602,13 +602,13 @@ 
 				throw new RestException(404, 'MO not found');
 			}
 
-			$upload_dir = $conf->mrp->dir_output . "/" . get_exdir(0, 0, 0, 1, $object, 'mrp');
+			$upload_dir = $conf->mrp->dir_output."/".get_exdir(0, 0, 0, 1, $object, 'mrp');
 		} 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;
 		}
 
@@ -624,7 +624,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) {
 							if ($filearray[$i]['name'] == $line->filename) {
 								// Next line converts EcmFilesLine properties to array
@@ -777,7 +777,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';
@@ -786,11 +786,11 @@ 
 				$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);
 			} else {
 				// TODO Implement additional moduleparts

htdocs/viewimage.php

Spacing +3 added lines, -3 removed lines

@@ -193,7 +193,7 @@ 
  * View
  */
 
-$cachestring = GETPOST("cache", 'aZ09');	// May be 1, or an int, or a hash
+$cachestring = GETPOST("cache", 'aZ09'); // May be 1, or an int, or a hash
 if ($cachestring) {
 	// Important: The following code is to avoid a page request by the browser and PHP CPU at each Dolibarr page access.
 	// We are here when param cache=xxx to force a cache policy:
@@ -203,7 +203,7 @@ 
 		$delaycache = ((is_numeric($cachestring) && (int) $cachestring > 1 && (int) $cachestring < 999999) ? $cachestring : '3600');
 		header('Cache-Control: max-age='.$delaycache.', public, must-revalidate');
 		header('Pragma: cache'); // This is to avoid to have Pragma: no-cache set by proxy or web server
-		header('Expires: '.gmdate('D, d M Y H:i:s', time() + (int) $delaycache).' GMT');	// This is to avoid to have Expires set by proxy or web server
+		header('Expires: '.gmdate('D, d M Y H:i:s', time() + (int) $delaycache).' GMT'); // This is to avoid to have Expires set by proxy or web server
 	} else {
 		// If any cache on files were disable by config file (for test purpose)
 		header('Cache-Control: no-cache');
@@ -264,7 +264,7 @@ 
 }
 
 // Security: Delete string ../ or ..\ into $original_file
-$original_file = preg_replace('/\.\.+/', '..', $original_file);	// Replace '... or more' with '..'
+$original_file = preg_replace('/\.\.+/', '..', $original_file); // Replace '... or more' with '..'
 $original_file = str_replace('../', '/', $original_file);
 $original_file = str_replace('..\\', '/', $original_file);
 

htdocs/admin/tools/export_files.php

Spacing +5 added lines, -5 removed lines

@@ -24,8 +24,8 @@ 
  *		\brief      Page to export documents into a compressed file
  */
 
-if (! defined('CSRFCHECK_WITH_TOKEN')) {
-	define('CSRFCHECK_WITH_TOKEN', '1');		// Force use of CSRF protection with tokens even for GET
+if (!defined('CSRFCHECK_WITH_TOKEN')) {
+	define('CSRFCHECK_WITH_TOKEN', '1'); // Force use of CSRF protection with tokens even for GET
 }
 
 // Load Dolibarr environment
@@ -100,7 +100,7 @@ 
  */
 
 // Increase limit of time. Works only if we are not in safe mode
-$ExecTimeLimit = getDolGlobalInt('MAIN_ADMIN_TOOLS_EXPORT_FILES_EXEC_TIME_LIMIT', 1800);; // 30mn
+$ExecTimeLimit = getDolGlobalInt('MAIN_ADMIN_TOOLS_EXPORT_FILES_EXEC_TIME_LIMIT', 1800); ; // 30mn
 if (!empty($ExecTimeLimit)) {
 	$err = error_reporting();
 	error_reporting(0); // Disable all errors
@@ -166,7 +166,7 @@ 
 	}
 
 	global $errormsg;
-	$ret = dol_compress_dir($fulldirtocompress, $outputdir."/".$file, $compression, $excludefiles, $rootdirinzip);	// Can modify $errormsg
+	$ret = dol_compress_dir($fulldirtocompress, $outputdir."/".$file, $compression, $excludefiles, $rootdirinzip); // Can modify $errormsg
 	if ($ret < 0) {
 		if ($ret == -2) {
 			$langs->load("errors");
@@ -174,7 +174,7 @@ 
 		} else {
 			$langs->load("errors");
 			// @phpstan-ignore-next-line The $errormsg can have been modified by the dol_compress_dir function.
-			$errormsg = $langs->trans("ErrorFailedToWriteInDir", $outputdir).($errormsg ? "\n" . $errormsg : "");
+			$errormsg = $langs->trans("ErrorFailedToWriteInDir", $outputdir).($errormsg ? "\n".$errormsg : "");
 		}
 	}
 } elseif (in_array($compression, array('gz', 'bz', 'zstd'))) {

htdocs/includes/tcpdi/tcpdi_parser.php

Spacing +56 added lines, -56 removed lines

@@ -51,32 +51,32 @@ 
 if (defined('TCPDF_PATH')) require_once(constant('TCPDF_PATH').'/include/tcpdf_filters.php');
 else require_once(dirname(__FILE__).'/../tecnickcom/tcpdf/include/tcpdf_filters.php');
 
-if (!defined ('PDF_TYPE_NULL'))
-    define ('PDF_TYPE_NULL', 0);
-if (!defined ('PDF_TYPE_NUMERIC'))
-    define ('PDF_TYPE_NUMERIC', 1);
-if (!defined ('PDF_TYPE_TOKEN'))
-    define ('PDF_TYPE_TOKEN', 2);
-if (!defined ('PDF_TYPE_HEX'))
-    define ('PDF_TYPE_HEX', 3);
-if (!defined ('PDF_TYPE_STRING'))
-    define ('PDF_TYPE_STRING', 4);
-if (!defined ('PDF_TYPE_DICTIONARY'))
-    define ('PDF_TYPE_DICTIONARY', 5);
-if (!defined ('PDF_TYPE_ARRAY'))
-    define ('PDF_TYPE_ARRAY', 6);
-if (!defined ('PDF_TYPE_OBJDEC'))
-    define ('PDF_TYPE_OBJDEC', 7);
-if (!defined ('PDF_TYPE_OBJREF'))
-    define ('PDF_TYPE_OBJREF', 8);
-if (!defined ('PDF_TYPE_OBJECT'))
-    define ('PDF_TYPE_OBJECT', 9);
-if (!defined ('PDF_TYPE_STREAM'))
-    define ('PDF_TYPE_STREAM', 10);
-if (!defined ('PDF_TYPE_BOOLEAN'))
-    define ('PDF_TYPE_BOOLEAN', 11);
-if (!defined ('PDF_TYPE_REAL'))
-    define ('PDF_TYPE_REAL', 12);
+if (!defined('PDF_TYPE_NULL'))
+    define('PDF_TYPE_NULL', 0);
+if (!defined('PDF_TYPE_NUMERIC'))
+    define('PDF_TYPE_NUMERIC', 1);
+if (!defined('PDF_TYPE_TOKEN'))
+    define('PDF_TYPE_TOKEN', 2);
+if (!defined('PDF_TYPE_HEX'))
+    define('PDF_TYPE_HEX', 3);
+if (!defined('PDF_TYPE_STRING'))
+    define('PDF_TYPE_STRING', 4);
+if (!defined('PDF_TYPE_DICTIONARY'))
+    define('PDF_TYPE_DICTIONARY', 5);
+if (!defined('PDF_TYPE_ARRAY'))
+    define('PDF_TYPE_ARRAY', 6);
+if (!defined('PDF_TYPE_OBJDEC'))
+    define('PDF_TYPE_OBJDEC', 7);
+if (!defined('PDF_TYPE_OBJREF'))
+    define('PDF_TYPE_OBJREF', 8);
+if (!defined('PDF_TYPE_OBJECT'))
+    define('PDF_TYPE_OBJECT', 9);
+if (!defined('PDF_TYPE_STREAM'))
+    define('PDF_TYPE_STREAM', 10);
+if (!defined('PDF_TYPE_BOOLEAN'))
+    define('PDF_TYPE_BOOLEAN', 11);
+if (!defined('PDF_TYPE_REAL'))
+    define('PDF_TYPE_REAL', 12);
 
 /**
  * @class tcpdi_parser
@@ -325,7 +325,7 @@ 
      * @protected
      * @since 1.0.000 (2011-05-24)
      */
-    protected function getXrefData($offset=0, $xref=array()) {
+    protected function getXrefData($offset = 0, $xref = array()) {
         if ($offset == 0) {
             // find last startxref
             if (preg_match('/.*[\r\n]startxref[\s\r\n]+([0-9]+)[\s\r\n]+%%EOF/is', $this->pdfdata, $matches) == 0) {
@@ -371,7 +371,7 @@ 
      * @protected
      * @since 1.0.000 (2011-06-20)
      */
-    protected function decodeXref($startxref, $xref=array()) {
+    protected function decodeXref($startxref, $xref = array()) {
         $this->xref_seen_offsets[] = $startxref;
         if (!isset($xref['xref_location'])) {
             $xref['xref_location'] = $startxref;
@@ -455,7 +455,7 @@ 
      * @protected
      * @since 1.0.003 (2013-03-16)
      */
-    protected function decodeXrefStream($startxref, $xref=array()) {
+    protected function decodeXrefStream($startxref, $xref = array()) {
         // try to read Cross-Reference Stream
         list($xrefobj, $unused) = $this->getRawObject($startxref);
         $xrefcrs = $this->getIndirectObject($xrefobj[1], $startxref, true);
@@ -508,7 +508,7 @@ 
                     }
                 }
             } elseif ($filltrailer) {
-                switch($key) {
+                switch ($key) {
                     case '/Size':
                     case '/Root':
                     case '/Info':
@@ -532,7 +532,7 @@ 
             // initialize decoded array
             $ddata = array();
             // initialize first row with zeros
-            $prev_row = array_fill (0, $rowlen, 0);
+            $prev_row = array_fill(0, $rowlen, 0);
             // for each row apply PNG unpredictor
             foreach ($sdata as $k => $row) {
                 // initialize new row
@@ -542,7 +542,7 @@ 
                     $predictor = (10 + $row[0]);
                 }
                 // for each byte on the row
-                for ($i=1; $i<=$columns; ++$i) {
+                for ($i = 1; $i <= $columns; ++$i) {
                     if (!isset($row[$i])) {
                         // No more data in this row - we're done here.
                         break;
@@ -693,7 +693,7 @@ 
         $obj[] = PDF_TYPE_STREAM;
         $obj[] = substr($this->pdfdata, $offset, $length);
 
-        return array($obj, $offset+$length);
+        return array($obj, $offset + $length);
     }
 
     /**
@@ -703,9 +703,9 @@ 
      * @protected
      * @since 1.0.000 (2011-06-20)
      */
-    protected function getRawObject($offset=0, $data=null) {
+    protected function getRawObject($offset = 0, $data = null) {
         if ($data == null) {
-            $data =& $this->pdfdata;
+            $data = & $this->pdfdata;
         }
         $objtype = ''; // object type to be returned
         $objval = ''; // object value to be returned
@@ -816,7 +816,7 @@ 
                 break;
             }
             default: {
-				$frag = $data[$offset] . @$data[$offset+1] . @$data[$offset+2] . @$data[$offset+3];
+				$frag = $data[$offset].@$data[$offset + 1].@$data[$offset + 2].@$data[$offset + 3];
                 switch ($frag) {
                     case 'endo':
                         // indirect object
@@ -860,7 +860,7 @@ 
                                 // object start
                                 $objtype = PDF_TYPE_OBJECT;
                                 $objval = intval($matches[1]).'_'.intval($matches[2]);
-                                $offset += strlen ($matches[0]);
+                                $offset += strlen($matches[0]);
                             }
                         } elseif (($numlen = strspn($data, '+-.0123456789', $offset)) > 0) {
                             // numeric object
@@ -889,15 +889,15 @@ 
         $objval = array();
 
         // Extract dict from data.
-        $i=1;
+        $i = 1;
         $dict = '';
         $offset += 2;
         do {
-			if ($data[$offset] == '>' && $data[$offset+1] == '>') {
+			if ($data[$offset] == '>' && $data[$offset + 1] == '>') {
                 $i--;
                 $dict .= '>>';
                 $offset += 2;
-			} else if ($data[$offset] == '<' && $data[$offset+1] == '<') {
+			} else if ($data[$offset] == '<' && $data[$offset + 1] == '<') {
                 $i++;
                 $dict .= '<<';
                 $offset += 2;
@@ -905,7 +905,7 @@ 
 				$dict .= $data[$offset];
                 $offset++;
             }
-        } while ($i>0);
+        } while ($i > 0);
 
         // Now that we have just the dict, parse it.
         $dictoffset = 0;
@@ -933,7 +933,7 @@ 
      * @protected
      * @since 1.0.000 (2011-05-24)
      */
-    protected function getIndirectObject($obj_ref, $offset=0, $decoding=true) {
+    protected function getIndirectObject($obj_ref, $offset = 0, $decoding = true) {
         $obj = explode('_', $obj_ref);
         if (($obj === false) OR (count($obj) != 2)) {
             $this->Error('Invalid object reference: '.$obj);
@@ -953,7 +953,7 @@ 
         do {
             if (($i > 0) AND (isset($objdata[($i - 1)][0])) AND ($objdata[($i - 1)][0] == PDF_TYPE_DICTIONARY) AND array_key_exists('/Length', $objdata[($i - 1)][1])) {
                 // Stream - get using /Length in stream's dict
-                $lengthobj = $objdata[($i-1)][1]['/Length'];
+                $lengthobj = $objdata[($i - 1)][1]['/Length'];
                 if ($lengthobj[0] === PDF_TYPE_OBJREF) {
                     $lengthobj = $this->getObjectVal($lengthobj);
                     if ($lengthobj[0] === PDF_TYPE_OBJECT) {
@@ -1011,7 +1011,7 @@ 
                 $objs = $streaminfo[0];
                 if (!isset($this->objstreams[$objs[0]][$objs[1]])) {
                     // Fetch and decode object stream
-                    $offset = $this->findObjectOffset($objs);;
+                    $offset = $this->findObjectOffset($objs); ;
                     $objstream = $this->getObjectVal(array(PDF_TYPE_OBJREF, $objs[0], $objs[1]));
                     $decoded = $this->decodeStream($objstream[1][1], $objstream[2][1]);
                     $this->objstreams[$objs[0]][$objs[1]] = $decoded[0]; // Store just the data, in case we need more from this objstream
@@ -1045,12 +1045,12 @@ 
             // Not a valid object stream dictionary - skip it.
             return;
         }
-        $stream = $this->decodeStream($obj[1][1], $obj[2][1]);// Decode object stream, as we need the first bit
+        $stream = $this->decodeStream($obj[1][1], $obj[2][1]); // Decode object stream, as we need the first bit
         $first = intval($obj[1][1]['/First'][1]);
         $ints = preg_split('/\s/', substr($stream[0], 0, $first)); // Get list of object / offset pairs
-        for ($j=1; $j<count($ints); $j++) {
+        for ($j = 1; $j < count($ints); $j++) {
             if (($j % 2) == 1) {
-                $this->objstreamobjs[$ints[$j-1]] = array($key, $ints[$j]+$first);
+                $this->objstreamobjs[$ints[$j - 1]] = array($key, $ints[$j] + $first);
             }
         }
 
@@ -1068,7 +1068,7 @@ 
         if (preg_match_all('/(*ANYCRLF)^[\s]*([0-9]+)[\s]+([0-9]+)[\s]+obj/im', $this->pdfdata, $matches, PREG_OFFSET_CAPTURE) >= 1) {
             $i = 0;
             $laststreamend = 0;
-            foreach($matches[0] as $match) {
+            foreach ($matches[0] as $match) {
                 $offset = $match[1] + strspn($match[0], "\x00\x09\x0a\x0c\x0d\x20");
                 if ($offset < $laststreamend) {
                     // Contained within another stream, skip it.
@@ -1196,7 +1196,7 @@ 
      *
      * @param array $obj Array of pdf-data
      */
-    private function _getPageResources ($obj) { // $obj = /Page
+    private function _getPageResources($obj) { // $obj = /Page
         $obj = $this->getObjectVal($obj);
 
         // If the current object has a resources
@@ -1234,7 +1234,7 @@ 
      *
      * @param array $obj Array of pdf-data
      */
-    private function _getPageAnnotations ($obj) { // $obj = /Page
+    private function _getPageAnnotations($obj) { // $obj = /Page
         $obj = $this->getObjectVal($obj);
 
         // If the current object has an annotations
@@ -1269,8 +1269,8 @@ 
 
         if (isset($this->pages[$this->pageno][1][1]['/Contents'])) {
             $contents = $this->_getPageContent($this->pages[$this->pageno][1][1]['/Contents']);
-            foreach($contents AS $tmp_content) {
-                $buffer .= $this->_rebuildContentStream($tmp_content) . ' ';
+            foreach ($contents AS $tmp_content) {
+                $buffer .= $this->_rebuildContentStream($tmp_content).' ';
             }
         }
 
@@ -1296,7 +1296,7 @@ 
             }
         } elseif ($content_ref[0] == PDF_TYPE_ARRAY) {
             foreach ($content_ref[1] AS $tmp_content_ref) {
-                $contents = array_merge($contents,$this->_getPageContent($tmp_content_ref));
+                $contents = array_merge($contents, $this->_getPageContent($tmp_content_ref));
             }
         }
 
@@ -1351,7 +1351,7 @@ 
         $page = $this->getObjectVal($page);
         $box = null;
         if (isset($page[1][1][$box_index]))
-            $box =& $page[1][1][$box_index];
+            $box = & $page[1][1][$box_index];
 
         if (!is_null($box) && $box[0] == PDF_TYPE_OBJREF) {
             $tmp_box = $this->getObjectVal($box);
@@ -1359,7 +1359,7 @@ 
         }
 
         if (!is_null($box) && $box[0] == PDF_TYPE_ARRAY) {
-            $b =& $box[1];
+            $b = & $box[1];
             return array('x' => $b[0][1] / $k,
                          'y' => $b[1][1] / $k,
                          'w' => abs($b[0][1] - $b[2][1]) / $k,
@@ -1396,7 +1396,7 @@ 
     private function _getPageBoxes($page, $k) {
         $boxes = array();
 
-        foreach($this->availableBoxes AS $box) {
+        foreach ($this->availableBoxes AS $box) {
             if ($_box = $this->getPageBox($page, $box, $k)) {
                 $boxes[$box] = $_box;
             }

htdocs/includes/tcpdi/tcpdi.php

Spacing +51 added lines, -51 removed lines

@@ -104,7 +104,7 @@ 
 
         if (!isset($this->parsers[$filename]))
             $this->parsers[$filename] = $this->_getPdfParser($filename);
-        $this->current_parser =& $this->parsers[$filename];
+        $this->current_parser = & $this->parsers[$filename];
         $this->setPDFVersion(max($this->getPDFVersion(), $this->current_parser->getPDFVersion()));
 
         return $this->parsers[$filename]->getPageCount();
@@ -122,7 +122,7 @@ 
 
         if (!isset($this->parsers[$filename]))
             $this->parsers[$filename] = new tcpdi_parser($pdfdata, $filename);
-        $this->current_parser =& $this->parsers[$filename];
+        $this->current_parser = & $this->parsers[$filename];
         $this->setPDFVersion(max($this->getPDFVersion(), $this->current_parser->getPDFVersion()));
 
         return $this->parsers[$filename]->getPageCount();
@@ -171,11 +171,11 @@ 
         $fn = $this->current_filename;
 
         // check if page already imported
-        $pageKey = $fn . '-' . ((int)$pageno) . $boxName;
+        $pageKey = $fn.'-'.((int) $pageno).$boxName;
         if (isset($this->_importedPages[$pageKey]))
             return $this->_importedPages[$pageKey];
 
-        $parser =& $this->parsers[$fn];
+        $parser = & $this->parsers[$fn];
         $parser->setPageno($pageno);
 
         if (!in_array($boxName, $parser->availableBoxes))
@@ -204,8 +204,8 @@ 
 
         $this->tpl++;
         $this->tpls[$this->tpl] = array();
-        $tpl =& $this->tpls[$this->tpl];
-        $tpl['parser'] =& $parser;
+        $tpl = & $this->tpls[$this->tpl];
+        $tpl['parser'] = & $parser;
         $tpl['resources'] = $parser->getPageResources();
         $tpl['buffer'] = $parser->getContent();
         $tpl['box'] = $box;
@@ -240,7 +240,7 @@ 
 
     function setPageFormatFromTemplatePage($pageno, $orientation) {
         $fn = $this->current_filename;
-        $parser =& $this->parsers[$fn];
+        $parser = & $this->parsers[$fn];
         $parser->setPageno($pageno);
         $boxes = $parser->getPageBoxes($pageno, $this->k);
         foreach ($boxes as $name => $box) {
@@ -253,7 +253,7 @@ 
     }
 
     /* Wrapper for AddPage() which tracks TOC pages to offset annotations later */
-    function AddPage($orientation='', $format='', $keepmargins=false, $tocpage=false) {
+    function AddPage($orientation = '', $format = '', $keepmargins = false, $tocpage = false) {
         if ($this->inxobj) {
             // we are inside an XObject template
             return;
@@ -265,7 +265,7 @@ 
     }
 
     /* Wrapper for AddTOC() which tracks TOC position to offset annotations later */
-    function AddTOC($page='', $numbersfont='', $filler='.', $toc_name='TOC', $style='', $color=array(0,0,0)) {
+    function AddTOC($page = '', $numbersfont = '', $filler = '.', $toc_name = 'TOC', $style = '', $color = array(0, 0, 0)) {
         if (!TCPDF_STATIC::empty_string($page)) {
             $this->_TOCpagenum = $page;
         } else {
@@ -277,7 +277,7 @@ 
 
     function importAnnotations($pageno) {
         $fn = $this->current_filename;
-        $parser =& $this->parsers[$fn];
+        $parser = & $this->parsers[$fn];
         $parser->setPageno($pageno);
         $annots = $parser->getPageAnnotations();
 
@@ -408,10 +408,10 @@ 
      */
     function _putimportedobjects() {
         if (is_array($this->parsers) && count($this->parsers) > 0) {
-            foreach($this->parsers AS $filename => $p) {
-                $this->current_parser =& $this->parsers[$filename];
+            foreach ($this->parsers AS $filename => $p) {
+                $this->current_parser = & $this->parsers[$filename];
                 if (isset($this->_obj_stack[$filename]) && is_array($this->_obj_stack[$filename])) {
-                    while(($n = key($this->_obj_stack[$filename])) !== null) {
+                    while (($n = key($this->_obj_stack[$filename])) !== null) {
                         $nObj = $this->current_parser->getObjectVal($this->_obj_stack[$filename][$n][1]);
 
                         $this->_newobj($this->_obj_stack[$filename][$n][0]);
@@ -441,15 +441,15 @@ 
      * Private Method that writes the form xobjects
      */
     function _putformxobjects() {
-        $filter=($this->compress) ? '/Filter /FlateDecode ' : '';
+        $filter = ($this->compress) ? '/Filter /FlateDecode ' : '';
 	    reset($this->tpls);
-        foreach($this->tpls AS $tplidx => $tpl) {
-            $p=($this->compress) ? gzcompress($tpl['buffer']) : $tpl['buffer'];
+        foreach ($this->tpls AS $tplidx => $tpl) {
+            $p = ($this->compress) ? gzcompress($tpl['buffer']) : $tpl['buffer'];
     		$this->_newobj();
     		$cN = $this->n; // TCPDF/Protection: rem current "n"
 
     		$this->tpls[$tplidx]['n'] = $this->n;
-    		$this->_out('<<' . $filter . '/Type /XObject');
+    		$this->_out('<<'.$filter.'/Type /XObject');
             $this->_out('/Subtype /Form');
             $this->_out('/FormType 1');
 
@@ -470,11 +470,11 @@ 
                 $ty = -$tpl['box']['lly'];
 
                 if ($tpl['_rotationAngle'] <> 0) {
-                    $angle = $tpl['_rotationAngle'] * M_PI/180;
-                    $c=cos($angle);
-                    $s=sin($angle);
+                    $angle = $tpl['_rotationAngle'] * M_PI / 180;
+                    $c = cos($angle);
+                    $s = sin($angle);
 
-                    switch($tpl['_rotationAngle']) {
+                    switch ($tpl['_rotationAngle']) {
                         case -90:
                            $tx = -$tpl['box']['lly'];
                            $ty = $tpl['box']['urx'];
@@ -506,27 +506,27 @@ 
             $this->_out('/Resources ');
 
             if (isset($tpl['resources'])) {
-                $this->current_parser =& $tpl['parser'];
+                $this->current_parser = & $tpl['parser'];
                 $this->pdf_write_value($tpl['resources']); // "n" will be changed
             } else {
                 $this->_out('<</ProcSet [/PDF /Text /ImageB /ImageC /ImageI]');
             	if (isset($this->_res['tpl'][$tplidx]['fonts']) && count($this->_res['tpl'][$tplidx]['fonts'])) {
                 	$this->_out('/Font <<');
-                    foreach($this->_res['tpl'][$tplidx]['fonts'] as $font)
-                		$this->_out('/F' . $font['i'] . ' ' . $font['n'] . ' 0 R');
+                    foreach ($this->_res['tpl'][$tplidx]['fonts'] as $font)
+                		$this->_out('/F'.$font['i'].' '.$font['n'].' 0 R');
                 	$this->_out('>>');
                 }
-            	if(isset($this->_res['tpl'][$tplidx]['images']) && count($this->_res['tpl'][$tplidx]['images']) ||
+            	if (isset($this->_res['tpl'][$tplidx]['images']) && count($this->_res['tpl'][$tplidx]['images']) ||
             	   isset($this->_res['tpl'][$tplidx]['tpls']) && count($this->_res['tpl'][$tplidx]['tpls']))
             	{
                     $this->_out('/XObject <<');
                     if (isset($this->_res['tpl'][$tplidx]['images']) && count($this->_res['tpl'][$tplidx]['images'])) {
-                        foreach($this->_res['tpl'][$tplidx]['images'] as $image)
-                  			$this->_out('/I' . $image['i'] . ' ' . $image['n'] . ' 0 R');
+                        foreach ($this->_res['tpl'][$tplidx]['images'] as $image)
+                  			$this->_out('/I'.$image['i'].' '.$image['n'].' 0 R');
                     }
                     if (isset($this->_res['tpl'][$tplidx]['tpls']) && count($this->_res['tpl'][$tplidx]['tpls'])) {
-                        foreach($this->_res['tpl'][$tplidx]['tpls'] as $i => $tpl)
-                            $this->_out($this->tplprefix . $i . ' ' . $tpl['n'] . ' 0 R');
+                        foreach ($this->_res['tpl'][$tplidx]['tpls'] as $i => $tpl)
+                            $this->_out($this->tplprefix.$i.' '.$tpl['n'].' 0 R');
                     }
                     $this->_out('>>');
             	}
@@ -539,8 +539,8 @@ 
             $this->n = $cN; // TCPDF: reset to current "n"
 
         	$p = $this->_getrawstream($p);
-        	$this->_out('/Length ' . strlen($p) . ' >>');
-        	$this->_out("stream\n" . $p . "\nendstream");
+        	$this->_out('/Length '.strlen($p).' >>');
+        	$this->_out("stream\n".$p."\nendstream");
 
     		$this->_out('endobj');
     		$this->n = $nN; // TCPDF: reset to new "n"
@@ -560,7 +560,7 @@ 
         //Begin a new object
         if (!$onlynewobj) {
             $this->offsets[$obj_id] = $this->bufferlen;
-            $this->_out($obj_id . ' 0 obj');
+            $this->_out($obj_id.' 0 obj');
             $this->_current_obj_id = $obj_id; // for later use with encryption
         }
 
@@ -608,14 +608,14 @@ 
         switch ($value[0]) {
 
             case PDF_TYPE_TOKEN:
-                $this->_straightOut('/'.$value[1] . ' ');
+                $this->_straightOut('/'.$value[1].' ');
                 break;
             case PDF_TYPE_NUMERIC:
             case PDF_TYPE_REAL:
                 if (is_float($value[1]) && $value[1] != 0) {
-                    $this->_straightOut(rtrim(rtrim(sprintf('%F', $value[1]), '0'), '.') . ' ');
+                    $this->_straightOut(rtrim(rtrim(sprintf('%F', $value[1]), '0'), '.').' ');
                 } else {
-                    $this->_straightOut($value[1] . ' ');
+                    $this->_straightOut($value[1].' ');
                 }
                 break;
 
@@ -637,10 +637,10 @@ 
                 // A dictionary.
                 $this->_straightOut('<<');
 
-                reset ($value[1]);
+                reset($value[1]);
 
                 foreach ($value[1] as $k => $v) {
-                    $this->_straightOut($k . ' ');
+                    $this->_straightOut($k.' ');
                     $this->pdf_write_value($v);
                 }
 
@@ -651,7 +651,7 @@ 
 
                 // An indirect object reference
                 // Fill the object stack if needed
-                $cpfn =& $this->current_parser->uniqueid;
+                $cpfn = & $this->current_parser->uniqueid;
 
                 if (!isset($this->_don_obj_stack[$cpfn][$value[1]])) {
                     $this->_newobj(false, true);
@@ -660,13 +660,13 @@ 
                 }
                 $objid = $this->_don_obj_stack[$cpfn][$value[1]][0];
 
-                $this->_out($objid . ' 0 R');
+                $this->_out($objid.' 0 R');
                 break;
 
             case PDF_TYPE_STRING:
 
                 // A string.
-                $this->_straightOut('(' . $value[1] . ')');
+                $this->_straightOut('('.$value[1].')');
 
                 break;
 
@@ -682,7 +682,7 @@ 
                 break;
 
             case PDF_TYPE_HEX:
-                $this->_straightOut('<' . $value[1] . '>');
+                $this->_straightOut('<'.$value[1].'>');
                 break;
 
             case PDF_TYPE_BOOLEAN:
@@ -747,7 +747,7 @@ 
      * Removes cylced references and closes the file handles of the parser objects
      */
     function cleanUp() {
-    	foreach ($this->parsers as $k => $_){
+    	foreach ($this->parsers as $k => $_) {
         	$this->parsers[$k]->cleanUp();
         	$this->parsers[$k] = null;
         	unset($this->parsers[$k]);
@@ -755,14 +755,14 @@ 
     }
 
     // Functions from here on are taken from FPDI's fpdi2tcpdf_bridge.php to remove dependence on it
-    function _putstream($s, $n=0) {
+    function _putstream($s, $n = 0) {
         $this->_out($this->_getstream($s, $n));
     }
 
     function _getxobjectdict() {
         $out = parent::_getxobjectdict();
         if (count($this->tpls)) {
-            foreach($this->tpls as $tplidx => $tpl) {
+            foreach ($this->tpls as $tplidx => $tpl) {
                 $out .= sprintf('%s%d %d 0 R', $this->tplprefix, $tplidx, $tpl['n']);
             }
         }
@@ -779,7 +779,7 @@ 
     function _unescape($s) {
         $out = '';
         for ($count = 0, $n = strlen($s); $count < $n; $count++) {
-            if ($s[$count] != '\\' || $count == $n-1) {
+            if ($s[$count] != '\\' || $count == $n - 1) {
                 $out .= $s[$count];
             } else {
                 switch ($s[++$count]) {
@@ -804,7 +804,7 @@ 
                         $out .= chr(0x0A);
                         break;
                     case "\r":
-                        if ($count != $n-1 && $s[$count+1] == "\n")
+                        if ($count != $n - 1 && $s[$count + 1] == "\n")
                             $count++;
                         break;
                     case "\n":
@@ -813,14 +813,14 @@ 
                         // Octal-Values
                         if (ord($s[$count]) >= ord('0') &&
                             ord($s[$count]) <= ord('9')) {
-                            $oct = ''. $s[$count];
+                            $oct = ''.$s[$count];
 
-                            if (ord($s[$count+1]) >= ord('0') &&
-                                ord($s[$count+1]) <= ord('9')) {
+                            if (ord($s[$count + 1]) >= ord('0') &&
+                                ord($s[$count + 1]) <= ord('9')) {
                                 $oct .= $s[++$count];
 
-                                if (ord($s[$count+1]) >= ord('0') &&
-                                    ord($s[$count+1]) <= ord('9')) {
+                                if (ord($s[$count + 1]) >= ord('0') &&
+                                    ord($s[$count + 1]) <= ord('9')) {
                                     $oct .= $s[++$count];
                                 }
                             }

htdocs/core/lib/website.lib.php

Spacing +14 added lines, -14 removed lines

@@ -33,7 +33,7 @@ 
  */
 function dolStripPhpCode($str, $replacewith = '')
 {
-	$str = str_replace('<?=', '<?php echo', $str);	// replace a bad practive
+	$str = str_replace('<?=', '<?php echo', $str); // replace a bad practive
 
 	$newstr = '';
 
@@ -79,7 +79,7 @@ 
 {
 	$str = str_replace('<?=', '<?php echo', $str);
 	$str = str_replace('<?php', '__LTINTPHP__', $str);
-	$str = str_replace('<?', '<?php', $str);			// replace the short_open_tag. It is recommended to set this to Off in php.ini
+	$str = str_replace('<?', '<?php', $str); // replace the short_open_tag. It is recommended to set this to Off in php.ini
 	$str = str_replace('__LTINTPHP__', '<?php', $str);
 
 	$newstr = '';
@@ -286,7 +286,7 @@ 
 	global $db, $langs, $conf, $user;
 	global $dolibarr_main_url_root, $dolibarr_main_data_root;
 	global $website;
-	global $includehtmlcontentopened;	// $includehtmlcontentopened is the level of includes (start at 0 for main page, 1 for first level include, ...)
+	global $includehtmlcontentopened; // $includehtmlcontentopened is the level of includes (start at 0 for main page, 1 for first level include, ...)
 	'@phan-var-force Website $website';
 
 	$nbrep = 0;
@@ -332,9 +332,9 @@ 
 		// at end we replace the '!~!~!~' only if we are in final parent page.
 		$content = preg_replace('/(href=")\/?([^:\"\!]*)\.php\?([^#\"<>]*)(#[^\"<>]*)?\"/', '\1!~!~!~'.DOL_URL_ROOT.'/public/website/index.php?website='.$website->ref.'&pageref=\2&\3\4"', $content, -1, $nbrep);
 		// Replace occurrence like _service_XXX.php with dolibarr URL
-		$content = preg_replace('/([\'"])_service_([^\'"]+)\.php\1/', '\1!~!~!~' . DOL_URL_ROOT . '/public/website/index.php?website=' . $website->ref . '&pageref=_service_\2\1', $content, -1, $nbrep);
+		$content = preg_replace('/([\'"])_service_([^\'"]+)\.php\1/', '\1!~!~!~'.DOL_URL_ROOT.'/public/website/index.php?website='.$website->ref.'&pageref=_service_\2\1', $content, -1, $nbrep);
 		// Replace occurrence like _library_XXX.php with dolibarr URL
-		$content = preg_replace('/([\'"])_library_([^\'"]+)\.php\1/', '\1!~!~!~' . DOL_URL_ROOT . '/public/website/index.php?website=' . $website->ref . '&pageref=_library_\2\1', $content, -1, $nbrep);
+		$content = preg_replace('/([\'"])_library_([^\'"]+)\.php\1/', '\1!~!~!~'.DOL_URL_ROOT.'/public/website/index.php?website='.$website->ref.'&pageref=_library_\2\1', $content, -1, $nbrep);
 		// Replace relative link without .php like /xxx#aaa or /xxx with dolibarr URL:  ...href="....php"
 		$content = preg_replace('/(href=")\/?([a-zA-Z0-9\-_#]+)(\"|\?)/', '\1!~!~!~'.DOL_URL_ROOT.'/public/website/index.php?website='.$website->ref.'&pageref=\2\3', $content, -1, $nbrep);
 
@@ -432,7 +432,7 @@ 
 	}
 
 	if (getDolGlobalString('WEBSITE_ADD_CSS_TO_BODY')) {
-		$content = str_replace('<body id="bodywebsite" class="bodywebsite', '<body id="bodywebsite" class="bodywebsite ' . getDolGlobalString('WEBSITE_ADD_CSS_TO_BODY'), $content);
+		$content = str_replace('<body id="bodywebsite" class="bodywebsite', '<body id="bodywebsite" class="bodywebsite '.getDolGlobalString('WEBSITE_ADD_CSS_TO_BODY'), $content);
 	}
 
 	$content = dolReplaceSmileyCodeWithUTF8($content);
@@ -469,7 +469,7 @@ 
 			$sql .= " WHERE rowid = ".((int) $websiteid);
 
 			$resql = $db->query($sql);
-			if (! $resql) {
+			if (!$resql) {
 				return -1;
 			}
 		}
@@ -558,7 +558,7 @@ 
 			unset($tmpwebsitepage);
 		}
 		if ($result > 0) {
-			$currenturi = $_SERVER["REQUEST_URI"];	// Example: /public/website/index.php?website=mywebsite.com&pageref=mywebsite-home&cache=3600
+			$currenturi = $_SERVER["REQUEST_URI"]; // Example: /public/website/index.php?website=mywebsite.com&pageref=mywebsite-home&cache=3600
 			$regtmp = array();
 			if (preg_match('/&pageref=([^&]+)/', $currenturi, $regtmp)) {
 				if ($regtmp[0] == $containerref) {
@@ -581,7 +581,7 @@ 
 	if ($newurl) {
 		if (!empty($parameters)) {
 			$separator = (parse_url($newurl, PHP_URL_QUERY) == null) ? '?' : '&';
-			$newurl = $newurl . $separator . http_build_query($parameters);
+			$newurl = $newurl.$separator.http_build_query($parameters);
 		}
 		if ($permanent) {
 			header("Status: 301 Moved Permanently", false, 301);
@@ -946,7 +946,7 @@ 
 		$hashtags = trim(implode(' #', array_map('trim', explode(',', $websitepage->keywords))));
 
 		// Open Graph
-		$out .= '<meta name="og:type" content="website">'."\n";	// TODO If blogpost, use type article
+		$out .= '<meta name="og:type" content="website">'."\n"; // TODO If blogpost, use type article
 		$out .= '<meta name="og:title" content="'.$websitepage->title.'">'."\n";
 		if ($websitepage->image) {
 			$out .= '<meta name="og:image" content="'.$website->virtualhost.$image.'">'."\n";
@@ -1058,9 +1058,9 @@ 
 	$sql = "SELECT COUNT(rowid) as nb";
 	$sql .= " FROM ".MAIN_DB_PREFIX."ecm_files";
 	$sql .= " WHERE entity IN (".getEntity($object->element).")";
-	$sql .= " AND src_object_type = '".$db->escape($object->element)."' AND src_object_id = ".((int) $object->id);	// Filter on object
+	$sql .= " AND src_object_type = '".$db->escape($object->element)."' AND src_object_id = ".((int) $object->id); // Filter on object
 	$sql .= " AND ".$db->regexpsql('filename', $regexforimg, 1);
-	$sql .= " AND share IS NOT NULL";	// Only image that are public
+	$sql .= " AND share IS NOT NULL"; // Only image that are public
 
 	$resql = $db->query($sql);
 	if ($resql) {
@@ -1097,7 +1097,7 @@ 
 	$sql = "SELECT rowid, ref, share, filename, cover, position";
 	$sql .= " FROM ".MAIN_DB_PREFIX."ecm_files";
 	$sql .= " WHERE entity IN (".getEntity($object->element).")";
-	$sql .= " AND src_object_type = '".$db->escape($object->element)."' AND src_object_id = ".((int) $object->id);	// Filter on object
+	$sql .= " AND src_object_type = '".$db->escape($object->element)."' AND src_object_id = ".((int) $object->id); // Filter on object
 	$sql .= " AND ".$db->regexpsql('filename', $regexforimg, 1);
 	$sql .= ($cover ? "" : " AND cover <> 1");
 	if ($cover == 1) {
@@ -1394,7 +1394,7 @@ 
 {
 	$dom = new DOMDocument();
 
-	libxml_use_internal_errors(false);	// Avoid to fill memory with xml errors
+	libxml_use_internal_errors(false); // Avoid to fill memory with xml errors
 	if (LIBXML_VERSION < 20900) {
 		// Avoid load of external entities (security problem).
 		// Required only if LIBXML_VERSION < 20900

htdocs/fourn/class/api_supplier_orders.class.php

Spacing +2 added lines, -2 removed lines

@@ -178,7 +178,7 @@ 
 			$errormessage = '';
 			$sql .= " AND EXISTS (SELECT tl.rowid FROM ".MAIN_DB_PREFIX."commande_fournisseurdet AS tl WHERE tl.fk_commande = t.rowid";
 			$sql .= forgeSQLFromUniversalSearchCriteria($sqlfilterlines, $errormessage);
-			$sql .=	")";
+			$sql .= ")";
 			if ($errormessage) {
 				throw new RestException(400, 'Error when validating parameter sqlfilterlines -> '.$errormessage);
 			}
@@ -361,7 +361,7 @@ 
 
 		if ($source == 'all' || $source == 'external') {
 			$tmpContacts = $this->order->liste_contact(-1, 'external', 0, $type);
-			$contacts =	array_merge($contacts, $tmpContacts);
+			$contacts = array_merge($contacts, $tmpContacts);
 		}
 
 		if ($source == 'all' || $source == 'internal') {