Selaa lähdekoodia

Change some curly braces #13929

gael.langlais 5 vuotta sitten
vanhempi
commit
af5de05a31

+ 5 - 6
htdocs/contact/list.php

@@ -76,7 +76,7 @@ $search_no_email = GETPOST("search_no_email", 'int');
 if (!empty($conf->socialnetworks->enabled)) {
 	foreach ($socialnetworks as $key => $value) {
 		if ($value['active']) {
-			$search_{$key} = GETPOST("search_".$key, 'alpha');
+			$search_[$key] = GETPOST("search_".$key, 'alpha');
 		}
 	}
 }
@@ -253,7 +253,7 @@ if (empty($reshook))
 		if (!empty($conf->socialnetworks->enabled)) {
 			foreach ($socialnetworks as $key => $value) {
 				if ($value['active']) {
-					$search_{$key} = "";
+					$search_[$key] = "";
 				}
 			}
 		}
@@ -357,9 +357,8 @@ if (strlen($search_phone_mobile))   $sql .= natural_search('p.phone_mobile', $se
 if (strlen($search_fax))            $sql .= natural_search('p.fax', $search_fax);
 if (!empty($conf->socialnetworks->enabled)) {
 	foreach ($socialnetworks as $key => $value) {
-		if ($value['active'] && strlen($search_{$key})) {
-			//$sql.= natural_search("p.socialnetworks->'$.".$key."'", $search_{$key});
-			$sql .= ' AND p.socialnetworks LIKE \'%"'.$key.'":"'.$search_{$key}.'%\'';
+		if ($value['active'] && strlen($search_[$key])) {
+			$sql .= ' AND p.socialnetworks LIKE \'%"'.$key.'":"'.$search_[$key].'%\'';
 		}
 	}
 }
@@ -669,7 +668,7 @@ if (!empty($conf->socialnetworks->enabled)) {
 			if (!empty($arrayfields['p.'.$key]['checked']))
 			{
 				print '<td class="liste_titre">';
-				print '<input class="flat" type="text" name="search_'.$key.'" size="6" value="'.dol_escape_htmltag($search_{$key}).'">';
+				print '<input class="flat" type="text" name="search_'.$key.'" size="6" value="'.dol_escape_htmltag($search_[$key]).'">';
 				print '</td>';
 			}
 		}

+ 1 - 1
htdocs/core/antispamimage.php

@@ -43,7 +43,7 @@ $number = strlen($letters);
 $string = '';
 for ($i = 0; $i < $length; $i++)
 {
-	$string .= $letters{mt_rand(0, $number - 1)};
+	$string .= $letters[mt_rand(0, $number - 1)];
 }
 //print $string;
 

+ 3 - 3
htdocs/core/class/lessc.class.php

@@ -1966,7 +1966,7 @@ class Lessc {
 		$this->pushEnv();
 		$parser = new lessc_parser($this, __METHOD__);
 		foreach ($args as $name => $strValue) {
-			if ($name{0} !== '@') {
+			if ($name[0] !== '@') {
 				$name = '@'.$name;
 			}
 			$parser->count = 0;
@@ -2638,7 +2638,7 @@ class lessc_parser {
 								$hidden = true;
 								if (!isset($block->args)) {
 									foreach ($block->tags as $tag) {
-										if (!is_string($tag) || $tag{0} != $this->lessc->mPrefix) {
+										if (!is_string($tag) || $tag[0] != $this->lessc->mPrefix) {
 											$hidden = false;
 											break;
 										}
@@ -2692,7 +2692,7 @@ class lessc_parser {
 		protected function fixTags($tags) {
 			// move @ tags out of variable namespace
 			foreach ($tags as &$tag) {
-				if ($tag{0} == $this->lessc->vPrefix)
+				if ($tag[0] == $this->lessc->vPrefix)
 					$tag[0] = $this->lessc->mPrefix;
 			}
 			return $tags;

+ 8 - 8
htdocs/core/lib/security2.lib.php

@@ -463,15 +463,15 @@ function getRandomPassword($generic = false, $replaceambiguouschars = null, $len
 		{
 			$max = strlen($lowercase) - 1;
 			for ($x = 0; $x < $nbofchar; $x++) {
-				$randomCode .= $lowercase{random_int(0, $max)};
+				$randomCode .= $lowercase[random_int(0, $max)];
 			}
 			$max = strlen($uppercase) - 1;
 			for ($x = 0; $x < $nbofchar; $x++) {
-				$randomCode .= $uppercase{random_int(0, $max)};
+				$randomCode .= $uppercase[random_int(0, $max)];
 			}
 			$max = strlen($numbers) - 1;
 			for ($x = 0; $x < $nbofcharlast; $x++) {
-				$randomCode .= $numbers{random_int(0, $max)};
+				$randomCode .= $numbers[random_int(0, $max)];
 			}
 
 			$generated_password = str_shuffle($randomCode);
@@ -480,15 +480,15 @@ function getRandomPassword($generic = false, $replaceambiguouschars = null, $len
 		{
 			$max = strlen($lowercase) - 1;
 			for ($x = 0; $x < $nbofchar; $x++) {
-				$randomCode .= $lowercase{mt_rand(0, $max)};
+				$randomCode .= $lowercase[mt_rand(0, $max)];
 			}
 			$max = strlen($uppercase) - 1;
 			for ($x = 0; $x < $nbofchar; $x++) {
-				$randomCode .= $uppercase{mt_rand(0, $max)};
+				$randomCode .= $uppercase[mt_rand(0, $max)];
 			}
 			$max = strlen($numbers) - 1;
 			for ($x = 0; $x < $nbofcharlast; $x++) {
-				$randomCode .= $numbers{mt_rand(0, $max)};
+				$randomCode .= $numbers[mt_rand(0, $max)];
 			}
 
 			$generated_password = str_shuffle($randomCode);
@@ -512,11 +512,11 @@ function getRandomPassword($generic = false, $replaceambiguouschars = null, $len
 		$max = strlen($numbers) - 1;
 		if (function_exists('random_int'))	// Cryptographic random
 		{
-			$generated_password = str_replace($replaceambiguouschars, $numbers{random_int(0, $max)}, $generated_password);
+			$generated_password = str_replace($replaceambiguouschars, $numbers[random_int(0, $max)], $generated_password);
 		}
 		else
 		{
-			$generated_password = str_replace($replaceambiguouschars, $numbers{mt_rand(0, $max)}, $generated_password);
+			$generated_password = str_replace($replaceambiguouschars, $numbers[mt_rand(0, $max)], $generated_password);
 		}
 	}