diff --git a/classes/db.class.php b/classes/db.class.php index 59226c5..b597cd3 100755 --- a/classes/db.class.php +++ b/classes/db.class.php @@ -205,11 +205,9 @@ public function DatabaseConnect() } else { $row = mysqli_fetch_array($this->sqlResult); } - $rs = $row[0]; - if(!$rs) - $rs = 0; - + $rs = ($row && isset($row[0])) ? $row[0] : 0; + $this->CleanQuery(); return $rs; diff --git a/classes/usuario.class.php b/classes/usuario.class.php index dca3b4c..030842a 100755 --- a/classes/usuario.class.php +++ b/classes/usuario.class.php @@ -117,7 +117,7 @@ class Usuario extends Main public function setCodigoPostal($value) { $this->Util()->ValidateString($value, $max_chars=50, $minChars = 0, "Codigo Postal"); - $this->codigoPostal = $value; + $this->codigoPostal = empty($value) ? 0 : $value; } public function setTelefono($value) @@ -156,10 +156,10 @@ class Usuario extends Main $this->tipo = $value; } - public function setSucursalId($value) + public function setSucursalId($value) { $this->Util()->ValidateString($value, $max_chars=300, $minChars = 0, 'Sucursal'); - $this->sucursalId = $value; + $this->sucursalId = empty($value) ? 0 : $value; } public function setEmail($value) @@ -227,40 +227,45 @@ class Usuario extends Main public function Save() { - if($this->Util()->PrintErrors()){ - return false; + if($this->Util()->PrintErrors()){ + return false; } - + + $identificacion = isset($this->identificacion) ? $this->identificacion : ''; + $comprobante = isset($this->comprobante) ? $this->comprobante : ''; + $db = new DB(true); $db->setQuery(" - INSERT INTO usuario ( + INSERT INTO usuario ( empresaId, nombre, - apellidos, + apellidos, calle, - noInt, - noExt, - referencia, - colonia, - localidad, - municipio, + noInt, + noExt, + referencia, + colonia, + localidad, + municipio, estado, - pais, + pais, codigoPostal, telefono, celular, noImss, curp, rfc, - email, - password, + identificacion, + comprobante, + email, + password, `type`, - sucursalId - ) + sucursalId + ) VALUES ( '".$_SESSION["empresaId"]."', '".$this->nombre."', - '".$this->apellidos."', + '".$this->apellidos."', '".$this->calle."', '".$this->noInt."', '".$this->noExt."', @@ -276,11 +281,12 @@ class Usuario extends Main '".$this->noImss."', '".$this->curp."', '".$this->rfc."', + '".$identificacion."', + '".$comprobante."', '".$this->email."', '".$this->passwd."', '".$this->tipo."', - '".$this->sucursalId."')" - ); + '".$this->sucursalId."')"); $usuarioId = $db->InsertData(); $this->Util()->setError(20017, "complete"); @@ -494,10 +500,12 @@ class Usuario extends Main } function IsEmailTaked(){ - + + $sqlAdd = ''; + if($this->usuarioId) $sqlAdd = ' AND usuarioId <> "'.$this->usuarioId.'"'; - + $sql = 'SELECT usuarioId FROM usuario WHERE email = "'.$this->email.'" '.$sqlAdd.' diff --git a/classes/util.class.php b/classes/util.class.php index 61fc4c5..42a0faa 100755 --- a/classes/util.class.php +++ b/classes/util.class.php @@ -168,15 +168,15 @@ class Util extends SystemError return true; } }//ValidateFloat - - function ValidateMail($mail, $field) + + function ValidateMail($mail, $field = 'Email') { $mail = strtolower($mail); if (!preg_match('/^[_a-zA-Z0-9-]+(\.[_a-zA-Z0-9-]+)*@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)+$/',trim($mail))) { return $this->setError(10002, "error", "", $field); } - } + } function ValidateUrl($url) { @@ -477,12 +477,16 @@ class Util extends SystemError function PrintErrors() { + if(empty($this->error)){ + return false; + } + $errorStr = "