Passed
Branch develop (fc1365)
by Laurent
84:32
created
htdocs/core/modules/barcode/mod_barcode_product_standard.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -205,12 +205,12 @@
 block discarded – undo
205 205
 
206 206
 		$numFinal = get_next_value($db, $mask, 'product', $field, $where, '', $now);
207 207
 		//Begin barcode with key: for barcode with key (EAN13...) calculate and substitute the last  character (* or ?) used in the mask by the key
208
-		if ((substr($numFinal, -1)=='*') or (substr($numFinal, -1)=='?')) { // if last mask character is * or ? a joker, probably we have to calculate a key as last character (EAN13...)
208
+		if ((substr($numFinal, -1) == '*') or (substr($numFinal, -1) == '?')) { // if last mask character is * or ? a joker, probably we have to calculate a key as last character (EAN13...)
209 209
 			$literaltype = '';
210
-			$literaltype = $this->literalBarcodeType($db, $type);//get literal_Barcode_Type
210
+			$literaltype = $this->literalBarcodeType($db, $type); //get literal_Barcode_Type
211 211
 			switch ($literaltype) {
212 212
 				case 'EAN13': //EAN13 rowid = 2
213
-					if (strlen($numFinal)==13) {// be sure that the mask length is correct for EAN13
213
+					if (strlen($numFinal) == 13) {// be sure that the mask length is correct for EAN13
214 214
 						$ean = substr($numFinal, 0, 12); //take first 12 digits
215 215
 							$eansum = barcode_gen_ean_sum($ean);
216 216
 							$ean .= $eansum; //substitute the las character by the key
Please login to merge, or discard this patch.
htdocs/core/modules/propale/doc/pdf_azur.modules.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1718,7 +1718,7 @@
 block discarded – undo
1718 1718
 
1719 1719
 			$carac_client_name = pdfBuildThirdpartyName($thirdparty, $outputlangs);
1720 1720
 
1721
-			$mode =  'target';
1721
+			$mode = 'target';
1722 1722
 			$carac_client = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, ($usecontact ? $object->contact : ''), $usecontact, $mode, $object);
1723 1723
 
1724 1724
 			// Show recipient
Please login to merge, or discard this patch.
Braces   +9 added lines, -3 removed lines patch added patch discarded remove patch
@@ -459,8 +459,12 @@  discard block
 block discarded – undo
459 459
 
460 460
 
461 461
 					$creator_info = $langs->trans("CaseFollowedBy").' '.$tmpuser->getFullName($langs);
462
-					if ($tmpuser->email) $creator_info .= ',  '.$langs->trans("EMail").': '.$tmpuser->email;
463
-					if ($tmpuser->office_phone) $creator_info .= ', '.$langs->trans("Phone").': '.$tmpuser->office_phone;
462
+					if ($tmpuser->email) {
463
+						$creator_info .= ',  '.$langs->trans("EMail").': '.$tmpuser->email;
464
+					}
465
+					if ($tmpuser->office_phone) {
466
+						$creator_info .= ', '.$langs->trans("Phone").': '.$tmpuser->office_phone;
467
+					}
464 468
 
465 469
 					$notetoshow = dol_concatdesc($notetoshow, $creator_info);
466 470
 				}
@@ -1439,7 +1443,9 @@  discard block
 block discarded – undo
1439 1443
 		global $conf, $langs;
1440 1444
 
1441 1445
 		$ltrdirection = 'L';
1442
-		if ($outputlangs->trans("DIRECTION") == 'rtl') $ltrdirection = 'R';
1446
+		if ($outputlangs->trans("DIRECTION") == 'rtl') {
1447
+			$ltrdirection = 'R';
1448
+		}
1443 1449
 
1444 1450
 		// Load traductions files required by page
1445 1451
 		$outputlangs->loadLangs(array("main", "propal", "companies", "bills"));
Please login to merge, or discard this patch.
htdocs/core/modules/commande/doc/pdf_einstein.modules.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1718,7 +1718,7 @@
 block discarded – undo
1718 1718
 
1719 1719
 			$carac_client_name = pdfBuildThirdpartyName($thirdparty, $outputlangs);
1720 1720
 
1721
-			$mode =  'target';
1721
+			$mode = 'target';
1722 1722
 			$carac_client = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, ($usecontact ? $object->contact : ''), $usecontact, $mode, $object);
1723 1723
 
1724 1724
 			// Show recipient
Please login to merge, or discard this patch.
htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1718,7 +1718,7 @@
 block discarded – undo
1718 1718
 
1719 1719
 			$carac_client_name = pdfBuildThirdpartyName($thirdparty, $outputlangs);
1720 1720
 
1721
-			$mode =  'target';
1721
+			$mode = 'target';
1722 1722
 			$carac_client = pdf_build_address($outputlangs, $this->emetteur, $object->thirdparty, ($usecontact ? $object->contact : ''), $usecontact, $mode, $object);
1723 1723
 
1724 1724
 			// Show recipient
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1423,7 +1423,9 @@
 block discarded – undo
1423 1423
 		global $conf, $langs, $hookmanager;
1424 1424
 
1425 1425
 		$ltrdirection = 'L';
1426
-		if ($outputlangs->trans("DIRECTION") == 'rtl') $ltrdirection = 'R';
1426
+		if ($outputlangs->trans("DIRECTION") == 'rtl') {
1427
+			$ltrdirection = 'R';
1428
+		}
1427 1429
 
1428 1430
 		// Load traductions files required by page
1429 1431
 		$outputlangs->loadLangs(array("main", "bills", "propal", "orders", "companies"));
Please login to merge, or discard this patch.
htdocs/adherents/class/adherent_type.class.php 2 patches
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -241,12 +241,12 @@
 block discarded – undo
241 241
 	}
242 242
 
243 243
 	   /**
244
-		* Delete a language for this member type
245
-		*
246
-		* @param string $langtodelete 	Language code to delete
247
-		* @param User   $user         	Object user making delete
248
-		* @return int                   <0 if KO, >0 if OK
249
-		*/
244
+	    * Delete a language for this member type
245
+	    *
246
+	    * @param string $langtodelete 	Language code to delete
247
+	    * @param User   $user         	Object user making delete
248
+	    * @return int                   <0 if KO, >0 if OK
249
+	    */
250 250
 	public function delMultiLangs($langtodelete, $user)
251 251
 	{
252 252
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."adherent_type_lang";
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -503,7 +503,7 @@
 block discarded – undo
503 503
 				$this->amount         = $obj->amount;
504 504
 				$this->caneditamount  = $obj->caneditamount;
505 505
 				$this->mail_valid     = $obj->mail_valid;
506
-				$this->note           = $obj->note_public;	// deprecated
506
+				$this->note           = $obj->note_public; // deprecated
507 507
 				$this->note_public    = $obj->note_public;
508 508
 				$this->vote           = $obj->vote;
509 509
 
Please login to merge, or discard this patch.
htdocs/salaries/admin/salaries.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -263,7 +263,7 @@
 block discarded – undo
263 263
 echo '<div>';
264 264
 echo '<table class="noborder centpercent">';
265 265
 echo '<thead>';
266
-echo '<tr class="liste_titre"><th>' . $langs->trans('Parameter') . '</th><th>' . $langs->trans('Value') . '</th></tr>';
266
+echo '<tr class="liste_titre"><th>'.$langs->trans('Parameter').'</th><th>'.$langs->trans('Value').'</th></tr>';
267 267
 echo '</thead>';
268 268
 echo '<tbody>';
269 269
 
Please login to merge, or discard this patch.
htdocs/core/boxes/box_members_subscriptions_by_year.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
  *	\brief      Module to show box of members
25 25
  */
26 26
 
27
-include_once DOL_DOCUMENT_ROOT . '/core/boxes/modules_boxes.php';
27
+include_once DOL_DOCUMENT_ROOT.'/core/boxes/modules_boxes.php';
28 28
 
29 29
 
30 30
 /**
@@ -83,8 +83,8 @@  discard block
 block discarded – undo
83 83
 
84 84
 		$this->max = $max;
85 85
 
86
-		include_once DOL_DOCUMENT_ROOT . '/adherents/class/adherent.class.php';
87
-		require_once DOL_DOCUMENT_ROOT . '/adherents/class/adherent_type.class.php';
86
+		include_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent.class.php';
87
+		require_once DOL_DOCUMENT_ROOT.'/adherents/class/adherent_type.class.php';
88 88
 		$memberstatic = new Adherent($this->db);
89 89
 		$statictype = new AdherentType($this->db);
90 90
 
@@ -100,8 +100,8 @@  discard block
 block discarded – undo
100 100
 			$numb = 0;
101 101
 
102 102
 			$sql = "SELECT c.subscription, c.dateadh as dateh";
103
-			$sql .= " FROM " . MAIN_DB_PREFIX . "adherent as d, " . MAIN_DB_PREFIX . "subscription as c";
104
-			$sql .= " WHERE d.entity IN (" . getEntity('adherent') . ")";
103
+			$sql .= " FROM ".MAIN_DB_PREFIX."adherent as d, ".MAIN_DB_PREFIX."subscription as c";
104
+			$sql .= " WHERE d.entity IN (".getEntity('adherent').")";
105 105
 			$sql .= " AND d.rowid = c.fk_adherent";
106 106
 
107 107
 
@@ -216,7 +216,7 @@  discard block
 block discarded – undo
216 216
 				$this->info_box_contents[0][0] = array(
217 217
 					'td' => '',
218 218
 					'maxlength' => 500,
219
-					'text' => ($this->db->error() . ' sql=' . $sql),
219
+					'text' => ($this->db->error().' sql='.$sql),
220 220
 				);
221 221
 			}
222 222
 		} else {
Please login to merge, or discard this patch.
htdocs/core/boxes/box_accountancy_last_manual_entries.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -100,7 +100,7 @@
 block discarded – undo
100 100
 				while ($line < $num) {
101 101
 					$objp		= $this->db->fetch_object($result);
102 102
 					$date		= $this->db->jdate($objp->date_movement);
103
-					$journal	= $objp->code_journal;
103
+					$journal = $objp->code_journal;
104 104
 					$label = $objp->label_operation;
105 105
 					$amount = $objp->amount;
106 106
 
Please login to merge, or discard this patch.
htdocs/product/stock/productlot_list.php 2 patches
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -110,7 +110,9 @@
 block discarded – undo
110 110
 	accessforbidden();
111 111
 }
112 112
 //$result = restrictedArea($user, 'productbatch');
113
-if (!$permissiontoread) accessforbidden();
113
+if (!$permissiontoread) {
114
+	accessforbidden();
115
+}
114 116
 
115 117
 
116 118
 /*
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -507,7 +507,7 @@
 block discarded – undo
507 507
 	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
508 508
 		$cssforfield .= ($cssforfield ? ' ' : '').'right';
509 509
 	}
510
-	$cssforfield = preg_replace('/small\s*/', '', $cssforfield);	// the 'small' css must not be used for the title label
510
+	$cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label
511 511
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
512 512
 		print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''))."\n";
513 513
 		$totalarray['nbfield']++;
Please login to merge, or discard this patch.