Merge branch 'development'

.gitignore

@@ -63,7 +63,7 @@ modules/shop
 modules/artificial_intelligence/assets/data/1_*
 modules/simple_erp
 modules/ishare
-modules/lifeline
+modules/lifelines
 modules/example
 modules/indonesia_area
 modules/market

application/core/CMS_AutoUpdate_Model.php

@@ -3,7 +3,7 @@
 class CMS_AutoUpdate_Model extends CMS_Model
 {
     // TODO: change this
-    private $CURRENT_VERSION = '1.1.2';
+    private $CURRENT_VERSION = '1.1.3';
     private static $module_updated = false;
 
     public function __construct()
@@ -690,5 +690,25 @@ private function __update_to_1_1_2(){
         $this->cms_add_config('meta_twitter_author_handler', '', 'Twitter author handler for SEO');
     }
 
+    private function __update_to_1_1_3(){
+        $t_user = cms_table_name('main_user');
+        $t_group = cms_table_name('main_group');
+        $t_privilege = cms_table_name('main_privilege');
+        $this->cms_adjust_tables(array(
+            $t_user => array(
+                'fields' => array(
+                    'user_name' => array('type' => 'VARCHAR', 'constraint' => 255, 'null' => FALSE),
+                    'email' => array('type' => 'VARCHAR', 'constraint' => 255, 'null' => FALSE)
+                )
+            ),
+            $t_group => array(
+                'fields' => array('group_name' => array('type' => 'VARCHAR', 'constraint' => 255, 'null' => FALSE))
+            ),
+            $t_privilege => array(
+                'fields' => array('privilege_name' => array('type' => 'VARCHAR', 'constraint' => 255, 'null' => FALSE))
+            )
+        ));
+
+    }
     // TODO : Write your upgrade function here (__update_to_x_y_x)
 }

assets/grocery_crud/themes/no-flexigrid/js/flexigrid-form.js

@@ -199,6 +199,13 @@ function is_numeric(input){
     return (input - 0) == input && input.length > 0;
 }
 
+if(typeof add_delete_all_feature != 'function'){
+    function add_delete_all_feature(url_delete_all, button_caption, notification_caption){
+        // Doing nothing. just to be here for the sake of compatibility to avoid reference error.
+        // Add all feature should only work on the view
+    }
+}
+
 // TODO: gonna be deprecated
 function IsNumeric(input){
     return is_numeric(input);

assets/grocery_crud/themes/no-flexigrid/js/flexigrid.js

@@ -263,7 +263,7 @@ function displaying_and_pages(this_container)
 	} else {
 		this_container.find('.page-ends-to').html( crud_page*per_page );
 	}
-} 
+}
 
 // additional code by gofrendi
 function add_delete_all_feature(url_delete_all, button_caption, notification_caption){

modules/cck/controllers/Manage.php

@@ -81,7 +81,7 @@ protected function make_crud($id_entity=NULL){
             $this->UNSET_PRINT = TRUE;
             $this->UNSET_EXPORT = TRUE;
         }
- 
+
         // call parent's make_crud
         $crud = parent::make_crud();
 
@@ -227,7 +227,7 @@ public function _before_insert_or_update($post_array, $primary_key=NULL){
                 $file_name = $this->randomize_string($file_name).$file_name;
                 $upload_path = FCPATH.'modules/'.$this->cms_module_path().'/assets/uploads/';
                 move_uploaded_file($tmp_name, $upload_path.$file_name);
-                @chmod($upload_path.$file_name, 644);
+                @chmod($upload_path.$file_name, 0744);
                 $post_array[$key] = $file_name;
             }
         }

modules/installer/models/Install_model.php

@@ -3,7 +3,7 @@ class Install_model extends CI_Model{
 
     private $__config_file = array();
 
-    private $VERSION        = '1.1.2';
+    private $VERSION        = '1.1.3';
     public $is_subsite      = FALSE;
     public $subsite         = '';
     public $subsite_aliases = '';
@@ -625,7 +625,7 @@ protected function create_all_table(){
         );
         $type_varchar_large_strict = array(
             'type' => 'VARCHAR',
-            'constraint' => '100',
+            'constraint' => '255',
             'null' => FALSE,
         );
         $type_user_agent = array(
@@ -658,7 +658,7 @@ protected function create_all_table(){
         // GROUP
         $fields = array(
                 'group_id'      => $type_primary_key,
-                'group_name'    => $type_varchar_small_strict,
+                'group_name'    => $type_varchar_large_strict,
                 'description'   => $type_text,
             );
         $sql_list[] = $this->create_table('main_group',$fields);
@@ -724,7 +724,7 @@ protected function create_all_table(){
         // PRIVILEGE
         $fields = array(
                 'privilege_id'      => $type_primary_key,
-                'privilege_name'    => $type_varchar_small_strict,
+                'privilege_name'    => $type_varchar_large_strict,
                 'title'             => $type_varchar_small,
                 'description'       => $type_text,
                 'authorization_id'  => $type_foreign_key_default_1,
@@ -735,8 +735,8 @@ protected function create_all_table(){
         if(!$this->is_subsite){
             $fields = array(
                     'user_id'           => $type_primary_key,
-                    'user_name'         => $type_varchar_small_strict,
-                    'email'             => $type_varchar_small,
+                    'user_name'         => $type_varchar_large_strict,
+                    'email'             => $type_varchar_large,
                     'password'          => $type_password,
                     'activation_code'   => $type_varchar_small,
                     'real_name'         => $type_varchar_large,

readme.md

@@ -39,7 +39,7 @@ No-CMS come with several batteries included:
 Release Information
 ===================
 
-- v1.1.2, Oct, 21, 2016
+- v1.1.3, Oct, 22, 2016
 
 
 Server Requirements