Skip to content

Commit 65c3fad

Browse files
committed
2017.07.14. / official release
- setup_net_ok.php : ssid comment bug fix
1 parent c1350c1 commit 65c3fad

File tree

5 files changed

+11
-28
lines changed

5 files changed

+11
-28
lines changed

config.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?php
22

3-
define("PHPOC_PKG_INFO", "arduino shield, 1.0.1,");
3+
define("PHPOC_PKG_INFO", "arduino shield, 1.0.2,");
44
define("NM0_ENVU_SIZE", 512);
55
define("NM0_ENVU_OFFSET", 1536);
66

setup_info.php

+2-1
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,8 @@
273273
</table>
274274
<?php
275275
}
276-
?>
276+
?>
277+
<br /><br /><br />
277278
</center>
278279
</form>
279280
<div id="footer">

setup_net.php

-6
Original file line numberDiff line numberDiff line change
@@ -163,12 +163,6 @@ function chkWlan()
163163
phpoc_setup.hide_key.disabled = "";
164164

165165
chkChannel();
166-
}
167-
168-
if('<?php echo $shared_key;?>' == "")
169-
{
170-
phpoc_setup.shared_key.disabled = "true";
171-
phpoc_setup.hide_key.disabled = "true";
172166
}
173167
}
174168

setup_net_ok.php

+6-6
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@
4444
$ip6_opt = (int) _POST("ip6_opt"); // Enable 1 - Disbale 0 (IPv6)
4545
$shared_key = _POST("shared_key");
4646
$ssid = hex2bin(_POST("ssid_raw"));
47-
// $ssid = bin2hex(_POST("ssid"));
48-
// $ssid_raw = _POST("ssid_raw");
47+
$ssid = bin2hex(_POST("ssid"));
48+
$ssid_raw = _POST("ssid_raw");
4949

50-
// if ( $ssid != $ssid_raw )
51-
// $ssid = hex2bin($ssid);
52-
// else
53-
// $ssid = hex2bin($ssid_raw);
50+
if ( $ssid != $ssid_raw )
51+
$ssid = hex2bin($ssid);
52+
else
53+
$ssid = hex2bin($ssid_raw);
5454

5555
$envs = envs_read();
5656

setup_search_ap.php

+2-14
Original file line numberDiff line numberDiff line change
@@ -62,22 +62,10 @@
6262
</style>
6363
<script type="text/javascript">
6464

65-
function select(ssid, ssid_raw, security)
65+
function select(ssid, ssid_raw)
6666
{
6767
window.opener.parent.document.phpoc_setup.ssid.value = ssid;
6868
window.opener.parent.document.phpoc_setup.ssid_raw.value = ssid_raw;
69-
70-
if (security == "None")
71-
{
72-
window.opener.parent.document.phpoc_setup.shared_key.value = "";
73-
window.opener.parent.document.phpoc_setup.shared_key.disabled = true;
74-
window.opener.parent.document.phpoc_setup.hide_key.disabled = true;
75-
}
76-
else
77-
{
78-
window.opener.parent.document.phpoc_setup.shared_key.disabled = false;
79-
window.opener.parent.document.phpoc_setup.hide_key.disabled = false;
80-
}
8169
window.close();
8270
}
8371

@@ -280,7 +268,7 @@ function get_item($src, $index, $delimiter)
280268
<td width="170px" class="theader"><?php echo $ssid;?></td>
281269
<td><?php echo $security;?></td>
282270
<td><?php echo "-",$rssi,"dBm";?></td>
283-
<td align="center"><button type="button" onclick="select('<?php echo $ssid?>', '<?php echo $ssid_raw?>', '<?php echo $security?>')";>Select</button></td>
271+
<td align="center"><button type="button" onclick="select('<?php echo $ssid?>', '<?php echo $ssid_raw?>')";>Select</button></td>
284272
</tr>
285273
<?php
286274

0 commit comments

Comments
 (0)