Dolibarr / dolibarr

htdocs/datapolicy/class/datapolicycron.class.php

Spacing +26 added lines, -26 removed lines

@@ -74,7 +74,7 @@ 
 				'const_anonymize' => 'DATAPOLICY_TIERS_CLIENT_ANONYMIZE_DELAY',
 				'sql_template' => "SELECT s.rowid FROM ".$prefix."societe as s WHERE s.entity = __ENTITY__ AND s.client = ".Societe::CUSTOMER." AND s.fournisseur = 0 AND s.tms < DATE_SUB(__NOW__, INTERVAL __DELAY__ MONTH) AND NOT EXISTS (SELECT a.id FROM ".$prefix."actioncomm as a WHERE a.fk_soc = s.rowid AND a.tms > DATE_SUB(__NOW__, INTERVAL __DELAY__ MONTH)) AND NOT EXISTS (SELECT f.rowid FROM ".$prefix."facture as f WHERE f.fk_soc = s.rowid)",
 				'class' => 'Societe',
-				'file' => DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php',
+				'file' => DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php',
 				'anonymize_fields' => array('name' => 'MAKEANONYMOUS', 'name_alias' => 'MAKEANONYMOUS', 'address' => '---', 'town' => '---', 'zip' => '---', 'phone' => '---', 'email' => '---', 'url' => '---', 'fax' => '---', 'siret' => '---', 'siren' => '---', 'ape' => '---', 'idprof4' => '---', 'idprof5' => '---', 'idprof6' => '---', 'tva_intra' => '---', 'capital' => 0, 'socialnetworks' => [], 'geolat' => 0, 'geolong' => 0, 'ip' => '0.0.0.0'),
 				'call_params' => array(
 					'delete' => array('id', 'user'), // $object->delete($id, $user)
@@ -89,7 +89,7 @@ 
 				'const_anonymize' => 'DATAPOLICY_TIERS_PROSPECT_ANONYMIZE_DELAY',
 				'sql_template' => "SELECT s.rowid FROM ".$prefix."societe as s WHERE s.entity = __ENTITY__ AND s.client = ".Societe::PROSPECT." AND s.fournisseur = 0 AND s.tms < DATE_SUB(__NOW__, INTERVAL __DELAY__ MONTH) AND NOT EXISTS (SELECT a.id FROM ".$prefix."actioncomm as a WHERE a.fk_soc = s.rowid AND a.tms > DATE_SUB(__NOW__, INTERVAL __DELAY__ MONTH)) AND NOT EXISTS (SELECT f.rowid FROM ".$prefix."facture as f WHERE f.fk_soc = s.rowid)",
 				'class' => 'Societe',
-				'file' => DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php',
+				'file' => DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php',
 				'anonymize_fields' => array('name' => 'MAKEANONYMOUS', 'name_alias' => 'MAKEANONYMOUS', 'address' => '---', 'town' => '---', 'zip' => '---', 'phone' => '---', 'email' => '---', 'url' => '---', 'fax' => '---', 'siret' => '---', 'siren' => '---', 'ape' => '---', 'idprof4' => '---', 'idprof5' => '---', 'idprof6' => '---', 'tva_intra' => '---', 'capital' => 0, 'socialnetworks' => [], 'geolat' => 0, 'geolong' => 0, 'ip' => '0.0.0.0'),
 				'call_params' => array(
 					'delete' => array('id', 'user'), // $object->delete($id, $user)
@@ -104,7 +104,7 @@ 
 				'const_anonymize' => 'DATAPOLICY_TIERS_PROSPECT_CLIENT_ANONYMIZE_DELAY',
 				'sql_template' => "SELECT s.rowid FROM ".$prefix."societe as s WHERE s.entity = __ENTITY__ AND s.client = ".Societe::CUSTOMER_AND_PROSPECT." AND s.fournisseur = 0 AND s.tms < DATE_SUB(__NOW__, INTERVAL __DELAY__ MONTH) AND NOT EXISTS (SELECT a.id FROM ".$prefix."actioncomm as a WHERE a.fk_soc = s.rowid AND a.tms > DATE_SUB(__NOW__, INTERVAL __DELAY__ MONTH)) AND NOT EXISTS (SELECT f.rowid FROM ".$prefix."facture as f WHERE f.fk_soc = s.rowid)",
 				'class' => 'Societe',
-				'file' => DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php',
+				'file' => DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php',
 				'anonymize_fields' => array('name' => 'MAKEANONYMOUS', 'name_alias' => 'MAKEANONYMOUS', 'address' => '---', 'town' => '---', 'zip' => '---', 'phone' => '---', 'email' => '---', 'url' => '---', 'fax' => '---', 'siret' => '---', 'siren' => '---', 'ape' => '---', 'idprof4' => '---', 'idprof5' => '---', 'idprof6' => '---', 'tva_intra' => '---', 'capital' => 0, 'socialnetworks' => [], 'geolat' => 0, 'geolong' => 0, 'ip' => '0.0.0.0'),
 				'call_params' => array(
 					'delete' => array('id', 'user'), // $object->delete($id, $user)
@@ -120,7 +120,7 @@ 
 				'sql_template' => "SELECT s.rowid FROM ".$prefix."societe as s WHERE s.entity = __ENTITY__ AND s.client = ".Societe::NO_CUSTOMER." AND s.fournisseur = 0 AND s.tms < DATE_SUB(__NOW__, INTERVAL __DELAY__ MONTH) AND NOT EXISTS (SELECT a.id FROM ".$prefix."actioncomm as a WHERE a.fk_soc = s.rowid AND a.tms > DATE_SUB(__NOW__, INTERVAL __DELAY__ MONTH)) AND NOT EXISTS (SELECT f.rowid FROM ".$prefix."facture as f WHERE f.fk_soc = s.rowid)",
 				'sql_template_delete' => "SELECT s.rowid FROM ".$prefix."societe as s WHERE s.entity = __ENTITY__ AND s.client = ".Societe::NO_CUSTOMER." AND s.fournisseur = 0 AND s.tms < DATE_SUB(__NOW__, INTERVAL __DELAY__ MONTH) AND NOT EXISTS (SELECT a.id FROM ".$prefix."actioncomm as a WHERE a.fk_soc = s.rowid AND a.tms > DATE_SUB(__NOW__, INTERVAL __DELAY__ MONTH)) AND NOT EXISTS (SELECT f.rowid FROM ".$prefix."facture as f WHERE f.fk_soc = s.rowid)",
 				'class' => 'Societe',
-				'file' => DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php',
+				'file' => DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php',
 				'anonymize_fields' => array('name' => 'MAKEANONYMOUS', 'name_alias' => 'MAKEANONYMOUS', 'address' => '---', 'town' => '---', 'zip' => '---', 'phone' => '---', 'email' => '---', 'url' => '---', 'fax' => '---', 'siret' => '---', 'siren' => '---', 'ape' => '---', 'idprof4' => '---', 'idprof5' => '---', 'idprof6' => '---', 'tva_intra' => '---', 'capital' => 0, 'socialnetworks' => [], 'geolat' => 0, 'geolong' => 0, 'ip' => '0.0.0.0'),
 				'call_params' => array(
 					'delete' => array('id', 'user'), // $object->delete($id, $user)
@@ -135,7 +135,7 @@ 
 				'const_anonymize' => 'DATAPOLICY_TIERS_FOURNISSEUR_ANONYMIZE_DELAY',
 				'sql_template' => "SELECT s.rowid FROM ".$prefix."societe as s WHERE s.entity = __ENTITY__ AND s.fournisseur = 1 AND s.tms < DATE_SUB(__NOW__, INTERVAL __DELAY__ MONTH) AND NOT EXISTS (SELECT a.id FROM ".$prefix."actioncomm as a WHERE a.fk_soc = s.rowid AND a.tms > DATE_SUB(__NOW__, INTERVAL __DELAY__ MONTH)) AND NOT EXISTS (SELECT f.rowid FROM ".$prefix."facture as f WHERE f.fk_soc = s.rowid)",
 				'class' => 'Societe',
-				'file' => DOL_DOCUMENT_ROOT . '/societe/class/societe.class.php',
+				'file' => DOL_DOCUMENT_ROOT.'/societe/class/societe.class.php',
 				'anonymize_fields' => array('name' => 'MAKEANONYMOUS', 'name_alias' => 'MAKEANONYMOUS', 'address' => '---', 'town' => '---', 'zip' => '---', 'phone' => '---', 'email' => '---', 'url' => '---', 'fax' => '---', 'siret' => '---', 'siren' => '---', 'ape' => '---', 'idprof4' => '---', 'idprof5' => '---', 'idprof6' => '---', 'tva_intra' => '---', 'capital' => 0, 'socialnetworks' => [], 'geolat' => 0, 'geolong' => 0, 'ip' => '0.0.0.0'),
 				'call_params' => array(
 					'delete' => array('id', 'user'), // $object->delete($id, $user)
@@ -151,7 +151,7 @@ 
 				'const_anonymize' => 'DATAPOLICY_CONTACT_CLIENT_ANONYMIZE_DELAY',
 				'sql_template' => "SELECT c.rowid FROM ".$prefix."socpeople as c INNER JOIN ".$prefix."societe as s ON s.rowid = c.fk_soc WHERE c.entity = __ENTITY__ AND c.tms < DATE_SUB(__NOW__, INTERVAL __DELAY__ MONTH) AND s.client = ".Societe::CUSTOMER." AND s.fournisseur = 0 AND NOT EXISTS (SELECT a.id FROM ".$prefix."actioncomm as a WHERE a.fk_contact = c.rowid AND a.tms > DATE_SUB(__NOW__, INTERVAL __DELAY__ MONTH)) AND NOT EXISTS (SELECT f.rowid FROM ".$prefix."facture as f WHERE f.fk_soc = s.rowid)",
 				'class' => 'Contact',
-				'file' => DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php',
+				'file' => DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php',
 				'anonymize_fields' => array('lastname' => 'MAKEANONYMOUS', 'firstname' => 'MAKEANONYMOUS', 'poste' => '---', 'address' => '---', 'town' => '---', 'zip' => '---', 'phone_pro' => '---', 'phone_perso' => '---', 'phone_mobile' => '---', 'email' => '---', 'photo' => '', 'url' => '---', 'fax' => '---', 'socialnetworks' => [], 'geolat' => 0, 'geolong' => 0, 'ip' => '0.0.0.0'),
 				'call_params' => array(
 					'delete' => array('user'), // $object->delete($user)
@@ -166,7 +166,7 @@ 
 				'const_anonymize' => 'DATAPOLICY_CONTACT_PROSPECT_ANONYMIZE_DELAY',
 				'sql_template' => "SELECT c.rowid FROM ".$prefix."socpeople as c INNER JOIN ".$prefix."societe as s ON s.rowid = c.fk_soc WHERE c.entity = __ENTITY__ AND c.tms < DATE_SUB(__NOW__, INTERVAL __DELAY__ MONTH) AND s.client = ".Societe::PROSPECT." AND s.fournisseur = 0 AND NOT EXISTS (SELECT a.id FROM ".$prefix."actioncomm as a WHERE a.fk_contact = c.rowid AND a.tms > DATE_SUB(__NOW__, INTERVAL __DELAY__ MONTH)) AND NOT EXISTS (SELECT f.rowid FROM ".$prefix."facture as f WHERE f.fk_soc = s.rowid)",
 				'class' => 'Contact',
-				'file' => DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php',
+				'file' => DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php',
 				'anonymize_fields' => array('lastname' => 'MAKEANONYMOUS', 'firstname' => 'MAKEANONYMOUS', 'poste' => '---', 'address' => '---', 'town' => '---', 'zip' => '---', 'phone_pro' => '---', 'phone_perso' => '---', 'phone_mobile' => '---', 'email' => '---', 'photo' => '', 'url' => '---', 'fax' => '---', 'socialnetworks' => [], 'geolat' => 0, 'geolong' => 0, 'ip' => '0.0.0.0'),
 				'call_params' => array(
 					'delete' => array('user'), // $object->delete($user)
@@ -181,7 +181,7 @@ 
 				'const_anonymize' => 'DATAPOLICY_CONTACT_PROSPECT_CLIENT_ANONYMIZE_DELAY',
 				'sql_template' => "SELECT c.rowid FROM ".$prefix."socpeople as c INNER JOIN ".$prefix."societe as s ON s.rowid = c.fk_soc WHERE c.entity = __ENTITY__ AND c.tms < DATE_SUB(__NOW__, INTERVAL __DELAY__ MONTH) AND s.client = ".Societe::CUSTOMER_AND_PROSPECT." AND s.fournisseur = 0 AND NOT EXISTS (SELECT a.id FROM ".$prefix."actioncomm as a WHERE a.fk_contact = c.rowid AND a.tms > DATE_SUB(__NOW__, INTERVAL __DELAY__ MONTH)) AND NOT EXISTS (SELECT f.rowid FROM ".$prefix."facture as f WHERE f.fk_soc = s.rowid)",
 				'class' => 'Contact',
-				'file' => DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php',
+				'file' => DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php',
 				'anonymize_fields' => array('lastname' => 'MAKEANONYMOUS', 'firstname' => 'MAKEANONYMOUS', 'poste' => '---', 'address' => '---', 'town' => '---', 'zip' => '---', 'phone_pro' => '---', 'phone_perso' => '---', 'phone_mobile' => '---', 'email' => '---', 'photo' => '', 'url' => '---', 'fax' => '---', 'socialnetworks' => [], 'geolat' => 0, 'geolong' => 0, 'ip' => '0.0.0.0'),
 				'call_params' => array(
 					'delete' => array('user'), // $object->delete($user)
@@ -196,7 +196,7 @@ 
 				'const_anonymize' => 'DATAPOLICY_CONTACT_NIPROSPECT_NICLIENT_ANONYMIZE_DELAY',
 				'sql_template' => "SELECT c.rowid FROM ".$prefix."socpeople as c INNER JOIN ".$prefix."societe as s ON s.rowid = c.fk_soc WHERE c.entity = __ENTITY__ AND c.tms < DATE_SUB(__NOW__, INTERVAL __DELAY__ MONTH) AND s.client = ".Societe::NO_CUSTOMER." AND s.fournisseur = 0 AND NOT EXISTS (SELECT a.id FROM ".$prefix."actioncomm as a WHERE a.fk_contact = c.rowid AND a.tms > DATE_SUB(__NOW__, INTERVAL __DELAY__ MONTH)) AND NOT EXISTS (SELECT f.rowid FROM ".$prefix."facture as f WHERE f.fk_soc = s.rowid)",
 				'class' => 'Contact',
-				'file' => DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php',
+				'file' => DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php',
 				'anonymize_fields' => array('lastname' => 'MAKEANONYMOUS', 'firstname' => 'MAKEANONYMOUS', 'poste' => '---', 'address' => '---', 'town' => '---', 'zip' => '---', 'phone_pro' => '---', 'phone_perso' => '---', 'phone_mobile' => '---', 'email' => '---', 'photo' => '', 'url' => '---', 'fax' => '---', 'socialnetworks' => [], 'geolat' => 0, 'geolong' => 0, 'ip' => '0.0.0.0'),
 				'call_params' => array(
 					'delete' => array('user'), // $object->delete($user)
@@ -211,7 +211,7 @@ 
 				'const_anonymize' => 'DATAPOLICY_CONTACT_FOURNISSEUR_ANONYMIZE_DELAY',
 				'sql_template' => "SELECT c.rowid FROM ".$prefix."socpeople as c INNER JOIN ".$prefix."societe as s ON s.rowid = c.fk_soc WHERE c.entity = __ENTITY__ AND c.tms < DATE_SUB(__NOW__, INTERVAL __DELAY__ MONTH) AND s.fournisseur = 1 AND NOT EXISTS (SELECT a.id FROM ".$prefix."actioncomm as a WHERE a.fk_contact = c.rowid AND a.tms > DATE_SUB(__NOW__, INTERVAL __DELAY__ MONTH)) AND NOT EXISTS (SELECT f.rowid FROM ".$prefix."facture as f WHERE f.fk_soc = s.rowid)",
 				'class' => 'Contact',
-				'file' => DOL_DOCUMENT_ROOT . '/contact/class/contact.class.php',
+				'file' => DOL_DOCUMENT_ROOT.'/contact/class/contact.class.php',
 				'anonymize_fields' => array('lastname' => 'MAKEANONYMOUS', 'firstname' => 'MAKEANONYMOUS', 'poste' => '---', 'address' => '---', 'town' => '---', 'zip' => '---', 'phone_pro' => '---', 'phone_perso' => '---', 'phone_mobile' => '---', 'email' => '---', 'photo' => '', 'url' => '---', 'fax' => '---', 'socialnetworks' => [], 'geolat' => 0, 'geolong' => 0, 'ip' => '0.0.0.0'),
 				'call_params' => array(
 					'delete' => array('user'), // $object->delete($user)
@@ -233,10 +233,10 @@ 
 				'const_anonymize' => 'DATAPOLICY_ADHERENT_ANONYMIZE_DELAY',
 				'sql_template' => $sqltemplate,
 				'class' => 'Adherent',
-				'file' => DOL_DOCUMENT_ROOT . '/adherents/class/adherent.class.php',
+				'file' => DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php',
 				'anonymize_fields' => array('lastname' => 'MAKEANONYMOUS', 'firstname' => 'MAKEANONYMOUS', 'societe' => '---', 'address' => '---', 'town' => '---', 'zip' => '---', 'phone' => '---', 'phone_perso' => '---', 'phone_mobile' => '---', 'email' => '---', 'birth' => '1900-01-01', 'photo' => '', 'url' => '---', 'fax' => '---', 'socialnetworks' => [], 'ip' => '0.0.0.0'),
 				'call_params' => array(
-					'delete' => array('user'),   // $object->delete($user)
+					'delete' => array('user'), // $object->delete($user)
 					'update' => array('user')    // $object->update($user)
 				)
 			);
@@ -252,10 +252,10 @@ 
 				'const_anonymize' => '', // Anonymization not applicable
 				'sql_template_delete' => "SELECT c.rowid FROM ".$prefix."recruitment_recruitmentcandidature as c WHERE c.entity = __ENTITY__ AND c.tms < DATE_SUB(__NOW__, INTERVAL __DELAY__ MONTH) AND NOT EXISTS (SELECT ac.id FROM ".$prefix."actioncomm as ac WHERE ac.elementtype = 'recruitmentcandidature@recruitment' AND ac.fk_element = c.rowid AND ac.tms > DATE_SUB(__NOW__, INTERVAL __DELAY__ MONTH))",
 				'class' => 'RecruitmentCandidature',
-				'file' => DOL_DOCUMENT_ROOT . '/recruitment/class/recruitmentcandidature.class.php',
+				'file' => DOL_DOCUMENT_ROOT.'/recruitment/class/recruitmentcandidature.class.php',
 				'anonymize_fields' => array(),
 				'call_params' => array(
-					'delete' => array('user'),   // $object->delete($user)
+					'delete' => array('user'), // $object->delete($user)
 					'update' => array('user')    // $object->update($user)
 				)
 			);
@@ -296,7 +296,7 @@ 
 		// Iterate through each defined policy to apply its rules.
 		foreach ($dataPolicies as $policy) {
 			// Instantiate object only once per class type for efficiency.
-			if (! isset($objectInstances[$policy['class']])) {
+			if (!isset($objectInstances[$policy['class']])) {
 				require_once $policy['file'];
 				$classtoinit = $policy['class'];
 				$objectInstances[$policy['class']] = new $classtoinit($this->db);
@@ -314,9 +314,9 @@ 
 		}
 
 		// Finalize the transaction based on the outcome of all operations.
-		if (! $this->errorCount) {
+		if (!$this->errorCount) {
 			$this->db->commit();
-			$this->output = $this->nbupdated . ' record(s) anonymized, ' . $this->nbdeleted . ' record(s) deleted.';
+			$this->output = $this->nbupdated.' record(s) anonymized, '.$this->nbdeleted.' record(s) deleted.';
 		} else {
 			$this->db->rollback();
 			$this->error = implode("\n", $this->errorMessages);
@@ -339,7 +339,7 @@ 
 	 */
 	private function _processPolicyAction($policy, $action, $object, &$processedIds, $conf, $user)
 	{
-		$constName = $policy['const_' . $action] ?? null;
+		$constName = $policy['const_'.$action] ?? null;
 		$delay = $constName ? getDolGlobalInt($constName) : 0;
 
 		if ($delay <= 0) {
@@ -350,25 +350,25 @@ 
 		$sqlPlaceholders = array(
 			'__ENTITY__' => (string) $conf->entity,
 			'__DELAY__' => (string) $delay,
-			'__NOW__' => "'" . $this->db->idate(dol_now()) . "'"
+			'__NOW__' => "'".$this->db->idate(dol_now())."'"
 		);
 		$sql = str_replace(array_keys($sqlPlaceholders), array_values($sqlPlaceholders), $policy['sql_template']);
 
 		$resql = $this->db->query($sql);
 
-		if (! $resql) {
+		if (!$resql) {
 			$this->errorCount++;
-			$this->errorMessages[] = 'Error executing ' . $action . ' query for policy ' . $constName . ': ' . $this->db->lasterror();
+			$this->errorMessages[] = 'Error executing '.$action.' query for policy '.$constName.': '.$this->db->lasterror();
 
 			return;
 		}
 
 		// Define the handler method for the action
-		$handlerMethod = '_handle' . ucfirst($action);
+		$handlerMethod = '_handle'.ucfirst($action);
 
 		// Process the records found by the query
 		while ($obj = $this->db->fetch_object($resql)) {
-			if (in_array($obj->rowid, $processedIds) || ! method_exists($this, $handlerMethod)) {
+			if (in_array($obj->rowid, $processedIds) || !method_exists($this, $handlerMethod)) {
 				continue;
 			}
 			/** @var CommonObject $object */
@@ -416,7 +416,7 @@ 
 		foreach ($policy['anonymize_fields'] as $field => $val) {
 			if ($val == 'MAKEANONYMOUS') {
 				// For each field with rule "MAKEANONYMOUS, set the new value, keeping the ID.
-				$object->$field = $field . '-anon-' . $object->id;
+				$object->$field = $field.'-anon-'.$object->id;
 			} else {
 				// For others, force the value, but only if not already empty.
 				if (!empty($object->$field)) {
@@ -448,7 +448,7 @@ 
 
 		$paramConfig = $policy['call_params'][$method] ?? [];
 
-		return array_map(function (string $paramName) use ($availableArgs) {
+		return array_map(function(string $paramName) use ($availableArgs) {
 			return $availableArgs[$paramName];
 		}, $paramConfig);
 	}
@@ -465,7 +465,7 @@ 
 	{
 		if ($result <= 0) {
 			$this->errorCount++;
-			$this->errorMessages[] = 'Failed to ' . $action . ' record ID ' . $object->id . ' from class ' . get_class($object) . '. Error: ' . $object->errorsToString();
+			$this->errorMessages[] = 'Failed to '.$action.' record ID '.$object->id.' from class '.get_class($object).'. Error: '.$object->errorsToString();
 		} else {
 			if ($action === 'delete') {
 				$this->nbdeleted++;

htdocs/contact/class/contact.class.php

Spacing +36 added lines, -36 removed lines

@@ -207,11 +207,11 @@ 
 	/**
 	 * @var int Thirdparty ID
 	 */
-	public $socid;		// both socid and fk_soc are used
+	public $socid; // both socid and fk_soc are used
 	/**
 	 * @var int
 	 */
-	public $fk_soc;		// both socid and fk_soc are used
+	public $fk_soc; // both socid and fk_soc are used
 
 	/**
 	 * @var string Thirdparty name
@@ -801,11 +801,11 @@ 
 		global $conf;
 		$dn = '';
 		if ($mode == 0) {
-			$dn = getDolGlobalString('LDAP_KEY_CONTACTS') . "=".$info[getDolGlobalString('LDAP_KEY_CONTACTS')]."," . getDolGlobalString('LDAP_CONTACT_DN');
+			$dn = getDolGlobalString('LDAP_KEY_CONTACTS')."=".$info[getDolGlobalString('LDAP_KEY_CONTACTS')].",".getDolGlobalString('LDAP_CONTACT_DN');
 		} elseif ($mode == 1) {
 			$dn = getDolGlobalString('LDAP_CONTACT_DN');
 		} elseif ($mode == 2) {
-			$dn = getDolGlobalString('LDAP_KEY_CONTACTS') . "=".$info[getDolGlobalString('LDAP_KEY_CONTACTS')];
+			$dn = getDolGlobalString('LDAP_KEY_CONTACTS')."=".$info[getDolGlobalString('LDAP_KEY_CONTACTS')];
 		}
 		return $dn;
 	}
@@ -954,12 +954,12 @@ 
 			// Update birthday alert
 			if (!empty($this->birthday_alert)) {
 				//check existing
-				$sql_check = "SELECT rowid FROM " . MAIN_DB_PREFIX . "user_alert WHERE type = 1 AND fk_contact = " . ((int) $id) . " AND fk_user = " . ((int) $user->id);
+				$sql_check = "SELECT rowid FROM ".MAIN_DB_PREFIX."user_alert WHERE type = 1 AND fk_contact = ".((int) $id)." AND fk_user = ".((int) $user->id);
 				$result_check = $this->db->query($sql_check);
 				if (!$result_check || ($this->db->num_rows($result_check) < 1)) {
 					//insert
-					$sql = "INSERT INTO " . MAIN_DB_PREFIX . "user_alert(type, fk_contact, fk_user) ";
-					$sql .= "VALUES (1," . ((int) $id) . "," . ((int) $user->id) . ")";
+					$sql = "INSERT INTO ".MAIN_DB_PREFIX."user_alert(type, fk_contact, fk_user) ";
+					$sql .= "VALUES (1,".((int) $id).",".((int) $user->id).")";
 					$result = $this->db->query($sql);
 					if (!$result) {
 						$error++;
@@ -969,8 +969,8 @@ 
 					$result = true;
 				}
 			} else {
-				$sql = "DELETE FROM " . MAIN_DB_PREFIX . "user_alert ";
-				$sql .= "WHERE type=1 AND fk_contact=" . ((int) $id) . " AND fk_user=" . ((int) $user->id);
+				$sql = "DELETE FROM ".MAIN_DB_PREFIX."user_alert ";
+				$sql .= "WHERE type=1 AND fk_contact=".((int) $id)." AND fk_user=".((int) $user->id);
 				$result = $this->db->query($sql);
 				if (!$result) {
 					$error++;
@@ -1071,37 +1071,37 @@ 
 			} elseif ($num) {   // $num = 1
 				$obj = $this->db->fetch_object($resql);
 
-				$this->id		= $obj->rowid;
-				$this->entity	= $obj->entity;
-				$this->ref		= $obj->rowid;
-				$this->ref_ext	= $obj->ref_ext;
+				$this->id = $obj->rowid;
+				$this->entity = $obj->entity;
+				$this->ref = $obj->rowid;
+				$this->ref_ext = $obj->ref_ext;
 
 				$this->civility_code    = $obj->civility_code;
 				$this->civility	        = $obj->civility_code ? ($langs->trans("Civility".$obj->civility_code) != "Civility".$obj->civility_code ? $langs->trans("Civility".$obj->civility_code) : $obj->civility_code) : '';
 
-				$this->name_alias	= $obj->name_alias;
+				$this->name_alias = $obj->name_alias;
 				$this->lastname		= $obj->lastname;
 				$this->firstname	= $obj->firstname;
-				$this->address		= $obj->address;
-				$this->zip			= $obj->zip;
-				$this->town			= $obj->town;
+				$this->address = $obj->address;
+				$this->zip = $obj->zip;
+				$this->town = $obj->town;
 
 				$this->date_creation     = $this->db->jdate($obj->date_creation);
 				$this->date_modification = $this->db->jdate($obj->date_modification);
 				$this->user_creation_id     = $obj->fk_user_creat;
 				$this->user_modification_id = $obj->fk_user_modif;
 
-				$this->state_id		= $obj->state_id;
+				$this->state_id = $obj->state_id;
 				$this->state_code	= $obj->state_code;
-				$this->state		= $obj->state;
+				$this->state = $obj->state;
 
 				$this->country_id	= $obj->country_id;
-				$this->country_code	= $obj->country_id ? $obj->country_code : '';
-				$this->country		= $obj->country_id ? ($langs->trans('Country'.$obj->country_code) != 'Country'.$obj->country_code ? $langs->transnoentities('Country'.$obj->country_code) : $obj->country) : '';
+				$this->country_code = $obj->country_id ? $obj->country_code : '';
+				$this->country = $obj->country_id ? ($langs->trans('Country'.$obj->country_code) != 'Country'.$obj->country_code ? $langs->transnoentities('Country'.$obj->country_code) : $obj->country) : '';
 
-				$this->fk_soc		= $obj->fk_soc;		// Both fk_soc and socid are used
-				$this->socid		= $obj->fk_soc;		// Both fk_soc and socid are used
-				$this->socname		= $obj->socname;
+				$this->fk_soc = $obj->fk_soc; // Both fk_soc and socid are used
+				$this->socid		= $obj->fk_soc; // Both fk_soc and socid are used
+				$this->socname = $obj->socname;
 				$this->poste		= $obj->poste;
 				$this->status		= $obj->statut;
 				$this->statut		= $obj->statut;
@@ -1114,25 +1114,25 @@ 
 				$this->statut_commercial = $libelle; // libelle statut commercial
 				$this->stcomm_picto = $obj->stcomm_picto; // Picto statut commercial
 
-				$this->phone_pro	= trim($obj->phone);
-				$this->fax			= trim($obj->fax);
-				$this->phone_perso	= trim($obj->phone_perso);
-				$this->phone_mobile	= trim($obj->phone_mobile);
+				$this->phone_pro = trim($obj->phone);
+				$this->fax = trim($obj->fax);
+				$this->phone_perso = trim($obj->phone_perso);
+				$this->phone_mobile = trim($obj->phone_mobile);
 
 				$this->email			= $obj->email;
-				$this->socialnetworks	= ($obj->socialnetworks ? (array) json_decode($obj->socialnetworks, true) : array());
+				$this->socialnetworks = ($obj->socialnetworks ? (array) json_decode($obj->socialnetworks, true) : array());
 				$this->photo			= $obj->photo;
 				$this->priv				= $obj->priv;
 				$this->mail				= $obj->email;
 
-				$this->birthday		= $this->db->jdate($obj->birthday);
-				$this->note			= $obj->note_private; // deprecated
+				$this->birthday = $this->db->jdate($obj->birthday);
+				$this->note = $obj->note_private; // deprecated
 				$this->note_private	= $obj->note_private;
-				$this->note_public	= $obj->note_public;
+				$this->note_public = $obj->note_public;
 				$this->default_lang	= $obj->default_lang;
-				$this->user_id		= $obj->user_id;
+				$this->user_id = $obj->user_id;
 				$this->user_login	= $obj->user_login;
-				$this->canvas		= $obj->canvas;
+				$this->canvas = $obj->canvas;
 
 				$this->import_key = $obj->import_key;
 
@@ -1499,7 +1499,7 @@ 
 			$datas['photo'] = $photo;
 		}
 
-		$datas['picto'] = img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("Contact").'</u> ' . $this->getLibStatut(4);
+		$datas['picto'] = img_picto('', $this->picto).' <u class="paddingrightonly">'.$langs->trans("Contact").'</u> '.$this->getLibStatut(4);
 		$datas['name'] = '<br><b>'.$langs->trans("Name").':</b> '.$this->getFullName($langs);
 		// if ($this->civility_id) $datas['civility'] = '<br><b>' . $langs->trans("Civility") . ':</b> '.$this->civility_id;		// TODO Translate civilty_id code
 		if (!empty($this->poste)) {
@@ -1957,7 +1957,7 @@ 
 		$error = 0;
 
 		if (!isset($this->roles)) {
-			return 0;	// Avoid to loose roles when property not set
+			return 0; // Avoid to loose roles when property not set
 		}
 
 		$this->db->begin();

htdocs/product/card.php

Spacing +25 added lines, -25 removed lines

@@ -108,7 +108,7 @@ 
 $formbarcode = null;
 
 // Get parameters
-$id  = GETPOSTINT('id');
+$id = GETPOSTINT('id');
 if (getDolGlobalString('MAIN_SECURITY_ALLOW_UNSECURED_REF_LABELS')) {
 	$ref = (GETPOSTISSET('ref') ? GETPOST('ref', 'nohtml') : null);
 } else {
@@ -120,7 +120,7 @@ 
 $backtopage = GETPOST('backtopage', 'alpha');
 $confirm = GETPOST('confirm', 'alpha');
 $socid = GETPOSTINT('socid');
-$duration_value = GETPOST('duration_value');	// duration value can be an empty string
+$duration_value = GETPOST('duration_value'); // duration value can be an empty string
 $duration_unit = GETPOST('duration_unit', 'alpha');
 
 $accountancy_code_sell = GETPOST('accountancy_code_sell', 'alpha');
@@ -495,7 +495,7 @@ 
 
 	// Quick edit for extrafields
 	if ($action == 'update_extras' && $permissiontoeditextra) {
-		$object->oldcopy = dol_clone($object, 2);  // @phan-suppress-current-line PhanTypeMismatchProperty
+		$object->oldcopy = dol_clone($object, 2); // @phan-suppress-current-line PhanTypeMismatchProperty
 
 		$attribute_name = GETPOST('attribute', 'aZ09');
 
@@ -549,11 +549,11 @@ 
 		if (!$error) {
 			$units = GETPOSTINT('units');
 
-			$object->entity				= $conf->entity;
-			$object->ref				= (string) $ref;
-			$object->label				= GETPOST('label', $label_security_check);
-			$object->price_base_type	= GETPOST('price_base_type', 'aZ09');
-			$object->mandatory_period	= empty(GETPOST("mandatoryperiod", 'alpha')) ? 0 : 1;
+			$object->entity = $conf->entity;
+			$object->ref = (string) $ref;
+			$object->label = GETPOST('label', $label_security_check);
+			$object->price_base_type = GETPOST('price_base_type', 'aZ09');
+			$object->mandatory_period = empty(GETPOST("mandatoryperiod", 'alpha')) ? 0 : 1;
 			if ($object->price_base_type == 'TTC') {
 				$object->price_ttc = GETPOSTFLOAT('price');
 			} else {
@@ -641,12 +641,12 @@ 
 			$object->duration_value     	 = $duration_value;
 			$object->duration_unit      	 = $duration_unit;
 			$object->fk_default_warehouse	 = GETPOSTINT('fk_default_warehouse');
-			$object->fk_default_workstation	 = GETPOSTINT('fk_default_workstation');
+			$object->fk_default_workstation = GETPOSTINT('fk_default_workstation');
 			$object->seuil_stock_alerte 	 = GETPOST('seuil_stock_alerte') ? GETPOST('seuil_stock_alerte') : 0;
 			$object->desiredstock          = GETPOST('desiredstock') ? GETPOST('desiredstock') : 0;
 			$object->canvas             	 = GETPOST('canvas');
 			$object->net_measure           = GETPOST('net_measure');
-			$object->net_measure_units      = GETPOST('net_measure_units') === '' ? null : GETPOSTINT('net_measure_units'); // This is not the fk_unit but the power of unit
+			$object->net_measure_units = GETPOST('net_measure_units') === '' ? null : GETPOSTINT('net_measure_units'); // This is not the fk_unit but the power of unit
 			$object->weight             	 = GETPOST('weight');
 			$object->weight_units       	 = GETPOST('weight_units'); // This is not the fk_unit but the power of unit
 			$object->length             	 = GETPOST('size');
@@ -789,7 +789,7 @@ 
 		} else {
 			if ($object->id > 0) {
 				// Need dol_clone methode 1 (same object class) because update product use hasbatch() method on oldcopy
-				$object->oldcopy = dol_clone($object, 1);  // @phan-suppress-current-line PhanTypeMismatchProperty
+				$object->oldcopy = dol_clone($object, 1); // @phan-suppress-current-line PhanTypeMismatchProperty
 
 				if (!getDolGlobalString('PRODUCT_GENERATE_REF_AFTER_FORM')) {
 					$object->ref = (string) $ref;
@@ -814,7 +814,7 @@ 
 				$object->status_batch = GETPOSTINT('status_batch');
 				$object->sell_or_eat_by_mandatory = GETPOSTINT('sell_or_eat_by_mandatory');
 				$object->batch_mask = GETPOST('batch_mask', 'alpha');
-				$object->fk_default_warehouse   = GETPOSTINT('fk_default_warehouse');
+				$object->fk_default_warehouse = GETPOSTINT('fk_default_warehouse');
 				$object->fk_default_workstation   = GETPOSTINT('fk_default_workstation');
 				// removed from update view so GETPOST always empty
 				/*
@@ -854,8 +854,8 @@ 
 				}
 
 				// managed_in_stock
-				$object->stockable_product   = (int) GETPOSTISSET('stockable_product');
-				if ($object->status_batch > 0  && $object->stockable_product == 0 && isModEnabled('stock') && isModEnabled('productbatch')) {
+				$object->stockable_product = (int) GETPOSTISSET('stockable_product');
+				if ($object->status_batch > 0 && $object->stockable_product == 0 && isModEnabled('stock') && isModEnabled('productbatch')) {
 					$object->stockable_product = 1;
 					setEventMessages($langs->trans('ForceBatchesNeedStockManagement'), null, 'warnings');
 				}
@@ -921,7 +921,7 @@ 
 					$object->accountancy_code_buy_export = $accountancy_code_buy_export;
 				}
 				if ($object->isService()) {
-					$object->mandatory_period =  (!empty($checkmandatory)) ? 1 : 0 ;
+					$object->mandatory_period = (!empty($checkmandatory)) ? 1 : 0;
 				}
 
 
@@ -1055,7 +1055,7 @@ 
 							$action = "";
 
 							$mesg = $langs->trans("ErrorProductAlreadyExists", $clone->ref);
-							$mesg .= ' <a href="' . $_SERVER["PHP_SELF"] . '?ref=' . $clone->ref . '">' . $langs->trans("ShowCardHere") . '</a>.';
+							$mesg .= ' <a href="'.$_SERVER["PHP_SELF"].'?ref='.$clone->ref.'">'.$langs->trans("ShowCardHere").'</a>.';
 							setEventMessages($mesg, null, 'errors');
 						} else {
 							setEventMessages(empty($clone->error) ? '' : $langs->trans($clone->error), $clone->errors, 'errors');
@@ -1070,7 +1070,7 @@ 
 					} else {
 						$db->commit();
 						$db->close();
-						header("Location: " . $_SERVER["PHP_SELF"] . "?id=" . $id);
+						header("Location: ".$_SERVER["PHP_SELF"]."?id=".$id);
 						exit;
 					}
 				} else {
@@ -2279,9 +2279,9 @@ 
 					if (isModEnabled('productbatch') && $object->hasbatch()) {
 						print '<tr><td><input type="hidden" id="stockable_product" name="stockable_product" value="on" /></td><td></td></tr>';
 					} else {
-						print '<tr><td><label for="stockable_product">' . $langs->trans("StockableProduct") . '</label></td>';
+						print '<tr><td><label for="stockable_product">'.$langs->trans("StockableProduct").'</label></td>';
 						$checked = empty($object->stockable_product) ? "" : "checked";
-						print '<td><input type="checkbox" id="stockable_product" name="stockable_product" '. $checked . ' /></td></tr>';
+						print '<td><input type="checkbox" id="stockable_product" name="stockable_product" '.$checked.' /></td></tr>';
 					}
 
 					// Default warehouse
@@ -2341,9 +2341,9 @@ 
 					print '</td></tr>';
 
 					if (isModEnabled('stock') && getDolGlobalString('STOCK_SUPPORTS_SERVICES')) {
-						print '<tr><td>' . $langs->trans("StockableProduct") . '</td>';
+						print '<tr><td>'.$langs->trans("StockableProduct").'</td>';
 						$checked = $object->stockable_product == 1 ? "checked" : "";
-						print '<td><input type="checkbox" id="stockable_product" name="stockable_product" ' . $checked . ' /></td></tr>';
+						print '<td><input type="checkbox" id="stockable_product" name="stockable_product" '.$checked.' /></td></tr>';
 					}
 				} else {
 					if (!getDolGlobalString('PRODUCT_DISABLE_NATURE')) {
@@ -2810,7 +2810,7 @@ 
 
 				// Stockable product / default warehouse
 				if (($object->isProduct() || getDolGlobalInt('STOCK_SUPPORTS_SERVICES')) && isModEnabled('stock')) {
-					print '<tr><td>' . $form->textwithpicto($langs->trans("StockableProduct"), $langs->trans('StockableProductDescription')) . '</td>';
+					print '<tr><td>'.$form->textwithpicto($langs->trans("StockableProduct"), $langs->trans('StockableProductDescription')).'</td>';
 					print '<td><input type="checkbox" readonly disabled '.($object->stockable_product == 1 ? 'checked' : '').'></td></tr>';
 
 					if ($object->isStockManaged()) {
@@ -2867,7 +2867,7 @@ 
 					$result = $measuringUnits->fetchAll('', 'scale', 0, 0, ['t.active' => 1, 't.unit_type' => 'time']);
 					if ($result !== -1) {
 						foreach ($measuringUnits->records as $record) {
-							$durations[$record->short_label] = dol_ucfirst($record->label) . $plural;
+							$durations[$record->short_label] = dol_ucfirst($record->label).$plural;
 						}
 					}
 					print '<tr><td class="titlefieldmiddle">'.$langs->trans("Duration").'</td><td>';
@@ -3108,7 +3108,7 @@ 
 			}
 
 			//Send
-			print dolGetButtonAction('', $langs->trans('SendMail'), 'default', $_SERVER["PHP_SELF"] . '?id=' . $object->id . '&action=presend&mode=init&token=' . newToken() . '#formmailbeforetitle');
+			print dolGetButtonAction('', $langs->trans('SendMail'), 'default', $_SERVER["PHP_SELF"].'?id='.$object->id.'&action=presend&mode=init&token='.newToken().'#formmailbeforetitle');
 
 			if (!isset($hookmanager->resArray['no_button_copy']) || $hookmanager->resArray['no_button_copy'] != 1) {
 				if (!empty($conf->use_javascript_ajax) && empty($conf->dol_use_jmobile)) {
@@ -3290,7 +3290,7 @@ 
 	$modelmail = 'product_send';
 	$defaulttopic = $object->label;
 	$diroutput = $conf->product->multidir_output[$object->entity];
-	$trackid = 'prod' . $object->id;
+	$trackid = 'prod'.$object->id;
 
 	include DOL_DOCUMENT_ROOT.'/core/tpl/card_presend.tpl.php';
 }

htdocs/commande/tpl/linkedobjectblock.tpl.php

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
 $langs->load("orders");
 
 $linkedObjectBlock = dol_sort_array($linkedObjectBlock, 'date', 'desc', 0, 0, 1);
-'@phan-var-force Commande[] $linkedObjectBlock';  // Repeat because type lost after dol_sort_array)
+'@phan-var-force Commande[] $linkedObjectBlock'; // Repeat because type lost after dol_sort_array)
 /** @var Commande[] $linkedObjectBlock */
 
 $total = 0;

htdocs/ticket/tpl/linkedobjectblock.tpl.php

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
 $langs->load('ticket');
 
 $linkedObjectBlock = dol_sort_array($linkedObjectBlock, 'datec', 'desc', 0, 0, 1);
-'@phan-var-force Ticket[] $linkedObjectBlock';  // Repeat because type lost after dol_sort_array)
+'@phan-var-force Ticket[] $linkedObjectBlock'; // Repeat because type lost after dol_sort_array)
 /** @var Ticket[] $linkedObjectBlock */
 
 $total = 0;

htdocs/delivery/class/delivery.class.php

Spacing +3 added lines, -3 removed lines

@@ -586,7 +586,7 @@ 
 		$this->note_private         = $expedition->note_private;
 		$this->note_public          = $expedition->note_public;
 		$this->fk_project           = $expedition->fk_project;
-		$this->date_delivery        = '';									// Date of real reception. The Expedition->date_delivery is the planned one.
+		$this->date_delivery        = ''; // Date of real reception. The Expedition->date_delivery is the planned one.
 		$this->fk_delivery_address  = $expedition->fk_delivery_address;
 		$this->socid                = $expedition->socid;
 		$this->ref_customer         = $expedition->ref_customer;
@@ -827,7 +827,7 @@ 
 		$result .= $linkstart.$this->ref.$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) {
@@ -872,7 +872,7 @@ 
 				$line->label = $obj->custom_label;
 				$line->description	= $obj->description;
 				$line->fk_product 	= $obj->fk_product;
-				$line->qty_asked 	= $obj->qty_asked;
+				$line->qty_asked = $obj->qty_asked;
 				$line->qty_shipped	= $obj->qty_shipped;
 
 				$line->product_label	= $obj->product_label; // Product label