Pi-Hole/web
1
0
Fork 0
mirror of https://github.com/pi-hole/web.git synced 2025-12-24 20:55:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1292 from pi-hole/tweak/group_name_separators

Browse Source 
Allow spaces in groups when wrapping names in "..."
This commit is contained in:
DL6ER
2020-06-02 13:43:49 +02:00
committed by GitHub
parent d518a1d43d 6a80f8c2a2
commit 580149e91f
4 changed files with 50 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
scripts/pi-hole/php/groups.php
View File

@@ -41,6 +41,37 @@ function JSON_error($message = null)
echo json_encode($response);
}
function space_aware_explode($input)
{
$ret = array();
$quoted = false;
$pos = 0;
// Loop over input string
for ($i = 0; $i < strlen($input); $i++)
{
// Get current character
$c = $input[$i];
// If current character is a space (or comma) and we're outside
// of a quoted region, we accept this character as separator
if (($c == ' ' || $c == ',') && !$quoted) {
$ret[] = str_replace('"', '', substr($input, $pos, $i - $pos));
$pos = $i+1;
}
elseif($c == '"' && !$quoted)
$quoted = true; // Quotation begins
elseif($c == '"' && $quoted)
$quoted = false; // Quotation ends here
}
// Get last element of the string
if ($pos > 0) {
$ret[] = substr($input, $pos);
}
return $ret;
}
if ($_POST['action'] == 'get_groups') {
// List all available groups
try {
@@ -58,7 +89,7 @@ if ($_POST['action'] == 'get_groups') {
} elseif ($_POST['action'] == 'add_group') {
// Add new group
try {
$names = explode(' ', trim($_POST['name']));
$names = space_aware_explode(trim($_POST['name']));
$total = count($names);
$added = 0;
$stmt = $db->prepare('INSERT INTO "group" (name,description) VALUES (:name,:desc)');