Completed
Branch develop (3557c7)
by
unknown
24:25
created
htdocs/core/lib/admin.lib.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -120,7 +120,7 @@  discard block
 block discarded – undo
120 120
 		}
121 121
 	}
122 122
 	//print join('.',$versionarray1).'('.count($versionarray1).') / '.join('.',$versionarray2).'('.count($versionarray2).') => '.$ret.'<br>'."\n";
123
-	return $ret;	// return level=1 if difference is on the main version, level=2 on minor version, level=3 on maintenance version, level=4 on development phase version
123
+	return $ret; // return level=1 if difference is on the main version, level=2 on minor version, level=3 on maintenance version, level=4 on development phase version
124 124
 }
125 125
 
126 126
 
@@ -336,7 +336,7 @@  discard block
 block discarded – undo
336 336
 		if ($sql) {
337 337
 			// Test if the SQL is allowed SQL
338 338
 			if ($onlysqltoimportwebsite) {
339
-				$newsql = str_replace(array("\'"), '__BACKSLASHQUOTE__', $sql);	// Replace the \' char
339
+				$newsql = str_replace(array("\'"), '__BACKSLASHQUOTE__', $sql); // Replace the \' char
340 340
 
341 341
 				// Remove all strings contents including the ' so we can analyse SQL instruction only later
342 342
 				$l = strlen($newsql);
@@ -384,7 +384,7 @@  discard block
 block discarded – undo
384 384
 				$extractphpold = '';
385 385
 
386 386
 				// Security analysis
387
-				$errorphpcheck = checkPHPCode($extractphpold, $extractphp);	// Contains the setEventMessages
387
+				$errorphpcheck = checkPHPCode($extractphpold, $extractphp); // Contains the setEventMessages
388 388
 				if ($errorphpcheck) {
389 389
 					$error++;
390 390
 					//print 'Request '.($i + 1)." contains non allowed instructions.<br>\n";
@@ -591,7 +591,7 @@  discard block
 block discarded – undo
591 591
 		dol_print_error(null, 'Error call dolibar_del_const with parameter name empty');
592 592
 		return -1;
593 593
 	}
594
-	if (! is_object($hookmanager)) {
594
+	if (!is_object($hookmanager)) {
595 595
 		require_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
596 596
 		$hookmanager = new HookManager($db);
597 597
 	}
@@ -686,12 +686,12 @@  discard block
 block discarded – undo
686 686
 		dol_print_error($db, "Error: Call to function dolibarr_set_const with wrong parameters");
687 687
 		exit;
688 688
 	}
689
-	if (! is_object($hookmanager)) {
689
+	if (!is_object($hookmanager)) {
690 690
 		require_once DOL_DOCUMENT_ROOT.'/core/class/hookmanager.class.php';
691 691
 		$hookmanager = new HookManager($db);
692 692
 	}
693 693
 
694
-	$value = (string) $value;	// We force type string (may be int)
694
+	$value = (string) $value; // We force type string (may be int)
695 695
 
696 696
 	$parameters = array(
697 697
 		'name' => $name,
@@ -1156,7 +1156,7 @@  discard block
 block discarded – undo
1156 1156
 
1157 1157
 					if (preg_match('/dol_login/i', $sessValues) && // limit to dolibarr session
1158 1158
 					(preg_match('/dol_entity\|i:('.$conf->entity.')/', $sessValues) || preg_match('/dol_entity\|s:([0-9]+):"('.$conf->entity.')"/i', $sessValues)) && // limit to current entity
1159
-					preg_match('/dol_company\|s:([0-9]+):"(' . getDolGlobalString('MAIN_INFO_SOCIETE_NOM').')"/i', $sessValues)) { // limit to company name
1159
+					preg_match('/dol_company\|s:([0-9]+):"('.getDolGlobalString('MAIN_INFO_SOCIETE_NOM').')"/i', $sessValues)) { // limit to company name
1160 1160
 						$tmp = explode('_', $file);
1161 1161
 						$idsess = $tmp[1];
1162 1162
 						// We remove session if it's not ourself
@@ -1974,7 +1974,7 @@  discard block
 block discarded – undo
1974 1974
 	global $langs;
1975 1975
 
1976 1976
 	$text = $langs->transnoentitiesnoconv("OnlyFollowingModulesAreOpenedToExternalUsers");
1977
-	$listofmodules = explode(',', getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL'));	// List of modules qualified for external user management
1977
+	$listofmodules = explode(',', getDolGlobalString('MAIN_MODULES_FOR_EXTERNAL')); // List of modules qualified for external user management
1978 1978
 
1979 1979
 	$i = 0;
1980 1980
 	if (!empty($modules)) {
@@ -2228,7 +2228,7 @@  discard block
 block discarded – undo
2228 2228
 		"script-src" => array("label" => "script-src", "data-directivetype" => "fetch"),
2229 2229
 		"script-src-elem" => array("label" => "script-src-elem", "data-directivetype" => "fetch"),
2230 2230
 		"script-src-attr" => array("label" => "script-src-attr", "data-directivetype" => "fetch"),
2231
-		"style-src" => array("label" => "style-src","data-directivetype" => "fetch"),
2231
+		"style-src" => array("label" => "style-src", "data-directivetype" => "fetch"),
2232 2232
 		"style-src-elem" => array("label" => "style-src-elem", "data-directivetype" => "fetch"),
2233 2233
 		"style-src-attr" => array("label" => "style-src-attr", "data-directivetype" => "fetch"),
2234 2234
 		"worker-src" => array("label" => "worker-src", "data-directivetype" => "fetch"),
Please login to merge, or discard this patch.