Commit 502f650

author

Mathieu Ferment

committed

Add url validation

1 parent fda1594 commit 502f650Copy full SHA for 502f650

File tree

-6

lines changed

-6

lines changed

Lines changed: 7 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,11 @@ function validateInput($argv)`
`32`	`32`	`$isValid = true;`
`33`	`33`	`}`
`34`	`34`
	`35`	`+ if (!filter_var($argv[1], FILTER_VALIDATE_URL)) {`
	`36`	`+ echo 'Bad url: ' . $argv[1] . PHP_EOL;`
	`37`	`+ die(1);`
	`38`	`+ }`
	`39`	`+`
`35`	`40`	`if (!$isValid) {`
`36`	`41`	`echo 'php explore_url <url> [--urldecode]' . PHP_EOL;`
`37`	`42`	`die(1);`
`@@ -47,13 +52,10 @@ function validateInput($argv)`
`47`	`52`	`$GETParts = explode('&', $url);`
`48`	`53`	`$pathParts = explode('?', $GETParts[0]);`
`49`	`54`
`50`		`-if (count($pathParts) !== 2) {`
`51`		`- throw new Exception('Not a valid url : found more than 1 ?');`
`52`		`-}`
`53`		`-`
`54`	`55`	`$path = $pathParts[0];`
`55`	`56`	`$firstParameter = $pathParts[1];`
`56`		`-$parameters = array_slice($GETParts, 1);`
	`57`	`+$moreParameters = array_slice($GETParts, 1);`
	`58`	`+$parameters = array_merge(array($firstParameter), $moreParameters);`
`57`	`59`
`58`	`60`	`// echo result`
`59`	`61`	`echo TextColorWriter::textColor('URL ANALYSIS:', TextColorWriter::BASH_PROMPT_GREEN) . PHP_EOL;`
`@@ -63,7 +65,6 @@ function validateInput($argv)`
`63`	`65`	`$urldecode = isset($argv[2]);`
`64`	`66`
`65`	`67`	`// echo GET parameters`
`66`		`-echo echoParameter($firstParameter, $urldecode);`
`67`	`68`	`foreach ($parameters as $parameter) {`
`68`	`69`	`echoParameter($parameter, $urldecode);`
`69`	`70`	`}`

Comments

(0)