karsten/scattport-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make ftp base directory configurable

Browse Source
This commit is contained in:
Karsten Heiken
2011-11-27 18:36:13 +01:00
parent 415d547538
commit 1fc9763ff3
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
application/config/scattport.php Normal file
View File

@@ -0,0 +1,15 @@
<?php defined('BASEPATH') || exit('No direct script access allowed');
/*
|--------------------------------------------------------------------------
| Directory into which the results are uploaded
|--------------------------------------------------------------------------
|
| When a client made a calculation, he uploads the results to a directory
| on this server.
|
| This has to be the base directory, i.e. the ftp-user's home directory.
*/
$config['ftp_base'] = '/var/scattportd';
/* End of file scattport.php */
/* Location: ./application/config/scattport.php */

4
application/controllers/xmlrpc.php
View File

@@ -37,6 +37,8 @@ class Xmlrpc extends MY_Controller {
$this->load->library('xmlrpc');
$this->load->library('xmlrpcs');
$this->load->config('scattport');
$this->load->model('server');
$this->session->sess_destroy();
@@ -156,7 +158,7 @@ class Xmlrpc extends MY_Controller {
$project = $this->project->getById($experiment['project_id']);
if($files_uploaded) {
foreach (glob("/tmp/sp_incoming/" . $job_id . "/*") as $filename) {
foreach (glob($this->config->item('ftp_base') ."/incoming/" . $job_id . "/*") as $filename) {
$job_dir = FCPATH . 'uploads/' . $experiment['project_id'] . '/' . $experiment['id'];
$directories = explode("/", $job_dir);
$dir_tmp = '/';