preg_replace typechecks

kimbtech · kimbtech · commit 8690cc500fb9 · 2020-09-21T19:31:51.000+02:00
diff --git a/php/core/ParamParser.php b/php/core/ParamParser.php
@@ -47,7 +47,7 @@ public function isLogoutGet() : bool {
 
 	public function loginPost(string $name) : string {
 		if( $name === 'group' ){
-			return !empty($_POST['group']) ? preg_replace('/[^A-Za-z0-9]/', '', $_POST['group']) : '';
+			return !empty($_POST['group']) && is_string($_POST['group']) ? preg_replace('/[^A-Za-z0-9]/', '', $_POST['group']) : '';
 		}
 		else if($name === 'password' ){
 			if( !empty($_POST['password']) && is_string($_POST['password']) ) {
diff --git a/php/core/WebGUI.php b/php/core/WebGUI.php
@@ -108,7 +108,7 @@ public function accountManage() : void {
 					}
 				}
 			}
-			else if(!empty($_GET['delete'])){
+			else if(!empty($_GET['delete']) && is_string($_GET['delete'])){
 				$account->setContent('NOTEDISABLE','');
 				$g = preg_replace('/[^A-Za-z0-9]/', '', $_GET['delete']);
 				if(!$this->login->getGroupList()->isValue([$g]) || $g === $this->login->getGroup() ){

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ public function isLogoutGet() : bool {`
`47`	`47`
`48`	`48`	`public function loginPost(string $name) : string {`
`49`	`49`	`if( $name === 'group' ){`
`50`		`- return !empty($_POST['group']) ? preg_replace('/[^A-Za-z0-9]/', '', $_POST['group']) : '';`
	`50`	`+ return !empty($_POST['group']) && is_string($_POST['group']) ? preg_replace('/[^A-Za-z0-9]/', '', $_POST['group']) : '';`
`51`	`51`	`}`
`52`	`52`	`else if($name === 'password' ){`
`53`	`53`	`if( !empty($_POST['password']) && is_string($_POST['password']) ) {`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ public function accountManage() : void {`
`108`	`108`	`}`
`109`	`109`	`}`
`110`	`110`	`}`
`111`		`- else if(!empty($_GET['delete'])){`
	`111`	`+ else if(!empty($_GET['delete']) && is_string($_GET['delete'])){`
`112`	`112`	`$account->setContent('NOTEDISABLE','');`
`113`	`113`	`$g = preg_replace('/[^A-Za-z0-9]/', '', $_GET['delete']);`
`114`	`114`	`if(!$this->login->getGroupList()->isValue([$g]) \|\| $g === $this->login->getGroup() ){`