Dolibarr / dolibarr

htdocs/core/modules/DolibarrModules.class.php

Spacing +30 added lines, -30 removed lines

@@ -140,7 +140,7 @@ 
 
 	const KEY_ID = 0;
 	const KEY_LABEL = 1;
-	const KEY_TYPE = 2;	// deprecated
+	const KEY_TYPE = 2; // deprecated
 	const KEY_DEFAULT = 3;
 	const KEY_FIRST_LEVEL = 4;
 	const KEY_SECOND_LEVEL = 5;
@@ -636,7 +636,7 @@ 
 				$moduleNameInConf = 'supplier_proposal';
 			}
 
-			unset($conf->modules[$moduleNameInConf]);	// Add this module in list of enabled modules so isModEnabled() will work (conf->module->enabled must no more be used)
+			unset($conf->modules[$moduleNameInConf]); // Add this module in list of enabled modules so isModEnabled() will work (conf->module->enabled must no more be used)
 
 			return 1;
 		} else {
@@ -732,7 +732,7 @@ 
 		$pathoffile = $this->getDescLongReadmeFound();
 
 		if ($pathoffile) {     // Mostly for external modules
-			$content = file_get_contents($pathoffile, false, null, 0, 1024 * 1024);	// Max size loaded 1Mb
+			$content = file_get_contents($pathoffile, false, null, 0, 1024 * 1024); // Max size loaded 1Mb
 
 			if ((float) DOL_VERSION >= 6.0) {
 				@include_once DOL_DOCUMENT_ROOT.'/core/lib/parsemd.lib.php';
@@ -1497,7 +1497,7 @@ 
 
 				$sql = "DELETE FROM ".MAIN_DB_PREFIX."boxes_def";
 				$sql .= " WHERE file = '".$this->db->escape($file)."'";
-				$sql .= " AND entity = ".$conf->entity;		// Do not use getEntity here, we want to delete only in current company
+				$sql .= " AND entity = ".$conf->entity; // Do not use getEntity here, we want to delete only in current company
 
 				dol_syslog(get_class($this)."::delete_boxes", LOG_DEBUG);
 				$resql = $this->db->query($sql);
@@ -1920,9 +1920,9 @@ 
 
 				// If the module is active
 				foreach ($this->rights as $key => $value) {
-					$r_id = $this->rights[$key][self::KEY_ID];	// permission id in llx_rights_def (not unique because primary key is couple id-entity)
+					$r_id = $this->rights[$key][self::KEY_ID]; // permission id in llx_rights_def (not unique because primary key is couple id-entity)
 					$r_label = $this->rights[$key][self::KEY_LABEL];
-					$r_type	= $this->rights[$key][self::KEY_TYPE] ?? 'w';	// TODO deprecated
+					$r_type = $this->rights[$key][self::KEY_TYPE] ?? 'w'; // TODO deprecated
 					$r_default = $this->rights[$key][self::KEY_DEFAULT] ?? 0;
 					$r_perms = $this->rights[$key][self::KEY_FIRST_LEVEL] ?? '';
 					$r_subperms = $this->rights[$key][self::KEY_SECOND_LEVEL] ?? '';
@@ -1946,7 +1946,7 @@ 
 					}
 
 					// condition to show or hide a user right (default: 1) (eg isModEnabled('anothermodule') or ($conf->global->MAIN_FEATURES_LEVEL > 0) or etc..)
-					$r_enabled	= $this->rights[$key][self::KEY_ENABLED] ?? '1';
+					$r_enabled = $this->rights[$key][self::KEY_ENABLED] ?? '1';
 
 					// Search if perm already present
 					$sql = "SELECT count(*) as nb FROM ".MAIN_DB_PREFIX."rights_def";
@@ -1964,7 +1964,7 @@ 
 							$sql .= ", libelle";
 							$sql .= ", module";
 							$sql .= ", module_origin";
-							$sql .= ", type";	// TODO deprecated
+							$sql .= ", type"; // TODO deprecated
 							$sql .= ", bydefault";
 							$sql .= ", perms";
 							$sql .= ", subperms";
@@ -1977,13 +1977,13 @@ 
 							$sql .= ", '".$this->db->escape($r_label)."'";
 							$sql .= ", '".$this->db->escape($r_module)."'";
 							$sql .= ", '".$this->db->escape($r_module_origin)."'";
-							$sql .= ", '".$this->db->escape($r_type)."'";	// TODO deprecated
+							$sql .= ", '".$this->db->escape($r_type)."'"; // TODO deprecated
 							$sql .= ", ".((int) $r_default);
 							$sql .= ", '".$this->db->escape($r_perms)."'";
 							$sql .= ", '".$this->db->escape($r_subperms)."'";
 							$sql .= ", '".$this->db->escape($r_enabled)."'";
 
-							$sql.= ")";
+							$sql .= ")";
 
 							$resqlinsert = $this->db->query($sql, 1);
 
@@ -2583,36 +2583,36 @@ 
 		}
 
 		if ($this->isCoreOrExternalModule() == 'external' || preg_match('/development|experimental|deprecated/i', $version)) {
-			$versionTitle =  $langs->trans("Version").' '.$this->getVersion(1);
+			$versionTitle = $langs->trans("Version").' '.$this->getVersion(1);
 			if ($this->needUpdate) {
 				$versionTitle .= '<br>'.$langs->trans('ModuleUpdateAvailable').' : '.$this->lastVersion;
 			}
 
-			$return .=  '<span class="info-box-icon-version'.($versiontrans ? ' '.$versiontrans : '').' classfortooltip" title="'.dol_escape_js($versionTitle).'" >';
-			$return .=  $this->getVersion(1);
-			$return .=  '</span>';
+			$return .= '<span class="info-box-icon-version'.($versiontrans ? ' '.$versiontrans : '').' classfortooltip" title="'.dol_escape_js($versionTitle).'" >';
+			$return .= $this->getVersion(1);
+			$return .= '</span>';
 		}
 
-		$return .=  '</div>
+		$return .= '</div>
 	    <div class="info-box-content info-box-text-module'.(!getDolGlobalString($const_name) ? '' : ' info-box-module-enabled'.($versiontrans ? ' info-box-content-warning' : '')).'">
 	    <span class="info-box-title">'.$this->getName().'</span>
 	    <span class="info-box-desc twolinesmax opacitymedium" title="'.dol_escape_htmltag($this->getDesc()).'">'.nl2br($this->getDesc()).'</span>';
 
-		$return .=  '<div class="valignmiddle inline-block info-box-more">';
+		$return .= '<div class="valignmiddle inline-block info-box-more">';
 		//if ($versiontrans) print img_warning($langs->trans("Version").' '.$this->getVersion(1)).' ';
-		$return .=  '<a class="valignmiddle inline-block" href="javascript:document_preview(\''.DOL_URL_ROOT.'/admin/modulehelp.php?id='.((int) $this->numero).'\',\'text/html\',\''.dol_escape_js($langs->trans("Module")).'\')">'.img_picto(($this->isCoreOrExternalModule() == 'external' ? $langs->trans("ExternalModule").' - ' : '').$langs->trans("ClickToShowDescription"), $imginfo).'</a>';
-		$return .=  '</div><br>';
-
-		$return .=  '<div class="valignmiddle inline-block info-box-actions">';
-		$return .=  '<div class="valignmiddle inline-block info-box-setup">';
-		$return .=  $codetoconfig;
-		$return .=  '</div>';
-		$return .=  '<div class="valignmiddle inline-block marginleftonly marginrightonly">';
-		$return .=  $codeenabledisable;
-		$return .=  '</div>';
-		$return .=  '</div>';
-
-		$return .=  '
+		$return .= '<a class="valignmiddle inline-block" href="javascript:document_preview(\''.DOL_URL_ROOT.'/admin/modulehelp.php?id='.((int) $this->numero).'\',\'text/html\',\''.dol_escape_js($langs->trans("Module")).'\')">'.img_picto(($this->isCoreOrExternalModule() == 'external' ? $langs->trans("ExternalModule").' - ' : '').$langs->trans("ClickToShowDescription"), $imginfo).'</a>';
+		$return .= '</div><br>';
+
+		$return .= '<div class="valignmiddle inline-block info-box-actions">';
+		$return .= '<div class="valignmiddle inline-block info-box-setup">';
+		$return .= $codetoconfig;
+		$return .= '</div>';
+		$return .= '<div class="valignmiddle inline-block marginleftonly marginrightonly">';
+		$return .= $codeenabledisable;
+		$return .= '</div>';
+		$return .= '</div>';
+
+		$return .= '
 	    </div><!-- /.info-box-content -->
 	    </div><!-- /.info-box -->
 	    </div>';
@@ -2631,7 +2631,7 @@ 
 	{
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
 		if (!empty($this->url_last_version)) {
-			$lastVersion = getURLContent($this->url_last_version, 'GET', '', 1, array(), array('http', 'https'), 0);	// Accept http or https links on external remote server only
+			$lastVersion = getURLContent($this->url_last_version, 'GET', '', 1, array(), array('http', 'https'), 0); // Accept http or https links on external remote server only
 			if (isset($lastVersion['content']) && strlen($lastVersion['content']) < 30) {
 				// Security warning :  be careful with remote data content, the module editor could be hacked (or evil) so limit to a-z A-Z 0-9 _ . -
 				$this->lastVersion = preg_replace("/[^a-zA-Z0-9_\.\-]+/", "", $lastVersion['content']);

Braces +3 added lines, -1 removed lines

@@ -2660,6 +2660,8 @@
 				$this->dictionaries['tab'.$field][] = $dictionaryArray[$field];
 			}
 		}
-		if ($langs && !in_array($langs, $this->dictionaries[$langs])) $this->dictionaries['langs'][] = $langs;
+		if ($langs && !in_array($langs, $this->dictionaries[$langs])) {
+			$this->dictionaries['langs'][] = $langs;
+		}
 	}
 }

htdocs/fichinter/class/fichinter.class.php

Spacing +24 added lines, -24 removed lines

@@ -196,12 +196,12 @@ 
 	/**
 	 * No signature
 	 */
-	const STATUS_NO_SIGNATURE    = 0;
+	const STATUS_NO_SIGNATURE = 0;
 
 	/**
 	 * Signed by sender
 	 */
-	const STATUS_SIGNED_SENDER   = 1;
+	const STATUS_SIGNED_SENDER = 1;
 
 	/**
 	 * Signed by receiver
@@ -211,7 +211,7 @@ 
 	/**
 	 * Signed by all
 	 */
-	const STATUS_SIGNED_ALL      = 9; // To handle future kind of signature (ex: tripartite contract)
+	const STATUS_SIGNED_ALL = 9; // To handle future kind of signature (ex: tripartite contract)
 
 
 	/**
@@ -506,7 +506,7 @@ 
 				$this->description  = $obj->description;
 				$this->socid        = $obj->fk_soc;
 				$this->status       = $obj->status;
-				$this->statut       = $obj->status;	// deprecated
+				$this->statut       = $obj->status; // deprecated
 				$this->duration     = $obj->duree;
 				$this->datec        = $this->db->jdate($obj->datec);
 				$this->dateo        = $this->db->jdate($obj->dateo);
@@ -702,7 +702,7 @@ 
 			if (!$error) {
 				$this->ref = $num;
 				$this->status = self::STATUS_VALIDATED;
-				$this->statut = self::STATUS_VALIDATED;	// deprecated
+				$this->statut = self::STATUS_VALIDATED; // deprecated
 				$this->date_validation = $now;
 				$this->db->commit();
 				return 1;
@@ -736,13 +736,13 @@ 
 
 			$now = dol_now();
 
-			$sql = 'UPDATE ' . MAIN_DB_PREFIX . $this->table_element;
-			$sql .= ' SET fk_statut = ' . self::STATUS_CLOSED . ',';
-			$sql .= " datet = '" . $this->db->idate($now) . "',";
-			$sql .= " fk_user_modif = " . ((int) $user->id);
-			$sql .= " WHERE rowid = " . ((int) $this->id);
-			$sql .= " AND fk_statut > " . self::STATUS_DRAFT;
-			$sql .= " AND entity = " . ((int) $conf->entity);
+			$sql = 'UPDATE '.MAIN_DB_PREFIX.$this->table_element;
+			$sql .= ' SET fk_statut = '.self::STATUS_CLOSED.',';
+			$sql .= " datet = '".$this->db->idate($now)."',";
+			$sql .= " fk_user_modif = ".((int) $user->id);
+			$sql .= " WHERE rowid = ".((int) $this->id);
+			$sql .= " AND fk_statut > ".self::STATUS_DRAFT;
+			$sql .= " AND entity = ".((int) $conf->entity);
 
 			if ($this->db->query($sql)) {
 				if (!$notrigger) {
@@ -1002,8 +1002,8 @@ 
 		if (getDolGlobalString('FICHEINTER_ADDON')) {
 			$mybool = false;
 
-			$file = "mod_" . getDolGlobalString('FICHEINTER_ADDON').".php";
-			$classname = "mod_" . getDolGlobalString('FICHEINTER_ADDON');
+			$file = "mod_".getDolGlobalString('FICHEINTER_ADDON').".php";
+			$classname = "mod_".getDolGlobalString('FICHEINTER_ADDON');
 
 			// Include file with class
 			$dirmodels = array_merge(array('/'), (array) $conf->modules_parts['models']);
@@ -1331,7 +1331,7 @@ 
 		$this->id = 0;
 		$this->ref = '';
 		$this->status = self::STATUS_DRAFT;
-		$this->statut = self::STATUS_DRAFT;	//  deprecated
+		$this->statut = self::STATUS_DRAFT; //  deprecated
 
 		// Clear fields
 		$this->user_author_id     = $user->id;
@@ -1403,7 +1403,7 @@ 
 			$line->fk_fichinter = $fichinterid;
 			$line->desc         = $desc;
 			$line->date         = $date_intervention;
-			$line->datei        = $date_intervention;	// For backward compatibility
+			$line->datei        = $date_intervention; // For backward compatibility
 			$line->duration     = $duration;
 
 			if (is_array($array_options) && count($array_options) > 0) {
@@ -1455,7 +1455,7 @@ 
 			$line = new FichinterLigne($this->db);
 			$line->desc = $langs->trans("Description")." ".$xnbp;
 			$line->date = ($now - 3600 * (1 + $xnbp));
-			$line->datei = ($now - 3600 * (1 + $xnbp));	// For backward compatibility
+			$line->datei = ($now - 3600 * (1 + $xnbp)); // For backward compatibility
 			$line->duration = 600;
 			$line->fk_fichinter = 0;
 			$this->lines[$xnbp] = $line;
@@ -1500,7 +1500,7 @@ 
 				//For invoicing we calculing hours
 				$line->qty = round($objp->duree / 3600, 2);
 				$line->date	= $this->db->jdate($objp->date);
-				$line->datei = $this->db->jdate($objp->date);	// For backward compatibility
+				$line->datei = $this->db->jdate($objp->date); // For backward compatibility
 				$line->rang	= $objp->rang;
 				$line->product_type = 1;
 				$line->fetch_optionals();
@@ -1666,19 +1666,19 @@ 
 	 */
 	public $fk_fichinter;
 
-	public $desc; 		// Description ligne
+	public $desc; // Description ligne
 
 	/**
 	 * @var int Date of intervention
 	 */
-	public $date; 		// Date intervention
+	public $date; // Date intervention
 	/**
 	 * @var int Date of intervention
 	 * @deprecated
 	 */
-	public $datei; 		// Date intervention
+	public $datei; // Date intervention
 
-	public $duration; 	// Duration of intervention
+	public $duration; // Duration of intervention
 	public $rang = 0;
 	public $tva_tx;
 	public $subprice;
@@ -1728,10 +1728,10 @@ 
 		if ($resql) {
 			$objp = $this->db->fetch_object($resql);
 			$this->rowid          	= $objp->rowid;
-			$this->id               = $objp->rowid;
+			$this->id = $objp->rowid;
 			$this->fk_fichinter   	= $objp->fk_fichinter;
 			$this->date = $this->db->jdate($objp->date);
-			$this->datei = $this->db->jdate($objp->date);	// For backward compatibility
+			$this->datei = $this->db->jdate($objp->date); // For backward compatibility
 			$this->desc           	= $objp->description;
 			$this->duration       	= $objp->duree;
 			$this->rang           	= $objp->rang;

htdocs/website/index.php

Spacing +34 added lines, -34 removed lines

@@ -353,7 +353,7 @@ 
 }
 
 $usercanedit = $user->hasRight('website', 'write');
-$permissiontoadd = $user->hasRight('website', 'write');	// Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles
+$permissiontoadd = $user->hasRight('website', 'write'); // Used by the include of actions_addupdatedelete.inc.php and actions_linkedfiles
 $permissiontodelete = $user->hasRight('website', 'delete');
 
 
@@ -420,7 +420,7 @@ 
 if ($sortorder) {
 	$backtopage .= '&sortorder='.urlencode($sortorder);
 }
-include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php';	// This manage 'sendit', 'confirm_deletefile', 'renamefile' action when submitting new file.
+include DOL_DOCUMENT_ROOT.'/core/actions_linkedfiles.inc.php'; // This manage 'sendit', 'confirm_deletefile', 'renamefile' action when submitting new file.
 
 $backtopage = $savbacktopage;
 //var_dump($backtopage);
@@ -1183,7 +1183,7 @@ 
 		$content = '';
 		if (GETPOSTISSET('content')) {
 			//$content = GETPOST('content', 'restricthtmlallowunvalid');	// @TODO Use a restricthtmlallowunvalidwithphp
-			$content = GETPOST('content', 'none');	// @TODO Use a restricthtmlallowunvalidwithphp
+			$content = GETPOST('content', 'none'); // @TODO Use a restricthtmlallowunvalidwithphp
 
 			$objectpage->content = make_substitutions($content, $substitutionarray);
 		} else {
@@ -1556,7 +1556,7 @@ 
 					$error++;
 					setEventMessages($langs->trans('ErrorFaviconMustBeASquaredImage'), array(), 'errors');
 				}
-				if (! $error && ($filesize[0] != 16 && $filesize[0] != 32 && $filesize[0] != 64)) {
+				if (!$error && ($filesize[0] != 16 && $filesize[0] != 32 && $filesize[0] != 64)) {
 					$error++;
 					setEventMessages($langs->trans('ErrorFaviconSize'), array(), 'errors');
 				}
@@ -1568,7 +1568,7 @@ 
 				if (!GETPOSTISSET('updateandstay')) {	// If we click on "Save And Stay", we don not make the redirect
 					$action = 'preview';
 					if ($backtopage) {
-						$backtopage = preg_replace('/searchstring=[^&]*/', '', $backtopage);	// Clean backtopage url
+						$backtopage = preg_replace('/searchstring=[^&]*/', '', $backtopage); // Clean backtopage url
 						header("Location: ".$backtopage);
 						exit;
 					}
@@ -1601,7 +1601,7 @@ 
 			$phpfullcodestring = dolKeepOnlyPhpCode($dataposted);
 
 			// Security analysis
-			$errorphpcheck = checkPHPCode($phpfullcodestringold, $phpfullcodestring);	// Contains the setEventMessages
+			$errorphpcheck = checkPHPCode($phpfullcodestringold, $phpfullcodestring); // Contains the setEventMessages
 
 			if (!$errorphpcheck) {
 				$htmlheadercontent = '';
@@ -1639,7 +1639,7 @@ 
 			$phpfullcodestring = dolKeepOnlyPhpCode($dataposted);
 
 			// Security analysis
-			$errorphpcheck = checkPHPCode($phpfullcodestringold, $phpfullcodestring);	// Contains the setEventMessages
+			$errorphpcheck = checkPHPCode($phpfullcodestringold, $phpfullcodestring); // Contains the setEventMessages
 
 			if (!$errorphpcheck) {
 				$csscontent = '';
@@ -1682,7 +1682,7 @@ 
 			$phpfullcodestring = dolKeepOnlyPhpCode($dataposted);
 
 			// Security analysis
-			$errorphpcheck = checkPHPCode($phpfullcodestringold, $phpfullcodestring);	// Contains the setEventMessages
+			$errorphpcheck = checkPHPCode($phpfullcodestringold, $phpfullcodestring); // Contains the setEventMessages
 
 			if (!$errorphpcheck) {
 				$jscontent = '';
@@ -1720,7 +1720,7 @@ 
 			$phpfullcodestring = dolKeepOnlyPhpCode($dataposted);
 
 			// Security analysis
-			$errorphpcheck = checkPHPCode($phpfullcodestringold, $phpfullcodestring);	// Contains the setEventMessages
+			$errorphpcheck = checkPHPCode($phpfullcodestringold, $phpfullcodestring); // Contains the setEventMessages
 
 			if (!$errorphpcheck) {
 				$robotcontent = '';
@@ -1758,7 +1758,7 @@ 
 			$phpfullcodestring = dolKeepOnlyPhpCode($dataposted);
 
 			// Security analysis
-			$errorphpcheck = checkPHPCode($phpfullcodestringold, $phpfullcodestring);	// Contains the setEventMessages
+			$errorphpcheck = checkPHPCode($phpfullcodestringold, $phpfullcodestring); // Contains the setEventMessages
 
 			if (!$errorphpcheck) {
 				$htaccesscontent = '';
@@ -1782,7 +1782,7 @@ 
 			$phpfullcodestring = dolKeepOnlyPhpCode($dataposted);
 
 			// Security analysis
-			$errorphpcheck = checkPHPCode($phpfullcodestringold, $phpfullcodestring);	// Contains the setEventMessages
+			$errorphpcheck = checkPHPCode($phpfullcodestringold, $phpfullcodestring); // Contains the setEventMessages
 
 			if (!$errorphpcheck) {
 				$manifestjsoncontent = '';
@@ -1820,7 +1820,7 @@ 
 			$phpfullcodestring = dolKeepOnlyPhpCode($dataposted);
 
 			// Security analysis
-			$errorphpcheck = checkPHPCode($phpfullcodestringold, $phpfullcodestring);	// Contains the setEventMessages
+			$errorphpcheck = checkPHPCode($phpfullcodestringold, $phpfullcodestring); // Contains the setEventMessages
 
 			if (!$errorphpcheck) {
 				$readmecontent = '';
@@ -1858,7 +1858,7 @@ 
 			$phpfullcodestring = dolKeepOnlyPhpCode($dataposted);
 
 			// Security analysis
-			$errorphpcheck = checkPHPCode($phpfullcodestringold, $phpfullcodestring);	// Contains the setEventMessages
+			$errorphpcheck = checkPHPCode($phpfullcodestringold, $phpfullcodestring); // Contains the setEventMessages
 
 			if (!$errorphpcheck) {
 				$licensecontent = '';
@@ -1900,7 +1900,7 @@ 
 			if (!GETPOSTISSET('updateandstay')) {	// If we click on "Save And Stay", we don not make the redirect
 				$action = 'preview';
 				if ($backtopage) {
-					$backtopage = preg_replace('/searchstring=[^&]*/', '', $backtopage);	// Clean backtopage url
+					$backtopage = preg_replace('/searchstring=[^&]*/', '', $backtopage); // Clean backtopage url
 					header("Location: ".$backtopage);
 					exit;
 				}
@@ -1919,7 +1919,7 @@ 
 
 	$object->fk_default_home = $pageid;
 	$res = $object->update($user);
-	if (! ($res > 0)) {
+	if (!($res > 0)) {
 		$error++;
 		setEventMessages($object->error, $object->errors, 'errors');
 	}
@@ -2310,7 +2310,7 @@ 
 
 			$phpfullcodestringold = dolKeepOnlyPhpCode($objectpage->content);
 
-			$objectpage->content = GETPOST('PAGE_CONTENT', 'none');	// any HTML content allowed
+			$objectpage->content = GETPOST('PAGE_CONTENT', 'none'); // any HTML content allowed
 
 			$phpfullcodestring = dolKeepOnlyPhpCode($objectpage->content);
 
@@ -2531,7 +2531,7 @@ 
 				$fileofzip = '';
 				if (GETPOSTISSET('templateuserfile')) {
 					// Case we selected one template
-					$fileofzip = DOL_DATA_ROOT.'/doctemplates/websites/'.GETPOST('templateuserfile', 'alpha');	// $fileofzip will be sanitized later into the importWebSite()
+					$fileofzip = DOL_DATA_ROOT.'/doctemplates/websites/'.GETPOST('templateuserfile', 'alpha'); // $fileofzip will be sanitized later into the importWebSite()
 				} elseif (!empty($_FILES) && is_array($_FILES['userfile'])) {
 					// Case we upload a new template
 					if (is_array($_FILES['userfile']['tmp_name'])) {
@@ -2613,7 +2613,7 @@ 
 	if ($website->virtualhost) {
 		$domainname = $website->virtualhost;
 	}
-	if (! preg_match('/^http/i', $domainname)) {
+	if (!preg_match('/^http/i', $domainname)) {
 		$domainname = 'https://'.$domainname;
 	}
 
@@ -2679,7 +2679,7 @@ 
 				$url->appendChild($lastmod);
 				// Add suggested frequency for refresh
 				if (getDolGlobalString('WEBSITE_SITEMAPS_ADD_WEEKLY_FREQ')) {
-					$changefreq = $domtree->createElement('changefreq', 'weekly');	// TODO Manage other values
+					$changefreq = $domtree->createElement('changefreq', 'weekly'); // TODO Manage other values
 					$url->appendChild($changefreq);
 				}
 				// Add higher priority for home page
@@ -2784,7 +2784,7 @@ 
 				$url->appendChild($lastmod);
 				// Add suggested frequency for refresh
 				if (getDolGlobalString('WEBSITE_SITEMAPS_ADD_WEEKLY_FREQ')) {
-					$changefreq = $domtree->createElement('changefreq', 'weekly');	// TODO Manage other values
+					$changefreq = $domtree->createElement('changefreq', 'weekly'); // TODO Manage other values
 					$url->appendChild($changefreq);
 				}
 
@@ -3072,11 +3072,11 @@ 
 
 			// // Export web site
 			$extraCssClass = getDolGlobalString('WEBSITE_ALLOW_OVERWRITE_GIT_SOURCE') ? 'hideobject' : '';
-			print '<input type="submit" class="button bordertransp ' . $extraCssClass . '" ' . $disabledexport . ' value="' . dol_escape_htmltag($exportlabel) . '" name="exportsite">';
+			print '<input type="submit" class="button bordertransp '.$extraCssClass.'" '.$disabledexport.' value="'.dol_escape_htmltag($exportlabel).'" name="exportsite">';
 
 			if (getDolGlobalString('WEBSITE_ALLOW_OVERWRITE_GIT_SOURCE')) {
 				// Overwrite template in sources
-				$overwriteGitUrl = $_SERVER["PHP_SELF"] . '?action=overwritesite&website=' . urlencode($website->ref);
+				$overwriteGitUrl = $_SERVER["PHP_SELF"].'?action=overwritesite&website='.urlencode($website->ref);
 				print dolButtonToOpenExportDialog('exportpopup', $langs->trans('ExportOptions'), $langs->trans('ExportSite'), 'exportsite', $overwriteGitUrl);
 				//print '<a href="'.$_SERVER["PHP_SELF"].'?action=overwritesite&website='.urlencode($website->ref).'" class="button bordertransp hideobject" title="'.dol_escape_htmltag($langs->trans("ExportIntoGIT").". Directory ".getDolGlobalString('WEBSITE_ALLOW_OVERWRITE_GIT_SOURCE')).'">'.dol_escape_htmltag($langs->trans("ExportIntoGIT")).'</a>';
 			}
@@ -3421,7 +3421,7 @@ 
 				print '<!-- button EditInLine and ShowSubcontainers -->'."\n";
 				print '<div class="websiteselectionsection inline-block">';
 
-				print '<div class="inline-block marginrightonly">';	// Button includes dynamic content
+				print '<div class="inline-block marginrightonly">'; // Button includes dynamic content
 				print $langs->trans("ShowSubcontainers");
 				if (!getDolGlobalString('WEBSITE_SUBCONTAINERSINLINE')) {
 					print '<a class="nobordertransp nohoverborder marginleftonlyshort valignmiddle"'.$disabled.' href="'.$_SERVER["PHP_SELF"].'?website='.$object->ref.'&pageid='.$websitepage->id.'&action=setshowsubcontainers&token='.newToken().'">'.img_picto($langs->trans("ShowSubContainersOnOff", $langs->transnoentitiesnoconv("Off")), 'switch_off', '', false, 0, 0, '', 'nomarginleft').'</a>';
@@ -3430,7 +3430,7 @@ 
 				}
 				print '</div>';
 
-				print '<div class="inline-block marginrightonly">';	// Button edit inline
+				print '<div class="inline-block marginrightonly">'; // Button edit inline
 
 				print '<span id="switchckeditorinline">'."\n";
 				// Enable CKEditor inline with js on section and div with conteneditable=true
@@ -3522,15 +3522,15 @@ 
 													// Sending data via AJAX
 													$.ajax({
 														type: \'POST\',
-														url: \'' . DOL_URL_ROOT . '/core/ajax/editinline.php\',
+														url: \'' . DOL_URL_ROOT.'/core/ajax/editinline.php\',
 														data: {
 															website_ref: \''.$website->ref.'\',
-															page_id: \'' . $websitepage->id . '\',
+															page_id: \'' . $websitepage->id.'\',
 															content: content,
 															element_id: elementId,
 															element_type: elementType,
 															action: \'updatedElementContent\',
-															token: \'' . newToken() . '\'
+															token: \'' . newToken().'\'
 														},
 														success: function(response) {
 															console.log(response);
@@ -3596,7 +3596,7 @@ 
 				} else {
 					$disabled = '';
 					$title = '';
-					$url = $_SERVER["PHP_SELF"].'?action=delete&token='.newToken().'&pageid='.((int) $websitepage->id).'&website='.urlencode($website->ref);	// action=delete for webpage, deletesite for website
+					$url = $_SERVER["PHP_SELF"].'?action=delete&token='.newToken().'&pageid='.((int) $websitepage->id).'&website='.urlencode($website->ref); // action=delete for webpage, deletesite for website
 				}
 				print '<a href="'.$url.'" class="button buttonDelete bordertransp'.($disabled ? ' disabled' : '').'"'.$disabled.' title="'.dol_escape_htmltag($title).'">'.img_picto('', 'delete', 'class=""').'<span class="hideonsmartphone paddingleft">'.$langs->trans("Delete").'</span></a>';
 				print '</span>';
@@ -3816,7 +3816,7 @@ 
 		// Clean the php htaccesscontent file to remove php code and get only html part
 		$htaccesscontent = preg_replace('/<\?php \/\/ BEGIN PHP[^\?]*END PHP \?>\n*/ims', '', $htaccesscontent);
 	} else {
-		$htaccesscontent = GETPOST('WEBSITE_HTACCESS', 'nohtml');	// We must use 'nohtml' and not 'alphanohtml' because we must accept "
+		$htaccesscontent = GETPOST('WEBSITE_HTACCESS', 'nohtml'); // We must use 'nohtml' and not 'alphanohtml' because we must accept "
 	}
 	if (!trim($htaccesscontent)) {
 		$htaccesscontent .= "# Order allow,deny\n";
@@ -3918,7 +3918,7 @@ 
 	$maxfilesizearray = getMaxFileSizeArray();
 	$maxmin = $maxfilesizearray['maxmin'];
 	if ($maxmin > 0) {
-		print '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
+		print '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file
 	}
 	print '<input type="file" class="flat minwidth300" name="addedfile" id="addedfile"/>';
 
@@ -4175,7 +4175,7 @@ 
 		$maxfilesizearray = getMaxFileSizeArray();
 		$maxmin = $maxfilesizearray['maxmin'];
 		if ($maxmin > 0) {
-			print '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
+			print '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file
 		}
 		print '<input class="flat minwidth400" type="file" name="userfile[]" accept=".zip">';
 		print '<input type="submit" class="button small" name="buttonsubmitimportfile" value="'.dol_escape_htmltag($langs->trans("Upload")).'">';
@@ -4783,7 +4783,7 @@ 
 
 
 	$module = 'medias';
-	$formalreadyopen = 2;	// So the form to submit a new file will not be opened another time inside the core/tpl/filemanager.tpl.php
+	$formalreadyopen = 2; // So the form to submit a new file will not be opened another time inside the core/tpl/filemanager.tpl.php
 	if (empty($url)) {
 		$url = DOL_URL_ROOT.'/website/index.php'; // Must be an url without param
 	}
@@ -5019,8 +5019,8 @@ 
 			print getTitleFieldOfList("Language", 0, $_SERVER['PHP_SELF'], 'lang', '', $param, '', $sortfield, $sortorder, 'center ')."\n";
 			print getTitleFieldOfList("", 0, $_SERVER['PHP_SELF']);
 			print getTitleFieldOfList("UserCreation", 0, $_SERVER['PHP_SELF'], 'fk_user_creat', '', $param, '', $sortfield, $sortorder, '')."\n";
-			print getTitleFieldOfList("DateCreation", 0, $_SERVER['PHP_SELF'], 'date_creation', '', $param, '', $sortfield, $sortorder, 'center ')."\n";		// Date creation
-			print getTitleFieldOfList("DateLastModification", 0, $_SERVER['PHP_SELF'], 'tms', '', $param, '', $sortfield, $sortorder, 'center ')."\n";		// Date last modif
+			print getTitleFieldOfList("DateCreation", 0, $_SERVER['PHP_SELF'], 'date_creation', '', $param, '', $sortfield, $sortorder, 'center ')."\n"; // Date creation
+			print getTitleFieldOfList("DateLastModification", 0, $_SERVER['PHP_SELF'], 'tms', '', $param, '', $sortfield, $sortorder, 'center ')."\n"; // Date last modif
 			print getTitleFieldOfList("", 0, $_SERVER['PHP_SELF']);
 			// Action column
 			if (!getDolGlobalString('MAIN_CHECKBOX_LEFT_COLUMN')) {

htdocs/core/ajax/editinline.php

Spacing +6 added lines, -6 removed lines

@@ -66,7 +66,7 @@ 
 	$objectpage = new WebsitePage($db);
 	$res = $objectpage->fetch($page_id);
 	if (!$res) {
-		print "Cannot find page with ID = " . $page_id . ".";
+		print "Cannot find page with ID = ".$page_id.".";
 		exit;
 	}
 
@@ -74,7 +74,7 @@ 
 	$objectwebsite = new Website($db);
 	$res = $objectwebsite->fetch($objectpage->fk_website);
 	if (!$res) {
-		print "Cannot find website with REF " . $objectpage->fk_website . ".";
+		print "Cannot find website with REF ".$objectpage->fk_website.".";
 		exit;
 	}
 
@@ -82,7 +82,7 @@ 
 	$error = 0;
 
 	// Replace element content into database and tpl file
-	$objectpage->content = preg_replace('/<' . $element_type . '[^>]*id="' . $element_id . '"[^>]*>\K(.*?)(?=<\/' . $element_type . '>)/s', $content, $objectpage->content, 1);
+	$objectpage->content = preg_replace('/<'.$element_type.'[^>]*id="'.$element_id.'"[^>]*>\K(.*?)(?=<\/'.$element_type.'>)/s', $content, $objectpage->content, 1);
 	$res = $objectpage->update($user);
 	if ($res) {
 		global $dolibarr_main_data_root;
@@ -91,17 +91,17 @@ 
 
 		$result = dolSavePageContent($filetpl, $objectwebsite, $objectpage, 1);
 		if (!$result) {
-			print "Failed to write file " . $filetpl . ".";
+			print "Failed to write file ".$filetpl.".";
 			$error++;
 		}
 	} else {
-		print "Failed to save changes error " . $objectpage->error . ".";
+		print "Failed to save changes error ".$objectpage->error.".";
 		$error++;
 	}
 
 	if (!$error) {
 		$db->commit();
-		print "Changes are saved for " . $element_type . " with id " . $element_id;
+		print "Changes are saved for ".$element_type." with id ".$element_id;
 	} else {
 		$db->rollback();
 	}

htdocs/core/ajax/onlineSign.php

Spacing +109 added lines, -109 removed lines

@@ -48,18 +48,18 @@ 
 if (!defined('NOBROWSERNOTIF')) {
 	define('NOBROWSERNOTIF', '1');
 }
-$entity = (!empty($_GET['entity']) ? (int) $_GET['entity'] : (!empty($_POST['entity']) ? (int) $_POST['entity'] : 1));	// Keep $_GET and $_POST here. GETPOST not yet defined.
+$entity = (!empty($_GET['entity']) ? (int) $_GET['entity'] : (!empty($_POST['entity']) ? (int) $_POST['entity'] : 1)); // Keep $_GET and $_POST here. GETPOST not yet defined.
 if (is_numeric($entity)) {
 	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");
 
@@ -80,8 +80,8 @@ 
 	$securekeyseed = getDolGlobalString(strtoupper($type).'_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);
 }
 
 
@@ -105,29 +105,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.';
@@ -137,12 +137,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
@@ -158,13 +158,13 @@ 
 						}
 
 						//$pdf->Open();
-						$pagecount = $pdf->setSourceFile($sourcefile);        // original PDF
+						$pagecount = $pdf->setSourceFile($sourcefile); // original PDF
 
 						$param = array();
 						$param['online_sign_name'] = $online_sign_name;
-						$param['pathtoimage'] = $upload_dir . $filename;
+						$param['pathtoimage'] = $upload_dir.$filename;
 
-						$s = array();    // Array with size of each page. Example array(w'=>210, 'h'=>297);
+						$s = array(); // Array with size of each page. Example array(w'=>210, 'h'=>297);
 						for ($i = 1; $i < ($pagecount + 1); $i++) {
 							try {
 								$tppl = $pdf->importPage($i);
@@ -183,7 +183,7 @@ 
 									dolPrintSignatureImage($pdf, $langs, $param);
 								}
 							} 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++;
 							}
@@ -220,14 +220,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);
@@ -246,7 +246,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";
 						}
@@ -267,25 +267,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.';
@@ -295,11 +295,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
@@ -315,13 +315,13 @@ 
 						}
 
 						//$pdf->Open();
-						$pagecount = $pdf->setSourceFile($sourcefile);        // original PDF
+						$pagecount = $pdf->setSourceFile($sourcefile); // original PDF
 
 						$param = array();
 						$param['online_sign_name'] = $online_sign_name;
-						$param['pathtoimage'] = $upload_dir . $filename;
+						$param['pathtoimage'] = $upload_dir.$filename;
 
-						$s = array();    // Array with size of each page. Example array(w'=>210, 'h'=>297);
+						$s = array(); // Array with size of each page. Example array(w'=>210, 'h'=>297);
 						for ($i = 1; $i < ($pagecount + 1); $i++) {
 							try {
 								$tppl = $pdf->importPage($i);
@@ -340,7 +340,7 @@ 
 									dolPrintSignatureImage($pdf, $langs, $param);
 								}
 							} 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++;
 							}
@@ -375,8 +375,8 @@ 
 				}
 			}
 		} 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);
 
@@ -385,20 +385,20 @@ 
 
 			$langs->loadLangs(array("main", "companies"));
 
-			$default_font_size = pdf_getPDFFontSize($langs);	// Must be after pdf_getInstance
-			$default_font = pdf_getPDFFont($langs);	// Must be
+			$default_font_size = pdf_getPDFFontSize($langs); // Must be after pdf_getInstance
+			$default_font = pdf_getPDFFont($langs); // Must be
 
 			$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.';
@@ -408,11 +408,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
@@ -428,13 +428,13 @@ 
 						}
 
 						//$pdf->Open();
-						$pagecount = $pdf->setSourceFile($sourcefile);        // original PDF
+						$pagecount = $pdf->setSourceFile($sourcefile); // original PDF
 
 						$param = array();
 						$param['online_sign_name'] = $online_sign_name;
-						$param['pathtoimage'] = $upload_dir . $filename;
+						$param['pathtoimage'] = $upload_dir.$filename;
 
-						$s = array();    // Array with size of each page. Example array(w'=>210, 'h'=>297);
+						$s = array(); // Array with size of each page. Example array(w'=>210, 'h'=>297);
 						for ($i = 1; $i < ($pagecount + 1); $i++) {
 							try {
 								$tppl = $pdf->importPage($i);
@@ -453,7 +453,7 @@ 
 									dolPrintSignatureImage($pdf, $langs, $param);
 								}
 							} 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++;
 							}
@@ -489,8 +489,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(0, $ref);
@@ -498,23 +498,23 @@ 
 				$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.';
@@ -525,14 +525,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
@@ -548,9 +548,9 @@ 
 							}
 
 							//$pdf->Open();
-							$pagecount = $pdf->setSourceFile($sourcefile);        // original PDF
+							$pagecount = $pdf->setSourceFile($sourcefile); // original PDF
 
-							$s = array();    // Array with size of each page. Example array(w'=>210, 'h'=>297);
+							$s = array(); // Array with size of each page. Example array(w'=>210, 'h'=>297);
 							for ($i = 1; $i < ($pagecount + 1); $i++) {
 								try {
 									$tppl = $pdf->importPage($i);
@@ -558,7 +558,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++;
 								}
@@ -574,18 +574,18 @@ 
 								$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 === '') {
-								$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++;
 							}
@@ -609,7 +609,7 @@ 
 
 								$param = array();
 								$param['online_sign_name'] = $online_sign_name;
-								$param['pathtoimage'] = $upload_dir . $filename;
+								$param['pathtoimage'] = $upload_dir.$filename;
 
 								// A signature image file is 720 x 180 (ratio 1/4) but we use only the size into PDF
 								// TODO Get position of box from PDF template
@@ -644,16 +644,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);
@@ -679,8 +679,8 @@ 
 				}
 			}
 		} elseif ($mode == 'expedition') {
-			require_once DOL_DOCUMENT_ROOT . '/expedition/class/expedition.class.php';
-			require_once DOL_DOCUMENT_ROOT . '/core/lib/pdf.lib.php';
+			require_once DOL_DOCUMENT_ROOT.'/expedition/class/expedition.class.php';
+			require_once DOL_DOCUMENT_ROOT.'/core/lib/pdf.lib.php';
 
 			$object = new Expedition($db);
 			$object->fetch(0, $ref);
@@ -690,20 +690,20 @@ 
 
 			$langs->loadLangs(array("main", "companies"));
 
-			$default_font_size = pdf_getPDFFontSize($langs);	// Must be after pdf_getInstance
-			$default_font = pdf_getPDFFont($langs);	// Must be
+			$default_font_size = pdf_getPDFFontSize($langs); // Must be after pdf_getInstance
+			$default_font = pdf_getPDFFont($langs); // Must be
 
 			$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.';
@@ -716,15 +716,15 @@ 
 				if (empty($last_main_doc_file) || !dol_is_file(DOL_DATA_ROOT.'/'.$object->last_main_doc)) {
 					// It seems document has never been generated, or was generated and then deleted.
 					// So we try to regenerate it with its default template.
-					$defaulttemplate = '';		// We force the use an empty string instead of $object->model_pdf to be sure to use a "main" default template and not the last one used.
+					$defaulttemplate = ''; // We force the use an empty string instead of $object->model_pdf to be sure to use a "main" default template and not the last one used.
 					$object->generateDocument($defaulttemplate, $langs);
 				}
 				$last_main_doc_file = $object->last_main_doc;
-				$directdownloadlink = $object->getLastMainDocLink('expedition');    // url to download the $object->last_main_doc
+				$directdownloadlink = $object->getLastMainDocLink('expedition'); // 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)) {
@@ -741,13 +741,13 @@ 
 						}
 
 						//$pdf->Open();
-						$pagecount = $pdf->setSourceFile($sourcefile);        // original PDF
+						$pagecount = $pdf->setSourceFile($sourcefile); // original PDF
 
 						$param = array();
 						$param['online_sign_name'] = $online_sign_name;
-						$param['pathtoimage'] = $upload_dir . $filename;
+						$param['pathtoimage'] = $upload_dir.$filename;
 
-						$s = array();    // Array with size of each page. Example array(w'=>210, 'h'=>297);
+						$s = array(); // Array with size of each page. Example array(w'=>210, 'h'=>297);
 						for ($i = 1; $i < ($pagecount + 1); $i++) {
 							try {
 								$tppl = $pdf->importPage($i);
@@ -766,7 +766,7 @@ 
 									dolPrintSignatureImage($pdf, $langs, $param);
 								}
 							} 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++;
 							}
@@ -804,9 +804,9 @@ 
 			if (!$error) {
 				$db->begin();
 
-				$sql = "UPDATE " . MAIN_DB_PREFIX . "expedition";
-				$sql .= " SET signed_status = " . ((int) $object::STATUS_SIGNED) ;
-				$sql .= " WHERE rowid = " . ((int) $object->id);
+				$sql = "UPDATE ".MAIN_DB_PREFIX."expedition";
+				$sql .= " SET signed_status = ".((int) $object::STATUS_SIGNED);
+				$sql .= " WHERE rowid = ".((int) $object->id);
 
 				dol_syslog(__FILE__, LOG_DEBUG);
 				$resql = $db->query($sql);
@@ -848,8 +848,8 @@ 
  */
 function dolPrintSignatureImage(TCPDF $pdf, $langs, $params)
 {
-	$default_font_size = pdf_getPDFFontSize($langs);	// Must be after pdf_getInstance
-	$default_font = pdf_getPDFFont($langs);	// Must be
+	$default_font_size = pdf_getPDFFontSize($langs); // Must be after pdf_getInstance
+	$default_font = pdf_getPDFFont($langs); // Must be
 	$xforimgstart = $params['xforimgstart'];
 	$yforimgstart = $params['yforimgstart'];
 	$wforimg = $params['wforimg'];
@@ -857,7 +857,7 @@ 
 	$pdf->SetXY($xforimgstart, $yforimgstart + round($wforimg / 4) - 4);
 	$pdf->SetFont($default_font, '', $default_font_size - 1);
 	$pdf->SetTextColor(80, 80, 80);
-	$pdf->MultiCell($wforimg, 4, $langs->trans("Signature") . ': ' . dol_print_date(dol_now(), "day", false, $langs, true). ' - '.$params['online_sign_name'], 0, 'L');
+	$pdf->MultiCell($wforimg, 4, $langs->trans("Signature").': '.dol_print_date(dol_now(), "day", false, $langs, true).' - '.$params['online_sign_name'], 0, 'L');
 	//$pdf->SetXY($xforimgstart, $yforimgstart + round($wforimg / 4));
 	//$pdf->MultiCell($wforimg, 4, $langs->trans("Lastname") . ': ' . $online_sign_name, 0, 'L');
 

htdocs/expedition/class/expedition.class.php

Spacing +32 added lines, -32 removed lines

@@ -268,7 +268,7 @@ 
 	/**
 	 * No signature
 	 */
-	const STATUS_NO_SIGNATURE    = 0;
+	const STATUS_NO_SIGNATURE = 0;
 
 	/**
 	 * Signed status
@@ -320,7 +320,7 @@ 
 		if (getDolGlobalString('EXPEDITION_ADDON_NUMBER')) {
 			$mybool = false;
 
-			$file = getDolGlobalString('EXPEDITION_ADDON_NUMBER') . ".php";
+			$file = getDolGlobalString('EXPEDITION_ADDON_NUMBER').".php";
 			$classname = getDolGlobalString('EXPEDITION_ADDON_NUMBER');
 
 			// Include file with class
@@ -992,7 +992,7 @@ 
 		// If product need a batch number, we should not have called this function but addline_batch instead.
 		// If this happen, we may have a bug in card.php page
 		if (isModEnabled('productbatch') && !empty($orderline->fk_product) && !empty($orderline->product_tobatch)) {
-			$this->error = 'ADDLINE_WAS_CALLED_INSTEAD_OF_ADDLINEBATCH '.$orderline->id.' '.$orderline->fk_product;	//
+			$this->error = 'ADDLINE_WAS_CALLED_INSTEAD_OF_ADDLINEBATCH '.$orderline->id.' '.$orderline->fk_product; //
 			return -4;
 		}
 
@@ -1562,8 +1562,8 @@ 
 							$this->db->commit();
 
 							// Delete record into ECM index (Note that delete is also done when deleting files with the dol_delete_dir_recursive
-							$this->deleteEcmFiles(0);	 // Deleting files physically is done later with the dol_delete_dir_recursive
-							$this->deleteEcmFiles(1);	 // Deleting files physically is done later with the dol_delete_dir_recursive
+							$this->deleteEcmFiles(0); // Deleting files physically is done later with the dol_delete_dir_recursive
+							$this->deleteEcmFiles(1); // Deleting files physically is done later with the dol_delete_dir_recursive
 
 							// We delete PDFs
 							$ref = dol_sanitizeFileName($this->ref);
@@ -1636,7 +1636,7 @@ 
 		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."product as p ON p.rowid = cd.fk_product";
 		$sql .= " WHERE ed.fk_expedition = ".((int) $this->id);
 		$sql .= " AND ed.fk_elementdet = cd.rowid";
-		$sql .= " ORDER BY cd.rang, ed.fk_elementdet";		// We need after a break on fk_elementdet but when there is no break on fk_elementdet, cd.rang is same so we can add it as first order criteria.
+		$sql .= " ORDER BY cd.rang, ed.fk_elementdet"; // We need after a break on fk_elementdet but when there is no break on fk_elementdet, cd.rang is same so we can add it as first order criteria.
 
 		dol_syslog(get_class($this)."::fetch_lines", LOG_DEBUG);
 		$resql = $this->db->query($sql);
@@ -1665,13 +1665,13 @@ 
 
 
 				if ($originline > 0 && $originline == $obj->fk_elementdet) {
-					'@phan-var-force ExpeditionLigne $line';  // $line from previous loop
+					'@phan-var-force ExpeditionLigne $line'; // $line from previous loop
 					$line->entrepot_id = 0; // entrepod_id in details_entrepot
 					$line->qty_shipped += $obj->qty_shipped;
 				} else {
-					$line = new ExpeditionLigne($this->db);		// new group to start
-					$line->entrepot_id    	= $obj->fk_entrepot;	// this is a property of a shipment line
-					$line->qty_shipped    	= $obj->qty_shipped;	// this is a property of a shipment line
+					$line = new ExpeditionLigne($this->db); // new group to start
+					$line->entrepot_id    	= $obj->fk_entrepot; // this is a property of a shipment line
+					$line->qty_shipped    	= $obj->qty_shipped; // this is a property of a shipment line
 				}
 
 				$detail_entrepot              = new stdClass();
@@ -1684,13 +1684,13 @@ 
 				$line->rowid            = $obj->line_id; // TODO deprecated
 				$line->id               = $obj->line_id;
 
-				$line->fk_origin = 'orderline';	// TODO deprecated, we already have element_type that can be use to guess type of line
+				$line->fk_origin = 'orderline'; // TODO deprecated, we already have element_type that can be use to guess type of line
 
-				$line->fk_element 		= $obj->fk_element;
-				$line->origin_id 		= $obj->fk_element;
-				$line->fk_elementdet 	= $obj->fk_elementdet;
-				$line->origin_line_id 	= $obj->fk_elementdet;
-				$line->element_type 	= $obj->element_type;
+				$line->fk_element = $obj->fk_element;
+				$line->origin_id = $obj->fk_element;
+				$line->fk_elementdet = $obj->fk_elementdet;
+				$line->origin_line_id = $obj->fk_elementdet;
+				$line->element_type = $obj->element_type;
 
 				$line->fk_expedition    = $this->id; // id of parent
 
@@ -1700,8 +1700,8 @@ 
 				$line->ref = $obj->product_ref; // TODO deprecated
 				$line->product_ref = $obj->product_ref;
 				$line->product_label = $obj->product_label;
-				$line->libelle        	= $obj->product_label; // TODO deprecated
-				$line->product_barcode  = $obj->product_barcode; // Barcode number product
+				$line->libelle = $obj->product_label; // TODO deprecated
+				$line->product_barcode = $obj->product_barcode; // Barcode number product
 				$line->product_tosell = $obj->product_tosell;
 				$line->product_tobuy = $obj->product_tobuy;
 				$line->product_tobatch = $obj->product_tobatch;
@@ -1947,7 +1947,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) {
@@ -2277,12 +2277,12 @@ 
 				if ($shipments_match_order) {
 					dol_syslog("Qty for the ".count($order->lines)." lines of the origin order is same than qty for lines in the shipment we close (shipments_match_order is true), with new status Expedition::STATUS_CLOSED=".self::STATUS_CLOSED.', so we close order');
 					// We close the order
-					$order->cloture($user);		// Note this may also create an invoice if module workflow ask it
+					$order->cloture($user); // Note this may also create an invoice if module workflow ask it
 				}
 			}
 
-			$this->statut = self::STATUS_CLOSED;	// Will be revert to STATUS_VALIDATED at end if there is a rollback
-			$this->status = self::STATUS_CLOSED;	// Will be revert to STATUS_VALIDATED at end if there is a rollback
+			$this->statut = self::STATUS_CLOSED; // Will be revert to STATUS_VALIDATED at end if there is a rollback
+			$this->status = self::STATUS_CLOSED; // Will be revert to STATUS_VALIDATED at end if there is a rollback
 
 			// If stock increment is done on closing
 			if (!$error && isModEnabled('stock') && getDolGlobalString('STOCK_CALCULATE_ON_SHIPMENT_CLOSE')) {
@@ -2331,7 +2331,7 @@ 
 
 		$error = 0;
 
-		require_once DOL_DOCUMENT_ROOT . '/product/stock/class/mouvementstock.class.php';
+		require_once DOL_DOCUMENT_ROOT.'/product/stock/class/mouvementstock.class.php';
 
 		$langs->load("agenda");
 
@@ -2341,14 +2341,14 @@ 
 		$sql .= " e.ref,";
 		$sql .= " edb.rowid as edbrowid, edb.eatby, edb.sellby, edb.batch, edb.qty as edbqty, edb.fk_origin_stock,";
 		$sql .= " cd.rowid as cdid, ed.rowid as edid";
-		$sql .= " FROM " . MAIN_DB_PREFIX . "commandedet as cd,";
-		$sql .= " " . MAIN_DB_PREFIX . "expeditiondet as ed";
-		$sql .= " LEFT JOIN " . MAIN_DB_PREFIX . "expeditiondet_batch as edb on edb.fk_expeditiondet = ed.rowid";
-		$sql .= " INNER JOIN " . MAIN_DB_PREFIX . "expedition as e ON ed.fk_expedition = e.rowid";
-		$sql .= " WHERE ed.fk_expedition = " . ((int) $this->id);
+		$sql .= " FROM ".MAIN_DB_PREFIX."commandedet as cd,";
+		$sql .= " ".MAIN_DB_PREFIX."expeditiondet as ed";
+		$sql .= " LEFT JOIN ".MAIN_DB_PREFIX."expeditiondet_batch as edb on edb.fk_expeditiondet = ed.rowid";
+		$sql .= " INNER JOIN ".MAIN_DB_PREFIX."expedition as e ON ed.fk_expedition = e.rowid";
+		$sql .= " WHERE ed.fk_expedition = ".((int) $this->id);
 		$sql .= " AND cd.rowid = ed.fk_elementdet";
 
-		dol_syslog(get_class($this) . "::valid select details", LOG_DEBUG);
+		dol_syslog(get_class($this)."::valid select details", LOG_DEBUG);
 		$resql = $this->db->query($sql);
 		if ($resql) {
 			$cpt = $this->db->num_rows($resql);
@@ -2362,7 +2362,7 @@ 
 				if ($qty <= 0 || ($qty < 0 && !getDolGlobalInt('SHIPMENT_ALLOW_NEGATIVE_QTY'))) {
 					continue;
 				}
-				dol_syslog(get_class($this) . "::valid movement index " . $i . " ed.rowid=" . $obj->rowid . " edb.rowid=" . $obj->edbrowid);
+				dol_syslog(get_class($this)."::valid movement index ".$i." ed.rowid=".$obj->rowid." edb.rowid=".$obj->edbrowid);
 
 				$mouvS = new MouvementStock($this->db);
 				$mouvS->origin = &$this;
@@ -2657,7 +2657,7 @@ 
 	 * @var int
 	 * @deprecated
 	 */
-	public $line_id;	// deprecated
+	public $line_id; // deprecated
 
 	/**
 	 * @var int ID	Duplicate of origin_id (using origin_id is better)
@@ -2691,7 +2691,7 @@ 
 	 * @var string
 	 * @deprecated	Use instead origin_type = element_type to guess the line of origin of the shipment line.
 	 */
-	public $fk_origin;			// Example: 'orderline'
+	public $fk_origin; // Example: 'orderline'
 
 	/**
 	 * @var int Id of shipment

htdocs/public/onlinesign/newonlinesign.php

Spacing +18 added lines, -18 removed lines

@@ -223,7 +223,7 @@ 
 $form = new Form($db);
 $head = '';
 if (getDolGlobalString('MAIN_SIGN_CSS_URL')) {
-	$head = '<link rel="stylesheet" type="text/css" href="' . getDolGlobalString('MAIN_SIGN_CSS_URL').'?lang='.$langs->defaultlang.'">'."\n";
+	$head = '<link rel="stylesheet" type="text/css" href="'.getDolGlobalString('MAIN_SIGN_CSS_URL').'?lang='.$langs->defaultlang.'">'."\n";
 }
 
 $conf->dol_hide_topmenu = 1;
@@ -298,7 +298,7 @@ 
 }
 if ($source == 'proposal' && getDolGlobalString('PROPOSAL_IMAGE_PUBLIC_SIGN')) {
 	print '<div class="backimagepublicproposalsign">';
-	print '<img id="idPROPOSAL_IMAGE_PUBLIC_INTERFACE" src="' . getDolGlobalString('PROPOSAL_IMAGE_PUBLIC_SIGN').'">';
+	print '<img id="idPROPOSAL_IMAGE_PUBLIC_INTERFACE" src="'.getDolGlobalString('PROPOSAL_IMAGE_PUBLIC_SIGN').'">';
 	print '</div>';
 }
 
@@ -309,7 +309,7 @@ 
 	if (preg_match('/^\((.*)\)$/', $conf->global->ONLINE_SIGN_NEWFORM_TEXT, $reg)) {
 		$text .= $langs->trans($reg[1])."<br>\n";
 	} else {
-		$text .= getDolGlobalString('ONLINE_SIGN_NEWFORM_TEXT') . "<br>\n";
+		$text .= getDolGlobalString('ONLINE_SIGN_NEWFORM_TEXT')."<br>\n";
 	}
 	$text = '<tr><td align="center"><br>'.$text.'<br></td></tr>'."\n";
 }
@@ -404,7 +404,7 @@ 
 		if (empty($last_main_doc_file) || !dol_is_file(DOL_DATA_ROOT.'/'.$object->last_main_doc)) {
 			// It seems document has never been generated, or was generated and then deleted.
 			// So we try to regenerate it with its default template.
-			$defaulttemplate = '';		// We force the use an empty string instead of $object->model_pdf to be sure to use a "main" default template and not the last one used.
+			$defaulttemplate = ''; // We force the use an empty string instead of $object->model_pdf to be sure to use a "main" default template and not the last one used.
 			$object->generateDocument($defaulttemplate, $langs);
 		}
 
@@ -475,7 +475,7 @@ 
 	if (empty($last_main_doc_file) || !dol_is_file(DOL_DATA_ROOT.'/'.$object->last_main_doc)) {
 		// It seems document has never been generated, or was generated and then deleted.
 		// So we try to regenerate it with its default template.
-		$defaulttemplate = '';		// We force the use an empty string instead of $object->model_pdf to be sure to use a "main" default template and not the last one used.
+		$defaulttemplate = ''; // We force the use an empty string instead of $object->model_pdf to be sure to use a "main" default template and not the last one used.
 		$object->generateDocument($defaulttemplate, $langs);
 	}
 
@@ -526,7 +526,7 @@ 
 	if (empty($last_main_doc_file) || !dol_is_file(DOL_DATA_ROOT.'/'.$object->last_main_doc)) {
 		// It seems document has never been generated, or was generated and then deleted.
 		// So we try to regenerate it with its default template.
-		$defaulttemplate = '';		// We force the use an empty string instead of $object->model_pdf to be sure to use a "main" default template and not the last one used.
+		$defaulttemplate = ''; // We force the use an empty string instead of $object->model_pdf to be sure to use a "main" default template and not the last one used.
 		$object->generateDocument($defaulttemplate, $langs);
 	}
 
@@ -550,24 +550,24 @@ 
 	$result = $object->fetch_thirdparty();
 
 	// Proposer
-	print '<tr class="CTableRow2"><td class="CTableRow2">' . $langs->trans("Proposer");
+	print '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("Proposer");
 	print '</td><td class="CTableRow2">';
 	print img_picto('', 'company', 'class="pictofixedwidth"');
-	print '<b>' . $creditor . '</b>';
-	print '<input type="hidden" name="creditor" value="' . $creditor . '">';
-	print '</td></tr>' . "\n";
+	print '<b>'.$creditor.'</b>';
+	print '<input type="hidden" name="creditor" value="'.$creditor.'">';
+	print '</td></tr>'."\n";
 
 	// Target
-	print '<tr class="CTableRow2"><td class="CTableRow2">' . $langs->trans("ThirdParty");
+	print '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("ThirdParty");
 	print '</td><td class="CTableRow2">';
 	print img_picto('', 'company', 'class="pictofixedwidth"');
-	print '<b>' . $object->thirdparty->name . '</b>';
-	print '</td></tr>' . "\n";
+	print '<b>'.$object->thirdparty->name.'</b>';
+	print '</td></tr>'."\n";
 
 	// Object
-	$text = '<b>' . $langs->trans("Signature" . dol_ucfirst($source) . "Ref", $object->ref) . '</b>';
-	print '<tr class="CTableRow2"><td class="CTableRow2">' . $langs->trans("Designation");
-	print '</td><td class="CTableRow2">' . $text;
+	$text = '<b>'.$langs->trans("Signature".dol_ucfirst($source)."Ref", $object->ref).'</b>';
+	print '<tr class="CTableRow2"><td class="CTableRow2">'.$langs->trans("Designation");
+	print '</td><td class="CTableRow2">'.$text;
 
 	$last_main_doc_file = $object->last_main_doc;
 	$diroutput = $conf->societe->multidir_output[$object->thirdparty->entity].'/'
@@ -630,7 +630,7 @@ 
 	if (empty($last_main_doc_file) || !dol_is_file(DOL_DATA_ROOT.'/'.$object->last_main_doc)) {
 		// It seems document has never been generated, or was generated and then deleted.
 		// So we try to regenerate it with its default template.
-		$defaulttemplate = '';		// We force the use an empty string instead of $object->model_pdf to be sure to use a "main" default template and not the last one used.
+		$defaulttemplate = ''; // We force the use an empty string instead of $object->model_pdf to be sure to use a "main" default template and not the last one used.
 		$object->generateDocument($defaulttemplate, $langs);
 	}
 	$directdownloadlink = $object->getLastMainDocLink('', 0, 0);
@@ -679,7 +679,7 @@ 
 	if (empty($last_main_doc_file) || !dol_is_file(DOL_DATA_ROOT.'/'.$object->last_main_doc)) {
 		// It seems document has never been generated, or was generated and then deleted.
 		// So we try to regenerate it with its default template.
-		$defaulttemplate = '';		// We force the use an empty string instead of $object->model_pdf to be sure to use a "main" default template and not the last one used.
+		$defaulttemplate = ''; // We force the use an empty string instead of $object->model_pdf to be sure to use a "main" default template and not the last one used.
 		$object->generateDocument($defaulttemplate, $langs);
 	}
 

htdocs/expensereport/class/expensereport.class.php

Spacing +20 added lines, -20 removed lines

@@ -244,8 +244,8 @@ 
 	 */
 	public $fk_user_approve;
 
-	public $localtax1;	// for backward compatibility (real field should be total_localtax1 defined into CommonObject)
-	public $localtax2;	// for backward compatibility (real field should be total_localtax2 defined into CommonObject)
+	public $localtax1; // for backward compatibility (real field should be total_localtax1 defined into CommonObject)
+	public $localtax2; // for backward compatibility (real field should be total_localtax2 defined into CommonObject)
 
 	/**
 	 * Draft status
@@ -336,8 +336,8 @@ 
 		$this->total_tva = 0;
 		$this->total_localtax1 = 0;
 		$this->total_localtax2 = 0;
-		$this->localtax1 = 0;	// For backward compatibility
-		$this->localtax2 = 0;	// For backward compatibility
+		$this->localtax1 = 0; // For backward compatibility
+		$this->localtax2 = 0; // For backward compatibility
 		$this->modepaymentid = 0;
 
 		// List of language codes for status
@@ -694,8 +694,8 @@ 
 				$this->total_ht     = $obj->total_ht;
 				$this->total_tva    = $obj->total_tva;
 				$this->total_ttc    = $obj->total_ttc;
-				$this->localtax1    = $obj->total_localtax1;		// For backward compatibility
-				$this->localtax2    = $obj->total_localtax2;		// For backward compatibility
+				$this->localtax1    = $obj->total_localtax1; // For backward compatibility
+				$this->localtax2    = $obj->total_localtax2; // For backward compatibility
 				$this->total_localtax1 = $obj->total_localtax1;
 				$this->total_localtax2 = $obj->total_localtax2;
 
@@ -1162,7 +1162,7 @@ 
 
 				$deplig->rule_warning_message = $objp->rule_warning_message;
 
-				$deplig->rang               = $objp->rang;
+				$deplig->rang = $objp->rang;
 
 				$this->lines[$i] = $deplig;
 
@@ -1710,7 +1710,7 @@ 
 		if (getDolGlobalString('EXPENSEREPORT_ADDON')) {
 			$mybool = false;
 
-			$file = getDolGlobalString('EXPENSEREPORT_ADDON') . ".php";
+			$file = getDolGlobalString('EXPENSEREPORT_ADDON').".php";
 			$classname = getDolGlobalString('EXPENSEREPORT_ADDON');
 
 			// Include file with class
@@ -1865,7 +1865,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) {
@@ -1958,8 +1958,8 @@ 
 			$this->line = new ExpenseReportLine($this->db);
 
 			// We don't know seller and buyer for expense reports
-			$seller = $mysoc;			// We use same than current company (expense report are often done in same country)
-			$seller->tva_assuj = 1;		// Most seller uses vat
+			$seller = $mysoc; // We use same than current company (expense report are often done in same country)
+			$seller->tva_assuj = 1; // Most seller uses vat
 			$buyer = new Societe($this->db);
 
 			$localtaxes_type = getLocalTaxesFromRate($vatrate, 0, $buyer, $seller);
@@ -2041,8 +2041,8 @@ 
 
 		// We don't know seller and buyer for expense reports
 		if (!is_object($seller)) {
-			$seller = $mysoc;			// We use same than current company (expense report are often done in same country)
-			$seller->tva_assuj = 1;		// Most seller uses vat
+			$seller = $mysoc; // We use same than current company (expense report are often done in same country)
+			$seller->tva_assuj = 1; // Most seller uses vat
 		}
 
 		$expensereportrule = new ExpenseReportRule($db);
@@ -2126,8 +2126,8 @@ 
 
 		// We don't know seller and buyer for expense reports
 		if (!is_object($seller)) {
-			$seller = $mysoc;			// We use same than current company (expense report are often done in same country)
-			$seller->tva_assuj = 1;		// Most seller uses vat
+			$seller = $mysoc; // We use same than current company (expense report are often done in same country)
+			$seller->tva_assuj = 1; // Most seller uses vat
 		}
 
 		$expenseik = new ExpenseReportIk($this->db);
@@ -2221,10 +2221,10 @@ 
 			$type = 0; // TODO What if type is service ?
 
 			// We don't know seller and buyer for expense reports
-			$seller = $mysoc;			// We use same than current company (expense report are often done in same country)
-			$seller->tva_assuj = 1;		// Most seller uses vat
-			$seller->localtax1_assuj = $mysoc->localtax1_assuj;		// We don't know, we reuse the state of company
-			$seller->localtax2_assuj = $mysoc->localtax1_assuj;		// We don't know, we reuse the state of company
+			$seller = $mysoc; // We use same than current company (expense report are often done in same country)
+			$seller->tva_assuj = 1; // Most seller uses vat
+			$seller->localtax1_assuj = $mysoc->localtax1_assuj; // We don't know, we reuse the state of company
+			$seller->localtax2_assuj = $mysoc->localtax1_assuj; // We don't know, we reuse the state of company
 			$buyer = new Societe($this->db);
 
 			$localtaxes_type = getLocalTaxesFromRate($vatrate, 0, $buyer, $seller);
@@ -3158,7 +3158,7 @@ 
 		} elseif ($mode == 'mon' || $mode == 'EX_MON') {
 			$sql .= " AND DATE_FORMAT(d.date, '%Y-%m') = '".dol_print_date($this->date, '%Y-%m')."'"; // @todo DATE_FORMAT is forbidden
 		} elseif ($mode == 'year' || $mode == 'EX_YEA') {
-			$sql .= " AND DATE_FORMAT(d.date, '%Y') = '".dol_print_date($this->date, '%Y')."'"; 	// @todo DATE_FORMAT is forbidden
+			$sql .= " AND DATE_FORMAT(d.date, '%Y') = '".dol_print_date($this->date, '%Y')."'"; // @todo DATE_FORMAT is forbidden
 		}
 
 		dol_syslog('ExpenseReportLine::getExpAmount');