RanchiMall/php-mpos
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update worker.class.php

Browse Source 
Fix for issue #957
This commit is contained in:
Joey 2013-12-19 06:48:00 -05:00
parent 722432fecc
commit fcebc8eb2b
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
public/include/classes/worker.class.php
View File

@ -29,7 +29,8 @@ class Worker extends Base {
$value['username'] = "$username." . $value['username']; $value['username'] = "$username." . $value['username'];
// Ensure we have a sane worker name // Ensure we have a sane worker name
$wData = explode('.', $value['username']); $wData = explode('.', $value['username']);
if (!preg_match('/[a-z_\-0-9]/i', $wData[1]) || strlen($value['username']) > 50) { $validName = (bool) preg_match("/^[0-9a-zA-Z_\-]*$/", $wData[1]);
if ($validName === false || strlen($value['username']) > 50) {
$validWorker = 0; $validWorker = 0;
} }
if ($validWorker) { if ($validWorker) {
@ -235,7 +236,8 @@ class Worker extends Base {
$this->setErrorMessage($this->getErrorMsg('E0058')); $this->setErrorMessage($this->getErrorMsg('E0058'));
return false; return false;
} }
if (!preg_match('/[a-z_\-0-9]i/', $workerName)) { $validName = (bool) preg_match("/^[0-9a-zA-Z_\-]*$/", $wData[1]);
if ($validName === false) {
$this->setErrorMessage($this->getErrorMsg('E0072')); $this->setErrorMessage($this->getErrorMsg('E0072'));
return false; return false;
} }