Completed
Branch develop (8b51aa)
by
unknown
16:02
created
htdocs/comm/action/class/cactioncomm.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -234,7 +234,7 @@
 block discarded – undo
234 234
 							}
235 235
 						}
236 236
 						// For the case type is not 'system...' neither 'module', we just check module is on
237
-						if (! in_array($obj->type, array('system', 'systemauto', 'module', 'moduleauto'))) {
237
+						if (!in_array($obj->type, array('system', 'systemauto', 'module', 'moduleauto'))) {
238 238
 							$tmpmodule = $obj->module;
239 239
 							//var_dump($tmpmodule);
240 240
 							if ($tmpmodule && isset($conf->$tmpmodule) && isModEnabled($tmpmodule)) {
Please login to merge, or discard this patch.
htdocs/comm/mailing/class/advtargetemailing.class.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -125,7 +125,7 @@  discard block
 block discarded – undo
125 125
 		$customerStatic->loadCacheOfProspStatus();
126 126
 		if (!empty($customerStatic->cacheprospectstatus)) {
127 127
 			foreach ($customerStatic->cacheprospectstatus as $dataProspectSt) {
128
-				$this->type_statuscommprospect[$dataProspectSt['id']]=$dataProspectSt['label'];
128
+				$this->type_statuscommprospect[$dataProspectSt['id']] = $dataProspectSt['label'];
129 129
 			}
130 130
 		} else {
131 131
 			$this->type_statuscommprospect = array(
@@ -628,7 +628,7 @@  discard block
 block discarded – undo
628 628
 						}
629 629
 					} elseif ($extrafields->attributes[$elementtype]['type'][$key] == 'link') {
630 630
 						if ($arrayquery['options_'.$key] > 0) {
631
-							$sqlwhere[]= " (te.".$key." = ".((int) $arrayquery["options_".$key]).")";
631
+							$sqlwhere[] = " (te.".$key." = ".((int) $arrayquery["options_".$key]).")";
632 632
 						}
633 633
 					} else {
634 634
 						if (is_array($arrayquery['options_'.$key])) {
Please login to merge, or discard this patch.
htdocs/don/payment/payment.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -95,7 +95,7 @@
 block discarded – undo
95 95
 			// Create a line of payments
96 96
 			$payment = new PaymentDonation($db);
97 97
 			$payment->chid         = $chid;
98
-			$payment->datep     = $datepaid;
98
+			$payment->datep = $datepaid;
99 99
 			$payment->amounts      = $amounts; // Tableau de montant
100 100
 			$payment->paymenttype  = GETPOST("paymenttype", 'int');
101 101
 			$payment->num_payment  = GETPOST("num_payment", 'alphanohtml');
Please login to merge, or discard this patch.
htdocs/don/document.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -81,7 +81,7 @@
 block discarded – undo
81 81
 }
82 82
 $result = restrictedArea($user, 'don', $object->id);
83 83
 
84
-$permissiontoadd = $user->rights->don->creer;	// Used by the include of actions_dellink.inc.php
84
+$permissiontoadd = $user->rights->don->creer; // Used by the include of actions_dellink.inc.php
85 85
 
86 86
 
87 87
 /*
Please login to merge, or discard this patch.
htdocs/don/class/paymentdonation.class.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -64,8 +64,8 @@  discard block
 block discarded – undo
64 64
 
65 65
 	public $amounts = array(); // Array of amounts
66 66
 
67
-	public $fk_typepayment;	// Payment mode ID
68
-	public $paymenttype;	// Payment mode ID or Code. TODO Use only the code in this field.
67
+	public $fk_typepayment; // Payment mode ID
68
+	public $paymenttype; // Payment mode ID or Code. TODO Use only the code in this field.
69 69
 
70 70
 	public $num_payment;
71 71
 
@@ -269,8 +269,8 @@  discard block
 block discarded – undo
269 269
 				$this->tms            = $this->db->jdate($obj->tms);
270 270
 				$this->datep		  = $this->db->jdate($obj->datep);
271 271
 				$this->amount         = $obj->amount;
272
-				$this->fk_typepayment = $obj->fk_typepayment;	// Id on type of payent
273
-				$this->paymenttype    = $obj->fk_typepayment;	// Id on type of payment. We should store the code into paymenttype.
272
+				$this->fk_typepayment = $obj->fk_typepayment; // Id on type of payent
273
+				$this->paymenttype    = $obj->fk_typepayment; // Id on type of payment. We should store the code into paymenttype.
274 274
 				$this->num_payment    = $obj->num_payment;
275 275
 				$this->note_public    = $obj->note_public;
276 276
 				$this->fk_bank        = $obj->fk_bank;
@@ -688,7 +688,7 @@  discard block
 block discarded – undo
688 688
 		}
689 689
 
690 690
 		global $action;
691
-		$hookmanager->initHooks(array($this->element . 'dao'));
691
+		$hookmanager->initHooks(array($this->element.'dao'));
692 692
 		$parameters = array('id'=>$this->id, 'getnomurl' => &$result);
693 693
 		$reshook = $hookmanager->executeHooks('getNomUrl', $parameters, $this, $action); // Note that $action and $object may have been modified by some hooks
694 694
 		if ($reshook > 0) {
Please login to merge, or discard this patch.
htdocs/core/modules/security/generate/modGeneratePassPerso.class.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -194,7 +194,7 @@  discard block
 block discarded – undo
194 194
 			return $pass;
195 195
 		}
196 196
 
197
-		return $this->getNewGeneratedPassword();	// warning, may generate infinite loop if conditions are not possible
197
+		return $this->getNewGeneratedPassword(); // warning, may generate infinite loop if conditions are not possible
198 198
 	}
199 199
 
200 200
 	/**
@@ -208,7 +208,7 @@  discard block
 block discarded – undo
208 208
 	{
209 209
 		global $langs;
210 210
 
211
-		$this->initAll();	// For the case this method is called alone
211
+		$this->initAll(); // For the case this method is called alone
212 212
 
213 213
 		$password_a = preg_split('//u', $password, null, PREG_SPLIT_NO_EMPTY);
214 214
 		$maj = preg_split('//u', $this->Maj, null, PREG_SPLIT_NO_EMPTY);
Please login to merge, or discard this patch.
htdocs/accountancy/class/accountancycategory.class.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -627,7 +627,7 @@  discard block
 block discarded – undo
627 627
 		if (is_array($cpt)) {
628 628
 			$listofaccount = '';
629 629
 			foreach ($cpt as $cptcursor) {
630
-				if (! is_null($cptcursor)) {
630
+				if (!is_null($cptcursor)) {
631 631
 					if ($listofaccount) {
632 632
 						$listofaccount .= ",";
633 633
 					}
@@ -776,7 +776,7 @@  discard block
 block discarded – undo
776 776
 
777 777
 		$sql = "SELECT c.rowid, c.code, c.label, c.formula, c.position, c.category_type, c.sens";
778 778
 		$sql .= " FROM ".MAIN_DB_PREFIX."c_accounting_category as c";
779
-		$sql .= " WHERE c.active = " . (int) $active;
779
+		$sql .= " WHERE c.active = ".(int) $active;
780 780
 		$sql .= " AND c.entity = ".$conf->entity;
781 781
 		if ($categorytype >= 0) {
782 782
 			$sql .= " AND c.category_type = 1";
Please login to merge, or discard this patch.
htdocs/website/class/websitepage.class.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -56,7 +56,7 @@  discard block
 block discarded – undo
56 56
 	 */
57 57
 	public $fk_website;
58 58
 
59
-	public $fk_page;		// If translation of another page
59
+	public $fk_page; // If translation of another page
60 60
 
61 61
 	public $pageurl;
62 62
 	public $aliasalt;
@@ -118,8 +118,8 @@  discard block
 block discarded – undo
118 118
 	 */
119 119
 	public $fk_object;
120 120
 
121
-	const STATUS_DRAFT = 0;			// offline
122
-	const STATUS_VALIDATED = 1;		// online
121
+	const STATUS_DRAFT = 0; // offline
122
+	const STATUS_VALIDATED = 1; // online
123 123
 
124 124
 
125 125
 	/**
Please login to merge, or discard this patch.
htdocs/core/modules/reception/doc/doc_generic_reception_odt.modules.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -179,7 +179,7 @@  discard block
 block discarded – undo
179 179
 		$maxfilesizearray = getMaxFileSizeArray();
180 180
 		$maxmin = $maxfilesizearray['maxmin'];
181 181
 		if ($maxmin > 0) {
182
-			$texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
182
+			$texte .= '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file
183 183
 		}
184 184
 		$texte .= ' <input type="file" name="uploadfile">';
185 185
 		$texte .= '<input type="hidden" value="RECEPTION_ADDON_PDF_ODT_PATH" name="keyforuploaddir">';
@@ -273,7 +273,7 @@  discard block
 block discarded – undo
273 273
 				$newfiletmp = preg_replace('/\.od[ts]/i', '', $newfile);
274 274
 				$newfiletmp = preg_replace('/template_/i', '', $newfiletmp);
275 275
 				$newfiletmp = preg_replace('/modele_/i', '', $newfiletmp);
276
-				$newfiletmp = $objectref . '_' . $newfiletmp;
276
+				$newfiletmp = $objectref.'_'.$newfiletmp;
277 277
 				//$file=$dir.'/'.$newfiletmp.'.'.dol_print_date(dol_now(),'%Y%m%d%H%M%S').'.odt';
278 278
 				// Get extension (ods or odt)
279 279
 				$newfileformat = substr($newfile, strrpos($newfile, '.') + 1);
@@ -282,11 +282,11 @@  discard block
 block discarded – undo
282 282
 					if ($format == '1') {
283 283
 						$format = '%Y%m%d%H%M%S';
284 284
 					}
285
-					$filename = $newfiletmp . '-' . dol_print_date(dol_now(), $format) . '.' . $newfileformat;
285
+					$filename = $newfiletmp.'-'.dol_print_date(dol_now(), $format).'.'.$newfileformat;
286 286
 				} else {
287
-					$filename = $newfiletmp . '.' . $newfileformat;
287
+					$filename = $newfiletmp.'.'.$newfileformat;
288 288
 				}
289
-				$file = $dir . '/' . $filename;
289
+				$file = $dir.'/'.$filename;
290 290
 				//print "newdir=".$dir;
291 291
 				//print "newfile=".$newfile;
292 292
 				//print "file=".$file;
@@ -295,7 +295,7 @@  discard block
 block discarded – undo
295 295
 				dol_mkdir($conf->reception->dir_temp);
296 296
 				if (!is_writable($conf->reception->dir_temp)) {
297 297
 					$this->error = $langs->transnoentities("ErrorFailedToWriteInTempDirectory", $conf->reception->dir_temp);
298
-					dol_syslog('Error in write_file: ' . $this->error, LOG_ERR);
298
+					dol_syslog('Error in write_file: '.$this->error, LOG_ERR);
299 299
 					return -1;
300 300
 				}
301 301
 
Please login to merge, or discard this patch.