frodovdr/raspap-webgui
1
0
Fork 0
mirror of https://github.com/billz/raspap-webgui.git synced 2023-10-10 13:37:24 +02:00
Code Issues Releases Wiki Activity

use special multibyte shell escaping to support unicode ssid names with qr code

Browse Source
This commit is contained in:
glaszig 2021-05-08 14:24:15 -03:00
parent 3969db61b0
commit 45a50edc41
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/img/wifi-qr-code.php
View File

@ -42,7 +42,7 @@ $ssid = qr_encode($ssid);
$password = qr_encode($password); $password = qr_encode($password);
$data = "WIFI:S:$ssid;T:$type;P:$password;$hidden;"; $data = "WIFI:S:$ssid;T:$type;P:$password;$hidden;";
$command = "qrencode -t svg -m 0 -o - " . escapeshellarg($data); $command = "qrencode -t svg -m 0 -o - " . mb_escapeshellarg($data);
$svg = shell_exec($command); $svg = shell_exec($command);
$config_mtime = filemtime(RASPI_HOSTAPD_CONFIG); $config_mtime = filemtime(RASPI_HOSTAPD_CONFIG);

12
includes/functions.php
View File

@ -518,6 +518,18 @@ function cache($key, $callback)
} }
} }
// insspired by
// http://markushedlund.com/dev/php-escapeshellarg-with-unicodeutf-8-support
function mb_escapeshellarg($arg)
{
$isWindows = strtolower(substr(PHP_OS, 0, 3)) === 'win';
if ($isWindows) {
return '"' . str_replace(array('"', '%'), '', $arg) . '"';
} else {
return "'" . str_replace("'", "'\\''", $arg) . "'";
}
}
function dnsServers() function dnsServers()
{ {
$data = json_decode(file_get_contents("./config/dns-servers.json")); $data = json_decode(file_get_contents("./config/dns-servers.json"));