kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-11-17 07:08:19 +00:00
Code Issues Projects Releases Wiki Activity

Some refactoring, courtesy of PHPStorm.

Browse Source
This commit is contained in:
James Cole
2016-01-15 16:26:49 +01:00
parent 88839e9610
commit 6c12f1bc86
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
app/Http/Controllers/CsvController.php
View File

@@ -394,15 +394,16 @@ class CsvController extends Controller
$settings['specifix'] = Input::get('specifix'); $settings['specifix'] = Input::get('specifix');
$settings['import-account'] = intval(Input::get('csv_import_account')); $settings['import-account'] = intval(Input::get('csv_import_account'));
$settings['delimiter'] = Input::get('csv_delimiter', ','); $settings['delimiter'] = Input::get('csv_delimiter', ',');
// A tab character cannot be used itself as option value in HTML // A tab character cannot be used itself as option value in HTML
// See http://stackoverflow.com/questions/6064135/valid-characters-in-option-value // See http://stackoverflow.com/questions/6064135/valid-characters-in-option-value
if( $settings[ 'delimiter' ] == 'tab' ) if ($settings['delimiter'] == 'tab') {
$settings[ 'delimiter' ] = "\t"; $settings['delimiter'] = "\t";
}
$settings['map'] = [];
$settings['mapped'] = []; $settings['map'] = [];
$settings['roles'] = []; $settings['mapped'] = [];
$settings['roles'] = [];
if ($request->hasFile('csv_config')) { // Process config file if present. if ($request->hasFile('csv_config')) { // Process config file if present.
$data = file_get_contents($request->file('csv_config')->getRealPath()); $data = file_get_contents($request->file('csv_config')->getRealPath());
@@ -421,7 +422,7 @@ class CsvController extends Controller
$this->data->setSpecifix($settings['specifix']); $this->data->setSpecifix($settings['specifix']);
$this->data->setImportAccount($settings['import-account']); $this->data->setImportAccount($settings['import-account']);
$this->data->setDelimiter($settings['delimiter']); $this->data->setDelimiter($settings['delimiter']);
return redirect(route('csv.column-roles')); return redirect(route('csv.column-roles'));
} }