Optimize

Author: yidas

Diff for: README.md

@@ -9,7 +9,6 @@
 CodeIgniter 3 Active Record (ORM) Standard Model supported Read & Write Connections
 
 [![Latest Stable Version](https://poser.pugx.org/yidas/codeigniter-model/v/stable?format=flat-square)](https://packagist.org/packages/yidas/codeigniter-model)
-[![Latest Unstable Version](https://poser.pugx.org/yidas/codeigniter-model/v/unstable?format=flat-square)](https://packagist.org/packages/yidas/codeigniter-model)
 [![License](https://poser.pugx.org/yidas/codeigniter-model/license?format=flat-square)](https://packagist.org/packages/yidas/codeigniter-model)
 
 This ORM Model extension is collected into [yidas/codeigniter-pack](https://github.com/yidas/codeigniter-pack) which is a complete solution for Codeigniter framework.
@@ -931,7 +930,7 @@ public array getErrors()
 
 ### Declaring Rules
 
-To make `validate()` really work, you should declare validation rules for the attributes you plan to validate. This should be done by overriding the `rules()` method.
+To make `validate()` really work, you should declare validation rules for the attributes you plan to validate. This should be done by overriding the `rules()` method with returning [CodeIgniter Rules](https://www.codeigniter.com/userguide3/libraries/form_validation.html#setting-rules-using-an-array).
 
 #### `rules()`
 
@@ -963,7 +962,7 @@ class PostsModel extends yidas\Model
 }
 ```
 
-> The validation rules and pattern could refer [CodeIgniter Rule Reference](https://www.codeigniter.com/userguide3/libraries/form_validation.html#rule-reference)
+> The returning array format could refer [CodeIgniter - Setting Rules Using an Array](https://www.codeigniter.com/userguide3/libraries/form_validation.html#setting-rules-using-an-array), and the rules pattern could refer [CodeIgniter - Rule Reference](https://www.codeigniter.com/userguide3/libraries/form_validation.html#rule-reference)
 
 #### Error Message with Language
 
@@ -1027,6 +1026,7 @@ public function filters()
         [['name'], function($value) {   // Perform defined anonymous function. 'value' => '[Filtered]value'
             return "[Filtered]" . $value;
         }],
+        [['content'], [$this->security, 'xss_clean']], // Perform CodeIgniter XSS Filtering for content input data
     ];
 }
 ```

Diff for: example/userACL/My_model.php

@@ -76,34 +76,12 @@ class My_model extends yidas\Model
      */
     protected $deletedUserAttribute = 'deleted_by';
 
-    /**
-     * @var int Application ACL
-     */
-    protected $companyID;
-
-    /**
-     * @var int Application User
-     */
-    protected $userID;
-
     function __construct()
     {
         parent::__construct();
 
-        // Assgin UserID and CompanyID from your own App mechanism
-        $this->loadACL();
-    }
-    
-    /**
-     * Load ACL from application
-     * 
-     * @param int $companyID
-     * @param int $userID
-     */
-    public function loadACL($companyID=NULL, $userID=NULL)
-    {
-        $this->companyID = ($companyID) ? $companyID : $this->config->item('sessionCompanyID');
-        $this->userID = ($userID) ? $userID : $this->config->item('sessionUserID');
+        // Load your own user library for companyID and userID data 
+        $this->load->library("user");
     }
 
     /**
@@ -115,15 +93,15 @@ protected function _globalScopes()
 
             $this->getBuilder()->where(
                 $this->_field($this->companyAttribute), 
-                $this->companyID
+                $this->user->getCompanyID();
                 );
         }
 
         if ($this->userAttribute) {
 
             $this->getBuilder()->where(
                 $this->_field($this->userAttribute), 
-                $this->userID
+                $this->user->getID();
                 );
         }
         return parent::_globalScopes();
@@ -136,16 +114,16 @@ protected function _attrEventBeforeInsert(&$attributes)
         // Auto Company
         if ($this->companyAttribute && !isset($attributes[$this->companyAttribute])) {
 
-            $attributes[$this->companyAttribute] = $this->companyID;
+            $attributes[$this->companyAttribute] = $this->user->getCompanyID();;
         }
         // Auto User
         if ($this->userAttribute && !isset($attributes[$this->userAttribute])) {
 
-            $attributes[$this->userAttribute] = $this->userID;
+            $attributes[$this->userAttribute] = $this->user->getID();;
         }
         // Auto created_by
         if ($this->createdUserAttribute && !isset($attributes[$this->createdUserAttribute])) {
-            $attributes[$this->createdUserAttribute] = $this->userID;
+            $attributes[$this->createdUserAttribute] = $this->user->getID();
         }
 
         return parent::_attrEventBeforeInsert($attributes);
@@ -157,7 +135,7 @@ public function _attrEventBeforeUpdate(&$attributes)
     {
         // Auto updated_by
         if ($this->updatedUserAttribute && !isset($attributes[$this->updatedUserAttribute])) {
-            $attributes[$this->updatedUserAttribute] = $this->userID;
+            $attributes[$this->updatedUserAttribute] = $this->user->getID();
         }
         return parent::_attrEventBeforeUpdate($attributes);
     }
@@ -168,7 +146,7 @@ public function _attrEventBeforeDelete(&$attributes)
     {
         // Auto deleted_by
         if ($this->deletedUserAttribute && !isset($attributes[$this->deletedUserAttribute])) {
-            $attributes[$this->deletedUserAttribute] = $this->userID;
+            $attributes[$this->deletedUserAttribute] = $this->user->getID();
         }
         return parent::_attrEventBeforeDelete($attributes);
     }

Diff for: example/userACL/README.md

@@ -47,7 +47,7 @@ By default, `My_model` assumes that each row data in model is belong to a user,
 ```php
 class Post_model extends My_model
 {
-    protected $userAttribute = NULL;
+    protected $userAttribute = false;
 }
 ```
 
@@ -67,7 +67,7 @@ By default, `My_model` assumes that each row data in model is belong to a compan
 ```php
 class Post_model extends My_model
 {
-    protected $companyAttribute = NULL;
+    protected $companyAttribute = false;
 }
 ```
 

Diff for: src/Model.php

@@ -625,7 +625,7 @@ public function batchInsert($data, $runValidation=true)
 
             // Validation
             if ($runValidation && false===$attributes=$this->validate($attributes, true))
-            return false; 
+                return false; 
 
             $this->_attrEventBeforeInsert($attributes);
         }