X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_enum.php;h=fc8e7e84577663fda658d833bce9deb5bee04702;hb=d98b59dd60e858d369d4cb55e097b376050d7020;hp=69ec25cd882a95b5a2d35ae3a2b696f097f364e9;hpb=bbe0fb74a3e92ec5e68edc9a7047f96fd9d76513;p=Pman.Core diff --git a/DataObjects/Core_enum.php b/DataObjects/Core_enum.php index 69ec25cd..fc8e7e84 100644 --- a/DataObjects/Core_enum.php +++ b/DataObjects/Core_enum.php @@ -158,12 +158,14 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject $tn = $this->tableName(); $x = $this->factory($tn); - if(empty($req['etype'])){ - if (empty($req['name'])) { + if(empty($req['etype']) || !strlen(trim($req['etype'])) ){ + + if (empty($req['name']) || !strlen(trim($req['name']))) { $roo->jerr('name or etype missing'); } + if($x->get('name', $req['name'])){ - $roo->jerr('name already exists'); + $roo->jerr("name already exists - '{$req['name']}'" ); } } else if (!empty($req['_bulk_names'])) { @@ -190,6 +192,10 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject $roo->jok("inserted"); } else { + if (empty($req['name']) || !strlen(trim($req['name']))) { + $roo->jerr('name missing'); + } + $x->whereAdd("etype = '{$this->escape($req['etype'])}' AND name = '{$this->escape($req['name'])}'"); $x->find(true); if($x->count() > 0){