Completed
Branch develop (983845)
by
unknown
18:30
created
htdocs/eventorganization/conferenceorbooth_card.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -97,7 +97,7 @@  discard block
 block discarded – undo
97 97
 if ($user->socid > 0) {
98 98
 	accessforbidden();
99 99
 }
100
-$isdraft = (($object->status== $object::STATUS_DRAFT) ? 1 : 0);
100
+$isdraft = (($object->status == $object::STATUS_DRAFT) ? 1 : 0);
101 101
 $result = restrictedArea($user, 'eventorganization', $object->id, '', '', 'fk_soc', 'id', $isdraft);
102 102
 
103 103
 if (!$permissiontoread) {
@@ -186,7 +186,7 @@  discard block
 block discarded – undo
186 186
 	$projectstatic->fetch_thirdparty();
187 187
 }
188 188
 
189
-$withProjectUrl='';
189
+$withProjectUrl = '';
190 190
 $object->project = clone $projectstatic;
191 191
 
192 192
 if (!empty($withproject)) {
@@ -571,7 +571,7 @@  discard block
 block discarded – undo
571 571
 	//$keyforbreak='fieldkeytoswitchonsecondcolumn';	// We change column just before this field
572 572
 	//unset($object->fields['fk_project']);				// Hide field already shown in banner
573 573
 	//unset($object->fields['fk_soc']);					// Hide field already shown in banner
574
-	$keyforbreak='num_vote';
574
+	$keyforbreak = 'num_vote';
575 575
 
576 576
 	include DOL_DOCUMENT_ROOT.'/core/tpl/commonfields_view.tpl.php';
577 577
 
@@ -643,12 +643,12 @@  discard block
 block discarded – undo
643 643
 
644 644
 		$object->fetchObjectLinked();
645 645
 
646
-		if (is_array($object->linkedObjects) && count($object->linkedObjects)>0 && array_key_exists("facture", $object->linkedObjects)) {
646
+		if (is_array($object->linkedObjects) && count($object->linkedObjects) > 0 && array_key_exists("facture", $object->linkedObjects)) {
647 647
 			foreach ($object->linkedObjects["facture"] as $fac) {
648 648
 				if (empty($fac->paye)) {
649 649
 					$key = 'paymentlink_'.$fac->id;
650 650
 
651
-					print img_picto('', 'globe').' <span class="opacitymedium">'.$langs->trans("ToOfferALinkForOnlinePayment", $langs->transnoentitiesnoconv('Online')) . ' '. $fac->ref.'</span><br>';
651
+					print img_picto('', 'globe').' <span class="opacitymedium">'.$langs->trans("ToOfferALinkForOnlinePayment", $langs->transnoentitiesnoconv('Online')).' '.$fac->ref.'</span><br>';
652 652
 
653 653
 					$sourcetouse = 'boothlocation';
654 654
 					$reftouse = $fac->id;
Please login to merge, or discard this patch.
htdocs/viewimage.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -122,9 +122,9 @@  discard block
 block discarded – undo
122 122
 require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
123 123
 
124 124
 $action = GETPOST('action', 'aZ09');
125
-$original_file = GETPOST('file', 'alphanohtml'); 	// Do not use urldecode here ($_GET are already decoded by PHP).
126
-$hashp = GETPOST('hashp', 'aZ09', 1);				// Must be read only by GET
127
-$modulepart = GETPOST('modulepart', 'alpha', 1);	// Must be read only by GET
125
+$original_file = GETPOST('file', 'alphanohtml'); // Do not use urldecode here ($_GET are already decoded by PHP).
126
+$hashp = GETPOST('hashp', 'aZ09', 1); // Must be read only by GET
127
+$modulepart = GETPOST('modulepart', 'alpha', 1); // Must be read only by GET
128 128
 $urlsource = GETPOST('urlsource', 'alpha');
129 129
 $entity = (GETPOST('entity', 'int') ? GETPOST('entity', 'int') : $conf->entity);
130 130
 
@@ -158,7 +158,7 @@  discard block
 block discarded – undo
158 158
 	if (empty($dolibarr_nocache)) {
159 159
 		header('Cache-Control: max-age=3600, public, must-revalidate');
160 160
 		header('Pragma: cache'); // This is to avoid to have Pragma: no-cache set by proxy or web server
161
-		header('Expires: '.gmdate('D, d M Y H:i:s', time() + 3600).' GMT');	// This is to avoid to have Expires set by proxy or web server
161
+		header('Expires: '.gmdate('D, d M Y H:i:s', time() + 3600).' GMT'); // This is to avoid to have Expires set by proxy or web server
162 162
 		//header('Expires: '.strtotime('+1 hour');
163 163
 	} else {
164 164
 		header('Cache-Control: no-cache');
@@ -215,7 +215,7 @@  discard block
 block discarded – undo
215 215
 }
216 216
 
217 217
 // Security: Delete string ../ or ..\ into $original_file
218
-$original_file = preg_replace('/\.\.+/', '..', $original_file);	// Replace '... or more' with '..'
218
+$original_file = preg_replace('/\.\.+/', '..', $original_file); // Replace '... or more' with '..'
219 219
 $original_file = str_replace('../', '/', $original_file);
220 220
 $original_file = str_replace('..\\', '/', $original_file);
221 221
 
Please login to merge, or discard this patch.
htdocs/debugbar/class/DebugBar.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -75,10 +75,10 @@
 block discarded – undo
75 75
 	public function getRenderer()
76 76
 	{
77 77
 		$renderer = parent::getJavascriptRenderer(DOL_URL_ROOT.'/includes/maximebf/debugbar/src/DebugBar/Resources');
78
-		$renderer->disableVendor('jquery');			// We already have jquery loaded globally by the main.inc.php
79
-		$renderer->disableVendor('fontawesome');	// We already have fontawesome loaded globally by the main.inc.php
80
-		$renderer->disableVendor('highlightjs');	// We don't need this
81
-		$renderer->setEnableJqueryNoConflict(false);	// We don't need no conflict
78
+		$renderer->disableVendor('jquery'); // We already have jquery loaded globally by the main.inc.php
79
+		$renderer->disableVendor('fontawesome'); // We already have fontawesome loaded globally by the main.inc.php
80
+		$renderer->disableVendor('highlightjs'); // We don't need this
81
+		$renderer->setEnableJqueryNoConflict(false); // We don't need no conflict
82 82
 
83 83
 		return $renderer;
84 84
 	}
Please login to merge, or discard this patch.
htdocs/contact/document.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -94,7 +94,7 @@
 block discarded – undo
94 94
 }
95 95
 $result = restrictedArea($user, 'contact', $id, 'socpeople&societe', '', '', 'rowid', 0); // If we create a contact with no company (shared contacts), no check on write permission
96 96
 
97
-$permissiontoadd = $user->hasRight('societe', 'contact', 'creer');	// Used by the include of actions_dellink.inc.php
97
+$permissiontoadd = $user->hasRight('societe', 'contact', 'creer'); // Used by the include of actions_dellink.inc.php
98 98
 
99 99
 
100 100
 /*
Please login to merge, or discard this patch.
htdocs/contact/perso.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -197,7 +197,7 @@
 block discarded – undo
197 197
 		$maxfilesizearray = getMaxFileSizeArray();
198 198
 		$maxmin = $maxfilesizearray['maxmin'];
199 199
 		if ($maxmin > 0) {
200
-			print '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">';	// MAX_FILE_SIZE must precede the field type=file
200
+			print '<input type="hidden" name="MAX_FILE_SIZE" value="'.($maxmin * 1024).'">'; // MAX_FILE_SIZE must precede the field type=file
201 201
 		}
202 202
 		print '<input type="file" class="flat" name="photo" id="photoinput">';
203 203
 		print '</td></tr>';
Please login to merge, or discard this patch.
htdocs/product/inventory/class/inventory.class.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -61,10 +61,10 @@  discard block
 block discarded – undo
61 61
 	 */
62 62
 	public $picto = 'inventory';
63 63
 
64
-	const STATUS_DRAFT     = 0;		// Draft
65
-	const STATUS_VALIDATED = 1;		// Inventory is in process
66
-	const STATUS_RECORDED  = 2;		// Inventory is finisged. Stock movement has been recorded.
67
-	const STATUS_CANCELED  = 9;		// Canceled
64
+	const STATUS_DRAFT     = 0; // Draft
65
+	const STATUS_VALIDATED = 1; // Inventory is in process
66
+	const STATUS_RECORDED  = 2; // Inventory is finisged. Stock movement has been recorded.
67
+	const STATUS_CANCELED  = 9; // Canceled
68 68
 
69 69
 	/**
70 70
 	 *  'type' field format ('integer', 'integer:ObjectClass:PathToClass[:AddCreateButtonOrNot[:Filter]]', 'sellist:TableName:LabelFieldName[:KeyFieldName[:KeyFieldParent[:Filter]]]', 'varchar(x)', 'double(24,8)', 'real', 'price', 'text', 'text:none', 'html', 'date', 'datetime', 'timestamp', 'duration', 'mail', 'phone', 'url', 'password')
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
 		'fk_warehouse'       => array('type'=>'integer:Entrepot:product/stock/class/entrepot.class.php', 'label'=>'Warehouse', 'visible'=>1, 'enabled'=>1, 'position'=>30, 'index'=>1, 'help'=>'InventoryForASpecificWarehouse', 'picto'=>'stock', 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx', 'csslist'=>'tdoverflowmax150'),
105 105
 		'fk_product'         => array('type'=>'integer:Product:product/class/product.class.php', 'label'=>'Product', 'get_name_url_params' => '0::0:-1:0::1', 'visible'=>1, 'enabled'=>1, 'position'=>32, 'index'=>1, 'help'=>'InventoryForASpecificProduct', 'picto'=>'product', 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx', 'csslist'=>'tdoverflowmax150'),
106 106
 		'categories_product' => array('type'=>'chkbxlst:categorie:label:rowid::type=0:0:', 'label'=>'OrProductsWithCategories', 'visible'=>3, 'enabled'=>1, 'position'=>33, 'help'=>'', 'picto'=>'category', 'css'=>'minwidth300 maxwidth500 widthcentpercentminusx'),
107
-		'date_inventory'     => array('type'=>'date', 'label'=>'DateValue', 'visible'=>1, 'enabled'=>'$conf->global->STOCK_INVENTORY_ADD_A_VALUE_DATE', 'position'=>35, 'csslist'=>'nowraponall'),	// This date is not used so disabled by default.
107
+		'date_inventory'     => array('type'=>'date', 'label'=>'DateValue', 'visible'=>1, 'enabled'=>'$conf->global->STOCK_INVENTORY_ADD_A_VALUE_DATE', 'position'=>35, 'csslist'=>'nowraponall'), // This date is not used so disabled by default.
108 108
 		'date_creation'      => array('type'=>'datetime', 'label'=>'DateCreation', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>500, 'csslist'=>'nowraponall'),
109 109
 		'tms'                => array('type'=>'timestamp', 'label'=>'DateModification', 'enabled'=>1, 'visible'=>-2, 'notnull'=>1, 'position'=>501, 'csslist'=>'nowraponall'),
110 110
 		'date_validation'    => array('type'=>'datetime', 'label'=>'DateValidation', 'visible'=>-2, 'enabled'=>1, 'position'=>502, 'csslist'=>'nowraponall'),
@@ -763,10 +763,10 @@  discard block
 block discarded – undo
763 763
 	public function getChildWarehouse($id, &$TChildWarehouse)
764 764
 	{
765 765
 		$sql = 'SELECT rowid FROM '.MAIN_DB_PREFIX.'entrepot';
766
-		$sql.= ' WHERE fk_parent='.(int) $id;
767
-		$sql.= ' ORDER BY rowid';
766
+		$sql .= ' WHERE fk_parent='.(int) $id;
767
+		$sql .= ' ORDER BY rowid';
768 768
 		$resql = $this->db->query($sql);
769
-		if ($resql && $this->db->num_rows($resql)>0) {
769
+		if ($resql && $this->db->num_rows($resql) > 0) {
770 770
 			while ($obj = $this->db->fetch_object($resql)) {
771 771
 				$TChildWarehouse[] = $obj->rowid;
772 772
 				$this->getChildWarehouse($obj->rowid, $TChildWarehouse);
Please login to merge, or discard this patch.
htdocs/product/inventory/list.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -73,7 +73,7 @@  discard block
 block discarded – undo
73 73
 
74 74
 // Default sort order (if not yet defined by previous GETPOST)
75 75
 if (!$sortfield) {
76
-	reset($object->fields);					// Reset is required to avoid key() to return null.
76
+	reset($object->fields); // Reset is required to avoid key() to return null.
77 77
 	$sortfield = "t.".key($object->fields); // Set here default search field. By default 1st field in definition.
78 78
 }
79 79
 if (!$sortorder) {
@@ -285,7 +285,7 @@  discard block
 block discarded – undo
285 285
 			if ($searchCategoryProductOperator == 0) {
286 286
 				$searchCategoryProductSqlList[] = " EXISTS (SELECT ck.fk_product FROM ".MAIN_DB_PREFIX."categorie_product as ck WHERE p.rowid = ck.fk_product AND ck.fk_categorie = ".((int) $searchCategoryProduct).")";
287 287
 			} else {
288
-				$listofcategoryid .= ($listofcategoryid ? ', ' : '') .((int) $searchCategoryProduct);
288
+				$listofcategoryid .= ($listofcategoryid ? ', ' : '').((int) $searchCategoryProduct);
289 289
 			}
290 290
 		}
291 291
 	}
@@ -374,7 +374,7 @@  discard block
 block discarded – undo
374 374
 // Output page
375 375
 // --------------------------------------------------------------------
376 376
 
377
-llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist');	// Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll
377
+llxHeader('', $title, $help_url, '', 0, 0, $morejs, $morecss, '', 'bodyforlist'); // Can use also classforhorizontalscrolloftabs instead of bodyforlist for no horizontal scroll
378 378
 
379 379
 $arrayofselected = is_array($toselect) ? $toselect : array();
380 380
 
@@ -484,7 +484,7 @@  discard block
 block discarded – undo
484 484
 	$categoriesProductArr[-2] = '- '.$langs->trans('NotCategorized').' -';
485 485
 	$moreforfilter .= Form::multiselectarray('search_category_product_list', $categoriesProductArr, $searchCategoryProductList, 0, 0, 'minwidth300', 0, 0, '', 'category', $tmptitle);
486 486
 	$moreforfilter .= ' <input type="checkbox" class="valignmiddle" id="search_category_product_operator" name="search_category_product_operator" value="1"'.($searchCategoryProductOperator == 1 ? ' checked="checked"' : '').'/>';
487
-	$moreforfilter .= $form->textwithpicto('', $langs->trans('UseOrOperatorForCategories') . ' : ' . $tmptitle, 1, 'help', '', 0, 2, 'tooltip_cat_pro'); // Tooltip on click
487
+	$moreforfilter .= $form->textwithpicto('', $langs->trans('UseOrOperatorForCategories').' : '.$tmptitle, 1, 'help', '', 0, 2, 'tooltip_cat_pro'); // Tooltip on click
488 488
 	$moreforfilter .= '</div>';
489 489
 }
490 490
 
@@ -596,7 +596,7 @@  discard block
 block discarded – undo
596 596
 	} elseif (in_array($val['type'], array('double(24,8)', 'double(6,3)', 'integer', 'real', 'price')) && !in_array($key, array('id', 'rowid', 'ref', 'status')) && $val['label'] != 'TechnicalID' && empty($val['arrayofkeyval'])) {
597 597
 		$cssforfield .= ($cssforfield ? ' ' : '').'right';
598 598
 	}
599
-	$cssforfield = preg_replace('/small\s*/', '', $cssforfield);	// the 'small' css must not be used for the title label
599
+	$cssforfield = preg_replace('/small\s*/', '', $cssforfield); // the 'small' css must not be used for the title label
600 600
 	if (!empty($arrayfields['t.'.$key]['checked'])) {
601 601
 		print getTitleFieldOfList($arrayfields['t.'.$key]['label'], 0, $_SERVER['PHP_SELF'], 't.'.$key, '', $param, ($cssforfield ? 'class="'.$cssforfield.'"' : ''), $sortfield, $sortorder, ($cssforfield ? $cssforfield.' ' : ''), 0, (empty($val['helplist']) ? '' : $val['helplist']))."\n";
602 602
 		$totalarray['nbfield']++;
Please login to merge, or discard this patch.
htdocs/product/traduction.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -134,15 +134,15 @@  discard block
 block discarded – undo
134 134
 
135 135
 		foreach ($object->multilangs as $key => $value) { // enregistrement des nouvelles valeurs dans l'objet
136 136
 			if ($key == $current_lang) {
137
-				$object->label = GETPOST("libelle-" . $key);
138
-				$object->description = dol_htmlcleanlastbr(GETPOST("desc-" . $key, 'restricthtml'));
139
-				$object->other = dol_htmlcleanlastbr(GETPOST("other-" . $key, 'restricthtml'));
137
+				$object->label = GETPOST("libelle-".$key);
138
+				$object->description = dol_htmlcleanlastbr(GETPOST("desc-".$key, 'restricthtml'));
139
+				$object->other = dol_htmlcleanlastbr(GETPOST("other-".$key, 'restricthtml'));
140 140
 
141 141
 				$object->update($object->id, $user);
142 142
 			} else {
143
-				$object->multilangs[$key]["label"] = GETPOST("libelle-" . $key);
144
-				$object->multilangs[$key]["description"] = dol_htmlcleanlastbr(GETPOST("desc-" . $key, 'restricthtml'));
145
-				$object->multilangs[$key]["other"] = dol_htmlcleanlastbr(GETPOST("other-" . $key, 'restricthtml'));
143
+				$object->multilangs[$key]["label"] = GETPOST("libelle-".$key);
144
+				$object->multilangs[$key]["description"] = dol_htmlcleanlastbr(GETPOST("desc-".$key, 'restricthtml'));
145
+				$object->multilangs[$key]["other"] = dol_htmlcleanlastbr(GETPOST("other-".$key, 'restricthtml'));
146 146
 			}
147 147
 		}
148 148
 
@@ -235,9 +235,9 @@  discard block
 block discarded – undo
235 235
 if (empty($reshook)) {
236 236
 	if ($action == '') {
237 237
 		if ($user->hasRight('produit', 'creer') || $user->hasRight('service', 'creer')) {
238
-			print '<a class="butAction" href="' . DOL_URL_ROOT . '/product/traduction.php?action=add&token='.newToken().'&id=' . $object->id . '">' . $langs->trans("Add") . '</a>';
238
+			print '<a class="butAction" href="'.DOL_URL_ROOT.'/product/traduction.php?action=add&token='.newToken().'&id='.$object->id.'">'.$langs->trans("Add").'</a>';
239 239
 			if ($cnt_trans > 0) {
240
-				print '<a class="butAction" href="' . DOL_URL_ROOT . '/product/traduction.php?action=edit&token='.newToken().'&id=' . $object->id . '">' . $langs->trans("Modify") . '</a>';
240
+				print '<a class="butAction" href="'.DOL_URL_ROOT.'/product/traduction.php?action=edit&token='.newToken().'&id='.$object->id.'">'.$langs->trans("Modify").'</a>';
241 241
 			}
242 242
 		}
243 243
 	}
Please login to merge, or discard this patch.
htdocs/product/dynamic_price/class/price_parser.class.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -155,7 +155,7 @@
 block discarded – undo
155 155
 		));
156 156
 
157 157
 		// Retrieve all extrafields if not already not know (should not happen)
158
-		if (! is_object($extrafields)) {
158
+		if (!is_object($extrafields)) {
159 159
 			$extrafields = new ExtraFields($this->db);
160 160
 			$extrafields->fetch_name_optionals_label($product->table_element);
161 161
 		}
Please login to merge, or discard this patch.