削除処理のあとのLocationの分岐を既存の関数で処理して行数を減らす。

satopian · Dec 15, 2024 · a222260 · a222260
1 parent 732d66d
commit a222260
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/petitnote/functions.php b/petitnote/functions.php
@@ -229,6 +229,7 @@ function set_darkmode(){
 function branch_destination_of_location(){
 	$page=(int)filter_input(INPUT_POST,'postpage',FILTER_VALIDATE_INT);
 	$resno=(int)filter_input(INPUT_POST,'resno',FILTER_VALIDATE_INT);
+	$resno= $resno ? $resno : (int)filter_input(INPUT_POST,'postresno',FILTER_VALIDATE_INT);
 	$catalog=(bool)filter_input(INPUT_POST,'catalog',FILTER_VALIDATE_BOOLEAN);
 	$search=(bool)filter_input(INPUT_POST,'search',FILTER_VALIDATE_BOOLEAN);
 	$paintcom=(bool)filter_input(INPUT_POST,'paintcom',FILTER_VALIDATE_BOOLEAN);
@@ -238,6 +239,9 @@ function branch_destination_of_location(){
 		return header('Location: ./?mode=paintcom');
 	}
 	if($resno){
+		if(!is_file(LOG_DIR.$resno.'.log')){
+			return header('Location: ./');
+		}
 		$res_catalog = $res_catalog ? '&res_catalog=on' : ''; 
 		return header('Location: ./?resno='.h($resno).$res_catalog);
 	}

diff --git a/petitnote/index.php b/petitnote/index.php
@@ -2064,15 +2064,8 @@ function del(){
 	closeFile($fp);
 
 	unset($_SESSION['userdel']);
-	$resno=(string)filter_input(INPUT_POST,'postresno',FILTER_VALIDATE_INT);
 	//多重送信防止
-	if((bool)filter_input(INPUT_POST,'resmode',FILTER_VALIDATE_BOOLEAN)){
-		if(!is_file(LOG_DIR.$resno.'.log')){
-			return header('Location: ./');
-		}
-		return header('Location: ./?resno='.$resno);
-	}
-	return header('Location: ./?page='.(int)filter_input(INPUT_POST,'postpage',FILTER_VALIDATE_INT));
+	branch_destination_of_location();
 }
 
 //シェアするserverの選択画面