merge

30 files changed, 15 insertions, 2 deletions

diff --git a/admin/index.php b/admin/index.php
index 2331c22f062..2331c22f062 100644..100755
--- a/admin/index.php
+++ b/admin/index.php
diff --git a/admin/index.php~ b/admin/index.php~
index 8d1c8b69c3f..8d1c8b69c3f 100644..100755
--- a/admin/index.php~
+++ b/admin/index.php~
diff --git a/config/config.php b/config/config.php
index acb6c3546c6..5a278271350 100644..100755
--- a/config/config.php
+++ b/config/config.php
@@ -1,2 +1,11 @@
-<?php
-?>
+<?php 
+$CONFIG_INSTALLED=true;
+$CONFIG_DATADIRECTORY='/var/www/owncloud/owncloud/data';
+$CONFIG_HTTPFORCESSL=false;
+$CONFIG_DATEFORMAT='j M Y G:i';
+$CONFIG_DBTYPE='mysql';
+$CONFIG_DBNAME='owncloud';
+$CONFIG_DBHOST='localhost';
+$CONFIG_DBUSER='owncloud';
+$CONFIG_DBPASSWORD='gehijm';
+?> 
\ No newline at end of file
diff --git a/docs/FAQs b/docs/FAQs
index d766192b99d..d766192b99d 100644..100755
--- a/docs/FAQs
+++ b/docs/FAQs
diff --git a/files/api.php b/files/api.php
index 5a4c8801d4e..5a4c8801d4e 100644..100755
--- a/files/api.php
+++ b/files/api.php
diff --git a/files/get_files.php b/files/get_files.php
index 21866dbf636..21866dbf636 100644..100755
--- a/files/get_files.php
+++ b/files/get_files.php
diff --git a/files/index.php b/files/index.php
index 6bd994e7616..6bd994e7616 100644..100755
--- a/files/index.php
+++ b/files/index.php
diff --git a/files/open_file.php b/files/open_file.php
index 933efa51e1e..933efa51e1e 100644..100755
--- a/files/open_file.php
+++ b/files/open_file.php
diff --git a/files/upload.php b/files/upload.php
index 0aa435cad6f..0aa435cad6f 100644..100755
--- a/files/upload.php
+++ b/files/upload.php
diff --git a/img/arrow_up.png b/img/arrow_up.png
index e2457c88838..e2457c88838 100644..100755
--- a/img/arrow_up.png
+++ b/img/arrow_up.png
diff --git a/img/icons/delete.png b/img/icons/delete.png
index d04a554ee17..d04a554ee17 100644..100755
--- a/img/icons/delete.png
+++ b/img/icons/delete.png
diff --git a/img/icons/loading.gif b/img/icons/loading.gif
index 40efb9be594..40efb9be594 100644..100755
--- a/img/icons/loading.gif
+++ b/img/icons/loading.gif
diff --git a/img/icons/rename.png b/img/icons/rename.png
index 2323757e0e9..2323757e0e9 100644..100755
--- a/img/icons/rename.png
+++ b/img/icons/rename.png
diff --git a/img/owncloud-icon.png b/img/owncloud-icon.png
index af123f0cd52..af123f0cd52 100644..100755
--- a/img/owncloud-icon.png
+++ b/img/owncloud-icon.png
diff --git a/inc/HTTP/WebDAV/Server.php b/inc/HTTP/WebDAV/Server.php
index 913550eb150..913550eb150 100644..100755
--- a/inc/HTTP/WebDAV/Server.php
+++ b/inc/HTTP/WebDAV/Server.php
diff --git a/inc/HTTP/WebDAV/Server/Filesystem.php b/inc/HTTP/WebDAV/Server/Filesystem.php
index d38d05e8f26..d38d05e8f26 100644..100755
--- a/inc/HTTP/WebDAV/Server/Filesystem.php
+++ b/inc/HTTP/WebDAV/Server/Filesystem.php
diff --git a/inc/HTTP/WebDAV/Tools/_parse_lockinfo.php b/inc/HTTP/WebDAV/Tools/_parse_lockinfo.php
index 6319f0d5200..6319f0d5200 100644..100755
--- a/inc/HTTP/WebDAV/Tools/_parse_lockinfo.php
+++ b/inc/HTTP/WebDAV/Tools/_parse_lockinfo.php
diff --git a/inc/HTTP/WebDAV/Tools/_parse_propfind.php b/inc/HTTP/WebDAV/Tools/_parse_propfind.php
index cf72b529d97..cf72b529d97 100644..100755
--- a/inc/HTTP/WebDAV/Tools/_parse_propfind.php
+++ b/inc/HTTP/WebDAV/Tools/_parse_propfind.php
diff --git a/inc/HTTP/WebDAV/Tools/_parse_proppatch.php b/inc/HTTP/WebDAV/Tools/_parse_proppatch.php
index fb0e595ddf7..fb0e595ddf7 100644..100755
--- a/inc/HTTP/WebDAV/Tools/_parse_proppatch.php
+++ b/inc/HTTP/WebDAV/Tools/_parse_proppatch.php
diff --git a/inc/lib_base.php b/inc/lib_base.php
index 851fc254b8e..ebc40372e16 100755
--- a/inc/lib_base.php
+++ b/inc/lib_base.php
@@ -69,6 +69,10 @@ oc_require_once('lib_config.php');
 oc_require_once('lib_user.php');
 oc_require_once('lib_ocs.php');
 
+
+if(!is_dir($CONFIG_DATADIRECTORY)){
+	mkdir($CONFIG_DATADIRECTORY);
+}
 if(OC_USER::isLoggedIn()){
 	//jail the user in a seperate data folder
 	$CONFIG_DATADIRECTORY=$SERVERROOT.'/data/'.$_SESSION['username_clean'];
diff --git a/inc/lib_user.php b/inc/lib_user.php
index 37e5f0bc217..37e5f0bc217 100644..100755
--- a/inc/lib_user.php
+++ b/inc/lib_user.php
diff --git a/inc/templates/adminform.php b/inc/templates/adminform.php
index c5e0bca61d3..c5e0bca61d3 100644..100755
--- a/inc/templates/adminform.php
+++ b/inc/templates/adminform.php
diff --git a/js/ajax.js b/js/ajax.js
index 534dd46a290..534dd46a290 100644..100755
--- a/js/ajax.js
+++ b/js/ajax.js
diff --git a/js/filebrowser.js b/js/filebrowser.js
index cc03fe33156..cc03fe33156 100644..100755
--- a/js/filebrowser.js
+++ b/js/filebrowser.js
diff --git a/js/lib_ajax.js b/js/lib_ajax.js
index 6a2ae53ee32..6a2ae53ee32 100644..100755
--- a/js/lib_ajax.js
+++ b/js/lib_ajax.js
diff --git a/js/lib_api.js b/js/lib_api.js
index 51fc843967d..51fc843967d 100644..100755
--- a/js/lib_api.js
+++ b/js/lib_api.js
diff --git a/js/lib_drag.js b/js/lib_drag.js
index bc6a8610500..bc6a8610500 100644..100755
--- a/js/lib_drag.js
+++ b/js/lib_drag.js
diff --git a/js/lib_files.js b/js/lib_files.js
index d1480e36637..d1480e36637 100644..100755
--- a/js/lib_files.js
+++ b/js/lib_files.js
diff --git a/js/lib_xmlloader.js b/js/lib_xmlloader.js
index 12ebfa474b6..12ebfa474b6 100644..100755
--- a/js/lib_xmlloader.js
+++ b/js/lib_xmlloader.js
diff --git a/ocs/v1.php b/ocs/v1.php
index 14d56bbec60..14d56bbec60 100644..100755
--- a/ocs/v1.php
+++ b/ocs/v1.php