phangoapp/phamodels
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes on fields for show errors properly

Browse source
This commit is contained in:
Antonio de la Rosa 2015-08-27 17:25:07 +02:00
parent f0860b413a
commit f3b4b4e454
5 changed files with 35 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/CoreFields/EmailField.php
View file

@ -50,7 +50,7 @@ class EmailField extends PhangoField {
else else
{ {
$this->std_error.='Email format error'; $this->std_error='Email format error';
return ''; return '';

15
src/CoreFields/PasswordField.php
View file

@ -35,9 +35,13 @@ class PasswordField extends CharField {
} }
/*
$token_pass=Utils::generate_random_password(); $token_pass=Utils::generate_random_password();
$hash_password=$token_pass.'_'.sha1($token_pass.'_'.$value); $hash_password=$token_pass.'_'.sha1($token_pass.'_'.$value);
*/
$hash_password=password_hash($value, PASSWORD_DEFAULT);
return $hash_password; return $hash_password;
@ -50,8 +54,8 @@ class PasswordField extends CharField {
//If pass have _ check if work fine... //If pass have _ check if work fine...
$token_pass=preg_replace('/(.*)[_].*/', '$1', $hash_password_check); //$token_pass=preg_replace('/(.*)[_].*/', '$1', $hash_password_check);
/*
$hash_password=$token_pass.'_'.sha1($token_pass.'_'.$value); $hash_password=$token_pass.'_'.sha1($token_pass.'_'.$value);
if($hash_password==$hash_password_check) if($hash_password==$hash_password_check)
@ -59,6 +63,13 @@ class PasswordField extends CharField {
return true; return true;
}*/
if(password_verify($value, $hash_password_check))
{
return true;
} }
return false; return false;

2
src/CoreFields/PrimaryField.php
View file

@ -22,7 +22,7 @@ class PrimaryField extends PhangoField {
* Initial label for the field. The label is used for create forms from a PhangoField. * Initial label for the field. The label is used for create forms from a PhangoField.
*/ */
public $label=""; public $label="#ID";
/** /**
* Boolean value that is used for check if the field is required for fill a row in the db model. * Boolean value that is used for check if the field is required for fill a row in the db model.

19
src/ModelForm.php
View file

@ -327,7 +327,7 @@ class ModelForm {
{ {
$form->std_error=$form->field->std_error; $form->std_error=$form->field->std_error;
} }
else else
{ {
@ -390,9 +390,9 @@ class ModelForm {
if(isset($arr_form[$name_field])) if(isset($arr_form[$name_field]))
{ {
if($arr_form[$name_field]->field->std_error!='' && $show_error==1) if($show_error==1)
{ {
/*
if($arr_form[$name_field]->std_error!='') if($arr_form[$name_field]->std_error!='')
{ {
@ -406,7 +406,20 @@ class ModelForm {
$arr_form[$name_field]->std_error=$arr_form[$name_field]->field->std_error; $arr_form[$name_field]->std_error=$arr_form[$name_field]->field->std_error;
}*/
if($arr_form[$name_field]->field->std_error!='')
{
$arr_form[$name_field]->std_error=$arr_form[$name_field]->field->std_error;
} }
/*else
{
}*/
} }

5
src/Webmodel.php
View file

@ -608,6 +608,7 @@ class Webmodel {
{ {
$this->std_error.=I18n::lang('error_model', 'cant_insert', 'Can\'t insert').' '; $this->std_error.=I18n::lang('error_model', 'cant_insert', 'Can\'t insert').' ';
ModelForm::pass_errors_to_form($this);
return 0; return 0;
} }
@ -621,6 +622,7 @@ class Webmodel {
else else
{ {
ModelForm::pass_errors_to_form($this);
$this->std_error.=I18n::lang('error_model', 'cant_insert', 'Can\'t insert').' '; $this->std_error.=I18n::lang('error_model', 'cant_insert', 'Can\'t insert').' ';
return 0; return 0;
@ -734,6 +736,7 @@ class Webmodel {
{ {
$this->std_error.=I18n::lang('error_model', 'cant_update', 'Can\'t update').' '; $this->std_error.=I18n::lang('error_model', 'cant_update', 'Can\'t update').' ';
ModelForm::pass_errors_to_form($this);
return 0; return 0;
} }
@ -747,7 +750,7 @@ class Webmodel {
else else
{ {
//Validation of $post fail, add error to $model->std_error //Validation of $post fail, add error to $model->std_error
ModelForm::pass_errors_to_form($this);
$this->std_error.=I18n::lang('error_model', 'cant_update', 'Can\'t update').' '; $this->std_error.=I18n::lang('error_model', 'cant_update', 'Can\'t update').' ';
return 0; return 0;