[Improve][Modularization][Webpage]

2022.09.20 / Folus Wen

Actions:
1. /var/www/upgrade_iso.php & /var/www/upgrade_iso_action.php upload file parameter name align to files[].

Files:
1. As follow commit history

Image version: D0.00.XX.XXXX.XX
Image checksum: XXXXXXXX

Hardware PWB P/N : XXXXXXX
Hardware Version : XXXXXXX

EVSE/Projects/AX80/Apps/Module_Cabinet.c

@@ -471,6 +471,7 @@ int conn_updateGunInfo(int socketFd, int gun_index, Gun_Info *infoData)
 			ShmCharger->gun_info[gun_index].mcuFlag.isReadMeterIcCorrectionStatus = gunInfo.mcuFlag.isReadMeterIcCorrectionStatus;
 			ShmCharger->gun_info[gun_index].mcuFlag.isSetModelNamePass = gunInfo.mcuFlag.isSetModelNamePass;
 			ShmCharger->gun_info[gun_index].mcuFlag.isSetSerialNumberPass = gunInfo.mcuFlag.isSetSerialNumberPass;
+			ShmCharger->gun_info[gun_index].mcuFlag.isMcuUpgradeReq = gunInfo.mcuFlag.isMcuUpgradeReq;
 			ShmCharger->gun_info[gun_index].ccsHandshakeState = gunInfo.ccsHandshakeState;
 			ShmCharger->gun_info[gun_index].isUpgradeEnd = gunInfo.isUpgradeEnd;
 			ShmCharger->gun_info[gun_index].isUpgradePASS = gunInfo.isUpgradePASS;

EVSE/rootfs/var/www/upgrade_iso.php

@@ -82,7 +82,7 @@ img {
 			//var formData = new FormData(document.getElementById("file_iso"));
 			var file = fileInput.files[0];
 			formData.append("fw_tag", "iso");
-			formData.append("file", file);
+			formData.append("files[]", file);
 
 			// POST 請求必須設置表頭在 open() 下面，send() 上面
 			request.upload.onprogress = function(e) {

EVSE/rootfs/var/www/upgrade_iso_action.php

@@ -4,15 +4,18 @@
 
 	// 判斷如果是 GET 請求，則進行搜尋；如果是 POST 請求，則進行新建
 	// $_SERVER['REQUEST_METHOD'] 返回訪問頁面使用的請求方法
-	if ($_SERVER['REQUEST_METHOD'] == "GET") {
+	if ($_SERVER['REQUEST_METHOD'] == "GET") 
+	{
 		create();
-	} else if ($_SERVER['REQUEST_METHOD'] == "POST") {
+	} 
+	else if ($_SERVER['REQUEST_METHOD'] == "POST") 
+	{
 		create();
 	}
 
 	// 新建員工
-	function create() {
-
+	function create() 
+	{
 		include 'lang.php';
 		$lang = new Lang;
 		$lang->getLang();
@@ -20,44 +23,29 @@
 		$message = $lang->showWord("message_upgrade");
 
 		chdir('/root');
-//		if($_POST['fw_tag']=='iso')
-//		{
-			exec("rm /mnt/*.zip");
-			$fileCount = count($_FILES['files']['name']);
-
-			for ($i = 0; $i < $fileCount; $i++) {
-				if ($_FILES["files"]["error"][$i] > 0)
-				{
-					echo "Return Code: " . $_FILES["files"]["error"][$i] . "<br />";
-				}
-				else
-				{
-					// echo "Upload: " . $_FILES["file"]["name"] . "<br />";
-					// echo "Type: " . $_FILES["file"]["type"] . "<br />";
-					// echo "Size: " . ($_FILES["file"]["size"]) . " <br />";
-					// echo "Temp file: " . $_FILES["file"]["tmp_name"] . "<br />";
-					// echo "<font color=#000fff>Upgrade is completed</font><br />";
-				}
-				//ob_start();
-				sleep(1);
-				move_uploaded_file($_FILES["files"]["tmp_name"][$i],"/mnt/".$_FILES["files"]["name"][$i]);
+		exec("rm /mnt/*.zip");
+		$fileCount = count($_FILES['files']['name']);
+		for ($i = 0; $i < $fileCount; $i++) 
+		{
+			if ($_FILES["files"]["error"][$i] > 0)
+			{
+				echo "Return Code: " . $_FILES["files"]["error"][$i] . "<br />";
 			}
-			$fCount = count($_FILES['file']['name']);
-			if($fCount>0){
-				if ($_FILES["file"]["error"] > 0)
-				{
-					echo "Return Code: " . $_FILES["file"]["error"] . "<br />";
-				}
-				sleep(1);
-				move_uploaded_file($_FILES["file"]["tmp_name"],"/mnt/".$_FILES["file"]["name"]);
+			else
+			{
+				// echo "Upload: " . $_FILES["files"]["name"] . "<br />";
+				// echo "Type: " . $_FILES["files"]["type"] . "<br />";
+				// echo "Size: " . ($_FILES["files"]["size"]) . " <br />";
+				// echo "Temp file: " . $_FILES["files"]["tmp_name"] . "<br />";
+				// echo "<font color=#000fff>Upgrade is completed</font><br />";
 			}
-			chdir("/root");
-			exec("'./WebService' 'upgrade' '".$_FILES["files"]["name"][0]."'",$output,$return_var);
-//			echo 'Result:'.json_decode(trim($output[0]))->{'Result'}.'    Message:'.json_decode(trim($output[0]))->{'Message'};
-			echo '<font color=#ff0000>'.json_decode(trim($output[0]))->{'Message'}.'</font>';
-			//printf($output);
-//		}
-		shell_exec('sync;sync;sync');
+			sleep(1);
+			move_uploaded_file($_FILES["files"]["tmp_name"][$i],"/mnt/".$_FILES["files"]["name"][$i]);
+		}
+		chdir("/root");
+		exec("'./WebService' 'upgrade' '".$_FILES["files"]["name"][0]."'",$output,$return_var);
+		echo '<font color=#ff0000>'.json_decode(trim($output[0]))->{'Message'}.'</font>';
+		shell_exec('sync;sync;sync;');
 	}
 
 ?>