2017.07.14. / official release

- setup_net_ok.php : ssid comment bug fix
phpoc · Jul 14, 2017 · 65c3fad · 65c3fad
1 parent c1350c1
commit 65c3fad
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 28 deletions.
diff --git a/config.php b/config.php
@@ -1,6 +1,6 @@
 <?php
 
-define("PHPOC_PKG_INFO", "arduino shield, 1.0.1,");
+define("PHPOC_PKG_INFO", "arduino shield, 1.0.2,");
 define("NM0_ENVU_SIZE", 512);
 define("NM0_ENVU_OFFSET", 1536);
 

diff --git a/setup_info.php b/setup_info.php
@@ -273,7 +273,8 @@
 		</table>
 		<?php 
 		}
-		?>
+		?>		
+		<br /><br /><br />
 	</center>	
 	</form>
 	<div id="footer">

diff --git a/setup_net.php b/setup_net.php
@@ -163,12 +163,6 @@ function chkWlan()
 			phpoc_setup.hide_key.disabled = "";	
 
 			chkChannel();			
-		}
-
-		if('<?php echo $shared_key;?>' == "")
-		{
-			phpoc_setup.shared_key.disabled = "true";
-			phpoc_setup.hide_key.disabled = "true";	
 		}		
 	}
 

diff --git a/setup_net_ok.php b/setup_net_ok.php
@@ -44,13 +44,13 @@
 $ip6_opt      = (int) _POST("ip6_opt");   // Enable 1 - Disbale 0 (IPv6)
 $shared_key   = _POST("shared_key");
 $ssid   	  = hex2bin(_POST("ssid_raw"));
-// $ssid   	  = bin2hex(_POST("ssid"));
-// $ssid_raw     = _POST("ssid_raw");
+$ssid   	  = bin2hex(_POST("ssid"));
+$ssid_raw     = _POST("ssid_raw");
 
-// if ( $ssid != $ssid_raw )
-	// $ssid    = hex2bin($ssid);
-// else
-	// $ssid    = hex2bin($ssid_raw);
+if ( $ssid != $ssid_raw )
+	$ssid    = hex2bin($ssid);
+else
+	$ssid    = hex2bin($ssid_raw);
 
 $envs = envs_read();
 

diff --git a/setup_search_ap.php b/setup_search_ap.php
@@ -62,22 +62,10 @@
 	</style>
 	<script type="text/javascript">
 
-	function select(ssid, ssid_raw, security)
+	function select(ssid, ssid_raw)
 	{
 		window.opener.parent.document.phpoc_setup.ssid.value = ssid;
 		window.opener.parent.document.phpoc_setup.ssid_raw.value = ssid_raw;
-
-		if (security == "None")
-		{
-			window.opener.parent.document.phpoc_setup.shared_key.value = "";
-			window.opener.parent.document.phpoc_setup.shared_key.disabled = true;
-			window.opener.parent.document.phpoc_setup.hide_key.disabled = true;
-		}
-		else
-		{
-			window.opener.parent.document.phpoc_setup.shared_key.disabled = false;
-			window.opener.parent.document.phpoc_setup.hide_key.disabled = false;
-		}	
 		window.close();
 	}
 
@@ -280,7 +268,7 @@ function get_item($src, $index, $delimiter)
 				<td width="170px" class="theader"><?php echo $ssid;?></td>	
 				<td><?php echo $security;?></td>
 				<td><?php echo "-",$rssi,"dBm";?></td>
-				<td align="center"><button type="button" onclick="select('<?php echo $ssid?>', '<?php echo $ssid_raw?>', '<?php echo $security?>')";>Select</button></td>
+				<td align="center"><button type="button" onclick="select('<?php echo $ssid?>', '<?php echo $ssid_raw?>')";>Select</button></td>
 			</tr>
 		<?php