diff --git a/bin/padmin b/bin/padmin index 5d0db8f..0305b48 100755 --- a/bin/padmin +++ b/bin/padmin @@ -160,7 +160,7 @@ function padminConsole($options) { //echo "Error, please, check ${post_install_script} file and execute padmin.php again\n"; - $climate->white()->backgroundRed()->out("Error, please, check ${post_install_script} file and execute padmin.php again"); + $climate->white()->backgroundRed()->out("Error, please, check {$post_install_script} file and execute padmin.php again"); } diff --git a/src/CoreFields/MoneyField.php b/src/CoreFields/MoneyField.php index 608845e..29d9490 100644 --- a/src/CoreFields/MoneyField.php +++ b/src/CoreFields/MoneyField.php @@ -45,6 +45,8 @@ class MoneyField extends DoubleField{ static function currency_format($value, $symbol_currency='€') { + settype($value, 'integer'); + return number_format($value, 2, MoneyField::$dec_point, MoneyField::$thousands_sep).' '.$symbol_currency; } diff --git a/src/CoreFields/ParentField.php b/src/CoreFields/ParentField.php index 6cac16f..0fbb659 100644 --- a/src/CoreFields/ParentField.php +++ b/src/CoreFields/ParentField.php @@ -11,6 +11,8 @@ class ParentField extends IntegerField{ //field related in the model... public $parent_model=''; + public $name_field=''; + public $name_value=''; function __construct($size=11, $name_field='', $name_value='') { diff --git a/src/CoreFields/PasswordField.php b/src/CoreFields/PasswordField.php index 0cec68d..2e67b8a 100644 --- a/src/CoreFields/PasswordField.php +++ b/src/CoreFields/PasswordField.php @@ -15,6 +15,7 @@ use PhangoApp\PhaI18n\I18n; class PasswordField extends CharField { + public $min_length; function __construct($size=255) { diff --git a/src/Forms/BaseForm.php b/src/Forms/BaseForm.php index bef2fe3..d38e0ea 100644 --- a/src/Forms/BaseForm.php +++ b/src/Forms/BaseForm.php @@ -24,6 +24,17 @@ class BaseForm { */ public $enctype=0; + public $label=''; + public $name=''; + public $default_value=''; + public $css=''; + public $type='text'; + public $required=0; + public $field; + public $comment_form=''; + public $txt_error=''; + public $extra_param=''; + public $form; public function __construct($name, $value, $extra_parameters=array()) { diff --git a/src/Forms/FileForm.php b/src/Forms/FileForm.php index f29ab5b..8c4e2af 100644 --- a/src/Forms/FileForm.php +++ b/src/Forms/FileForm.php @@ -11,6 +11,8 @@ use PhangoApp\PhaUtils\Utils; class FileForm extends BaseForm{ + public $file_url; + public function __construct($name, $value='') { @@ -29,8 +31,6 @@ class FileForm extends BaseForm{ } - - } -?> + diff --git a/src/Forms/SelectModelForm.php b/src/Forms/SelectModelForm.php index 9860199..5fb6556 100644 --- a/src/Forms/SelectModelForm.php +++ b/src/Forms/SelectModelForm.php @@ -23,6 +23,8 @@ class SelectModelForm extends SelectForm{ public $empty_value=true; + public $form; + public function __construct($name, $value, $model, $field_name, $field_value) { diff --git a/src/Forms/SelectModelFormByOrder.php b/src/Forms/SelectModelFormByOrder.php index 6888f06..7205052 100644 --- a/src/Forms/SelectModelFormByOrder.php +++ b/src/Forms/SelectModelFormByOrder.php @@ -11,6 +11,10 @@ class SelectModelFormByOrder extends SelectForm { public $model_name; public $identifier_field; public $field_parent; + public $model; + public $where; + public $null_yes; + public $form; public function __construct($name, $value, $model, $identifier_field, $field_parent, $where=['WHERE 1=1', []], $null_yes=1) { diff --git a/src/Webmodel.php b/src/Webmodel.php index d0d0376..7ebba84 100644 --- a/src/Webmodel.php +++ b/src/Webmodel.php @@ -74,7 +74,7 @@ class Webmodel { * String where save the query if error. */ - static public $save_query=array(); + static public $save_query=0; /** * Variable for the db prefix. For security, change this always. @@ -486,7 +486,8 @@ class Webmodel { Webmodel::$model[$name_model]=&$this; - Webmodel::$m->$name_model=&Webmodel::$model[$name_model]; + //Webmodel::$m->$name_model=&Webmodel::$model[$name_model]; + //Webmodel::$m->__set($name_model, Webmodel::$model[$name_model]); Webmodel::$model_type[get_class($this)]=1; @@ -2616,13 +2617,18 @@ class Webmodel { } //A simple shortcut for access to models - +/* class SuperModel { + public function __set(string $name, mixed $value) { + + echo $name; + $this->{$name}=&$value; + } } -Webmodel::$m=new SuperModel(); +Webmodel::$m=new SuperModel();*/ ?>