Skip to content

Commit 4dd7450

Browse files
authored
Merge pull request #71 from thib66/fix-php7.3-regexp-hyphen
fix php7.3 regexp hyphen
2 parents ccaa8ea + a1a4667 commit 4dd7450

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

app_model.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public function add($userid,$app,$name)
7878
{
7979
$userid = (int) $userid;
8080
if (preg_replace('/[^\p{N}\p{L}]/u','',$app)!=$app) return array('success'=>false, "message"=>"Invalid app");
81-
if (preg_replace('/[^\p{N}\p{L}_\s-:]/u','',$name)!=$name) return array('success'=>false, "message"=>"Invalid app name");
81+
if (preg_replace('/[^\p{N}\p{L}_\s\-:]/u','',$name)!=$name) return array('success'=>false, "message"=>"Invalid app name");
8282

8383
// Load config from database
8484
$applist = $this->get($userid);
@@ -100,7 +100,7 @@ public function add($userid,$app,$name)
100100
public function remove($userid,$name)
101101
{
102102
$userid = (int) $userid;
103-
if (preg_replace('/[^\p{N}\p{L}_\s-:]/u','',$name)!=$name) return array('success'=>false, "message"=>"Invalid app name");
103+
if (preg_replace('/[^\p{N}\p{L}_\s\-:]/u','',$name)!=$name) return array('success'=>false, "message"=>"Invalid app name");
104104

105105
// Load config from database
106106
$applist = $this->get($userid);
@@ -120,7 +120,7 @@ public function remove($userid,$name)
120120
public function set_config($userid,$name,$config)
121121
{
122122
$userid = (int) $userid;
123-
if (preg_replace('/[^\p{N}\p{L}_\s-:]/u','',$name)!=$name) return array('success'=>false, "message"=>"Invalid app name");
123+
if (preg_replace('/[^\p{N}\p{L}_\s\-:]/u','',$name)!=$name) return array('success'=>false, "message"=>"Invalid app name");
124124
// Config sanitisation
125125
$config = json_decode($config);
126126
if (!$config || $config===null) return array('success'=>false, "message"=>"Could not parse json");
@@ -167,7 +167,7 @@ public function set_config($userid,$name,$config)
167167
public function get_config($userid,$name)
168168
{
169169
$userid = (int) $userid;
170-
if (preg_replace('/[^\p{N}\p{L}_\s-:]/u','',$name)!=$name) return array('success'=>false, "message"=>"Invalid app name");
170+
if (preg_replace('/[^\p{N}\p{L}_\s\-:]/u','',$name)!=$name) return array('success'=>false, "message"=>"Invalid app name");
171171

172172
$applist = $this->get($userid);
173173
if (!isset($applist->$name)) return array('success'=>false, "message"=>"App does not exist with name $name");

0 commit comments

Comments
 (0)