From 415d5475383fe7f5fe630170c2a1505da56d017b Mon Sep 17 00:00:00 2001
From: Karsten Heiken <karsten@disposed.de>
Date: Sat, 26 Nov 2011 19:22:43 +0100
Subject: [PATCH 1/2] Add empty favicon and add rule to .htaccess

Otherwise the log files will get spammed.
And we hate spam.
---
 .htaccess.sample | 1 +
 favicon.ico      | 0
 2 files changed, 1 insertion(+)
 create mode 100644 favicon.ico

diff --git a/.htaccess.sample b/.htaccess.sample
index 33cdd17..f330197 100644
--- a/.htaccess.sample
+++ b/.htaccess.sample
@@ -9,6 +9,7 @@
 
     RewriteCond %{REQUEST_FILENAME} !-f
     RewriteCond %{REQUEST_FILENAME} !-d
+    RewriteCond %{REQUEST_URI} !^/uploads/.*
     RewriteRule ^(.*)$ index.php?/$1 [L]
 </IfModule>
 
diff --git a/favicon.ico b/favicon.ico
new file mode 100644
index 0000000..e69de29

From 1fc9763ff34092c0940b6014beeced8fa3fc7c6c Mon Sep 17 00:00:00 2001
From: Karsten Heiken <karsten@disposed.de>
Date: Sun, 27 Nov 2011 18:36:13 +0100
Subject: [PATCH 2/2] Make ftp base directory configurable

---
 application/config/scattport.php   | 15 +++++++++++++++
 application/controllers/xmlrpc.php |  4 +++-
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 application/config/scattport.php

diff --git a/application/config/scattport.php b/application/config/scattport.php
new file mode 100644
index 0000000..1c38acc
--- /dev/null
+++ b/application/config/scattport.php
@@ -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 */
diff --git a/application/controllers/xmlrpc.php b/application/controllers/xmlrpc.php
index 0fe7940..9efce65 100644
--- a/application/controllers/xmlrpc.php
+++ b/application/controllers/xmlrpc.php
@@ -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 = '/';