utf8 alpha and alphanum

composer.json

@@ -8,11 +8,11 @@
         }
     ],
     "require": {
-        "krutush/template": "dev-master"
+        "krutush/template": "dev-develop"
     },
     "autoload": {
         "psr-4": {
             "Krutush\\Form\\": "src/"
         }
     }
-}
+}

src/Element.php

@@ -16,17 +16,28 @@ class Element{
 
     public function name() : string{ return $this->data['name']; }
 
+    public function id(string $id): self{
+        $this->data['id'] = $id;
+        return $this;
+    }
+
+    public function label(string $label, string $more = ''): self {
+        $this->data['label'] = $label;
+        $this->data['label.more'] = $more;
+        return $this;
+    }
+
     public function required(bool $value = true) : self{
         $this->data['required'] = $value;
         return $this;
     }
 
-    public function value(string $value) : self{
+    public function value(string $value = null) : self{
         $this->data['value'] = $value;
         return $this;
     }
 
-    public function get() : ?string{
+    public function get(){
         return $this->data['value'];
     }
 
@@ -35,14 +46,22 @@ class Element{
         return $this;
     }
 
-    public function valid(mixed $data)/* :bool|string */{
+    public function valid($data)/* :bool|string */{
         if((!isset($data) || empty($data)) && isset($this->data['required']) && $this->data['required'] == true)
             return 'requis';
 
         return true;
     }
 
+    protected function getId(): string{
+        return isset($this->data['id']) ? $this->data['id'] : $this->data['name'];
+    }
+
+    protected function htmlLabel(): string{
+        return isset($this->data['label']) ? '<label for="'.$this->getId().'" '.$this->data['label.more'].'>'.$this->data['label']."</label>\n" : '';
+    }
+
     public function html(string $more = '') : string{
-        return '<span '.$more.'></span>';
+        return $this->htmlLabel().'<span '.$more.'></span>';
     }
 }

src/Form.php

@@ -11,15 +11,30 @@ class Form {
     private $name;
     private $errors = array();
     private $set = false;
+    private $csrfToken;
+    public static $csrfSession = '_form_token';
+    public static $csrfInput = "_token";
 
-    public function __construct(string $name, string $path, bool $extention = true, bool $folder = true){
+    public function __construct(string $name, string $path, string $extention = null, bool $folder = true, array $sets = array()){
         $this->name = $name;
+        $this->resetCsrf();
         $tpl = new Html($path, $extention, $folder);
         $tpl->set($name, $this)
+            ->sets($sets)
             ->run('buffer');
         return $this;
     }
 
+    public function resetCsrf(){
+        if(session_status() == PHP_SESSION_NONE) session_start(); //TODO: create Krutsh\Session
+        if(isset($_SESSION[static::$csrfSession][$this->name])){
+            $this->csrfToken = $_SESSION[static::$csrfSession][$this->name];
+        }else{
+            $this->csrfToken = base64_encode(random_bytes(6));
+            $_SESSION[static::$csrfSession][$this->name] = $this->csrfToken;
+        }
+    }
+
     public static function sanitize(array $data) : array{
         $return = array();
         foreach($data as $key => $value){
@@ -32,25 +47,38 @@ class Form {
     public function valid(array $data) : bool{
         $data = static::sanitize($data);
         $this->set = true;
+        if(!isset($_SESSION[static::$csrfSession][$this->name]) || !isset($data[static::$csrfInput]) || $_SESSION[static::$csrfSession][$this->name] != $data[static::$csrfInput]){
+            $this->error('Formulaire expiré');
+            return false;
+        }
         $valid = true;
         foreach($this->elements as $element){
             $value = isset($data[$element->name()]) ? $data[$element->name()] : null;
             $return = $element->valid($value);
             if($return !== true){
-                $this->errors[] = 'Le champ '.$element->name().' est '.$return.'.';
+                $this->error('Le champ '.$element->name().' est '.$return.'.', false);
                 $valid = false;
             }else{
                 $element->value($value);
             }
         }
+        if($valid)
+            unset($_SESSION[static::$csrfSession][$this->name]);
+
         return $valid;
     }
 
+    public function error(string $error, bool $reset = true){
+        $this->errors[] = $error;
+        if($reset)
+            $this->resetCsrf();
+    }
+
     public function name() : string{
         return $this->name;
     }
 
-    public function start(string $more = '', string $method = 'post', string $url = null) : string{
+    public function _start(string $more = '', string $method = 'post', string $url = null) : string{
         if(!in_array($method, array('post', 'get')))
             $method = 'post';
 
@@ -59,6 +87,7 @@ class Form {
             $this->url = $url;
         }
         $html = '<form method="'.$method.'" '.(isset($url) ? 'action="'.$url.'" ' : '').$more.'>';
+        $html .= '<input type="hidden" name="'.static::$csrfInput.'" value="'.$this->csrfToken.'">';
         $html .= "
 <script type=\"text/javascript\">
 function SelectOther(source, other){
@@ -83,11 +112,11 @@ function SelectOther(source, other){
         return $html;
     }
 
-    public function end(string $more = '') : string{
+    public function _end(string $more = '') : string{
         return '</form '.$more.'>';
     }
 
-    public function errors(string $more = '') : string{
+    public function _errors(string $more = '') : string{
         if(empty($this->errors))
             return '';
 
@@ -98,11 +127,11 @@ function SelectOther(source, other){
         return $html.'</div>';
     }
 
-    public function submit(string $name = null, string $more = '') : string{
+    public function _submit(string $name = null, string $more = '') : string{
         return '<input type="submit" '.(isset($name) ? 'value="'.$name.'" ' : '').$more.'>';
     }
 
-    function input(string $name, bool $add = true) : Element{
+    function _input(string $name, bool $add = true) : Element{
         if($add == false)
             return new Input($name);
 
@@ -116,7 +145,7 @@ function SelectOther(source, other){
         return $input;
     }
 
-    function select(string $name, bool $add = true) : Element{
+    function _select(string $name, bool $add = true) : Element{
         if($add == false)
             return new Select($name);
         if($this->set == true){
@@ -129,7 +158,7 @@ function SelectOther(source, other){
         return $input;
     }
 
-    function textarea(string $name) : Element{
+    function _textarea(string $name) : Element{
         if($this->set == true){
             $input = $this->get($name);
             if(isset($input))
@@ -145,7 +174,7 @@ function SelectOther(source, other){
             $this->elements[] = $thing;
     }
 
-    public function get(string $name) : ?Element{
+    public function get(string $name) : Element{
         foreach($this->elements as $element){
             if($element->name() == $name)
                 return $element;

src/Input.php

@@ -28,6 +28,46 @@ class Input extends Element{
         return $this;
     }
 
+    public function number(): Input{
+        $this->data['type'] = 'number';
+        $this->data['number'] = true;
+        return $this;
+    }
+
+    public function date(): Input{
+        $this->data['type'] = 'date';
+        $this->data['date'] = true;
+        return $this;
+    }
+
+    public function time(): Input{
+        $this->data['type'] = 'time';
+        $this->data['time'] = true;
+        return $this;
+    }
+
+    public function min(string $value) : Input{
+        $this->data['min'] = $value;
+        return $this;
+    }
+
+    public function max(string $value) : Input{
+        $this->data['max'] = $value;
+        return $this;
+    }
+
+    public function password(bool $complexity = false): Input{
+        $this->data['type'] = 'password';
+        $this->data['password'] = true;
+        if($complexity){
+            $regex = '^(?=.*\d)(?=.*[a-z])(?=.*[A-Z])(?=.*\W).{8,}$';
+            $this->data['pattern'] = $regex;
+            $this->data['regex'] = $regex;
+            $this->data['title'] = 'Mot de passe trop simple';
+        }
+        return $this;
+    }
+
     public function minlength(int $value) : Input{
         $this->data['minlength'] = $value;
         return $this;
@@ -41,7 +81,7 @@ class Input extends Element{
     public function alpha(string $value = '') : Input{
         $this->data['type'] = 'text';
         $this->data['title'] = 'Alphabétique';
-        $this->data['alpha'] = $value;
+        $this->data['alpha'] = $value; //TODO: add parttern
         return $this;
     }
 
@@ -64,45 +104,67 @@ class Input extends Element{
         return $this;
     }
 
-    public function valid(mixde $data)/*: bool|string*/{
+    public function valid($data)/*: bool|string*/{
         $parent = parent::valid($data);
 
         if($parent !== true || !isset($data))
             return $parent;
 
         if(!empty($data)){
-            if(isset($this->data['phone'])){
-                if($this->data['phone'] == true && !preg_match("#^((\+\d{1,3}(-| )?\(?\d\)?(-| )?\d{1,5})|(\(?\d{2,6}\)?))(-| )?(\d{3,4})(-| )?(\d{4})(( x| ext)\d{1,5}){0,1}$#", $data))
-                    return 'incorrect';
-            }else if(isset($this->data['email'])){
-                if($this->data['email'] == true && !filter_var($data, FILTER_VALIDATE_EMAIL))
-                    return 'incorrect';
-            }else if(isset($this->data['minlength'])){
-                if(strlen($data) < $this->data['minlength'])
-                    return 'trop court';
-            }else if(isset($this->data['maxlength'])){
-                if(strlen($data) > $this->data['maxlength'])
-                    return 'trop long';
-            }else if(isset($this->data['alpha'])){
-                if(!preg_match('#^[\p{L}'.$this->data['alpha'].']*$#', $data))
-                    return 'non alphabétique';
-            }else if(isset($this->data['alphanum'])){
-                if(!preg_match('#^[\p{L}\p{N}'.$this->data['alphanum'].']*$#', $data))
-                    return 'non alphanumérique';
-            }else if(isset($this->data['regex'])){
-                if(!preg_match('#'.$this->data['regex'].'#', $data))
+            if(isset($this->data['phone']) && $this->data['phone'] == true && !preg_match("#^((\+\d{1,3}(-| )?\(?\d\)?(-| )?\d{1,5})|(\(?\d{2,6}\)?))(-| )?(\d{3,4})(-| )?(\d{4})(( x| ext)\d{1,5}){0,1}$#", $data))
+                return 'incorrect';
+
+            if(isset($this->data['number']) && $this->data['number'] == true && !ctype_digit($data))
+                return 'non numérique';
+
+            if(isset($this->data['date']) && $this->data['date'] == true){
+                $d = \DateTime::createFromFormat('Y-m-d', $data);
+                if(!$d || $d->format('Y-m-d') != $data)
                     return 'incorrect';
             }
+            if(isset($this->data['time']) && $this->data['time'] == true){
+                $t = \DateTime::createFromFormat('H:i', $data);
+                if(!$t || $t->format('H:i') != $data)
+                    return 'incorrect';
+            }
+            if(isset($this->data['min']) && $data < $this->data['min'])
+                return 'trop petit';
+
+            if(isset($this->data['max']) && $data > $this->data['max'])
+                return 'trop grand';
+
+            if(isset($this->data['email']) && $this->data['email'] == true && !filter_var($data, FILTER_VALIDATE_EMAIL))
+                return 'incorrect';
+
+            if(isset($this->data['minlength']) && strlen($data) < $this->data['minlength'])
+                return 'trop court';
+
+            if(isset($this->data['maxlength']) && strlen($data) > $this->data['maxlength'])
+                return 'trop long';
+
+            if(isset($this->data['alpha']) && !preg_match('#^[\p{L}\p{M}'.$this->data['alpha'].']*$#', $data))
+                return 'non alphabétique';
+
+            if(isset($this->data['alphanum']) && !preg_match('#^[\p{L}\p{M}\p{N}'.$this->data['alphanum'].']*$#', $data))
+                return 'non alphanumérique';
+
+            if(isset($this->data['regex']) && !preg_match('#'.$this->data['regex'].'#', $data))
+                return 'incorrect';
+
         }
         return $parent;
     }
 
     public function html(string $more = '') : string{
-        return '<input name="'.$this->data['name'].'" '.
-        (isset($this->data['value']) ? 'value="'.$this->data['value'].'" ' : '').
+        return $this->htmlLabel().
+        '<input name="'.$this->data['name'].'" '.
+        'id="'.$this->getId().'" '.
+        (isset($this->data['value']) && !(isset($this->data['password']) && $this->data['password'] == true) ? 'value="'.$this->data['value'].'" ' : '').
         (isset($this->data['type']) ? 'type="'.$this->data['type'].'" ' : '').
         (isset($this->data['title']) ? 'title="'.$this->data['title'].'" ' : '').
         (isset($this->data['pattern']) ? 'pattern="'.$this->data['pattern'].'" ' : '').
+        (isset($this->data['min']) ? 'min="'.$this->data['min'].'" ' : '').
+        (isset($this->data['max']) ? 'max="'.$this->data['max'].'" ' : '').
         (isset($this->data['minlength']) ? 'minlength="'.$this->data['minlength'].'" ' : '').
         (isset($this->data['maxlength']) ? 'maxlength="'.$this->data['maxlength'].'" ' : '').
         (isset($this->data['required']) && $this->data['required'] == true ? 'required ' : '').

src/Select.php

@@ -33,7 +33,7 @@ class Select extends Element{
     }
 
 
-    public function valid(mixed $data)/*: bool|string*/{
+    public function valid($data)/*: bool|string*/{
         $parent = parent::valid($data);
         if($parent !== true || !isset($data))
             return $parent;
@@ -62,7 +62,9 @@ class Select extends Element{
             $options .= $option['more'].'>'.$option['text'].'</option>';
         }
 
-        $html = '<select name="'.$this->data['name'].'" ';
+        $html = $this->htmlLabel().
+        '<select name="'.$this->data['name'].'" '.
+        'id="'.$this->getId().'" ';
         $inputmore = '';
         if(isset($this->data['other.text'])){
             $options .= '<option value="'.$this->data['other.text'].'" '.(isset($this->data['value']) && $selected == false ? 'selected="selected" ' : '').'>'.$this->data['other.text'].'</option>';

src/TextArea.php

@@ -3,14 +3,15 @@
 namespace Krutush\Form;
 
 class TextArea extends Element{
-    public function valid(mixed $data)/*: bool|string*/{
+    public function valid($data)/*: bool|string*/{
         return parent::valid($data);
     }
 
     public function html(string $more = '') : string{
-        return '<textarea name="'.$this->data['name'].'" '.
-        (isset($this->data['value']) ? 'value="'.$this->data['value'].'" ' : '').
+        return $this->htmlLabel().
+        '<textarea name="'.$this->data['name'].'" '.
+        'id="'.$this->getId().'" '.
         (isset($this->data['required']) && $this->data['required'] == true ? 'required ' : '').
-        $more.'></textarea>';
+        $more.'>'.(isset($this->data['value']) ? $this->data['value'] : '').'</textarea>';
     }
 }