Completed
Branch develop (e07a15)
by
unknown
18:33
created
htdocs/admin/dict.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -100,7 +100,7 @@  discard block
 block discarded – undo
100 100
 
101 101
 $id = GETPOSTINT('id');
102 102
 $rowid = GETPOST('rowid', 'alpha');
103
-$entity = GETPOST('entity', 'alpha');	// Do not use GETPOSTINT here. Should be '', 0 or >0.
103
+$entity = GETPOST('entity', 'alpha'); // Do not use GETPOSTINT here. Should be '', 0 or >0.
104 104
 $code = GETPOST('code', 'alpha');
105 105
 $from = GETPOST('from', 'alpha');
106 106
 
@@ -569,7 +569,7 @@  discard block
 block discarded – undo
569 569
 $tabcond[DICT_STCOMM] = isModEnabled("societe");
570 570
 $tabcond[DICT_HOLIDAY_TYPES] = isModEnabled('holiday');
571 571
 $tabcond[DICT_LEAD_STATUS] = isModEnabled('project');
572
-$tabcond[DICT_FORMAT_CARDS] = (isModEnabled('label') || isModEnabled('barcode') || isModEnabled('member'));	// stickers format dictionary
572
+$tabcond[DICT_FORMAT_CARDS] = (isModEnabled('label') || isModEnabled('barcode') || isModEnabled('member')); // stickers format dictionary
573 573
 $tabcond[DICT_INVOICE_SUBTYPE] = ((isModEnabled('invoice') || isModEnabled('supplier_invoice')) && $mysoc->country_code == 'GR');
574 574
 $tabcond[DICT_HRM_PUBLIC_HOLIDAY] = (isModEnabled('holiday') || isModEnabled('hrm'));
575 575
 $tabcond[DICT_HRM_DEPARTMENT] = isModEnabled('hrm');
@@ -972,7 +972,7 @@  discard block
 block discarded – undo
972 972
 				if ($value == 'price' || preg_match('/^amount/i', $value)) {
973 973
 					$_POST[$keycode] = price2num(GETPOST($keycode), 'MU');
974 974
 				} elseif ($value == 'taux' || $value == 'localtax1') {
975
-					$_POST[$keycode] = price2num(GETPOST($keycode), 8);	// Note that localtax2 can be a list of rates separated by coma like X:Y:Z
975
+					$_POST[$keycode] = price2num(GETPOST($keycode), 8); // Note that localtax2 can be a list of rates separated by coma like X:Y:Z
976 976
 				} elseif ($value == 'entity') {
977 977
 					$_POST[$keycode] = getEntity($tablename);
978 978
 				}
@@ -1041,7 +1041,7 @@  discard block
 block discarded – undo
1041 1041
 				if ($field == 'price' || preg_match('/^amount/i', $field)) {
1042 1042
 					$_POST[$keycode] = price2num(GETPOST($keycode), 'MU');
1043 1043
 				} elseif ($field == 'taux' || $field == 'localtax1') {
1044
-					$_POST[$keycode] = price2num(GETPOST($keycode), 8);	// Note that localtax2 can be a list of rates separated by coma like X:Y:Z
1044
+					$_POST[$keycode] = price2num(GETPOST($keycode), 8); // Note that localtax2 can be a list of rates separated by coma like X:Y:Z
1045 1045
 				} elseif ($field == 'entity') {
1046 1046
 					$_POST[$keycode] = getEntity($tablename);
1047 1047
 				}
@@ -2483,7 +2483,7 @@  discard block
 block discarded – undo
2483 2483
 							}
2484 2484
 							// Show value for field
2485 2485
 							if ($showfield) {
2486
-								print '<!-- '. $value .' --><td class="'.$class.'"'.($titletoshow ? ' title="'.dolPrintHTMLForAttribute($titletoshow).'"' : '').'>'.$valuetoshow.'</td>';
2486
+								print '<!-- '.$value.' --><td class="'.$class.'"'.($titletoshow ? ' title="'.dolPrintHTMLForAttribute($titletoshow).'"' : '').'>'.$valuetoshow.'</td>';
2487 2487
 							}
2488 2488
 						}
2489 2489
 
@@ -2667,7 +2667,7 @@  discard block
 block discarded – undo
2667 2667
 			// Special case for c_actioncomm (field that should not be modified)
2668 2668
 			$hidden = (!empty($obj->{$value}) ? $obj->{$value} : '');
2669 2669
 			print '<td>';
2670
-			print '<input type="hidden" name="'. $value .'" value="'.$hidden.'">';
2670
+			print '<input type="hidden" name="'.$value.'" value="'.$hidden.'">';
2671 2671
 			print $langs->trans($hidden);
2672 2672
 			print '</td>';
2673 2673
 		} elseif ($value == 'country') {
@@ -2688,7 +2688,7 @@  discard block
 block discarded – undo
2688 2688
 			if (!in_array('country', $fieldlist)) {	// If there is already a field country, we don't show country_id (avoid duplicate)
2689 2689
 				$country_id = (!empty($obj->{$value}) ? $obj->{$value} : 0);
2690 2690
 				print '<td class="tdoverflowmax100">';
2691
-				print '<input type="hidden" name="'. $value .'" value="'.$country_id.'">';
2691
+				print '<input type="hidden" name="'.$value.'" value="'.$country_id.'">';
2692 2692
 				print '</td>';
2693 2693
 			}
2694 2694
 		} elseif ($value == 'region') {
@@ -2698,7 +2698,7 @@  discard block
 block discarded – undo
2698 2698
 		} elseif ($value == 'region_id') {
2699 2699
 			$region_id = (!empty($obj->{$value}) ? $obj->{$value} : 0);
2700 2700
 			print '<td>';
2701
-			print '<input type="hidden" name="'. $value .'" value="'.$region_id.'">';
2701
+			print '<input type="hidden" name="'.$value.'" value="'.$region_id.'">';
2702 2702
 			print '</td>';
2703 2703
 		} elseif ($value == 'lang') {
2704 2704
 			print '<td>';
@@ -2754,7 +2754,7 @@  discard block
 block discarded – undo
2754 2754
 				$class = "center"; // Fields aligned on right
2755 2755
 			}
2756 2756
 			print '<td class="'.$class.'">';
2757
-			print '<input type="text" class="flat" value="'.(isset($obj->{$value}) ? $obj->{$value} : '').'" size="3" name="'. $value .'">';
2757
+			print '<input type="text" class="flat" value="'.(isset($obj->{$value}) ? $obj->{$value} : '').'" size="3" name="'.$value.'">';
2758 2758
 			print '</td>';
2759 2759
 		} elseif (in_array($value, array('libelle_facture'))) {
2760 2760
 			print '<td>';
@@ -2764,7 +2764,7 @@  discard block
 block discarded – undo
2764 2764
 			if ($tabname == 'c_payment_term') {
2765 2765
 				$langs->load("bills");
2766 2766
 				if (isset($obj->code) && !empty($obj->code)) {
2767
-					$transkey = "PaymentCondition" . strtoupper($obj->code);
2767
+					$transkey = "PaymentCondition".strtoupper($obj->code);
2768 2768
 					if ($langs->trans($transkey) != $transkey) {
2769 2769
 						$transfound = 1;
2770 2770
 						print $form->textwithpicto($langs->trans($transkey), $langs->trans("GoIntoTranslationMenuToChangeThis"));
@@ -2772,21 +2772,21 @@  discard block
 block discarded – undo
2772 2772
 				}
2773 2773
 			}
2774 2774
 			if (!$transfound) {
2775
-				print '<textarea cols="30" rows="'.ROWS_2.'" class="flat" name="'. $value .'">'.(!empty($obj->{$value}) ? $obj->{$value} : '').'</textarea>';
2775
+				print '<textarea cols="30" rows="'.ROWS_2.'" class="flat" name="'.$value.'">'.(!empty($obj->{$value}) ? $obj->{$value} : '').'</textarea>';
2776 2776
 			} else {
2777
-				print '<input type="hidden" name="'. $value .'" value="'.$transkey.'">';
2777
+				print '<input type="hidden" name="'.$value.'" value="'.$transkey.'">';
2778 2778
 			}
2779 2779
 			print '</td>';
2780 2780
 		} elseif ($value == 'price' || preg_match('/^amount/i', $value)) {
2781
-			print '<td><input type="text" class="flat minwidth75" value="'.price((!empty($obj->{$value}) ? $obj->{$value} : '')).'" name="'. $value .'"></td>';
2781
+			print '<td><input type="text" class="flat minwidth75" value="'.price((!empty($obj->{$value}) ? $obj->{$value} : '')).'" name="'.$value.'"></td>';
2782 2782
 		} elseif ($value == 'code' && isset($obj->{$value})) {
2783 2783
 			print '<td>';
2784 2784
 			if ($tabname == 'c_paiement' && in_array($obj->{$value}, array('LIQ', 'CB', 'CHQ', 'VIR'))) {
2785 2785
 				// Case of code that should not be modified
2786
-				print '<input type="hidden" class="flat minwidth75 maxwidth100" value="'.(!empty($obj->{$value}) ? $obj->{$value} : '').'" name="'. $value .'">';
2786
+				print '<input type="hidden" class="flat minwidth75 maxwidth100" value="'.(!empty($obj->{$value}) ? $obj->{$value} : '').'" name="'.$value.'">';
2787 2787
 				print $obj->{$value};
2788 2788
 			} else {
2789
-				print '<input type="text" class="flat minwidth75 maxwidth100" value="'.(!empty($obj->{$value}) ? $obj->{$value} : '').'" name="'. $value .'">';
2789
+				print '<input type="text" class="flat minwidth75 maxwidth100" value="'.(!empty($obj->{$value}) ? $obj->{$value} : '').'" name="'.$value.'">';
2790 2790
 			}
2791 2791
 			print '</td>';
2792 2792
 		} elseif ($value == 'unit') {
@@ -2814,10 +2814,10 @@  discard block
 block discarded – undo
2814 2814
 			if (isModEnabled('accounting')) {
2815 2815
 				$fieldname = $value;
2816 2816
 				$accountancy_account = (!empty($obj->$fieldname) ? $obj->$fieldname : 0);
2817
-				print $formaccounting->select_account($accountancy_account, '.'. $value, 1, '', 1, 1, 'maxwidth200 maxwidthonsmartphone');
2817
+				print $formaccounting->select_account($accountancy_account, '.'.$value, 1, '', 1, 1, 'maxwidth200 maxwidthonsmartphone');
2818 2818
 			} else {
2819 2819
 				$fieldname = $value;
2820
-				print '<input type="text" size="10" class="flat" value="'.(isset($obj->$fieldname) ? $obj->$fieldname : '').'" name="'. $value .'">';
2820
+				print '<input type="text" size="10" class="flat" value="'.(isset($obj->$fieldname) ? $obj->$fieldname : '').'" name="'.$value.'">';
2821 2821
 			}
2822 2822
 			print '</td>';
2823 2823
 		} elseif ($value == 'fk_tva') {
@@ -2838,7 +2838,7 @@  discard block
 block discarded – undo
2838 2838
 			print '</td>';
2839 2839
 		} elseif ($value == 'type_duration') {
2840 2840
 			print '<td>';
2841
-			print $form->selectTypeDuration('', (empty($obj->type_duration) ? '' : $obj->type_duration), array('i','h'));
2841
+			print $form->selectTypeDuration('', (empty($obj->type_duration) ? '' : $obj->type_duration), array('i', 'h'));
2842 2842
 			print '</td>';
2843 2843
 		} else {
2844 2844
 			$fieldValue = isset($obj->{$value}) ? $obj->{$value} : '';
Please login to merge, or discard this patch.
htdocs/modulebuilder/index.php 1 patch
Spacing   +40 added lines, -40 removed lines patch added patch discarded remove patch
@@ -83,7 +83,7 @@  discard block
 block discarded – undo
83 83
 $family = GETPOST('family', 'alpha');
84 84
 $picto = GETPOST('idpicto', 'alpha');
85 85
 $idmodule = GETPOST('idmodule', 'alpha');
86
-$format = '';  // Prevent undefined in css tab
86
+$format = ''; // Prevent undefined in css tab
87 87
 
88 88
 // Security check
89 89
 if (!isModEnabled('modulebuilder')) {
@@ -272,7 +272,7 @@  discard block
 block discarded – undo
272 272
 		// Copy last 'html.formsetup.class.php' to backport folder
273 273
 		if (getDolGlobalInt('MODULEBUILDER_SUPPORT_COMPATIBILITY_V16')) {
274 274
 			$tryToCopyFromSetupClass = true;
275
-			$backportDest = $destdir .'/backport/v16/core/class';
275
+			$backportDest = $destdir.'/backport/v16/core/class';
276 276
 			$backportFileSrc = DOL_DOCUMENT_ROOT.'/core/class/html.formsetup.class.php';
277 277
 			$backportFileDest = $backportDest.'/html.formsetup.class.php';
278 278
 			$result = dol_mkdir($backportDest);
@@ -380,7 +380,7 @@  discard block
 block discarded – undo
380 380
 			);
381 381
 
382 382
 			if (getDolGlobalString('MODULEBUILDER_SPECIFIC_AUTHOR')) {
383
-				$arrayreplacement['---Replace with your own copyright and developer email---'] = dol_print_date($now, '%Y')."\t\t" . getDolGlobalString('MODULEBUILDER_SPECIFIC_AUTHOR');
383
+				$arrayreplacement['---Replace with your own copyright and developer email---'] = dol_print_date($now, '%Y')."\t\t".getDolGlobalString('MODULEBUILDER_SPECIFIC_AUTHOR');
384 384
 			}
385 385
 
386 386
 			// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
@@ -409,7 +409,7 @@  discard block
 block discarded – undo
409 409
 
410 410
 		clearstatcache(true);
411 411
 		if (function_exists('opcache_invalidate')) {
412
-			opcache_reset();	// remove the include cache hell !
412
+			opcache_reset(); // remove the include cache hell !
413 413
 		}
414 414
 
415 415
 		header("Location: ".$_SERVER["PHP_SELF"].'?module='.$modulename);
@@ -417,9 +417,9 @@  discard block
 block discarded – undo
417 417
 	}
418 418
 }
419 419
 
420
-$destdir = '/not_set/';  // Initialize (for static analysis)
421
-$destfile = '/not_set/';  // Initialize (for static analysis)
422
-$srcfile = '/not_set/';  // Initialize (for static analysis)
420
+$destdir = '/not_set/'; // Initialize (for static analysis)
421
+$destfile = '/not_set/'; // Initialize (for static analysis)
422
+$srcfile = '/not_set/'; // Initialize (for static analysis)
423 423
 
424 424
 // init API, PHPUnit
425 425
 if ($dirins && in_array($action, array('initapi', 'initphpunit', 'initpagecontact', 'initpagedocument', 'initpagenote', 'initpageagenda')) && !empty($module) && $user->hasRight("modulebuilder", "run")) {
@@ -910,7 +910,7 @@  discard block
 block discarded – undo
910 910
 			}
911 911
 			$stringLog = implode("\n", $strreplace);
912 912
 			// @phan-suppress-next-line PhanPluginSuspiciousParamPosition
913
-			dolReplaceInFile($destfile, array('//include::ChangeLog.md[]' => '','__CHANGELOG__' => $stringLog));
913
+			dolReplaceInFile($destfile, array('//include::ChangeLog.md[]' => '', '__CHANGELOG__' => $stringLog));
914 914
 		}
915 915
 
916 916
 		// Delete old documentation files
@@ -1353,7 +1353,7 @@  discard block
 block discarded – undo
1353 1353
 		}
1354 1354
 	}
1355 1355
 
1356
-	$filetogenerate = array();  // For static analysis
1356
+	$filetogenerate = array(); // For static analysis
1357 1357
 	if (!$error) {
1358 1358
 		// Copy some files
1359 1359
 		$filetogenerate = array(
@@ -1589,7 +1589,7 @@  discard block
 block discarded – undo
1589 1589
 		} else {
1590 1590
 			$menus = array();
1591 1591
 		}
1592
-		$counter = 0 ;
1592
+		$counter = 0;
1593 1593
 		foreach ($menus as $menu) {
1594 1594
 			if ($menu['leftmenu'] == strtolower($objectname)) {
1595 1595
 				$counter++;
@@ -1631,7 +1631,7 @@  discard block
 block discarded – undo
1631 1631
 			);
1632 1632
 
1633 1633
 			if (getDolGlobalString('MODULEBUILDER_SPECIFIC_AUTHOR')) {
1634
-				$arrayreplacement['---Replace with your own copyright and developer email---'] = dol_print_date($now, '%Y').' ' . getDolGlobalString('MODULEBUILDER_SPECIFIC_AUTHOR');
1634
+				$arrayreplacement['---Replace with your own copyright and developer email---'] = dol_print_date($now, '%Y').' '.getDolGlobalString('MODULEBUILDER_SPECIFIC_AUTHOR');
1635 1635
 			}
1636 1636
 
1637 1637
 			$result = dolReplaceInFile($phpfileval['fullname'], $arrayreplacement);
@@ -1732,7 +1732,7 @@  discard block
 block discarded – undo
1732 1732
 		} else {
1733 1733
 			createNewDictionnary($module, $moduledescriptorfile, $newdicname, $dictionaries);
1734 1734
 			if (function_exists('opcache_invalidate')) {
1735
-				opcache_reset();	// remove the include cache hell !
1735
+				opcache_reset(); // remove the include cache hell !
1736 1736
 			}
1737 1737
 			clearstatcache(true);
1738 1738
 			header("Location: ".DOL_URL_ROOT.'/modulebuilder/index.php?tab=dictionaries&module='.$module.($forceddirread ? '@'.$dirread : ''));
@@ -1831,7 +1831,7 @@  discard block
 block discarded – undo
1831 1831
 				'isameasure' => GETPOSTINT('propisameasure'),
1832 1832
 				'comment' => GETPOST('propcomment', 'alpha'),
1833 1833
 				'help' => GETPOST('prophelp', 'alpha'),
1834
-				'css' => GETPOST('propcss', 'alpha'),        // Can be 'maxwidth500 widthcentpercentminusxx' for example
1834
+				'css' => GETPOST('propcss', 'alpha'), // Can be 'maxwidth500 widthcentpercentminusxx' for example
1835 1835
 				'cssview' => GETPOST('propcssview', 'alpha'),
1836 1836
 				'csslist' => GETPOST('propcsslist', 'alpha'),
1837 1837
 				'default' => GETPOST('propdefault', 'restricthtml'),
@@ -1987,7 +1987,7 @@  discard block
 block discarded – undo
1987 1987
 
1988 1988
 			clearstatcache(true);
1989 1989
 			if (function_exists('opcache_invalidate')) {
1990
-				opcache_reset();	// remove the include cache hell !
1990
+				opcache_reset(); // remove the include cache hell !
1991 1991
 			}
1992 1992
 
1993 1993
 			header("Location: ".$_SERVER["PHP_SELF"].'?module=deletemodule');
@@ -2044,7 +2044,7 @@  discard block
 block discarded – undo
2044 2044
 		$pathtofile = $listofmodules[strtolower($module)]['moduledescriptorrelpath'];
2045 2045
 		dol_include_once($pathtofile);
2046 2046
 		$class = 'mod'.$module;
2047
-		$moduleobj =  null;
2047
+		$moduleobj = null;
2048 2048
 		if (class_exists($class)) {
2049 2049
 			try {
2050 2050
 				$moduleobj = new $class($db);
@@ -2081,7 +2081,7 @@  discard block
 block discarded – undo
2081 2081
 
2082 2082
 			clearstatcache(true);
2083 2083
 			if (function_exists('opcache_invalidate')) {
2084
-				opcache_reset();	// remove the include cache hell !
2084
+				opcache_reset(); // remove the include cache hell !
2085 2085
 			}
2086 2086
 			$resultko = 0;
2087 2087
 			foreach ($filetodelete as $tmpfiletodelete) {
@@ -2101,7 +2101,7 @@  discard block
 block discarded – undo
2101 2101
 	}
2102 2102
 
2103 2103
 	$action = '';
2104
-	if (! $error) {
2104
+	if (!$error) {
2105 2105
 		$tabobj = 'newobject';
2106 2106
 	} else {
2107 2107
 		$tabobj = 'deleteobject';
@@ -2211,7 +2211,7 @@  discard block
 block discarded – undo
2211 2211
 			setEventMessages($langs->trans("DictionaryDeleted", ucfirst(substr($newdicname, 2))), null);
2212 2212
 		}
2213 2213
 		if (function_exists('opcache_invalidate')) {
2214
-			opcache_reset();	// remove the include cache hell !
2214
+			opcache_reset(); // remove the include cache hell !
2215 2215
 		}
2216 2216
 		clearstatcache(true);
2217 2217
 		header("Location: ".DOL_URL_ROOT.'/modulebuilder/index.php?tab=dictionaries&module='.$module.($forceddirread ? '@'.$dirread : ''));
@@ -2219,7 +2219,7 @@  discard block
 block discarded – undo
2219 2219
 	}
2220 2220
 }
2221 2221
 if ($dirins && $action == 'updatedictionary' && GETPOST('dictionnarykey') && $user->hasRight("modulebuilder", "run")) {
2222
-	$keydict = GETPOSTINT('dictionnarykey') - 1 ;
2222
+	$keydict = GETPOSTINT('dictionnarykey') - 1;
2223 2223
 
2224 2224
 	$pathtofile = $listofmodules[strtolower($module)]['moduledescriptorrelpath'];
2225 2225
 	$destdir = $dirins.'/'.strtolower($module);
@@ -2254,7 +2254,7 @@  discard block
 block discarded – undo
2254 2254
 				setEventMessages($langs->trans("DictionaryNameUpdated", ucfirst(GETPOST('tablib'))), null);
2255 2255
 			}
2256 2256
 			if (function_exists('opcache_invalidate')) {
2257
-				opcache_reset();	// remove the include cache hell !
2257
+				opcache_reset(); // remove the include cache hell !
2258 2258
 			}
2259 2259
 			clearstatcache(true);
2260 2260
 			header("Location: ".DOL_URL_ROOT.'/modulebuilder/index.php?tab=dictionaries&module='.$module.($forceddirread ? '@'.$dirread : ''));
@@ -2437,7 +2437,7 @@  discard block
 block discarded – undo
2437 2437
 
2438 2438
 		clearstatcache(true);
2439 2439
 		if (function_exists('opcache_invalidate')) {
2440
-			opcache_reset();	// remove the include cache hell !
2440
+			opcache_reset(); // remove the include cache hell !
2441 2441
 		}
2442 2442
 		header("Location: ".DOL_URL_ROOT.'/modulebuilder/index.php?tab=permissions&module='.$module);
2443 2443
 		exit;
@@ -2551,12 +2551,12 @@  discard block
 block discarded – undo
2551 2551
 		if ($rewrite < 0) {
2552 2552
 			setEventMessages($langs->trans("WarningCommentNotFound", $langs->trans("Permissions"), "mod".$module."class.php"), null, 'warnings');
2553 2553
 		} else {
2554
-			$rightUpdated = null;  // I not set at this point
2554
+			$rightUpdated = null; // I not set at this point
2555 2555
 			reWriteAllPermissions($moduledescriptorfile, $permissions, $key, $rightUpdated, '', '', 2);
2556 2556
 			setEventMessages($langs->trans('PermissionUpdatedSuccesfuly'), null);
2557 2557
 			clearstatcache(true);
2558 2558
 			if (function_exists('opcache_invalidate')) {
2559
-				opcache_reset();	// remove the include cache hell !
2559
+				opcache_reset(); // remove the include cache hell !
2560 2560
 			}
2561 2561
 			header("Location: ".DOL_URL_ROOT.'/modulebuilder/index.php?tab=permissions&module='.$module);
2562 2562
 			exit;
@@ -2608,7 +2608,7 @@  discard block
 block discarded – undo
2608 2608
 
2609 2609
 			clearstatcache(true);
2610 2610
 			if (function_exists('opcache_invalidate')) {
2611
-				opcache_reset();	// remove the include cache hell !
2611
+				opcache_reset(); // remove the include cache hell !
2612 2612
 			}
2613 2613
 
2614 2614
 			header("Location: ".DOL_URL_ROOT.'/modulebuilder/index.php?tab=permissions&module='.$module);
@@ -2780,7 +2780,7 @@  discard block
 block discarded – undo
2780 2780
 
2781 2781
 		clearstatcache(true);
2782 2782
 		if (function_exists('opcache_invalidate')) {
2783
-			opcache_reset();	// remove the include cache hell !
2783
+			opcache_reset(); // remove the include cache hell !
2784 2784
 		}
2785 2785
 
2786 2786
 		setEventMessages($langs->trans('MenuDeletedSuccessfuly'), null);
@@ -2839,7 +2839,7 @@  discard block
 block discarded – undo
2839 2839
 		setEventMessages($langs->trans("ErrorFieldRequired", $langs->transnoentities("Url")), null, 'errors');
2840 2840
 	}
2841 2841
 	if (!empty(GETPOST('target'))) {
2842
-		$targets = array('_blank','_self','_parent','_top','');
2842
+		$targets = array('_blank', '_self', '_parent', '_top', '');
2843 2843
 		if (!in_array(GETPOST('target'), $targets)) {
2844 2844
 			$error++;
2845 2845
 			setEventMessages($langs->trans("ErrorFieldValue", $langs->transnoentities("target")), null, 'errors');
@@ -2945,7 +2945,7 @@  discard block
 block discarded – undo
2945 2945
 
2946 2946
 // Modify a menu entry
2947 2947
 if ($dirins && $action == "update_menu" && GETPOSTINT('menukey') && GETPOST('tabobj') && $user->hasRight("modulebuilder", "run")) {
2948
-	$objectname =  GETPOST('tabobj');
2948
+	$objectname = GETPOST('tabobj');
2949 2949
 	$dirins = $listofmodules[strtolower($module)]['moduledescriptorrootpath'];
2950 2950
 	$destdir = $dirins.'/'.strtolower($module);
2951 2951
 	$objects = dolGetListOfObjectClasses($destdir);
@@ -3042,7 +3042,7 @@  discard block
 block discarded – undo
3042 3042
 			}
3043 3043
 		}
3044 3044
 	} else {
3045
-		$_POST['type'] = '';	// TODO Use a var here and later
3045
+		$_POST['type'] = ''; // TODO Use a var here and later
3046 3046
 		$_POST['titre'] = '';
3047 3047
 		$_POST['fk_menu'] = '';
3048 3048
 		$_POST['leftmenu'] = '';
@@ -4116,8 +4116,8 @@  discard block
 block discarded – undo
4116 4116
 				}
4117 4117
 				print '</table><br>'."\n";
4118 4118
 				print '<div class="center">';
4119
-				print '<input type="submit" class="button button-save" name="add" value="' . dol_escape_htmltag($langs->trans('Create')) . '">';
4120
-				print '<input type="button" class="button button-cancel" name="cancel" value="' . dol_escape_htmltag($langs->trans('Cancel')) . '" onclick="goBack()">';
4119
+				print '<input type="submit" class="button button-save" name="add" value="'.dol_escape_htmltag($langs->trans('Create')).'">';
4120
+				print '<input type="button" class="button button-cancel" name="cancel" value="'.dol_escape_htmltag($langs->trans('Cancel')).'" onclick="goBack()">';
4121 4121
 				print '</div>';
4122 4122
 				print '</form>';
4123 4123
 				// javascript
@@ -4222,16 +4222,16 @@  discard block
 block discarded – undo
4222 4222
 						// Define path for sql file
4223 4223
 						$pathtosql = strtolower($module).'/sql/llx_'.strtolower($module).'_'.strtolower($tabobj).'-'.strtolower($module).'.sql';
4224 4224
 						$result = dol_buildpath($pathtosql);
4225
-						if (! dol_is_file($result)) {
4225
+						if (!dol_is_file($result)) {
4226 4226
 							$pathtosql = strtolower($module).'/sql/llx_'.strtolower($module).'_'.strtolower($tabobj).'.sql';
4227 4227
 							$result = dol_buildpath($pathtosql);
4228
-							if (! dol_is_file($result)) {
4228
+							if (!dol_is_file($result)) {
4229 4229
 								$pathtosql = 'install/mysql/tables/llx_'.strtolower($module).'_'.strtolower($tabobj).'-'.strtolower($module).'.sql';
4230 4230
 								$result = dol_buildpath($pathtosql);
4231
-								if (! dol_is_file($result)) {
4231
+								if (!dol_is_file($result)) {
4232 4232
 									$pathtosql = 'install/mysql/tables/llx_'.strtolower($module).'-'.strtolower($module).'.sql';
4233 4233
 									$result = dol_buildpath($pathtosql);
4234
-									if (! dol_is_file($result)) {
4234
+									if (!dol_is_file($result)) {
4235 4235
 										$pathtosql = 'install/mysql/tables/llx_'.strtolower($module).'.sql';
4236 4236
 										$pathtosqlextra = 'install/mysql/tables/llx_'.strtolower($module).'_extrafields.sql';
4237 4237
 										$result = dol_buildpath($pathtosql);
@@ -4250,12 +4250,12 @@  discard block
 block discarded – undo
4250 4250
 						$pathtosqlroot = preg_replace('/\/llx_.*$/', '', $pathtosql);
4251 4251
 
4252 4252
 						$pathtosqlkey   = preg_replace('/\.sql$/', '.key.sql', $pathtosql);
4253
-						$pathtosqlextrakey   = preg_replace('/\.sql$/', '.key.sql', $pathtosqlextra);
4253
+						$pathtosqlextrakey = preg_replace('/\.sql$/', '.key.sql', $pathtosqlextra);
4254 4254
 
4255 4255
 						$pathtolib      = strtolower($module).'/lib/'.strtolower($module).'.lib.php';
4256 4256
 						$pathtoobjlib   = strtolower($module).'/lib/'.strtolower($module).'_'.strtolower($tabobj).'.lib.php';
4257 4257
 
4258
-						$tmpobject = $tmpobject ?? null;  // @phan-suppress-current-line PhanPluginDuplicateExpressionAssignmentOperation
4258
+						$tmpobject = $tmpobject ?? null; // @phan-suppress-current-line PhanPluginDuplicateExpressionAssignmentOperation
4259 4259
 						if (is_object($tmpobject) && property_exists($tmpobject, 'picto')) {
4260 4260
 							$pathtopicto = $tmpobject->picto;
4261 4261
 							$realpathtopicto = '';
@@ -5538,7 +5538,7 @@  discard block
 block discarded – undo
5538 5538
 						}
5539 5539
 					  });
5540 5540
 
5541
-					var groupedRights = ' . $groupedRights_json . ';
5541
+					var groupedRights = ' . $groupedRights_json.';
5542 5542
 					var objectsSelect = $("select[id=\'objects\']");
5543 5543
 					var permsSelect = $("select[id=\'perms\']");
5544 5544
 
@@ -5762,7 +5762,7 @@  discard block
 block discarded – undo
5762 5762
 							if (in_array($perm[5], array('lire', 'read', 'creer', 'write', 'effacer', 'delete'))) {
5763 5763
 								print dol_escape_htmltag(ucfirst($perm[4]));
5764 5764
 							} else {
5765
-								print '';	// No particular object
5765
+								print ''; // No particular object
5766 5766
 							}
5767 5767
 							print '</td>';
5768 5768
 
@@ -6664,9 +6664,9 @@  discard block
 block discarded – undo
6664 6664
 
6665 6665
 						print '<td>';
6666 6666
 						if ($tabName[0] === "+") {
6667
-							print '<span class="badge badge-status4 badge-status">' . dol_escape_htmltag($tabName) . '</span>';
6667
+							print '<span class="badge badge-status4 badge-status">'.dol_escape_htmltag($tabName).'</span>';
6668 6668
 						} else {
6669
-							print '<span class="badge badge-status8 badge-status">' . dol_escape_htmltag($tabName) . '</span>';
6669
+							print '<span class="badge badge-status8 badge-status">'.dol_escape_htmltag($tabName).'</span>';
6670 6670
 						}
6671 6671
 						print '</td>';
6672 6672
 
Please login to merge, or discard this patch.
htdocs/api/class/api.class.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -214,11 +214,11 @@  discard block
 block discarded – undo
214 214
 		unset($object->barcode_type_code);
215 215
 		unset($object->barcode_type_label);
216 216
 
217
-		unset($object->mode_reglement);		// We use mode_reglement_id now
218
-		unset($object->cond_reglement);		// We use cond_reglement_id now
219
-		unset($object->note);				// We use note_public or note_private now
220
-		unset($object->contact);			// We use contact_id now
221
-		unset($object->thirdparty);			// We use thirdparty_id or fk_soc or socid now
217
+		unset($object->mode_reglement); // We use mode_reglement_id now
218
+		unset($object->cond_reglement); // We use cond_reglement_id now
219
+		unset($object->note); // We use note_public or note_private now
220
+		unset($object->contact); // We use contact_id now
221
+		unset($object->thirdparty); // We use thirdparty_id or fk_soc or socid now
222 222
 
223 223
 		unset($object->projet); // Should be fk_project
224 224
 		unset($object->project); // Should be fk_project
@@ -283,7 +283,7 @@  discard block
 block discarded – undo
283 283
 
284 284
 		unset($object->prefix_comm);
285 285
 
286
-		if (!isset($object->table_element) || ! in_array($object->table_element, array('expensereport_det', 'ticket'))) {
286
+		if (!isset($object->table_element) || !in_array($object->table_element, array('expensereport_det', 'ticket'))) {
287 287
 			unset($object->comments);
288 288
 		}
289 289
 
Please login to merge, or discard this patch.
htdocs/core/modules/DolibarrModules.class.php 1 patch
Spacing   +35 added lines, -35 removed lines patch added patch discarded remove patch
@@ -140,7 +140,7 @@  discard block
 block discarded – undo
140 140
 
141 141
 	const KEY_ID = 0;
142 142
 	const KEY_LABEL = 1;
143
-	const KEY_TYPE = 2;	// deprecated
143
+	const KEY_TYPE = 2; // deprecated
144 144
 	const KEY_DEFAULT = 3;
145 145
 	const KEY_FIRST_LEVEL = 4;
146 146
 	const KEY_SECOND_LEVEL = 5;
@@ -714,7 +714,7 @@  discard block
 block discarded – undo
714 714
 				$moduleNameInConf = 'supplier_proposal';
715 715
 			}
716 716
 
717
-			unset($conf->modules[$moduleNameInConf]);	// Add this module in list of enabled modules so isModEnabled() will work (conf->module->enabled must no more be used)
717
+			unset($conf->modules[$moduleNameInConf]); // Add this module in list of enabled modules so isModEnabled() will work (conf->module->enabled must no more be used)
718 718
 
719 719
 			return 1;
720 720
 		} else {
@@ -810,7 +810,7 @@  discard block
 block discarded – undo
810 810
 		$pathoffile = $this->getDescLongReadmeFound();
811 811
 
812 812
 		if ($pathoffile) {     // Mostly for external modules
813
-			$content = file_get_contents($pathoffile, false, null, 0, 1024 * 1024);	// Max size loaded 1Mb
813
+			$content = file_get_contents($pathoffile, false, null, 0, 1024 * 1024); // Max size loaded 1Mb
814 814
 
815 815
 			if ((float) DOL_VERSION >= 6.0) {
816 816
 				@include_once DOL_DOCUMENT_ROOT.'/core/lib/parsemd.lib.php';
@@ -1574,7 +1574,7 @@  discard block
 block discarded – undo
1574 1574
 
1575 1575
 				$sql = "DELETE FROM ".MAIN_DB_PREFIX."boxes_def";
1576 1576
 				$sql .= " WHERE file = '".$this->db->escape($file)."'";
1577
-				$sql .= " AND entity = ".$conf->entity;		// Do not use getEntity here, we want to delete only in current company
1577
+				$sql .= " AND entity = ".$conf->entity; // Do not use getEntity here, we want to delete only in current company
1578 1578
 
1579 1579
 				dol_syslog(get_class($this)."::delete_boxes", LOG_DEBUG);
1580 1580
 				$resql = $this->db->query($sql);
@@ -1597,15 +1597,15 @@  discard block
 block discarded – undo
1597 1597
 	public function insert_cronjobs()
1598 1598
 	{
1599 1599
 		// phpcs:enable
1600
-		include_once DOL_DOCUMENT_ROOT . '/core/class/infobox.class.php';
1601
-		include_once DOL_DOCUMENT_ROOT . '/cron/class/cronjob.class.php';
1600
+		include_once DOL_DOCUMENT_ROOT.'/core/class/infobox.class.php';
1601
+		include_once DOL_DOCUMENT_ROOT.'/cron/class/cronjob.class.php';
1602 1602
 
1603 1603
 		global $conf, $user;
1604 1604
 
1605 1605
 		$err = 0;
1606 1606
 
1607 1607
 		if (is_array($this->cronjobs)) {
1608
-			dol_syslog(get_class($this) . "::insert_cronjobs", LOG_DEBUG);
1608
+			dol_syslog(get_class($this)."::insert_cronjobs", LOG_DEBUG);
1609 1609
 
1610 1610
 			foreach ($this->cronjobs as $key => $value) {
1611 1611
 				$now = dol_now();
@@ -1632,7 +1632,7 @@  discard block
 block discarded – undo
1632 1632
 				$test = isset($value['test']) ? $value['test'] : ''; // Line must be enabled or not (so visible or not)
1633 1633
 
1634 1634
 				// Search if cron entry already present
1635
-				$sql = "SELECT count(*) as nb FROM " . MAIN_DB_PREFIX . "cronjob";
1635
+				$sql = "SELECT count(*) as nb FROM ".MAIN_DB_PREFIX."cronjob";
1636 1636
 				//$sql .= " WHERE module_name = '" . $this->db->escape(empty($this->rights_class) ? strtolower($this->name) : $this->rights_class) . "'";
1637 1637
 				$sql .= " WHERE label = '".$this->db->escape($label)."'";
1638 1638
 				/* unique key is on label,entity so no need for this test
@@ -1652,7 +1652,7 @@  discard block
 block discarded – undo
1652 1652
 					$sql .= " AND params = '" . $this->db->escape($params) . "'";
1653 1653
 				}
1654 1654
 				*/
1655
-				$sql .= " AND entity = " . ((int) $entity); // Must be exact entity
1655
+				$sql .= " AND entity = ".((int) $entity); // Must be exact entity
1656 1656
 
1657 1657
 				$result = $this->db->query($sql);
1658 1658
 				if (!$result) {
@@ -1978,9 +1978,9 @@  discard block
 block discarded – undo
1978 1978
 
1979 1979
 				// If the module is active
1980 1980
 				foreach ($this->rights as $key => $value) {
1981
-					$r_id = $this->rights[$key][self::KEY_ID];	// permission id in llx_rights_def (not unique because primary key is couple id-entity)
1981
+					$r_id = $this->rights[$key][self::KEY_ID]; // permission id in llx_rights_def (not unique because primary key is couple id-entity)
1982 1982
 					$r_label = $this->rights[$key][self::KEY_LABEL];
1983
-					$r_type	= $this->rights[$key][self::KEY_TYPE] ?? 'w';	// TODO deprecated
1983
+					$r_type = $this->rights[$key][self::KEY_TYPE] ?? 'w'; // TODO deprecated
1984 1984
 					$r_default = $this->rights[$key][self::KEY_DEFAULT] ?? 0;
1985 1985
 					$r_perms = $this->rights[$key][self::KEY_FIRST_LEVEL] ?? '';
1986 1986
 					$r_subperms = $this->rights[$key][self::KEY_SECOND_LEVEL] ?? '';
@@ -2004,7 +2004,7 @@  discard block
 block discarded – undo
2004 2004
 					}
2005 2005
 
2006 2006
 					// condition to show or hide a user right (default: 1) (eg isModEnabled('anothermodule') or ($conf->global->MAIN_FEATURES_LEVEL > 0) or etc..)
2007
-					$r_enabled	= $this->rights[$key][self::KEY_ENABLED] ?? '1';
2007
+					$r_enabled = $this->rights[$key][self::KEY_ENABLED] ?? '1';
2008 2008
 
2009 2009
 					// Search if perm already present
2010 2010
 					$sql = "SELECT count(*) as nb FROM ".MAIN_DB_PREFIX."rights_def";
@@ -2021,7 +2021,7 @@  discard block
 block discarded – undo
2021 2021
 							$sql .= ", libelle";
2022 2022
 							$sql .= ", module";
2023 2023
 							$sql .= ", module_origin";
2024
-							$sql .= ", type";	// TODO deprecated
2024
+							$sql .= ", type"; // TODO deprecated
2025 2025
 							$sql .= ", bydefault";
2026 2026
 							$sql .= ", perms";
2027 2027
 							$sql .= ", subperms";
@@ -2032,7 +2032,7 @@  discard block
 block discarded – undo
2032 2032
 							$sql .= ", '".$this->db->escape($r_label)."'";
2033 2033
 							$sql .= ", '".$this->db->escape($r_module)."'";
2034 2034
 							$sql .= ", '".$this->db->escape($r_module_origin)."'";
2035
-							$sql .= ", '".$this->db->escape($r_type)."'";	// TODO deprecated
2035
+							$sql .= ", '".$this->db->escape($r_type)."'"; // TODO deprecated
2036 2036
 							$sql .= ", ".((int) $r_default);
2037 2037
 							$sql .= ", '".$this->db->escape($r_perms)."'";
2038 2038
 							$sql .= ", '".$this->db->escape($r_subperms)."'";
@@ -2254,7 +2254,7 @@  discard block
 block discarded – undo
2254 2254
 
2255 2255
 		$sql = "DELETE FROM ".MAIN_DB_PREFIX."menu";
2256 2256
 		$sql .= " WHERE module = '".$this->db->escape($module)."'";
2257
-		$sql .= " AND menu_handler = 'all'";	// We delete only lines that were added manually or by the module activation. We keep entry added by menuhandler like 'auguria'
2257
+		$sql .= " AND menu_handler = 'all'"; // We delete only lines that were added manually or by the module activation. We keep entry added by menuhandler like 'auguria'
2258 2258
 		$sql .= " AND entity IN (0, ".$conf->entity.")";
2259 2259
 
2260 2260
 		dol_syslog(get_class($this)."::delete_menus", LOG_DEBUG);
@@ -2638,36 +2638,36 @@  discard block
 block discarded – undo
2638 2638
 		}
2639 2639
 
2640 2640
 		if ($this->isCoreOrExternalModule() == 'external' || preg_match('/development|experimental|deprecated/i', $version)) {
2641
-			$versionTitle =  $langs->trans("Version").' '.$this->getVersion(1);
2641
+			$versionTitle = $langs->trans("Version").' '.$this->getVersion(1);
2642 2642
 			if ($this->needUpdate) {
2643 2643
 				$versionTitle .= '<br>'.$langs->trans('ModuleUpdateAvailable').' : '.$this->lastVersion;
2644 2644
 			}
2645 2645
 
2646
-			$return .=  '<span class="info-box-icon-version'.($versiontrans ? ' '.$versiontrans : '').' classfortooltip" title="'.dol_escape_js($versionTitle).'" >';
2647
-			$return .=  $this->getVersion(1);
2648
-			$return .=  '</span>';
2646
+			$return .= '<span class="info-box-icon-version'.($versiontrans ? ' '.$versiontrans : '').' classfortooltip" title="'.dol_escape_js($versionTitle).'" >';
2647
+			$return .= $this->getVersion(1);
2648
+			$return .= '</span>';
2649 2649
 		}
2650 2650
 
2651
-		$return .=  '</div>
2651
+		$return .= '</div>
2652 2652
 	    <div class="info-box-content info-box-text-module'.(!getDolGlobalString($const_name) ? '' : ' info-box-module-enabled'.($versiontrans ? ' info-box-content-warning' : '')).'">
2653 2653
 	    <span class="info-box-title">'.$this->getName().'</span>
2654 2654
 	    <span class="info-box-desc twolinesmax opacitymedium" title="'.dol_escape_htmltag($this->getDesc()).'">'.nl2br($this->getDesc()).'</span>';
2655 2655
 
2656
-		$return .=  '<div class="valignmiddle inline-block info-box-more">';
2656
+		$return .= '<div class="valignmiddle inline-block info-box-more">';
2657 2657
 		//if ($versiontrans) print img_warning($langs->trans("Version").' '.$this->getVersion(1)).' ';
2658
-		$return .=  '<a class="valignmiddle inline-block" href="javascript:document_preview(\''.DOL_URL_ROOT.'/admin/modulehelp.php?id='.((int) $this->numero).'\',\'text/html\',\''.dol_escape_js($langs->trans("Module")).'\')">'.img_picto(($this->isCoreOrExternalModule() == 'external' ? $langs->trans("ExternalModule").' - ' : '').$langs->trans("ClickToShowDescription"), $imginfo).'</a>';
2659
-		$return .=  '</div><br>';
2660
-
2661
-		$return .=  '<div class="valignmiddle inline-block info-box-actions">';
2662
-		$return .=  '<div class="valignmiddle inline-block info-box-setup">';
2663
-		$return .=  $codetoconfig;
2664
-		$return .=  '</div>';
2665
-		$return .=  '<div class="valignmiddle inline-block marginleftonly marginrightonly">';
2666
-		$return .=  $codeenabledisable;
2667
-		$return .=  '</div>';
2668
-		$return .=  '</div>';
2669
-
2670
-		$return .=  '
2658
+		$return .= '<a class="valignmiddle inline-block" href="javascript:document_preview(\''.DOL_URL_ROOT.'/admin/modulehelp.php?id='.((int) $this->numero).'\',\'text/html\',\''.dol_escape_js($langs->trans("Module")).'\')">'.img_picto(($this->isCoreOrExternalModule() == 'external' ? $langs->trans("ExternalModule").' - ' : '').$langs->trans("ClickToShowDescription"), $imginfo).'</a>';
2659
+		$return .= '</div><br>';
2660
+
2661
+		$return .= '<div class="valignmiddle inline-block info-box-actions">';
2662
+		$return .= '<div class="valignmiddle inline-block info-box-setup">';
2663
+		$return .= $codetoconfig;
2664
+		$return .= '</div>';
2665
+		$return .= '<div class="valignmiddle inline-block marginleftonly marginrightonly">';
2666
+		$return .= $codeenabledisable;
2667
+		$return .= '</div>';
2668
+		$return .= '</div>';
2669
+
2670
+		$return .= '
2671 2671
 	    </div><!-- /.info-box-content -->
2672 2672
 	    </div><!-- /.info-box -->
2673 2673
 	    </div>';
@@ -2687,7 +2687,7 @@  discard block
 block discarded – undo
2687 2687
 	{
2688 2688
 		require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
2689 2689
 		if (!empty($this->url_last_version)) {
2690
-			$lastVersion = getURLContent($this->url_last_version, 'GET', '', 1, array(), array('http', 'https'), 0);	// Accept http or https links on external remote server only
2690
+			$lastVersion = getURLContent($this->url_last_version, 'GET', '', 1, array(), array('http', 'https'), 0); // Accept http or https links on external remote server only
2691 2691
 			if (isset($lastVersion['content']) && strlen($lastVersion['content']) < 30) {
2692 2692
 				// Security warning :  be careful with remote data content, the module editor could be hacked (or evil) so limit to a-z A-Z 0-9 _ . -
2693 2693
 				$this->lastVersion = preg_replace("/[^a-zA-Z0-9_\.\-]+/", "", $lastVersion['content']);
Please login to merge, or discard this patch.
htdocs/user/class/usergroup.class.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -98,9 +98,9 @@  discard block
 block discarded – undo
98 98
 	public $members = array(); // Array of users
99 99
 
100 100
 	public $nb_rights; // Number of rights granted to the user
101
-	public $nb_users;  // Number of users in the group
101
+	public $nb_users; // Number of users in the group
102 102
 
103
-	public $rights;	// Permissions of the group
103
+	public $rights; // Permissions of the group
104 104
 
105 105
 	private $_tab_loaded = array(); // Array of cache of already loaded permissions
106 106
 
@@ -173,7 +173,7 @@  discard block
 block discarded – undo
173 173
 		if ($result) {
174 174
 			if ($load_members) {
175 175
 				$excludefilter = '';
176
-				$this->members = $this->listUsersForGroup($excludefilter, 0);	// This make a request to get list of users but may also do subrequest to fetch each users on some versions
176
+				$this->members = $this->listUsersForGroup($excludefilter, 0); // This make a request to get list of users but may also do subrequest to fetch each users on some versions
177 177
 			}
178 178
 
179 179
 			return 1;
@@ -897,13 +897,13 @@  discard block
 block discarded – undo
897 897
 		global $conf;
898 898
 		$dn = '';
899 899
 		if ($mode == 0) {
900
-			$dn = getDolGlobalString('LDAP_KEY_GROUPS') . "=".$info[getDolGlobalString('LDAP_KEY_GROUPS')]."," . getDolGlobalString('LDAP_GROUP_DN');
900
+			$dn = getDolGlobalString('LDAP_KEY_GROUPS')."=".$info[getDolGlobalString('LDAP_KEY_GROUPS')].",".getDolGlobalString('LDAP_GROUP_DN');
901 901
 		}
902 902
 		if ($mode == 1) {
903 903
 			$dn = getDolGlobalString('LDAP_GROUP_DN');
904 904
 		}
905 905
 		if ($mode == 2) {
906
-			$dn = getDolGlobalString('LDAP_KEY_GROUPS') . "=".$info[getDolGlobalString('LDAP_KEY_GROUPS')];
906
+			$dn = getDolGlobalString('LDAP_KEY_GROUPS')."=".$info[getDolGlobalString('LDAP_KEY_GROUPS')];
907 907
 		}
908 908
 		return $dn;
909 909
 	}
Please login to merge, or discard this patch.
htdocs/opensurvey/card.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -63,7 +63,7 @@
 block discarded – undo
63 63
 
64 64
 $permissiontoread = $user->hasRight('opensurvey', 'read');
65 65
 $permissiontoadd = $user->hasRight('opensurvey', 'write');
66
-$permissiontodelete = $user->hasRight('opensurvey', 'write');	// permission delete doesn't exists
66
+$permissiontodelete = $user->hasRight('opensurvey', 'write'); // permission delete doesn't exists
67 67
 
68 68
 
69 69
 /*
Please login to merge, or discard this patch.