Dolibarr / dolibarr

htdocs/projet/class/project.class.php

Spacing +5 added lines, -5 removed lines

@@ -1391,7 +1391,7 @@ 
 				$label = $langs->trans("ShowProject");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
-			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' :  ' title="tocomplete"');
+			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' : ' title="tocomplete"');
 			$linkclose .= $dataparams.' class="'.$classfortooltip.($morecss ? ' '.$morecss : '').'"';
 		} else {
 			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
@@ -1758,7 +1758,7 @@ 
 
 				foreach (array('internal', 'external') as $source) {
 					$tab = $origin_project->liste_contact(-1, $source);
-					if (is_array($tab) && count($tab)>0) {
+					if (is_array($tab) && count($tab) > 0) {
 						foreach ($tab as $contacttoadd) {
 							$clone_project->add_contact($contacttoadd['id'], $contacttoadd['code'], $contacttoadd['source'], $notrigger);
 							if ($clone_project->error == 'DB_ERROR_RECORD_ALREADY_EXISTS') {
@@ -1943,7 +1943,7 @@ 
 		if ($tableName == "actioncomm") {
 			$sql .= " SET fk_project=".$this->id;
 			$sql .= " WHERE id=".((int) $elementSelectId);
-		} elseif (in_array($tableName, ["entrepot","mrp_mo","stocktransfer_stocktransfer"])) {
+		} elseif (in_array($tableName, ["entrepot", "mrp_mo", "stocktransfer_stocktransfer"])) {
 			$sql .= " SET fk_project=".$this->id;
 			$sql .= " WHERE rowid=".((int) $elementSelectId);
 		} else {
@@ -2380,7 +2380,7 @@ 
 		require_once DOL_DOCUMENT_ROOT.'/projet/class/task.class.php';
 		$taskstatic = new Task($this->db);
 
-		$this->lines = $taskstatic->getTasksArray(0, $user, $this->id, 0, 0, '',  '-1', '', 0, 0, array(),  0,  array(),  0,  $loadRoleMode);
+		$this->lines = $taskstatic->getTasksArray(0, $user, $this->id, 0, 0, '', '-1', '', 0, 0, array(), 0, array(), 0, $loadRoleMode);
 		return 1;
 	}
 
@@ -2451,7 +2451,7 @@ 
 			$return .= '<br><div class="info-box-ref tdoverflowmax150 inline-block valignmiddle">'.$this->thirdparty->getNomUrl(1);
 			$return .= '</div><div class="inline-block valignmiddle">';
 			$return .= dol_print_phone($this->thirdparty->phone, $this->thirdparty->country_code, 0, $this->thirdparty->id, 'tel', 'hidenum', 'phone');
-			$return .='</div>';
+			$return .= '</div>';
 		}
 		if (!empty($arraydata['assignedusers'])) {
 			$return .= '<br>';

htdocs/product/class/product.class.php

Spacing +81 added lines, -81 removed lines

@@ -139,7 +139,7 @@ 
 	 */
 	public $price;
 
-	public $price_formated;			// used by takepos/ajax/ajax.php
+	public $price_formated; // used by takepos/ajax/ajax.php
 
 	/**
 	 * Selling price with tax
@@ -148,7 +148,7 @@ 
 	 */
 	public $price_ttc;
 
-	public $price_ttc_formated;		// used by takepos/ajax/ajax.php
+	public $price_ttc_formated; // used by takepos/ajax/ajax.php
 
 	/**
 	 * Minimum price net
@@ -227,7 +227,7 @@ 
 	public $packaging;
 
 
-	public $lifetime;	// In seconds
+	public $lifetime; // In seconds
 
 	public $qc_frequency;
 
@@ -359,20 +359,20 @@ 
 
 	//! Metric of products
 	public $weight;
-	public $weight_units;	// scale -3, 0, 3, 6
+	public $weight_units; // scale -3, 0, 3, 6
 	public $length;
-	public $length_units;	// scale -3, 0, 3, 6
+	public $length_units; // scale -3, 0, 3, 6
 	public $width;
-	public $width_units;	// scale -3, 0, 3, 6
+	public $width_units; // scale -3, 0, 3, 6
 	public $height;
-	public $height_units;	// scale -3, 0, 3, 6
+	public $height_units; // scale -3, 0, 3, 6
 	public $surface;
-	public $surface_units;	// scale -3, 0, 3, 6
+	public $surface_units; // scale -3, 0, 3, 6
 	public $volume;
-	public $volume_units;	// scale -3, 0, 3, 6
+	public $volume_units; // scale -3, 0, 3, 6
 
 	public $net_measure;
-	public $net_measure_units;	// scale -3, 0, 3, 6
+	public $net_measure_units; // scale -3, 0, 3, 6
 
 	public $accountancy_code_sell;
 	public $accountancy_code_sell_intra;
@@ -559,7 +559,7 @@ 
 		'import_key'    =>array('type'=>'varchar(14)', 'label'=>'ImportId', 'enabled'=>1, 'visible'=>-2, 'notnull'=>-1, 'index'=>0, 'position'=>1000),
 		//'tosell'       =>array('type'=>'integer',      'label'=>'Status',           'enabled'=>1, 'visible'=>1,  'notnull'=>1, 'default'=>0, 'index'=>1,  'position'=>1000, 'arrayofkeyval'=>array(0=>'Draft', 1=>'Active', -1=>'Cancel')),
 		//'tobuy'        =>array('type'=>'integer',      'label'=>'Status',           'enabled'=>1, 'visible'=>1,  'notnull'=>1, 'default'=>0, 'index'=>1,  'position'=>1000, 'arrayofkeyval'=>array(0=>'Draft', 1=>'Active', -1=>'Cancel')),
-		'mandatory_period' => array('type'=>'integer', 'label'=>'mandatoryperiod', 'enabled'=>1, 'visible'=>1,  'notnull'=>1, 'default'=>0, 'index'=>1,  'position'=>1000),
+		'mandatory_period' => array('type'=>'integer', 'label'=>'mandatoryperiod', 'enabled'=>1, 'visible'=>1, 'notnull'=>1, 'default'=>0, 'index'=>1, 'position'=>1000),
 	);
 
 	/**
@@ -849,9 +849,9 @@ 
 
 							// update accountancy for this entity
 							if (!$error && !empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
-								$this->db->query("DELETE FROM " . $this->db->prefix() . "product_perentity WHERE fk_product = " .((int) $this->id) . " AND entity = " . ((int) $conf->entity));
+								$this->db->query("DELETE FROM ".$this->db->prefix()."product_perentity WHERE fk_product = ".((int) $this->id)." AND entity = ".((int) $conf->entity));
 
-								$sql = "INSERT INTO " . $this->db->prefix() . "product_perentity (";
+								$sql = "INSERT INTO ".$this->db->prefix()."product_perentity (";
 								$sql .= " fk_product";
 								$sql .= ", entity";
 								$sql .= ", accountancy_code_buy";
@@ -862,13 +862,13 @@ 
 								$sql .= ", accountancy_code_sell_export";
 								$sql .= ") VALUES (";
 								$sql .= $this->id;
-								$sql .= ", " . $conf->entity;
-								$sql .= ", '" . $this->db->escape($this->accountancy_code_buy) . "'";
-								$sql .= ", '" . $this->db->escape($this->accountancy_code_buy_intra) . "'";
-								$sql .= ", '" . $this->db->escape($this->accountancy_code_buy_export) . "'";
-								$sql .= ", '" . $this->db->escape($this->accountancy_code_sell) . "'";
-								$sql .= ", '" . $this->db->escape($this->accountancy_code_sell_intra) . "'";
-								$sql .= ", '" . $this->db->escape($this->accountancy_code_sell_export) . "'";
+								$sql .= ", ".$conf->entity;
+								$sql .= ", '".$this->db->escape($this->accountancy_code_buy)."'";
+								$sql .= ", '".$this->db->escape($this->accountancy_code_buy_intra)."'";
+								$sql .= ", '".$this->db->escape($this->accountancy_code_buy_export)."'";
+								$sql .= ", '".$this->db->escape($this->accountancy_code_sell)."'";
+								$sql .= ", '".$this->db->escape($this->accountancy_code_sell_intra)."'";
+								$sql .= ", '".$this->db->escape($this->accountancy_code_sell_export)."'";
 								$sql .= ")";
 								$result = $this->db->query($sql);
 								if (!$result) {
@@ -1233,12 +1233,12 @@ 
 			$sql .= ", note_public = ".(isset($this->note_public) ? "'".$this->db->escape($this->note_public)."'" : 'null');
 			$sql .= ", duration = '".$this->db->escape($this->duration_value.$this->duration_unit)."'";
 			if (empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
-				$sql .= ", accountancy_code_buy = '" . $this->db->escape($this->accountancy_code_buy) . "'";
-				$sql .= ", accountancy_code_buy_intra = '" . $this->db->escape($this->accountancy_code_buy_intra) . "'";
-				$sql .= ", accountancy_code_buy_export = '" . $this->db->escape($this->accountancy_code_buy_export) . "'";
-				$sql .= ", accountancy_code_sell= '" . $this->db->escape($this->accountancy_code_sell) . "'";
-				$sql .= ", accountancy_code_sell_intra= '" . $this->db->escape($this->accountancy_code_sell_intra) . "'";
-				$sql .= ", accountancy_code_sell_export= '" . $this->db->escape($this->accountancy_code_sell_export) . "'";
+				$sql .= ", accountancy_code_buy = '".$this->db->escape($this->accountancy_code_buy)."'";
+				$sql .= ", accountancy_code_buy_intra = '".$this->db->escape($this->accountancy_code_buy_intra)."'";
+				$sql .= ", accountancy_code_buy_export = '".$this->db->escape($this->accountancy_code_buy_export)."'";
+				$sql .= ", accountancy_code_sell= '".$this->db->escape($this->accountancy_code_sell)."'";
+				$sql .= ", accountancy_code_sell_intra= '".$this->db->escape($this->accountancy_code_sell_intra)."'";
+				$sql .= ", accountancy_code_sell_export= '".$this->db->escape($this->accountancy_code_sell_export)."'";
 			}
 			$sql .= ", desiredstock = ".((isset($this->desiredstock) && is_numeric($this->desiredstock)) ? (float) $this->desiredstock : "null");
 			$sql .= ", cost_price = ".($this->cost_price != '' ? $this->db->escape($this->cost_price) : 'null');
@@ -1246,7 +1246,7 @@ 
 			$sql .= ", price_autogen = ".(!$this->price_autogen ? 0 : 1);
 			$sql .= ", fk_price_expression = ".($this->fk_price_expression != 0 ? (int) $this->fk_price_expression : 'NULL');
 			$sql .= ", fk_user_modif = ".($user->id > 0 ? $user->id : 'NULL');
-			$sql .= ", mandatory_period = ".($this->mandatory_period );
+			$sql .= ", mandatory_period = ".($this->mandatory_period);
 			// stock field is not here because it is a denormalized value from product_stock.
 			$sql .= " WHERE rowid = ".((int) $id);
 
@@ -1268,9 +1268,9 @@ 
 
 				// update accountancy for this entity
 				if (!$error && !empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED)) {
-					$this->db->query("DELETE FROM " . $this->db->prefix() . "product_perentity WHERE fk_product = " . ((int) $this->id) . " AND entity = " . ((int) $conf->entity));
+					$this->db->query("DELETE FROM ".$this->db->prefix()."product_perentity WHERE fk_product = ".((int) $this->id)." AND entity = ".((int) $conf->entity));
 
-					$sql = "INSERT INTO " . $this->db->prefix() . "product_perentity (";
+					$sql = "INSERT INTO ".$this->db->prefix()."product_perentity (";
 					$sql .= " fk_product";
 					$sql .= ", entity";
 					$sql .= ", accountancy_code_buy";
@@ -1281,13 +1281,13 @@ 
 					$sql .= ", accountancy_code_sell_export";
 					$sql .= ") VALUES (";
 					$sql .= $this->id;
-					$sql .= ", " . $conf->entity;
-					$sql .= ", '" . $this->db->escape($this->accountancy_code_buy) . "'";
-					$sql .= ", '" . $this->db->escape($this->accountancy_code_buy_intra) . "'";
-					$sql .= ", '" . $this->db->escape($this->accountancy_code_buy_export) . "'";
-					$sql .= ", '" . $this->db->escape($this->accountancy_code_sell) . "'";
-					$sql .= ", '" . $this->db->escape($this->accountancy_code_sell_intra) . "'";
-					$sql .= ", '" . $this->db->escape($this->accountancy_code_sell_export) . "'";
+					$sql .= ", ".$conf->entity;
+					$sql .= ", '".$this->db->escape($this->accountancy_code_buy)."'";
+					$sql .= ", '".$this->db->escape($this->accountancy_code_buy_intra)."'";
+					$sql .= ", '".$this->db->escape($this->accountancy_code_buy_export)."'";
+					$sql .= ", '".$this->db->escape($this->accountancy_code_sell)."'";
+					$sql .= ", '".$this->db->escape($this->accountancy_code_sell_intra)."'";
+					$sql .= ", '".$this->db->escape($this->accountancy_code_sell_export)."'";
 					$sql .= ")";
 					$result = $this->db->query($sql);
 					if (!$result) {
@@ -1299,8 +1299,8 @@ 
 				if (!$this->hasbatch() && $this->oldcopy->hasbatch()) {
 					// Selection of all product stock mouvements that contains batchs
 					$sql = 'SELECT pb.qty, pb.fk_entrepot, pb.batch FROM '.MAIN_DB_PREFIX.'product_batch as pb';
-					$sql.= ' INNER JOIN '.MAIN_DB_PREFIX.'product_stock as ps ON (ps.rowid = batch.fk_product_stock)';
-					$sql.= ' WHERE ps.fk_product = '.(int) $this->id;
+					$sql .= ' INNER JOIN '.MAIN_DB_PREFIX.'product_stock as ps ON (ps.rowid = batch.fk_product_stock)';
+					$sql .= ' WHERE ps.fk_product = '.(int) $this->id;
 
 					$resql = $this->db->query($sql);
 					if ($resql) {
@@ -1621,7 +1621,7 @@ 
 				}
 			} elseif (isset($this->multilangs[$key])) {
 				if (empty($this->multilangs["$key"]["label"])) {
-					$this->errors[] = $key . ' : ' . $langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label"));
+					$this->errors[] = $key.' : '.$langs->trans("ErrorFieldRequired", $langs->transnoentitiesnoconv("Label"));
 					return -1;
 				}
 
@@ -1817,7 +1817,7 @@ 
 	private function getArrayForPriceCompare($level = 0)
 	{
 
-		$testExit = array('multiprices','multiprices_ttc','multiprices_base_type','multiprices_min','multiprices_min_ttc','multiprices_tva_tx','multiprices_recuperableonly');
+		$testExit = array('multiprices', 'multiprices_ttc', 'multiprices_base_type', 'multiprices_min', 'multiprices_min_ttc', 'multiprices_tva_tx', 'multiprices_recuperableonly');
 
 		foreach ($testExit as $field) {
 			if (!isset($this->$field)) {
@@ -2440,20 +2440,20 @@ 
 
 		//For MultiCompany
 		//PMP per entity & Stocks Sharings stock_reel includes only stocks shared with this entity
-		$separatedEntityPMP = false;	// Set to true to get the AWP from table llx_product_perentity instead of field 'pmp' into llx_product.
-		$separatedStock = false;		// Set to true will count stock from subtable llx_product_stock. It is slower than using denormalized field 'stock', but it is required when using multientity and shared warehouses.
+		$separatedEntityPMP = false; // Set to true to get the AWP from table llx_product_perentity instead of field 'pmp' into llx_product.
+		$separatedStock = false; // Set to true will count stock from subtable llx_product_stock. It is slower than using denormalized field 'stock', but it is required when using multientity and shared warehouses.
 		$visibleWarehousesEntities = $conf->entity;
 		if (!empty($conf->global->MULTICOMPANY_PRODUCT_SHARING_ENABLED)) {
 			if (!empty($conf->global->MULTICOMPANY_PMP_PER_ENTITY_ENABLED)) {
-				$checkPMPPerEntity = $this->db->query("SELECT pmp FROM " . $this->db->prefix() . "product_perentity WHERE fk_product = ".((int) $id)." AND entity = ".(int) $conf->entity);
-				if ($this->db->num_rows($checkPMPPerEntity)>0) {
+				$checkPMPPerEntity = $this->db->query("SELECT pmp FROM ".$this->db->prefix()."product_perentity WHERE fk_product = ".((int) $id)." AND entity = ".(int) $conf->entity);
+				if ($this->db->num_rows($checkPMPPerEntity) > 0) {
 					$separatedEntityPMP = true;
 				}
 			}
 			global $mc;
 			$separatedStock = true;
 			if (isset($mc->sharings['stock']) && !empty($mc->sharings['stock'])) {
-				$visibleWarehousesEntities .= "," . implode(",", $mc->sharings['stock']);
+				$visibleWarehousesEntities .= ",".implode(",", $mc->sharings['stock']);
 			}
 		}
 		if ($separatedEntityPMP) {
@@ -2470,10 +2470,10 @@ 
 		}
 		$sql .= " FROM ".$this->db->prefix()."product as p";
 		if (!empty($conf->global->MAIN_PRODUCT_PERENTITY_SHARED) || $separatedEntityPMP) {
-			$sql .= " LEFT JOIN " . $this->db->prefix() . "product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = " . ((int) $conf->entity);
+			$sql .= " LEFT JOIN ".$this->db->prefix()."product_perentity as ppe ON ppe.fk_product = p.rowid AND ppe.entity = ".((int) $conf->entity);
 		}
 		if ($separatedStock) {
-			$sql .= " LEFT JOIN " . $this->db->prefix() . "product_stock as sp ON sp.fk_product = p.rowid AND sp.fk_entrepot IN (SELECT rowid FROM ".$this->db->prefix()."entrepot WHERE entity IN (".$this->db->sanitize($visibleWarehousesEntities)."))";
+			$sql .= " LEFT JOIN ".$this->db->prefix()."product_stock as sp ON sp.fk_product = p.rowid AND sp.fk_entrepot IN (SELECT rowid FROM ".$this->db->prefix()."entrepot WHERE entity IN (".$this->db->sanitize($visibleWarehousesEntities)."))";
 		}
 
 		if ($id) {
@@ -2627,15 +2627,15 @@ 
 						$sql .= " WHERE entity IN (".getEntity('productprice').")";
 						$sql .= " AND price_level=".((int) $i);
 						$sql .= " AND fk_product = ".((int) $this->id);
-						$sql .= " ORDER BY date_price DESC, rowid DESC";	// Get the most recent line
-						$sql .= " LIMIT 1";									// Only the first one
+						$sql .= " ORDER BY date_price DESC, rowid DESC"; // Get the most recent line
+						$sql .= " LIMIT 1"; // Only the first one
 						$resql = $this->db->query($sql);
 						if ($resql) {
 							$result = $this->db->fetch_array($resql);
 
 							$this->multiprices[$i] = $result ? $result["price"] : null;
 							$this->multiprices_ttc[$i] = $result ? $result["price_ttc"] : null;
-							$this->multiprices_min[$i] =  $result ? $result["price_min"] : null;
+							$this->multiprices_min[$i] = $result ? $result["price_min"] : null;
 							$this->multiprices_min_ttc[$i] = $result ? $result["price_min_ttc"] : null;
 							$this->multiprices_base_type[$i] = $result ? $result["price_base_type"] : null;
 							// Next two fields are used only if PRODUIT_MULTIPRICES_USE_VAT_PER_LEVEL is on
@@ -2855,7 +2855,7 @@ 
 				$obj = $this->db->fetch_object($result);
 				$this->stats_mo['customers_'.$role] = $obj->nb_customers ? $obj->nb_customers : 0;
 				$this->stats_mo['nb_'.$role] = $obj->nb ? $obj->nb : 0;
-				$this->stats_mo['qty_'.$role] = $obj->qty ? price2num($obj->qty, 'MS') : 0;		// qty may be a float due to the SUM()
+				$this->stats_mo['qty_'.$role] = $obj->qty ? price2num($obj->qty, 'MS') : 0; // qty may be a float due to the SUM()
 			} else {
 				$this->error = $this->db->error();
 				$error++;
@@ -4332,7 +4332,7 @@ 
 				//Addition of a product with the highest rank +1
 				$sql = "INSERT INTO ".$this->db->prefix()."product_association(fk_product_pere,fk_product_fils,qty,incdec,rang)";
 				$sql .= " VALUES (".((int) $id_pere).", ".((int) $id_fils).", ".price2num($qty, 'MS').", ".price2num($incdec, 'MS').", ".((int) $rank).")";
-				if (! $this->db->query($sql)) {
+				if (!$this->db->query($sql)) {
 					dol_print_error($this->db);
 					return -1;
 				} else {
@@ -4443,17 +4443,17 @@ 
 
 		// Updated ranks so that none are missing
 		$sqlrank = "SELECT rowid, rang FROM ".$this->db->prefix()."product_association";
-		$sqlrank.= " WHERE fk_product_pere = ".((int) $fk_parent);
-		$sqlrank.= " ORDER BY rang";
+		$sqlrank .= " WHERE fk_product_pere = ".((int) $fk_parent);
+		$sqlrank .= " ORDER BY rang";
 		$resqlrank = $this->db->query($sqlrank);
 		if ($resqlrank) {
 			$cpt = 0;
 			while ($objrank = $this->db->fetch_object($resqlrank)) {
 				$cpt++;
 				$sql = "UPDATE ".$this->db->prefix()."product_association";
-				$sql.= " SET rang = ".((int) $cpt);
-				$sql.= " WHERE rowid = ".((int) $objrank->rowid);
-				if (! $this->db->query($sql)) {
+				$sql .= " SET rang = ".((int) $cpt);
+				$sql .= " WHERE rowid = ".((int) $objrank->rowid);
+				if (!$this->db->query($sql)) {
 					dol_print_error($this->db);
 					return -1;
 				}
@@ -4886,7 +4886,7 @@ 
 		if (isset($this->sousprods) && is_array($this->sousprods)) {
 			foreach ($this->sousprods as $prod_name => $desc_product) {
 				if (is_array($desc_product)) {
-					$this->fetch_prod_arbo($desc_product, "", $multiply, 1, $this->id, $ignore_stock_load);	// This set $this->res
+					$this->fetch_prod_arbo($desc_product, "", $multiply, 1, $this->id, $ignore_stock_load); // This set $this->res
 				}
 			}
 		}
@@ -5041,9 +5041,9 @@ 
 		$sql .= " WHERE p.rowid = pa.fk_product_fils";
 		$sql .= " AND pa.fk_product_pere = ".((int) $id);
 		$sql .= " AND pa.fk_product_fils <> ".((int) $id); // This should not happens, it is to avoid infinite loop if it happens
-		$sql.= " ORDER BY pa.rang";
+		$sql .= " ORDER BY pa.rang";
 
-		dol_syslog(get_class($this).'::getChildsArbo id='.$id.' level='.$level. ' parents='.(is_array($parents)?implode(',', $parents):$parents), LOG_DEBUG);
+		dol_syslog(get_class($this).'::getChildsArbo id='.$id.' level='.$level.' parents='.(is_array($parents) ?implode(',', $parents) : $parents), LOG_DEBUG);
 
 		if ($level == 1) {
 			$alreadyfound = array($id=>1); // We init array of found object to start of tree, so if we found it later (should not happened), we stop immediatly
@@ -5133,41 +5133,41 @@ 
 		if (!empty($this->entity)) {
 			$tmpphoto = $this->show_photos('product', $conf->product->multidir_output[$this->entity], 1, 1, 0, 0, 0, 80, 0, 0, 0, 0, 1);
 			if ($this->nbphoto > 0) {
-				$datas['photo'] = '<div class="photointooltip floatright">'."\n" . $tmpphoto . '</div>';
+				$datas['photo'] = '<div class="photointooltip floatright">'."\n".$tmpphoto.'</div>';
 			}
 		}
 
 		if ($this->type == Product::TYPE_PRODUCT) {
 			$datas['picto'] = img_picto('', 'product').' <u class="paddingrightonly">'.$langs->trans("Product").'</u>';
 		} elseif ($this->type == Product::TYPE_SERVICE) {
-			$datas['picto']= img_picto('', 'service').' <u class="paddingrightonly">'.$langs->trans("Service").'</u>';
+			$datas['picto'] = img_picto('', 'service').' <u class="paddingrightonly">'.$langs->trans("Service").'</u>';
 		}
 		if (isset($this->status) && isset($this->status_buy)) {
-			$datas['status']= ' '.$this->getLibStatut(5, 0) . ' '.$this->getLibStatut(5, 1);
+			$datas['status'] = ' '.$this->getLibStatut(5, 0).' '.$this->getLibStatut(5, 1);
 		}
 
 		if (!empty($this->ref)) {
-			$datas['ref']= '<br><b>'.$langs->trans('ProductRef').':</b> '.$this->ref;
+			$datas['ref'] = '<br><b>'.$langs->trans('ProductRef').':</b> '.$this->ref;
 		}
 		if (!empty($this->label)) {
-			$datas['label']= '<br><b>'.$langs->trans('ProductLabel').':</b> '.$this->label;
+			$datas['label'] = '<br><b>'.$langs->trans('ProductLabel').':</b> '.$this->label;
 		}
 		if (!empty($this->description)) {
-			$datas['description']= '<br><b>'.$langs->trans('ProductDescription').':</b> '.dolGetFirstLineofText($this->description, 5);
+			$datas['description'] = '<br><b>'.$langs->trans('ProductDescription').':</b> '.dolGetFirstLineofText($this->description, 5);
 		}
 		if ($this->type == Product::TYPE_PRODUCT || !empty($conf->global->STOCK_SUPPORTS_SERVICES)) {
 			if (isModEnabled('productbatch')) {
 				$langs->load("productbatch");
-				$datas['batchstatus']= "<br><b>".$langs->trans("ManageLotSerial").'</b>: '.$this->getLibStatut(0, 2);
+				$datas['batchstatus'] = "<br><b>".$langs->trans("ManageLotSerial").'</b>: '.$this->getLibStatut(0, 2);
 			}
 		}
 		if (isModEnabled('barcode')) {
-			$datas['barcode']= '<br><b>'.$langs->trans('BarCode').':</b> '.$this->barcode;
+			$datas['barcode'] = '<br><b>'.$langs->trans('BarCode').':</b> '.$this->barcode;
 		}
 
 		if ($this->type == Product::TYPE_PRODUCT) {
 			if ($this->weight) {
-				$datas['weight']= "<br><b>".$langs->trans("Weight").'</b>: '.$this->weight.' '.measuringUnitString(0, "weight", $this->weight_units);
+				$datas['weight'] = "<br><b>".$langs->trans("Weight").'</b>: '.$this->weight.' '.measuringUnitString(0, "weight", $this->weight_units);
 			}
 			$labelsize = "";
 			if ($this->length) {
@@ -5180,7 +5180,7 @@ 
 				$labelsize .= ($labelsize ? " - " : "")."<b>".$langs->trans("Height").'</b>: '.$this->height.' '.measuringUnitString(0, 'size', $this->height_units);
 			}
 			if ($labelsize) {
-				$datas['size']= "<br>".$labelsize;
+				$datas['size'] = "<br>".$labelsize;
 			}
 
 			$labelsurfacevolume = "";
@@ -5191,7 +5191,7 @@ 
 				$labelsurfacevolume .= ($labelsurfacevolume ? " - " : "")."<b>".$langs->trans("Volume").'</b>: '.$this->volume.' '.measuringUnitString(0, 'volume', $this->volume_units);
 			}
 			if ($labelsurfacevolume) {
-				$datas['surface']= "<br>" . $labelsurfacevolume;
+				$datas['surface'] = "<br>".$labelsurfacevolume;
 			}
 		}
 		if (!empty($this->pmp) && $this->pmp) {
@@ -5221,9 +5221,9 @@ 
 		}
 		// show categories for this record only in ajax to not overload lists
 		if (isModEnabled('categorie') && !$nofetch) {
-			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'] = '<br>' . $form->showCategories($this->id, Categorie::TYPE_PRODUCT, 1);
+			$datas['categories'] = '<br>'.$form->showCategories($this->id, Categorie::TYPE_PRODUCT, 1);
 		}
 
 		return $datas;
@@ -5275,7 +5275,7 @@ 
 				$label = $langs->trans("ShowProduct");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1, 1).'"';
 			}
-			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1, 1).'"' :  ' title="tocomplete"');
+			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1, 1).'"' : ' title="tocomplete"');
 			$linkclose .= $dataparams.' class="nowraponall '.$classfortooltip.($morecss ? ' '.$morecss : '').'"';
 		} else {
 			$linkclose = ' class="nowraponall'.($morecss ? ' '.$morecss : '').'"';
@@ -5452,7 +5452,7 @@ 
 				$labelStatus = ($status == 1 ? $langs->transnoentitiesnoconv('ProductStatusOnBatch') : $langs->transnoentitiesnoconv('ProductStatusOnSerial'));
 				$labelStatusShort = ($status == 1 ? $langs->transnoentitiesnoconv('ProductStatusOnBatchShort') : $langs->transnoentitiesnoconv('ProductStatusOnSerialShort'));
 			}
-		} elseif ( $type == 2 && $status == 2 ) {
+		} elseif ($type == 2 && $status == 2) {
 			$labelStatus = $langs->transnoentitiesnoconv('ProductStatusOnSerial');
 			$labelStatusShort = $langs->transnoentitiesnoconv('ProductStatusOnSerialShort');
 		}
@@ -5663,7 +5663,7 @@ 
 			$sql .= " AND w.statut IN (".$this->db->sanitize(implode(',', $warehouseStatus)).")";
 		}
 
-		$sql .= " ORDER BY ps.reel ".(!empty($conf->global->DO_NOT_TRY_TO_DEFRAGMENT_STOCKS_WAREHOUSE)?'DESC':'ASC'); // Note : qty ASC is important for expedition card, to avoid stock fragmentation;
+		$sql .= " ORDER BY ps.reel ".(!empty($conf->global->DO_NOT_TRY_TO_DEFRAGMENT_STOCKS_WAREHOUSE) ? 'DESC' : 'ASC'); // Note : qty ASC is important for expedition card, to avoid stock fragmentation;
 
 		dol_syslog(get_class($this)."::load_stock", LOG_DEBUG);
 		$result = $this->db->query($sql);
@@ -5744,7 +5744,7 @@ 
 		if (isModEnabled("supplier_order")) {
 			$filterStatus = empty($conf->global->SUPPLIER_ORDER_STATUS_FOR_VIRTUAL_STOCK) ? '3,4' : $conf->global->SUPPLIER_ORDER_STATUS_FOR_VIRTUAL_STOCK;
 			if (isset($includedraftpoforvirtual)) {
-				$filterStatus = '0,1,2,'.$filterStatus;	// 1,2 may have already been inside $filterStatus but it is better to have twice than missing $filterStatus does not include them
+				$filterStatus = '0,1,2,'.$filterStatus; // 1,2 may have already been inside $filterStatus but it is better to have twice than missing $filterStatus does not include them
 			}
 			$result = $this->load_stats_commande_fournisseur(0, $filterStatus, 1, $dateofvirtualstock);
 			if ($result < 0) {
@@ -6138,7 +6138,7 @@ 
 		if (!empty($conf->global->BARCODE_PRODUCT_ADDON_NUM)) {
 			$dirsociete = array_merge(array('/core/modules/barcode/'), $conf->modules_parts['barcode']);
 			foreach ($dirsociete as $dirroot) {
-				$res = dol_include_once($dirroot . getDolGlobalString('BARCODE_PRODUCT_ADDON_NUM').'.php');
+				$res = dol_include_once($dirroot.getDolGlobalString('BARCODE_PRODUCT_ADDON_NUM').'.php');
 				if ($res) {
 					break;
 				}
@@ -6437,7 +6437,7 @@ 
 		global $langs;
 
 		if (empty($this->duration_value)) {
-			$this->errors[]='ErrorDurationForServiceNotDefinedCantCalculateHourlyPrice';
+			$this->errors[] = 'ErrorDurationForServiceNotDefinedCantCalculateHourlyPrice';
 			return -1;
 		}
 
@@ -6474,7 +6474,7 @@ 
 	 */
 	public function getKanbanView($option = '', $arraydata = null)
 	{
-		global $langs,$conf;
+		global $langs, $conf;
 
 		$selected = (empty($arraydata['selected']) ? 0 : $arraydata['selected']);
 
@@ -6515,7 +6515,7 @@ 
 			$return .= '<br><span class="info-box-status opacitymedium">'.$langs->trans('PhysicalStock').' : <span class="bold">'.$this->stock_reel.'</span></span>';
 		}
 		if (method_exists($this, 'getLibStatut')) {
-			$return .='<br><span class="info-box-status margintoponly">'.$this->getLibStatut(3, 1).' '.$this->getLibStatut(3, 0).'</span>';
+			$return .= '<br><span class="info-box-status margintoponly">'.$this->getLibStatut(3, 1).' '.$this->getLibStatut(3, 0).'</span>';
 		}
 		$return .= '</div>';
 		$return .= '</div>';

htdocs/commande/class/commande.class.php

Spacing +12 added lines, -12 removed lines

@@ -388,8 +388,8 @@ 
 	/**
 	 * Shipment on process
 	 */
-	const STATUS_SHIPMENTONPROCESS = 2;		// We set this status when a shipment is validated
-	const STATUS_ACCEPTED = 2; 				// For backward compatibility. Use key STATUS_SHIPMENTONPROCESS instead.
+	const STATUS_SHIPMENTONPROCESS = 2; // We set this status when a shipment is validated
+	const STATUS_ACCEPTED = 2; // For backward compatibility. Use key STATUS_SHIPMENTONPROCESS instead.
 
 	/**
 	 * Closed (Sent, billed or not)
@@ -422,7 +422,7 @@ 
 		if (!empty($conf->global->COMMANDE_ADDON)) {
 			$mybool = false;
 
-			$file = getDolGlobalString('COMMANDE_ADDON') . ".php";
+			$file = getDolGlobalString('COMMANDE_ADDON').".php";
 			$classname = $conf->global->COMMANDE_ADDON;
 
 			// Include file with class
@@ -597,7 +597,7 @@ 
 		// Set new ref and current status
 		if (!$error) {
 			$this->ref = $num;
-			$this->statut = self::STATUS_VALIDATED;	// deprecated
+			$this->statut = self::STATUS_VALIDATED; // deprecated
 			$this->status = self::STATUS_VALIDATED;
 		}
 
@@ -1218,7 +1218,7 @@ 
 			if ($objsoc->fetch($socid) > 0) {
 				$this->socid = $objsoc->id;
 				$this->cond_reglement_id	= (!empty($objsoc->cond_reglement_id) ? $objsoc->cond_reglement_id : 0);
-				$this->deposit_percent		= (!empty($objsoc->deposit_percent) ? $objsoc->deposit_percent : null);
+				$this->deposit_percent = (!empty($objsoc->deposit_percent) ? $objsoc->deposit_percent : null);
 				$this->mode_reglement_id	= (!empty($objsoc->mode_reglement_id) ? $objsoc->mode_reglement_id : 0);
 				$this->fk_project = 0;
 				$this->fk_delivery_address = 0;
@@ -1342,7 +1342,7 @@ 
 			$line->fk_parent_line    = $object->lines[$i]->fk_parent_line;
 			$line->fk_unit = $object->lines[$i]->fk_unit;
 
-			$line->date_start 		= $object->lines[$i]->date_start;
+			$line->date_start = $object->lines[$i]->date_start;
 			$line->date_end    		= $object->lines[$i]->date_end;
 
 			$line->fk_fournprice	= $object->lines[$i]->fk_fournprice;
@@ -3570,15 +3570,15 @@ 
 		//$sql.= " AND c.fk_statut IN (1,2,3) AND c.facture = 0";
 		if ($mode == 'toship') {
 			// An order to ship is an open order (validated or in progress)
-			$sql .= " AND c.fk_statut IN (" . self::STATUS_VALIDATED . "," . self::STATUS_SHIPMENTONPROCESS . ")";
+			$sql .= " AND c.fk_statut IN (".self::STATUS_VALIDATED.",".self::STATUS_SHIPMENTONPROCESS.")";
 		}
 		if ($mode == 'tobill') {
 			// An order to bill is an order not already billed
-			$sql .= " AND c.fk_statut IN (" . self::STATUS_VALIDATED . "," . self::STATUS_SHIPMENTONPROCESS . ", " . self::STATUS_CLOSED . ") AND c.facture = 0";
+			$sql .= " AND c.fk_statut IN (".self::STATUS_VALIDATED.",".self::STATUS_SHIPMENTONPROCESS.", ".self::STATUS_CLOSED.") AND c.facture = 0";
 		}
 		if ($mode == 'shippedtobill') {
 			// An order shipped and to bill is a delivered order not already billed
-			$sql .= " AND c.fk_statut IN (" . self::STATUS_CLOSED . ") AND c.facture = 0";
+			$sql .= " AND c.fk_statut IN (".self::STATUS_CLOSED.") AND c.facture = 0";
 		}
 		if ($user->socid) {
 			$sql .= " AND c.fk_soc = ".((int) $user->socid);
@@ -3862,7 +3862,7 @@ 
 				$label = $langs->trans("Order");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
-			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' :  ' title="tocomplete"');
+			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' : ' title="tocomplete"');
 			$linkclose .= $dataparams.' class="'.$classfortooltip.'"';
 
 			$target_value = array('_self', '_blank', '_parent', '_top');
@@ -3904,7 +3904,7 @@ 
 		}
 
 		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) {
@@ -4305,7 +4305,7 @@ 
 			$objp = $this->db->fetch_object($result);
 
 			if (!$objp) {
-				$this->error = 'OrderLine with id '. $rowid .' not found sql='.$sql;
+				$this->error = 'OrderLine with id '.$rowid.' not found sql='.$sql;
 				return 0;
 			}
 

htdocs/core/triggers/interface_20_all_Logevents.class.php

Spacing +21 added lines, -21 removed lines

@@ -42,11 +42,11 @@ 
 	{
 		$this->db = $db;
 
-		$this->name 		= preg_replace('/^Interface/i', '', get_class($this));
-		$this->family 		= "core";
-		$this->description  = "Triggers of this module allows to add security event records inside Dolibarr.";
-		$this->version 		= self::VERSION_DOLIBARR;  // VERSION_ 'DEVELOPMENT' or 'EXPERMENTAL' or 'DOLIBARR'
-		$this->picto 		= 'technic';
+		$this->name = preg_replace('/^Interface/i', '', get_class($this));
+		$this->family = "core";
+		$this->description = "Triggers of this module allows to add security event records inside Dolibarr.";
+		$this->version = self::VERSION_DOLIBARR; // VERSION_ 'DEVELOPMENT' or 'EXPERMENTAL' or 'DOLIBARR'
+		$this->picto = 'technic';
 	}
 
 	/**
@@ -87,40 +87,40 @@ 
 		// Actions
 		switch ($action) {
 			case 'USER_LOGIN':
-				dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
+				dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 				// Initialize data (date,duree,text,desc)
-				$text = "(UserLogged," . $object->login . ")";
-				$desc = "(UserLogged," . $object->login . ")";
+				$text = "(UserLogged,".$object->login.")";
+				$desc = "(UserLogged,".$object->login.")";
 				break;
 			case 'USER_LOGIN_FAILED':
-				dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
+				dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 				break;
 			case 'USER_LOGOUT':
-				dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
+				dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 				// Initialize data (date,duree,text,desc)
-				$text = "(UserLogoff," . $object->login . ")";
-				$desc = "(UserLogoff," . $object->login . ")";
+				$text = "(UserLogoff,".$object->login.")";
+				$desc = "(UserLogoff,".$object->login.")";
 				break;
 			case 'USER_CREATE':
-				dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
+				dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 				// Initialize data (date,duree,text,desc)
 				$text = $langs->transnoentities("NewUserCreated", $object->login);
 				$desc = $langs->transnoentities("NewUserCreated", $object->login);
 				break;
 			case 'USER_MODIFY':
-				dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
+				dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 				// Initialize data (date,duree,text,desc)
 				$text = $langs->transnoentities("EventUserModified", $object->login);
 				$desc = $langs->transnoentities("EventUserModified", $object->login);
 				break;
 			case 'USER_NEW_PASSWORD':
-				dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
+				dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 				// Initialize data (date,duree,text,desc)
 				$text = $langs->transnoentities("NewUserPassword", $object->login);
 				$desc = $langs->transnoentities("NewUserPassword", $object->login);
 				break;
 			case 'USER_ENABLEDISABLE':
-				dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
+				dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 				// Initialize data (date,duree,text,desc)
 				if ($object->statut == 0) {
 					$text = $langs->transnoentities("UserEnabled", $object->login);
@@ -132,31 +132,31 @@ 
 				}
 				break;
 			case 'USER_DELETE':
-				dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
+				dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 				// Initialize data (date,duree,text,desc)
 				$text = $langs->transnoentities("UserDeleted", $object->login);
 				$desc = $langs->transnoentities("UserDeleted", $object->login);
 				break;
 			case 'USERGROUP_CREATE':
-				dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
+				dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 				// Initialize data (date,duree,text,desc)
 				$text = $langs->transnoentities("NewGroupCreated", $object->name);
 				$desc = $langs->transnoentities("NewGroupCreated", $object->name);
 				break;
 			case 'USERGROUP_MODIFY':
-				dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
+				dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 				// Initialize data (date,duree,text,desc)
 				$text = $langs->transnoentities("GroupModified", $object->name);
 				$desc = $langs->transnoentities("GroupModified", $object->name);
 				break;
 			case 'USERGROUP_DELETE':
-				dol_syslog("Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
+				dol_syslog("Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 				// Initialize data (date,duree,text,desc)
 				$text = $langs->transnoentities("GroupDeleted", $object->name);
 				$desc = $langs->transnoentities("GroupDeleted", $object->name);
 				break;
 			default:
-				dol_syslog("Unknown action. Trigger '" . $this->name . "' for action '$action' launched by " . __FILE__ . ". id=" . $object->id);
+				dol_syslog("Unknown action. Trigger '".$this->name."' for action '$action' launched by ".__FILE__.". id=".$object->id);
 				break;
 		}
 

htdocs/core/ajax/onlineSign.php

Spacing +88 added lines, -88 removed lines

@@ -51,13 +51,13 @@ 
 	define("DOLENTITY", $entity);
 }
 include '../../main.inc.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
 
 $action = GETPOST('action', 'aZ09');
 
 $signature = GETPOST('signaturebase64');
 $ref = GETPOST('ref', 'aZ09');
-$mode = GETPOST('mode', 'aZ09');    // 'proposal', ...
+$mode = GETPOST('mode', 'aZ09'); // 'proposal', ...
 $SECUREKEY = GETPOST("securekey"); // Secure key
 $online_sign_name = GETPOST("onlinesignname") ? GETPOST("onlinesignname") : '';
 
@@ -72,8 +72,8 @@ 
 	$securekeyseed = getDolGlobalString('PROPOSAL_ONLINE_SIGNATURE_SECURITY_TOKEN');
 }
 
-if (empty($SECUREKEY) || !dol_verifyHash($securekeyseed . $type . $ref . (!isModEnabled('multicompany') ? '' : $entity), $SECUREKEY, '0')) {
-	httponly_accessforbidden('Bad value for securitykey. Value provided ' . dol_escape_htmltag($SECUREKEY) . ' does not match expected value for ref=' . dol_escape_htmltag($ref), 403);
+if (empty($SECUREKEY) || !dol_verifyHash($securekeyseed.$type.$ref.(!isModEnabled('multicompany') ? '' : $entity), $SECUREKEY, '0')) {
+	httponly_accessforbidden('Bad value for securitykey. Value provided '.dol_escape_htmltag($SECUREKEY).' does not match expected value for ref='.dol_escape_htmltag($ref), 403);
 }
 
 
@@ -97,29 +97,29 @@ 
 		$data = base64_decode($signature);
 
 		if ($mode == "propale" || $mode == 'proposal') {
-			require_once DOL_DOCUMENT_ROOT . '/comm/propal/class/propal.class.php';
-			require_once DOL_DOCUMENT_ROOT . '/core/lib/pdf.lib.php';
+			require_once DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 			$object = new Propal($db);
 			$object->fetch(0, $ref);
 
 			$upload_dir = !empty($conf->propal->multidir_output[$object->entity]) ? $conf->propal->multidir_output[$object->entity] : $conf->propal->dir_output;
-			$upload_dir .= '/' . dol_sanitizeFileName($object->ref) . '/';
+			$upload_dir .= '/'.dol_sanitizeFileName($object->ref).'/';
 
-			$default_font_size = pdf_getPDFFontSize($langs);    // Must be after pdf_getInstance
-			$default_font = pdf_getPDFFont($langs);    // Must be after pdf_getInstance
+			$default_font_size = pdf_getPDFFontSize($langs); // Must be after pdf_getInstance
+			$default_font = pdf_getPDFFont($langs); // Must be after pdf_getInstance
 			$langs->loadLangs(array("main", "companies"));
 
 			$date = dol_print_date(dol_now(), "%Y%m%d%H%M%S");
-			$filename = "signatures/" . $date . "_signature.png";
-			if (!is_dir($upload_dir . "signatures/")) {
-				if (!dol_mkdir($upload_dir . "signatures/")) {
-					$response = "Error mkdir. Failed to create dir " . $upload_dir . "signatures/";
+			$filename = "signatures/".$date."_signature.png";
+			if (!is_dir($upload_dir."signatures/")) {
+				if (!dol_mkdir($upload_dir."signatures/")) {
+					$response = "Error mkdir. Failed to create dir ".$upload_dir."signatures/";
 					$error++;
 				}
 			}
 
 			if (!$error) {
-				$return = file_put_contents($upload_dir . $filename, $data);
+				$return = file_put_contents($upload_dir.$filename, $data);
 				if ($return == false) {
 					$error++;
 					$response = 'Error file_put_content: failed to create signature file.';
@@ -129,12 +129,12 @@ 
 			if (!$error) {
 				// Defined modele of doc
 				$last_main_doc_file = $object->last_main_doc;
-				$directdownloadlink = $object->getLastMainDocLink('proposal');    // url to download the $object->last_main_doc
+				$directdownloadlink = $object->getLastMainDocLink('proposal'); // url to download the $object->last_main_doc
 
 				if (preg_match('/\.pdf/i', $last_main_doc_file)) {
 					// TODO Use the $last_main_doc_file to defined the $newpdffilename and $sourcefile
-					$newpdffilename = $upload_dir . $ref . "_signed-" . $date . ".pdf";
-					$sourcefile = $upload_dir . $ref . ".pdf";
+					$newpdffilename = $upload_dir.$ref."_signed-".$date.".pdf";
+					$sourcefile = $upload_dir.$ref.".pdf";
 
 					if (dol_is_file($sourcefile)) {
 						// We build the new PDF
@@ -150,9 +150,9 @@ 
 						}
 
 						//$pdf->Open();
-						$pagecount = $pdf->setSourceFile($sourcefile);        // original PDF
+						$pagecount = $pdf->setSourceFile($sourcefile); // original PDF
 
-						$s = array();    // Array with size of each page. Exemple array(w'=>210, 'h'=>297);
+						$s = array(); // Array with size of each page. Exemple array(w'=>210, 'h'=>297);
 						for ($i = 1; $i < ($pagecount + 1); $i++) {
 							try {
 								$tppl = $pdf->importPage($i);
@@ -160,7 +160,7 @@ 
 								$pdf->AddPage($s['h'] > $s['w'] ? 'P' : 'L');
 								$pdf->useTemplate($tppl);
 							} catch (Exception $e) {
-								dol_syslog("Error when manipulating the PDF " . $sourcefile . " by onlineSign: " . $e->getMessage(), LOG_ERR);
+								dol_syslog("Error when manipulating the PDF ".$sourcefile." by onlineSign: ".$e->getMessage(), LOG_ERR);
 								$response = $e->getMessage();
 								$error++;
 							}
@@ -174,11 +174,11 @@ 
 
 						$pdf->SetXY($xforimgstart, $yforimgstart + round($wforimg / 4) - 4);
 						$pdf->SetFont($default_font, '', $default_font_size - 1);
-						$pdf->MultiCell($wforimg, 4, $langs->trans("DateSigning") . ': ' . dol_print_date(dol_now(), "daytext", false, $langs, true), 0, 'L');
+						$pdf->MultiCell($wforimg, 4, $langs->trans("DateSigning").': '.dol_print_date(dol_now(), "daytext", false, $langs, true), 0, 'L');
 						$pdf->SetXY($xforimgstart, $yforimgstart + round($wforimg / 4));
-						$pdf->MultiCell($wforimg, 4, $langs->trans("Lastname") . ': ' . $online_sign_name, 0, 'L');
+						$pdf->MultiCell($wforimg, 4, $langs->trans("Lastname").': '.$online_sign_name, 0, 'L');
 
-						$pdf->Image($upload_dir . $filename, $xforimgstart, $yforimgstart, $wforimg, round($wforimg / 4));
+						$pdf->Image($upload_dir.$filename, $xforimgstart, $yforimgstart, $wforimg, round($wforimg / 4));
 
 						//$pdf->Close();
 						$pdf->Output($newpdffilename, "F");
@@ -200,14 +200,14 @@ 
 
 				$online_sign_ip = getUserRemoteIP();
 
-				$sql = "UPDATE " . MAIN_DB_PREFIX . "propal";
-				$sql .= " SET fk_statut = " . ((int) $object::STATUS_SIGNED) . ", note_private = '" . $db->escape($object->note_private) . "',";
-				$sql .= " date_signature = '" . $db->idate(dol_now()) . "',";
-				$sql .= " online_sign_ip = '" . $db->escape($online_sign_ip) . "'";
+				$sql = "UPDATE ".MAIN_DB_PREFIX."propal";
+				$sql .= " SET fk_statut = ".((int) $object::STATUS_SIGNED).", note_private = '".$db->escape($object->note_private)."',";
+				$sql .= " date_signature = '".$db->idate(dol_now())."',";
+				$sql .= " online_sign_ip = '".$db->escape($online_sign_ip)."'";
 				if ($online_sign_name) {
-					$sql .= ", online_sign_name = '" . $db->escape($online_sign_name) . "'";
+					$sql .= ", online_sign_name = '".$db->escape($online_sign_name)."'";
 				}
-				$sql .= " WHERE rowid = " . ((int) $object->id);
+				$sql .= " WHERE rowid = ".((int) $object->id);
 
 				dol_syslog(__FILE__, LOG_DEBUG);
 				$resql = $db->query($sql);
@@ -226,7 +226,7 @@ 
 						$result = $object->call_trigger('PROPAL_CLOSE_SIGNED', $user);
 						if ($result < 0) {
 							$error++;
-							$response = "error in trigger " . $object->error;
+							$response = "error in trigger ".$object->error;
 						} else {
 							$response = "success";
 						}
@@ -247,25 +247,25 @@ 
 				}
 			}
 		} elseif ($mode == 'contract') {
-			require_once DOL_DOCUMENT_ROOT . '/contrat/class/contrat.class.php';
-			require_once DOL_DOCUMENT_ROOT . '/core/lib/pdf.lib.php';
+			require_once DOL_DOCUMENT_ROOT.'/contrat/class/contrat.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 			$object = new Contrat($db);
 			$object->fetch(0, $ref);
 
 			$upload_dir = !empty($conf->contrat->multidir_output[$object->entity]) ? $conf->contrat->multidir_output[$object->entity] : $conf->contrat->dir_output;
-			$upload_dir .= '/' . dol_sanitizeFileName($object->ref) . '/';
+			$upload_dir .= '/'.dol_sanitizeFileName($object->ref).'/';
 
 			$date = dol_print_date(dol_now(), "%Y%m%d%H%M%S");
-			$filename = "signatures/" . $date . "_signature.png";
-			if (!is_dir($upload_dir . "signatures/")) {
-				if (!dol_mkdir($upload_dir . "signatures/")) {
-					$response = "Error mkdir. Failed to create dir " . $upload_dir . "signatures/";
+			$filename = "signatures/".$date."_signature.png";
+			if (!is_dir($upload_dir."signatures/")) {
+				if (!dol_mkdir($upload_dir."signatures/")) {
+					$response = "Error mkdir. Failed to create dir ".$upload_dir."signatures/";
 					$error++;
 				}
 			}
 
 			if (!$error) {
-				$return = file_put_contents($upload_dir . $filename, $data);
+				$return = file_put_contents($upload_dir.$filename, $data);
 				if ($return == false) {
 					$error++;
 					$response = 'Error file_put_content: failed to create signature file.';
@@ -275,11 +275,11 @@ 
 			if (!$error) {
 				// Defined modele of doc
 				$last_main_doc_file = $object->last_main_doc;
-				$directdownloadlink = $object->getLastMainDocLink('contrat');    // url to download the $object->last_main_doc
+				$directdownloadlink = $object->getLastMainDocLink('contrat'); // url to download the $object->last_main_doc
 				if (preg_match('/\.pdf/i', $last_main_doc_file)) {
 					// TODO Use the $last_main_doc_file to defined the $newpdffilename and $sourcefile
-					$newpdffilename = $upload_dir . $ref . "_signed-" . $date . ".pdf";
-					$sourcefile = $upload_dir . $ref . ".pdf";
+					$newpdffilename = $upload_dir.$ref."_signed-".$date.".pdf";
+					$sourcefile = $upload_dir.$ref.".pdf";
 
 					if (dol_is_file($sourcefile)) {
 						// We build the new PDF
@@ -296,8 +296,8 @@ 
 
 
 						//$pdf->Open();
-						$pagecount = $pdf->setSourceFile($sourcefile);        // original PDF
-						$s = array();    // Array with size of each page. Exemple array(w'=>210, 'h'=>297);
+						$pagecount = $pdf->setSourceFile($sourcefile); // original PDF
+						$s = array(); // Array with size of each page. Exemple array(w'=>210, 'h'=>297);
 						for ($i = 1; $i < ($pagecount + 1); $i++) {
 							try {
 								$tppl = $pdf->importPage($i);
@@ -305,7 +305,7 @@ 
 								$pdf->AddPage($s['h'] > $s['w'] ? 'P' : 'L');
 								$pdf->useTemplate($tppl);
 							} catch (Exception $e) {
-								dol_syslog("Error when manipulating some PDF by onlineSign: " . $e->getMessage(), LOG_ERR);
+								dol_syslog("Error when manipulating some PDF by onlineSign: ".$e->getMessage(), LOG_ERR);
 								$response = $e->getMessage();
 								$error++;
 							}
@@ -317,7 +317,7 @@ 
 						$yforimgstart = (empty($s['h']) ? 240 : $s['h'] - 65);
 						$wforimg = $s['w'] / 2 - $xforimgstart;
 
-						$pdf->Image($upload_dir . $filename, $xforimgstart, $yforimgstart, $wforimg, round($wforimg / 4));
+						$pdf->Image($upload_dir.$filename, $xforimgstart, $yforimgstart, $wforimg, round($wforimg / 4));
 						//$pdf->Close();
 						$pdf->Output($newpdffilename, "F");
 
@@ -336,24 +336,24 @@ 
 				}
 			}
 		} elseif ($mode == 'fichinter') {
-			require_once DOL_DOCUMENT_ROOT . '/fichinter/class/fichinter.class.php';
-			require_once DOL_DOCUMENT_ROOT . '/core/lib/pdf.lib.php';
+			require_once DOL_DOCUMENT_ROOT.'/fichinter/class/fichinter.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 			$object = new Fichinter($db);
 			$object->fetch(0, $ref);
 
 			$upload_dir = !empty($conf->ficheinter->multidir_output[$object->entity]) ? $conf->ficheinter->multidir_output[$object->entity] : $conf->ficheinter->dir_output;
-			$upload_dir .= '/' . dol_sanitizeFileName($object->ref) . '/';
+			$upload_dir .= '/'.dol_sanitizeFileName($object->ref).'/';
 			$date = dol_print_date(dol_now(), "%Y%m%d%H%M%S");
-			$filename = "signatures/" . $date . "_signature.png";
-			if (!is_dir($upload_dir . "signatures/")) {
-				if (!dol_mkdir($upload_dir . "signatures/")) {
-					$response = "Error mkdir. Failed to create dir " . $upload_dir . "signatures/";
+			$filename = "signatures/".$date."_signature.png";
+			if (!is_dir($upload_dir."signatures/")) {
+				if (!dol_mkdir($upload_dir."signatures/")) {
+					$response = "Error mkdir. Failed to create dir ".$upload_dir."signatures/";
 					$error++;
 				}
 			}
 
 			if (!$error) {
-				$return = file_put_contents($upload_dir . $filename, $data);
+				$return = file_put_contents($upload_dir.$filename, $data);
 				if ($return == false) {
 					$error++;
 					$response = 'Error file_put_content: failed to create signature file.';
@@ -363,11 +363,11 @@ 
 			if (!$error) {
 				// Defined modele of doc
 				$last_main_doc_file = $object->last_main_doc;
-				$directdownloadlink = $object->getLastMainDocLink('fichinter');    // url to download the $object->last_main_doc
+				$directdownloadlink = $object->getLastMainDocLink('fichinter'); // url to download the $object->last_main_doc
 				if (preg_match('/\.pdf/i', $last_main_doc_file)) {
 					// TODO Use the $last_main_doc_file to defined the $newpdffilename and $sourcefile
-					$newpdffilename = $upload_dir . $ref . "_signed-" . $date . ".pdf";
-					$sourcefile = $upload_dir . $ref . ".pdf";
+					$newpdffilename = $upload_dir.$ref."_signed-".$date.".pdf";
+					$sourcefile = $upload_dir.$ref.".pdf";
 
 					if (dol_is_file($sourcefile)) {
 						// We build the new PDF
@@ -384,8 +384,8 @@ 
 
 
 						//$pdf->Open();
-						$pagecount = $pdf->setSourceFile($sourcefile);        // original PDF
-						$s = array();    // Array with size of each page. Exemple array(w'=>210, 'h'=>297);
+						$pagecount = $pdf->setSourceFile($sourcefile); // original PDF
+						$s = array(); // Array with size of each page. Exemple array(w'=>210, 'h'=>297);
 						for ($i = 1; $i < ($pagecount + 1); $i++) {
 							try {
 								$tppl = $pdf->importPage($i);
@@ -393,7 +393,7 @@ 
 								$pdf->AddPage($s['h'] > $s['w'] ? 'P' : 'L');
 								$pdf->useTemplate($tppl);
 							} catch (Exception $e) {
-								dol_syslog("Error when manipulating some PDF by onlineSign: " . $e->getMessage(), LOG_ERR);
+								dol_syslog("Error when manipulating some PDF by onlineSign: ".$e->getMessage(), LOG_ERR);
 								$response = $e->getMessage();
 								$error++;
 							}
@@ -404,7 +404,7 @@ 
 						$xforimgstart = 105;
 						$yforimgstart = (empty($s['h']) ? 250 : $s['h'] - 57);
 						$wforimg = $s['w'] / 1 - ($xforimgstart + 16);
-						$pdf->Image($upload_dir . $filename, $xforimgstart, $yforimgstart, $wforimg, round($wforimg / 4));
+						$pdf->Image($upload_dir.$filename, $xforimgstart, $yforimgstart, $wforimg, round($wforimg / 4));
 						//$pdf->Close();
 						$pdf->Output($newpdffilename, "F");
 
@@ -424,8 +424,8 @@ 
 			}
 		} elseif ($mode == "societe_rib") {
 			$langs->load('withdrawals');
-			require_once DOL_DOCUMENT_ROOT . '/societe/class/companybankaccount.class.php';
-			require_once DOL_DOCUMENT_ROOT . '/core/lib/pdf.lib.php';
+			require_once DOL_DOCUMENT_ROOT.'/societe/class/companybankaccount.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 			$modelpath = "core/modules/bank/doc/";
 			$object = new CompanyBankAccount($db);
 			$object->fetch($ref);
@@ -433,24 +433,24 @@ 
 				$object->fetch_thirdparty();
 
 
-				$upload_dir = $conf->societe->multidir_output[$object->thirdparty->entity] . '/'
-					. dol_sanitizeFileName($object->thirdparty->id) . '/';
+				$upload_dir = $conf->societe->multidir_output[$object->thirdparty->entity].'/'
+					. dol_sanitizeFileName($object->thirdparty->id).'/';
 
-				$default_font_size = pdf_getPDFFontSize($langs);    // Must be after pdf_getInstance
-				$default_font = pdf_getPDFFont($langs);    // Must be after pdf_getInstance
+				$default_font_size = pdf_getPDFFontSize($langs); // Must be after pdf_getInstance
+				$default_font = pdf_getPDFFont($langs); // Must be after pdf_getInstance
 				$langs->loadLangs(array("main", "companies"));
 
 				$date = dol_print_date(dol_now(), "%Y%m%d%H%M%S");
-				$filename = "signatures/" . $date . "_signature.png";
-				if (!is_dir($upload_dir . "signatures/")) {
-					if (!dol_mkdir($upload_dir . "signatures/")) {
-						$response = "Error mkdir. Failed to create dir " . $upload_dir . "signatures/";
+				$filename = "signatures/".$date."_signature.png";
+				if (!is_dir($upload_dir."signatures/")) {
+					if (!dol_mkdir($upload_dir."signatures/")) {
+						$response = "Error mkdir. Failed to create dir ".$upload_dir."signatures/";
 						$error++;
 					}
 				}
 
 				if (!$error) {
-					$return = file_put_contents($upload_dir . $filename, $data);
+					$return = file_put_contents($upload_dir.$filename, $data);
 					if ($return == false) {
 						$error++;
 						$response = 'Error file_put_content: failed to create signature file.';
@@ -461,14 +461,14 @@ 
 					// Defined modele of doc
 					$last_main_doc_file = $object->last_main_doc;
 					$last_modelpdf = $object->model_pdf;
-					$directdownloadlink = $object->getLastMainDocLink('company');    // url to download the $object->last_main_doc
+					$directdownloadlink = $object->getLastMainDocLink('company'); // url to download the $object->last_main_doc
 
 					if (preg_match('/\.pdf/i', $last_main_doc_file)) {
 						$sourcefile = '';
 						$newpdffilename = '';
 						if ($last_modelpdf == 'sepamandate') {
-							$newpdffilename = $upload_dir . $langs->transnoentitiesnoconv("SepaMandateShort") . ' ' . dol_sanitizeFileName($object->ref) . "-" . dol_sanitizeFileName($object->rum) . "_signed-" . $date . ".pdf";
-							$sourcefile = $upload_dir . $langs->transnoentitiesnoconv("SepaMandateShort") . ' ' . dol_sanitizeFileName($object->ref) . "-" . dol_sanitizeFileName($object->rum) . ".pdf";
+							$newpdffilename = $upload_dir.$langs->transnoentitiesnoconv("SepaMandateShort").' '.dol_sanitizeFileName($object->ref)."-".dol_sanitizeFileName($object->rum)."_signed-".$date.".pdf";
+							$sourcefile = $upload_dir.$langs->transnoentitiesnoconv("SepaMandateShort").' '.dol_sanitizeFileName($object->ref)."-".dol_sanitizeFileName($object->rum).".pdf";
 						}
 						if (dol_is_file($sourcefile)) {
 							// We build the new PDF
@@ -484,9 +484,9 @@ 
 							}
 
 							//$pdf->Open();
-							$pagecount = $pdf->setSourceFile($sourcefile);        // original PDF
+							$pagecount = $pdf->setSourceFile($sourcefile); // original PDF
 
-							$s = array();    // Array with size of each page. Exemple array(w'=>210, 'h'=>297);
+							$s = array(); // Array with size of each page. Exemple array(w'=>210, 'h'=>297);
 							for ($i = 1; $i < ($pagecount + 1); $i++) {
 								try {
 									$tppl = $pdf->importPage($i);
@@ -494,7 +494,7 @@ 
 									$pdf->AddPage($s['h'] > $s['w'] ? 'P' : 'L');
 									$pdf->useTemplate($tppl);
 								} catch (Exception $e) {
-									dol_syslog("Error when manipulating the PDF " . $sourcefile . " by onlineSign: " . $e->getMessage(), LOG_ERR);
+									dol_syslog("Error when manipulating the PDF ".$sourcefile." by onlineSign: ".$e->getMessage(), LOG_ERR);
 									$response = $e->getMessage();
 									$error++;
 								}
@@ -510,12 +510,12 @@ 
 								$dirmodels = array_merge($dirmodels, $conf->modules_parts['models']);
 							}
 							foreach ($dirmodels as $reldir) {
-								$file = "pdf_" . $last_modelpdf . ".modules.php";
+								$file = "pdf_".$last_modelpdf.".modules.php";
 								// On vérifie l'emplacement du modele
-								$file = dol_buildpath($reldir . $modelpath . $file, 0);
+								$file = dol_buildpath($reldir.$modelpath.$file, 0);
 								if (file_exists($file)) {
 									$filefound = $file;
-									$classname = 'pdf_' . $last_modelpdf;
+									$classname = 'pdf_'.$last_modelpdf;
 									break;
 								}
 								if ($filefound) {
@@ -524,7 +524,7 @@ 
 							}
 
 							if (!$filefound) {
-								$response = $langs->trans("Error") . ' Failed to load doc generator with modelpaths=' . $modelpath . ' - modele=' . $last_modelpdf;
+								$response = $langs->trans("Error").' Failed to load doc generator with modelpaths='.$modelpath.' - modele='.$last_modelpdf;
 								dol_syslog($response, LOG_ERR);
 								$error++;
 							}
@@ -547,10 +547,10 @@ 
 								$wforimg = $s['w'] - 20 - $xforimgstart;
 
 								$pdf->SetXY($xforimgstart, $yforimgstart + round($wforimg / 4));
-								$pdf->MultiCell($wforimg, 4, $langs->trans("Lastname") . ': ' . $online_sign_name, 0, 'L');
+								$pdf->MultiCell($wforimg, 4, $langs->trans("Lastname").': '.$online_sign_name, 0, 'L');
 
 								// A signature image file is 720 x 180 (ratio 1/4) but we use only the size into PDF
-								$pdf->Image($upload_dir . $filename, $xforimgstart, $yforimgstart, $wforimg, round($wforimg / 4));
+								$pdf->Image($upload_dir.$filename, $xforimgstart, $yforimgstart, $wforimg, round($wforimg / 4));
 							}
 							//$pdf->Close();
 							$pdf->Output($newpdffilename, "F");
@@ -576,16 +576,16 @@ 
 
 				$online_sign_ip = getUserRemoteIP();
 
-				$sql = "UPDATE " . MAIN_DB_PREFIX . $object->table_element;
+				$sql = "UPDATE ".MAIN_DB_PREFIX.$object->table_element;
 				$sql .= " SET ";
-				$sql .= " date_signature = '" . $db->idate(dol_now()) . "',";
-				$sql .= " online_sign_ip = '" . $db->escape($online_sign_ip) . "'";
+				$sql .= " date_signature = '".$db->idate(dol_now())."',";
+				$sql .= " online_sign_ip = '".$db->escape($online_sign_ip)."'";
 				if ($online_sign_name) {
-					$sql .= ", online_sign_name = '" . $db->escape($online_sign_name) . "'";
+					$sql .= ", online_sign_name = '".$db->escape($online_sign_name)."'";
 				}
 				//$sql .= ", last_main_doc = '" . $db->escape($object->element'..') . "'";
 
-				$sql .= " WHERE rowid = " . ((int) $object->id);
+				$sql .= " WHERE rowid = ".((int) $object->id);
 
 				dol_syslog(__FILE__, LOG_DEBUG);
 				$resql = $db->query($sql);

htdocs/core/class/timespent.class.php

Spacing +3 added lines, -3 removed lines

@@ -113,7 +113,7 @@ 
 	/**
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
-	public $fields=array(
+	public $fields = array(
 		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>0, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
 		'tms' => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>'1', 'position'=>17, 'notnull'=>0, 'visible'=>-2,),
 		'import_key' => array('type'=>'varchar(14)', 'label'=>'import_key', 'enabled'=>'1', 'position'=>15, 'notnull'=>0, 'visible'=>-1,),
@@ -717,7 +717,7 @@ 
 				$label = $langs->trans("ShowTimeSpent");
 				$linkclose .= ' alt="'.dol_escape_htmltag($label, 1).'"';
 			}
-			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' :  ' title="tocomplete"');
+			$linkclose .= ($label ? ' title="'.dol_escape_htmltag($label, 1).'"' : ' title="tocomplete"');
 			$linkclose .= $dataparams.' class="'.$classfortooltip.($morecss ? ' '.$morecss : '').'"';
 		} else {
 			$linkclose = ($morecss ? ' class="'.$morecss.'"' : '');
@@ -944,7 +944,7 @@ 
 		if (!empty($conf->global->TIMESPENT_timespent_ADDON)) {
 			$mybool = false;
 
-			$file = getDolGlobalString('TIMESPENT_timespent_ADDON') . ".php";
+			$file = getDolGlobalString('TIMESPENT_timespent_ADDON').".php";
 			$classname = $conf->global->TIMESPENT_timespent_ADDON;
 
 			// Include file with class

htdocs/core/modules/import/import_csv.modules.php

Spacing +11 added lines, -11 removed lines

@@ -470,7 +470,7 @@ 
 											//print 'We have made a '.$class.'->'.$method.' to get id from code '.$newval.'. ';
 											if ($classinstance->id != '') {	// id may be 0, it is a found value
 												$newval = $classinstance->id;
-											} elseif (! $error) {
+											} elseif (!$error) {
 												if (!empty($objimport->array_import_convertvalue[0][$val]['dict'])) {
 													$this->errors[$error]['lib'] = $langs->trans('ErrorFieldValueNotIn', num2Alpha($key - 1), $newval, 'code', $langs->transnoentitiesnoconv($objimport->array_import_convertvalue[0][$val]['dict']));
 												} elseif (!empty($objimport->array_import_convertvalue[0][$val]['element'])) {
@@ -643,7 +643,7 @@ 
 									$classinstance = new $class($this->db);
 									$res = call_user_func_array(array($classinstance, $method), array(&$arrayrecord, $arrayfield, ($key - 1)));
 									if (empty($classinstance->error) && empty($classinstance->errors)) {
-										$newval = $res; 	// We get new value computed.
+										$newval = $res; // We get new value computed.
 									} else {
 										$this->errors[$error]['type'] = 'CLASSERROR';
 										$this->errors[$error]['lib'] = implode(
@@ -741,12 +741,12 @@ 
 						if (isModEnabled("socialnetworks") && strpos($fieldname, "socialnetworks") !== false) {
 							if (!in_array("socialnetworks", $listfields)) {
 								$listfields[] = "socialnetworks";
-								$socialkey = array_search("socialnetworks", $listfields);	// Return position of 'socialnetworks' key in array
+								$socialkey = array_search("socialnetworks", $listfields); // Return position of 'socialnetworks' key in array
 								$listvalues[$socialkey] = '';
 							}
 							//var_dump($newval); var_dump($arrayrecord[($key - 1)]['type']);
 							if (!empty($newval) && $arrayrecord[($key - 1)]['type'] > 0) {
-								$socialkey = array_search("socialnetworks", $listfields);	// Return position of 'socialnetworks' key in array
+								$socialkey = array_search("socialnetworks", $listfields); // Return position of 'socialnetworks' key in array
 								//var_dump('sk='.$socialkey);	// socialkey=19
 								$socialnetwork = explode("_", $fieldname)[1];
 								if (empty($listvalues[$socialkey]) || $listvalues[$socialkey] == "null") {
@@ -807,7 +807,7 @@ 
 									$method = $objimport->array_import_convertvalue[0][$fieldname]['method'];
 									$resultload = dol_include_once($file);
 									if (empty($resultload)) {
-										dol_print_error('', 'Error trying to call file=' . $file . ', class=' . $class . ', method=' . $method);
+										dol_print_error('', 'Error trying to call file='.$file.', class='.$class.', method='.$method);
 										break;
 									}
 									$classinstance = new $class($this->db);
@@ -851,7 +851,7 @@ 
 						$fname = 'rowid';
 						if (strpos($tablename, '_categorie_') !== false) {
 							$is_table_category_link = true;
-							$fname='*';
+							$fname = '*';
 						}
 
 						if (!empty($updatekeys)) {
@@ -860,8 +860,8 @@ 
 							if (empty($lastinsertid)) {	// No insert done yet for a parent table
 								$sqlSelect = "SELECT ".$fname." FROM ".$tablename;
 								$data = array_combine($listfields, $listvalues);
-								$where = array();	// filters to forge SQL request
-								$filters = array();	// filters to forge output error message
+								$where = array(); // filters to forge SQL request
+								$filters = array(); // filters to forge output error message
 								foreach ($updatekeys as $key) {
 									$col = $objimport->array_import_updatekeys[0][$key];
 									$key = preg_replace('/^.*\./i', '', $key);
@@ -948,7 +948,7 @@ 
 								// We db escape social network field because he isn't in field creation
 								if (in_array("socialnetworks", $listfields)) {
 									$socialkey = array_search("socialnetworks", $listfields);
-									$tmpsql =  $listvalues[$socialkey];
+									$tmpsql = $listvalues[$socialkey];
 									$listvalues[$socialkey] = "'".$this->db->escape($tmpsql)."'";
 								}
 
@@ -968,7 +968,7 @@ 
 								$sqlend = " WHERE ".$keyfield." = ".((int) $lastinsertid);
 
 								if ($is_table_category_link) {
-									$sqlend = " WHERE " . implode(' AND ', $where);
+									$sqlend = " WHERE ".implode(' AND ', $where);
 								}
 
 								if (!empty($tablewithentity_cache[$tablename])) {
@@ -996,7 +996,7 @@ 
 							// We db escape social network field because he isn't in field creation
 							if (in_array("socialnetworks", $listfields)) {
 								$socialkey = array_search("socialnetworks", $listfields);
-								$tmpsql =  $listvalues[$socialkey];
+								$tmpsql = $listvalues[$socialkey];
 								$listvalues[$socialkey] = "'".$this->db->escape($tmpsql)."'";
 							}
 

htdocs/public/eventorganization/attendee_new.php

Spacing +33 added lines, -33 removed lines

@@ -197,7 +197,7 @@ 
 
 	if (!empty($conf->global->EVENTORGANIZATION_IMAGE_PUBLIC_INTERFACE)) {
 		print '<div class="backimagepubliceventorganizationsubscription">';
-		print '<img id="idEVENTORGANIZATION_IMAGE_PUBLIC_INTERFACE" src="' . getDolGlobalString('EVENTORGANIZATION_IMAGE_PUBLIC_INTERFACE').'">';
+		print '<img id="idEVENTORGANIZATION_IMAGE_PUBLIC_INTERFACE" src="'.getDolGlobalString('EVENTORGANIZATION_IMAGE_PUBLIC_INTERFACE').'">';
 		print '</div>';
 	}
 
@@ -235,7 +235,7 @@ 
 }
 
 // Action called when page is submitted
-if (empty($reshook) && $action == 'add' && (!empty($conference->id) && $conference->status==2  || !empty($project->id) && $project->status == Project::STATUS_VALIDATED)) {
+if (empty($reshook) && $action == 'add' && (!empty($conference->id) && $conference->status == 2 || !empty($project->id) && $project->status == Project::STATUS_VALIDATED)) {
 	$error = 0;
 
 	$urlback = '';
@@ -336,7 +336,7 @@ 
 
 		// If the registration has already been paid for this attendee
 		if (!empty($confattendee->date_subscription) && !empty($confattendee->amount)) {
-			$securekeyurl = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY') . 'conferenceorbooth'.$id, 'master');
+			$securekeyurl = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY').'conferenceorbooth'.$id, 'master');
 			$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?id='.((int) $id).'&securekey='.urlencode($securekeyurl);
 
 			$mesg = $langs->trans("RegistrationAndPaymentWereAlreadyRecorded", $email);
@@ -350,7 +350,7 @@ 
 
 		$resultfetchthirdparty = 0;
 
-		$genericcompanyname = $langs->trans('EventParticipant').' '.($emailcompany ? $emailcompany : $email);	// Keep this label simple so we can retreive same thirdparty for another event
+		$genericcompanyname = $langs->trans('EventParticipant').' '.($emailcompany ? $emailcompany : $email); // Keep this label simple so we can retreive same thirdparty for another event
 
 		// Getting the thirdparty or creating it
 		$thirdparty = new Societe($db);
@@ -603,7 +603,7 @@ 
 				$redirection = $dolibarr_main_url_root.'/public/payment/newpayment.php?source='.urlencode($sourcetouse).'&ref='.urlencode($reftouse);
 				if (!empty($conf->global->PAYMENT_SECURITY_TOKEN)) {
 					if (!empty($conf->global->PAYMENT_SECURITY_TOKEN_UNIQUE)) {
-						$redirection .= '&securekey='.dol_hash(getDolGlobalString('PAYMENT_SECURITY_TOKEN') . $sourcetouse . $reftouse, 2); // Use the source in the hash to avoid duplicates if the references are identical
+						$redirection .= '&securekey='.dol_hash(getDolGlobalString('PAYMENT_SECURITY_TOKEN').$sourcetouse.$reftouse, 2); // Use the source in the hash to avoid duplicates if the references are identical
 					} else {
 						$redirection .= '&securekey='.urlencode($conf->global->PAYMENT_SECURITY_TOKEN);
 					}
@@ -664,7 +664,7 @@ 
 				dol_syslog("Failed to send EMail to ".$sendto, LOG_ERR, 0, '_payment');
 			}
 
-			$securekeyurl = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY') . 'conferenceorbooth'.$id, 2);
+			$securekeyurl = dol_hash(getDolGlobalString('EVENTORGANIZATION_SECUREKEY').'conferenceorbooth'.$id, 2);
 			$redirection = $dolibarr_main_url_root.'/public/eventorganization/subscriptionok.php?id='.((int) $id).'&securekey='.urlencode($securekeyurl);
 
 			Header("Location: ".$redirection);
@@ -698,7 +698,7 @@ 
 print '<span class="opacitymedium">'.$langs->trans("EvntOrgWelcomeMessage").'</span>';
 print '<br>';
 // Title
-print '<span class="eventlabel large">'.dol_escape_htmltag($project->title . ' '. $conference->label).'</span><br>';
+print '<span class="eventlabel large">'.dol_escape_htmltag($project->title.' '.$conference->label).'</span><br>';
 print '</div>';
 
 // Help text
@@ -756,7 +756,7 @@ 
 	 print ' - ';
 	 print dol_print_date($project->date_end);
 	 }*/
-	$maxattendees = $project->max_attendees;	// Max attendeed for the project/event
+	$maxattendees = $project->max_attendees; // Max attendeed for the project/event
 }
 
 if ($maxattendees && $currentnbofattendees >= $maxattendees) {
@@ -772,14 +772,14 @@ 
 if ((!empty($conference->id) && $conference->status == ConferenceOrBooth::STATUS_CONFIRMED) || (!empty($project->id) && $project->status == Project::STATUS_VALIDATED)) {
 	if (empty($maxattendees) || $currentnbofattendees < $maxattendees) {
 		// Print form
-		print '<form action="' . $_SERVER["PHP_SELF"] . '" method="POST" name="newmember">' . "\n";
-		print '<input type="hidden" name="token" value="' . newToken() . '" / >';
-		print '<input type="hidden" name="entity" value="' . $entity . '" />';
+		print '<form action="'.$_SERVER["PHP_SELF"].'" method="POST" name="newmember">'."\n";
+		print '<input type="hidden" name="token" value="'.newToken().'" / >';
+		print '<input type="hidden" name="entity" value="'.$entity.'" />';
 		print '<input type="hidden" name="action" value="add" />';
-		print '<input type="hidden" name="type" value="' . $type . '" />';
-		print '<input type="hidden" name="id" value="' . $conference->id . '" />';
-		print '<input type="hidden" name="fk_project" value="' . $project->id . '" />';
-		print '<input type="hidden" name="securekey" value="' . $securekeyreceived . '" />';
+		print '<input type="hidden" name="type" value="'.$type.'" />';
+		print '<input type="hidden" name="id" value="'.$conference->id.'" />';
+		print '<input type="hidden" name="fk_project" value="'.$project->id.'" />';
+		print '<input type="hidden" name="securekey" value="'.$securekeyreceived.'" />';
 
 		print '<br>';
 		print '<br>';
@@ -799,20 +799,20 @@ 
 		});
 		</script>';
 
-		print '<table class="border" summary="form to subscribe" id="tablesubscribe">' . "\n";
+		print '<table class="border" summary="form to subscribe" id="tablesubscribe">'."\n";
 
 		// Firstname
-		print '<tr><td><span class="fieldrequired">' . $langs->trans("Firstname") . '</span></td><td>';
-		print '<input type="text" name="firstname" maxlength="255" class="minwidth200 maxwidth300" value="' . dol_escape_htmltag($firstname) . '" required></td></tr>' . "\n";
+		print '<tr><td><span class="fieldrequired">'.$langs->trans("Firstname").'</span></td><td>';
+		print '<input type="text" name="firstname" maxlength="255" class="minwidth200 maxwidth300" value="'.dol_escape_htmltag($firstname).'" required></td></tr>'."\n";
 
 		// Lastname
-		print '<tr><td><span class="fieldrequired">' . $langs->trans("Lastname") . '</span></td><td>';
-		print '<input type="text" name="lastname" maxlength="255" class="minwidth200 maxwidth300" value="' . dol_escape_htmltag($lastname) . '" required></td></tr>' . "\n";
+		print '<tr><td><span class="fieldrequired">'.$langs->trans("Lastname").'</span></td><td>';
+		print '<input type="text" name="lastname" maxlength="255" class="minwidth200 maxwidth300" value="'.dol_escape_htmltag($lastname).'" required></td></tr>'."\n";
 
 		// Email
-		print '<tr><td><span class="fieldrequired">' . $langs->trans("EmailAttendee") . '</span></td><td>';
+		print '<tr><td><span class="fieldrequired">'.$langs->trans("EmailAttendee").'</span></td><td>';
 		print img_picto('', 'email', 'class="pictofixedwidth"');
-		print '<input type="text" name="email" maxlength="255" class="minwidth200 widthcentpercentminusx maxwidth300" value="' . dol_escape_htmltag(GETPOST('email')) . '" required></td></tr>' . "\n";
+		print '<input type="text" name="email" maxlength="255" class="minwidth200 widthcentpercentminusx maxwidth300" value="'.dol_escape_htmltag(GETPOST('email')).'" required></td></tr>'."\n";
 
 		// Company
 		print '<tr id="trcompany" class="trcompany"><td>';
@@ -825,21 +825,21 @@ 
 		}
 		print '</td><td>';
 		print img_picto('', 'company', 'class="pictofixedwidth"');
-		print '<input type="text" name="societe" class="minwidth200 widthcentpercentminusx maxwidth300" value="' . dol_escape_htmltag(GETPOST('societe')) . '"'.(empty(floatval($project->price_registration)) ? '' : ' required').'></td></tr>' . "\n";
+		print '<input type="text" name="societe" class="minwidth200 widthcentpercentminusx maxwidth300" value="'.dol_escape_htmltag(GETPOST('societe')).'"'.(empty(floatval($project->price_registration)) ? '' : ' required').'></td></tr>'."\n";
 
 		// Email company for invoice
 		if ($project->price_registration) {
-			print '<tr><td>' . $form->textwithpicto($langs->trans("EmailCompany"), $langs->trans("EmailCompanyForInvoice")) . '</td><td>';
+			print '<tr><td>'.$form->textwithpicto($langs->trans("EmailCompany"), $langs->trans("EmailCompanyForInvoice")).'</td><td>';
 			print img_picto('', 'email', 'class="pictofixedwidth"');
-			print '<input type="text" name="emailcompany" maxlength="255" class="minwidth200 widthcentpercentminusx maxwidth300" value="' . dol_escape_htmltag(GETPOST('emailcompany')) . '"></td></tr>' . "\n";
+			print '<input type="text" name="emailcompany" maxlength="255" class="minwidth200 widthcentpercentminusx maxwidth300" value="'.dol_escape_htmltag(GETPOST('emailcompany')).'"></td></tr>'."\n";
 		}
 
 		// Address
-		print '<tr><td>' . $langs->trans("Address") . '</td><td>' . "\n";
-		print '<textarea name="address" id="address" wrap="soft" class="centpercent" rows="' . ROWS_2 . '">' . dol_escape_htmltag(GETPOST('address', 'restricthtml'), 0, 1) . '</textarea></td></tr>' . "\n";
+		print '<tr><td>'.$langs->trans("Address").'</td><td>'."\n";
+		print '<textarea name="address" id="address" wrap="soft" class="centpercent" rows="'.ROWS_2.'">'.dol_escape_htmltag(GETPOST('address', 'restricthtml'), 0, 1).'</textarea></td></tr>'."\n";
 
 		// Zip / Town
-		print '<tr><td>' . $langs->trans('Zip') . ' / ' . $langs->trans('Town') . '</td><td>';
+		print '<tr><td>'.$langs->trans('Zip').' / '.$langs->trans('Town').'</td><td>';
 		print $formcompany->select_ziptown(GETPOST('zipcode'), 'zipcode', array('town', 'selectcountry_id', 'state_id'), 6, 1);
 		print ' / ';
 		print $formcompany->select_ziptown(GETPOST('town'), 'town', array('zipcode', 'selectcountry_id', 'state_id'), 0, 1);
@@ -868,7 +868,7 @@ 
 		print '</td></tr>';
 		// State
 		if (empty($conf->global->SOCIETE_DISABLE_STATE)) {
-			print '<tr><td>' . $langs->trans('State') . '</td><td>';
+			print '<tr><td>'.$langs->trans('State').'</td><td>';
 			if ($country_code) {
 				print img_picto('', 'state', 'class="pictofixedwidth"');
 				print $formcompany->select_state(GETPOST("state_id"), $country_code);
@@ -879,13 +879,13 @@ 
 		}
 
 		if ($project->price_registration) {
-			print '<tr><td>' . $langs->trans('Price') . '</td><td>';
+			print '<tr><td>'.$langs->trans('Price').'</td><td>';
 			print '<span class="amount price-registration">'.price($project->price_registration, 1, $langs, 1, -1, -1, $conf->currency).'</span>';
 			print '</td></tr>';
 		}
 
 		$notetoshow = $note_public;
-		print '<tr><td>' . $langs->trans('Note') . '</td><td>';
+		print '<tr><td>'.$langs->trans('Note').'</td><td>';
 		if (!empty($conf->global->EVENTORGANIZATION_DEFAULT_NOTE_ON_REGISTRATION)) {
 			$notetoshow = str_replace('\n', "\n", $conf->global->EVENTORGANIZATION_DEFAULT_NOTE_ON_REGISTRATION);
 		}
@@ -898,9 +898,9 @@ 
 
 		// Save
 		print '<div class="center">';
-		print '<input type="submit" value="' . $langs->trans("Submit") . '" id="submitsave" class="button">';
+		print '<input type="submit" value="'.$langs->trans("Submit").'" id="submitsave" class="button">';
 		if (!empty($backtopage)) {
-			print ' &nbsp; &nbsp; <input type="submit" value="' . $langs->trans("Cancel") . '" id="submitcancel" class="button button-cancel">';
+			print ' &nbsp; &nbsp; <input type="submit" value="'.$langs->trans("Cancel").'" id="submitcancel" class="button button-cancel">';
 		}
 		print '</div>';
 

htdocs/bookcal/class/availabilities.class.php

Spacing +2 added lines, -2 removed lines

@@ -112,7 +112,7 @@ 
 	/**
 	 * @var array  Array with all fields and their property. Do not use it as a static var. It may be modified by constructor.
 	 */
-	public $fields=array(
+	public $fields = array(
 		'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>'1', 'position'=>1, 'notnull'=>1, 'visible'=>2, 'noteditable'=>'1', 'index'=>1, 'css'=>'left', 'comment'=>"Id"),
 		'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>'1', 'position'=>20, 'notnull'=>0, 'visible'=>1, 'searchall'=>1, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'help'=>"BookcalLabelAvailabilityHelp", 'showoncombobox'=>'2', 'validate'=>'1',),
 		'fk_bookcal_calendar' => array('type'=>'integer:Calendar:bookcal/class/calendar.class.php:1', 'label'=>'Calendar', 'enabled'=>'1', 'position'=>25, 'notnull'=>1, 'visible'=>1, 'css'=>'maxwidth500 widthcentpercentminusxx', 'csslist'=>'tdoverflowmax150'),
@@ -996,7 +996,7 @@ 
 		if (!empty($conf->global->BOOKCAL_AVAILABILITIES_ADDON)) {
 			$mybool = false;
 
-			$file = getDolGlobalString('BOOKCAL_AVAILABILITIES_ADDON') . ".php";
+			$file = getDolGlobalString('BOOKCAL_AVAILABILITIES_ADDON').".php";
 			$classname = $conf->global->BOOKCAL_AVAILABILITIES_ADDON;
 
 			// Include file with class