fixes

Author: numerogeek

README.md

@@ -9,6 +9,10 @@ Download and install the module through the Admin or Manually
 
 ## How to use
 
+### Quick Import
+
+You can choose to run a _Quick Import_ which will act as a one-time import. Simply follow the steps in the Admin to complete.
+
 ### Profiles
 
 Profiles can be used to setup a common import you will run multiple times. A Profile will store your destination Stream and field mapping to eliminate these steps in the future.
@@ -26,4 +30,4 @@ It's in beta for now, but we all need import system in our favorite CMS !
 
 ## Issues
 
-Please submit any issues back to the Github issue tracker: <https://github.com/bergeo-fr/streams_import>
+Please submit any issues back to the Github issue tracker: <https://github.com/bergeo-fr/streams_import>

config/streams_import_c.php

@@ -4,7 +4,9 @@
  * We some security so we can call the importer on the front end
  */
 $config['streams_import:hash']                      = 'a874de040c2439d710d1b8e6c7bd59a0';
-$config['streams_import:unzip_folder']              = "uploads/default/files/temp_unzip/";
+$config['streams_import:unzip_folder']              = "uploads/default/files/temp_unzip2/";
 $config['streams_import:archives_folder']           = "uploads/default/files/archives/";
 $config['streams_import:anomalies_folder']          = "uploads/default/files/anomalies/";
-$config['streams_import:profiles_directory']        = "uploads/default/ftp/profiles/";
+$config['streams_import:profiles_directory']        = "uploads/default/ftp/profiles/web_users/";
+$config['streams_import:break_value']               = "{{do_no_insert}}";
+$config['streams_import:debug']                     = true;

controllers/admin_logs.php

@@ -38,11 +38,60 @@ public function __construct()
 	{
 		parent::__construct();
         $this->lang->load('streams_import');
+        $this->load->library('streams_import');
 
 	}
 
     public function index($offset)
     {
+
+        $keyword = trim($this->input->post('keyword'));
+        $start_date = trim($this->input->post('start_date'));
+        $end_date = trim($this->input->post('end_date'));
+        $profile = trim($this->input->post('profile'));
+
+        (!empty($keyword))? $where[] = " ( log_detail like '%".$keyword."%' ) " : false;
+        (!empty($start_date))? $where[] = " ( created >= '".$start_date." 00:00:00' ) " : false;
+        (!empty($end_date))? $where[] = " ( created <= '".$start_date." 00:00:00' ) " : false;
+        (!empty($profile))? $where[] = " ( profile_rel_logs = ".$profile." ) " : false;
+
+
+        $where_str = (!empty($where))?implode(' AND ', $where):' created <='.date("Y-m-d").' ';
+        //Get the logs
+
+       // var_dump($where_str);
+
+
+        $params = array(
+            'namespace'=>$this->namespace,
+            'stream'    =>$this->section,
+            'where'     =>$where_str,
+            'limit'     =>'150',
+            'paginate'  =>'no',
+            'pag_segment'=>4,
+
+            );
+
+        $results = $this->streams->entries->get_entries($params);
+
+        $data->entries = $results['entries'];
+        $data->section = $this->section;
+        $data->namespace = $this->section;
+        $data->title = lang($this->namespace.':title:'.$this->section.':index');
+
+        $profiles = $this->db->select('id,profile_name')->get('streams_import_profiles');
+        $data->profiles['0'] = '----';
+        foreach ($profiles->result() as $profile) {
+            $data->profiles[$profile->id] = $profile->profile_name;
+        }
+
+        $this->template
+          ->append_js('admin/filter.js');
+
+        $this->input->is_ajax_request() ? $this->template->set_layout(false)->build('admin/'.$this->section.'/table',$data) : $this->template->build('admin/'.$this->section.'/index',$data);
+
+
+/*
         $extra = 
          array(
          'title'                => lang($this->namespace.':title:'.$this->section.':index'),
@@ -58,8 +107,9 @@ public function index($offset)
                 'confirm'   => false
             ))
          );
-         echo $this->streams->cp->entries_table($this->section, $this->namespace, $pagination = "50", $pagination_uri = "admin/streams_import/logs", $view_override = true, $extra);
-    }
+        
+        echo $this->streams->cp->entries_table($this->section, $this->namespace, $pagination = "50", $pagination_uri = "admin/streams_import/logs", $view_override = true, $extra);
+  */  }
 
     public function create()
     {

controllers/admin_profiles.php

@@ -375,9 +375,21 @@ private function get_stream_fields_list($stream_id)
 		return $fieldlist;
 	}
 
+	public function activation($profile_id, $activation)
+	{
+		$this->db->where('id',$profile_id );
+		$data = array("active"=>$activation);
+		$this->db->update('streams_import_profiles',$data);
+		redirect('admin/' . $this->namespace . '/' . $this->section);
+	}
 
 
-
+	
+	public function reset_lock()
+	{
+		Settings::set('stream_import_lock_info','0');
+		return true;
+	}
 
 }
 

details.php

@@ -12,7 +12,7 @@
 class Module_Streams_import extends Module
 {
 
-	public $version = 0.7;
+	public $version = 0.9;
 	public $module_name = 'streams_import';
 
 
@@ -326,6 +326,7 @@ public function install()
 			);
 			$this->streams->fields->add_field($field);
 		}
+		
 		$field_slug = "unique_keys";
 		if ( $this->db->where('field_namespace', $this->module_name)->where('field_slug', $field_slug)->limit(1)->get('data_fields')->num_rows() == null )
 		{
@@ -343,6 +344,29 @@ public function install()
 				'unique'          => false
 			);
 			$this->streams->fields->add_field($field);
+		}		
+
+		$field_slug = "active";
+		if ( $this->db->where('field_namespace', $this->module_name)->where('field_slug', $field_slug)->limit(1)->get('data_fields')->num_rows() == null )
+		{
+			$field = array(
+				'name'            => 'lang:' . $this->module_name . ':fields:' . $field_slug,
+				'slug'            => $field_slug,
+				'namespace'       => $this->module_name,
+				'type'            => 'choice',
+				'extra'			  => array(
+						'choice_type'=> 'dropdown',
+						'choice_data'=>	"0 : Non \n ".
+										"1 : Oui",
+						'default_value'=>'0'
+					),
+				'assign'          => $stream_slug,
+				'instructions'     => 'lang:' . $this->module_name . ':fields:' . $field_slug.'_instructions',
+				'title_column'    => false,
+				'required'        => false,
+				'unique'          => false
+			);
+			$this->streams->fields->add_field($field);
 		}	
 
 
@@ -503,6 +527,19 @@ public function install()
 			);
 			$this->streams->fields->add_field($field);
 		}		
+		//the lock setting
+		$this->db->insert('settings', array(
+				'slug'			=> 'stream_import_lock_info',
+				'title'			=> 'Lock info for Stream Importer Module',
+				'description'	=> 'Tell you if the stream importer is running, and the start date.',
+				'`default`'		=> '0',
+				'`value`'		=> '0',
+				'type'			=> 'text',
+				'`options`'		=> '',
+				'is_required'	=> 1,
+				'is_gui'		=> 0,
+				'module'		=> $this->module_name
+			));
 		return true;
 	}
 
@@ -526,7 +563,6 @@ public function uninstall()
 	public function upgrade($old_version)
 	{
 
-
 		return true;
 	}