Dolibarr / dolibarr

htdocs/core/class/commondocgenerator.class.php

Spacing +7 added lines, -7 removed lines

@@ -151,8 +151,8 @@ 
 	public $result;
 
 	public $posxref;
-	public $posxpicture;	// For picture
-	public $posxdesc;		// For description
+	public $posxpicture; // For picture
+	public $posxdesc; // For description
 	public $posxqty;
 	public $posxpuht;
 	public $posxtva;
@@ -204,7 +204,7 @@ 
 			'myuser_email'=>$user->email,
 			'myuser_logo'=>$logotouse,
 			'myuser_job'=>$user->job,
-			'myuser_web'=>'',	// url not exist in $user object
+			'myuser_web'=>'', // url not exist in $user object
 			'myuser_birth'=>dol_print_date($user->birth, 'day', 'gmt'),
 			'myuser_dateemployment'=>dol_print_date($user->dateemployment, 'day', 'tzuser'),
 			'myuser_dateemploymentend'=>dol_print_date($user->dateemploymentend, 'day', 'tzuser'),
@@ -520,7 +520,7 @@ 
 
 		if (get_class($object) == 'CommandeFournisseur') {
 			/* @var $object CommandeFournisseur*/
-			$object->date_validation =  $object->date_valid;
+			$object->date_validation = $object->date_valid;
 			$object->date_commande = $object->date;
 		}
 		$resarray = array(
@@ -606,7 +606,7 @@ 
 			$resarray[$array_key.'_bank_bic'] = (empty($bank_account) ? '' : $bank_account->bic);
 			$resarray[$array_key.'_bank_label'] = (empty($bank_account) ? '' : $bank_account->label);
 			$resarray[$array_key.'_bank_number'] = (empty($bank_account) ? '' : $bank_account->number);
-			$resarray[$array_key.'_bank_proprio'] =(empty($bank_account) ? '' : $bank_account->proprio);
+			$resarray[$array_key.'_bank_proprio'] = (empty($bank_account) ? '' : $bank_account->proprio);
 		}
 
 		if (method_exists($object, 'getTotalDiscount') && in_array(get_class($object), array('Propal', 'Proposal', 'Commande', 'Facture', 'SupplierProposal', 'CommandeFournisseur', 'FactureFournisseur'))) {
@@ -629,7 +629,7 @@ 
 			$resarray[$array_key.'_project_date_start'] = dol_print_date($object->project->date_start, 'day');
 			$resarray[$array_key.'_project_date_end'] = dol_print_date($object->project->date_end, 'day');
 		} else { // empty replacement
-			$resarray[$array_key.'_project_ref'] ='';
+			$resarray[$array_key.'_project_ref'] = '';
 			$resarray[$array_key.'_project_title'] = '';
 			$resarray[$array_key.'_project_description'] = '';
 			$resarray[$array_key.'_project_date_start'] = '';
@@ -1461,7 +1461,7 @@ 
 
 		if (!empty($fields)) {
 			// Sort extrafields by rank
-			uasort($fields, function ($a, $b) {
+			uasort($fields, function($a, $b) {
 				return  ($a->rank > $b->rank) ? 1 : -1;
 			});
 

htdocs/core/modules/modPartnership.class.php

Spacing +5 added lines, -5 removed lines

@@ -211,7 +211,7 @@ 
 		// 'user'             to add a tab in user view
 
 		// Dictionaries
-		$this->dictionaries=array(
+		$this->dictionaries = array(
 			'langs'=>'partnership',
 			// List of tables we want to see into dictonnary editor
 			'tabname'=>array("c_partnership_type"),
@@ -249,12 +249,12 @@ 
 		// Cronjobs (List of cron jobs entries to add when module is enabled)
 		// unit_frequency must be 60 for minute, 3600 for hour, 86400 for day, 604800 for week
 
-		$arraydate=dol_getdate(dol_now());
-		$datestart=dol_mktime(21, 15, 0, $arraydate['mon'], $arraydate['mday'], $arraydate['year']);
+		$arraydate = dol_getdate(dol_now());
+		$datestart = dol_mktime(21, 15, 0, $arraydate['mon'], $arraydate['mday'], $arraydate['year']);
 
 		$this->cronjobs = array(
-			0	=> array('priority'=>60, 'label'=>'CancelPartnershipForExpiredMembers', 'jobtype'=>'method', 'class'=>'/partnership/class/partnershiputils.class.php', 'objectname'=>'PartnershipUtils', 'method'=>'doCancelStatusOfMemberPartnership', 'parameters'=>'',      'comment'=>'Cancel status of partnership when subscription is expired + x days.', 'frequency'=>1, 'unitfrequency'=>86400, 'status'=>1, 'test'=>'isModEnabled("partnership")', 'datestart'=>$datestart),
-			1	=> array('priority'=>61, 'label'=>'PartnershipCheckBacklink', 'jobtype'=>'method', 'class'=>'/partnership/class/partnershiputils.class.php', 'objectname'=>'PartnershipUtils', 'method'=>'doWarningOfPartnershipIfDolibarrBacklinkNotfound', 'parameters'=>'',      'comment'=>'Add a warning on partnership record if the backlink keyword is not found on the partner website.', 'frequency'=>1, 'unitfrequency'=>86400, 'status'=>0, 'test'=>'isModEnabled("partnership")', 'datestart'=>$datestart),
+			0	=> array('priority'=>60, 'label'=>'CancelPartnershipForExpiredMembers', 'jobtype'=>'method', 'class'=>'/partnership/class/partnershiputils.class.php', 'objectname'=>'PartnershipUtils', 'method'=>'doCancelStatusOfMemberPartnership', 'parameters'=>'', 'comment'=>'Cancel status of partnership when subscription is expired + x days.', 'frequency'=>1, 'unitfrequency'=>86400, 'status'=>1, 'test'=>'isModEnabled("partnership")', 'datestart'=>$datestart),
+			1	=> array('priority'=>61, 'label'=>'PartnershipCheckBacklink', 'jobtype'=>'method', 'class'=>'/partnership/class/partnershiputils.class.php', 'objectname'=>'PartnershipUtils', 'method'=>'doWarningOfPartnershipIfDolibarrBacklinkNotfound', 'parameters'=>'', 'comment'=>'Add a warning on partnership record if the backlink keyword is not found on the partner website.', 'frequency'=>1, 'unitfrequency'=>86400, 'status'=>0, 'test'=>'isModEnabled("partnership")', 'datestart'=>$datestart),
 		);
 
 		// Permissions provided by this module

htdocs/partnership/class/partnershiputils.class.php

Braces +38 added lines, -13 removed lines

@@ -118,7 +118,9 @@ 
 
 				$obj = $this->db->fetch_object($resql);
 				if ($obj) {
-					if (!empty($partnershipsprocessed[$obj->rowid])) continue;
+					if (!empty($partnershipsprocessed[$obj->rowid])) {
+						continue;
+					}
 
 					if ($somethingdoneonpartnership >= $MAXPERCALL) {
 						dol_syslog("We reach the limit of ".$MAXPERCALL." partnership processed, so we quit loop for this batch doCancelStatusOfMemberPartnership to avoid to reach email quota.", LOG_WARNING);
@@ -140,8 +142,11 @@ 
 							$error++;
 							$this->error = $object->error;
 							if (is_array($object->errors) && count($object->errors)) {
-								if (is_array($this->errors)) $this->errors = array_merge($this->errors, $object->errors);
-								else $this->errors = $object->errors;
+								if (is_array($this->errors)) {
+									$this->errors = array_merge($this->errors, $object->errors);
+								} else {
+									$this->errors = $object->errors;
+								}
 							}
 						} else {
 							$partnershipsprocessed[$object->id] = $object->ref;
@@ -159,7 +164,9 @@ 
 							// Define output language
 							$outputlangs = $langs;
 							$newlang = '';
-							if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
+							if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
+								$newlang = GETPOST('lang_id', 'aZ09');
+							}
 							if (!empty($newlang)) {
 								$outputlangs = new Translate("", $conf);
 								$outputlangs->setDefaultLang($newlang);
@@ -184,7 +191,9 @@ 
 							if (!$result || $cmail->error) {
 								$erroremail .= ($erroremail ? ', ' : '').$cmail->error;
 								$this->errors[] = $cmail->error;
-								if (is_array($cmail->errors) && count($cmail->errors) > 0) $this->errors += $cmail->errors;
+								if (is_array($cmail->errors) && count($cmail->errors) > 0) {
+									$this->errors += $cmail->errors;
+								}
 							}
 						}
 					}
@@ -198,12 +207,16 @@ 
 		if (!$error) {
 			$this->db->commit();
 			$this->output = $numofexpiredmembers.' expired partnership members found'."\n";
-			if ($erroremail) $this->output .= '. Got errors when sending some email : '.$erroremail;
+			if ($erroremail) {
+				$this->output .= '. Got errors when sending some email : '.$erroremail;
+			}
 		} else {
 			$this->db->rollback();
 			$this->output = "Rollback after error\n";
 			$this->output .= $numofexpiredmembers.' expired partnership members found'."\n";
-			if ($erroremail) $this->output .= '. Got errors when sending some email : '.$erroremail;
+			if ($erroremail) {
+				$this->output .= '. Got errors when sending some email : '.$erroremail;
+			}
 		}
 
 		return ($error ? 1 : 0);
@@ -276,7 +289,9 @@ 
 
 				$obj = $this->db->fetch_object($resql);
 				if ($obj) {
-					if (!empty($partnershipsprocessed[$obj->rowid])) continue;
+					if (!empty($partnershipsprocessed[$obj->rowid])) {
+						continue;
+					}
 
 					if ($somethingdoneonpartnership >= $MAXPERCALL) {
 						dol_syslog("We reach the limit of ".$MAXPERCALL." partnership processed, so we quit loop for this batch doWarningOfPartnershipIfDolibarrBacklinkNotfound to avoid to reach email quota.", LOG_WARNING);
@@ -321,7 +336,9 @@ 
 								// Define output language
 								$outputlangs = $langs;
 								$newlang = '';
-								if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) $newlang = GETPOST('lang_id', 'aZ09');
+								if (getDolGlobalInt('MAIN_MULTILANGS') && empty($newlang) && GETPOST('lang_id', 'aZ09')) {
+									$newlang = GETPOST('lang_id', 'aZ09');
+								}
 								if (!empty($newlang)) {
 									$outputlangs = new Translate("", $conf);
 									$outputlangs->setDefaultLang($newlang);
@@ -344,7 +361,9 @@ 
 								if (!$result || $cmail->error) {
 									$erroremail .= ($erroremail ? ', ' : '').$cmail->error;
 									$this->errors[] = $cmail->error;
-									if (is_array($cmail->errors) && count($cmail->errors) > 0) $this->errors += $cmail->errors;
+									if (is_array($cmail->errors) && count($cmail->errors) > 0) {
+										$this->errors += $cmail->errors;
+									}
 								}
 							}
 						} elseif ($tmpcount > 4) { // Cancel Partnership
@@ -378,9 +397,15 @@ 
 			$this->output = "Rollback after error\n";
 		}
 		$this->output .= $numofexpiredmembers.' partnership checked'."\n";
-		if ($erroremail) $this->output .= '. Got errors when sending some email : '.$erroremail."\n";
-		if ($emailnotfound) $this->output .= '. Email not found for some partner : '.$emailnotfound."\n";
-		if ($websitenotfound) $this->output .= '. Website not found for some partner : '.$websitenotfound."\n";
+		if ($erroremail) {
+			$this->output .= '. Got errors when sending some email : '.$erroremail."\n";
+		}
+		if ($emailnotfound) {
+			$this->output .= '. Email not found for some partner : '.$emailnotfound."\n";
+		}
+		if ($websitenotfound) {
+			$this->output .= '. Website not found for some partner : '.$websitenotfound."\n";
+		}
 		$this->output .= "\nSQL used to find partnerships to scan: ".$sql;
 
 		return ($error ? 1 : 0);