From aacda0367d2894911098357e3c82c03071d27a02 Mon Sep 17 00:00:00 2001 From: Robin Date: Wed, 28 Apr 2010 12:15:52 +0200 Subject: [PATCH] merge --- admin/index.php | 0 admin/index.php~ | 0 config/config.php | 13 +++++++++++-- docs/FAQs | 0 files/api.php | 0 files/get_files.php | 0 files/index.php | 0 files/open_file.php | 0 files/upload.php | 0 img/arrow_up.png | Bin img/icons/delete.png | Bin img/icons/loading.gif | Bin img/icons/rename.png | Bin img/owncloud-icon.png | Bin inc/HTTP/WebDAV/Server.php | 0 inc/HTTP/WebDAV/Server/Filesystem.php | 0 inc/HTTP/WebDAV/Tools/_parse_lockinfo.php | 0 inc/HTTP/WebDAV/Tools/_parse_propfind.php | 0 inc/HTTP/WebDAV/Tools/_parse_proppatch.php | 0 inc/lib_base.php | 4 ++++ inc/lib_user.php | 0 inc/templates/adminform.php | 0 js/ajax.js | 0 js/filebrowser.js | 0 js/lib_ajax.js | 0 js/lib_api.js | 0 js/lib_drag.js | 0 js/lib_files.js | 0 js/lib_xmlloader.js | 0 ocs/v1.php | 0 30 files changed, 15 insertions(+), 2 deletions(-) mode change 100644 => 100755 admin/index.php mode change 100644 => 100755 admin/index.php~ mode change 100644 => 100755 config/config.php mode change 100644 => 100755 docs/FAQs mode change 100644 => 100755 files/api.php mode change 100644 => 100755 files/get_files.php mode change 100644 => 100755 files/index.php mode change 100644 => 100755 files/open_file.php mode change 100644 => 100755 files/upload.php mode change 100644 => 100755 img/arrow_up.png mode change 100644 => 100755 img/icons/delete.png mode change 100644 => 100755 img/icons/loading.gif mode change 100644 => 100755 img/icons/rename.png mode change 100644 => 100755 img/owncloud-icon.png mode change 100644 => 100755 inc/HTTP/WebDAV/Server.php mode change 100644 => 100755 inc/HTTP/WebDAV/Server/Filesystem.php mode change 100644 => 100755 inc/HTTP/WebDAV/Tools/_parse_lockinfo.php mode change 100644 => 100755 inc/HTTP/WebDAV/Tools/_parse_propfind.php mode change 100644 => 100755 inc/HTTP/WebDAV/Tools/_parse_proppatch.php mode change 100644 => 100755 inc/lib_user.php mode change 100644 => 100755 inc/templates/adminform.php mode change 100644 => 100755 js/ajax.js mode change 100644 => 100755 js/filebrowser.js mode change 100644 => 100755 js/lib_ajax.js mode change 100644 => 100755 js/lib_api.js mode change 100644 => 100755 js/lib_drag.js mode change 100644 => 100755 js/lib_files.js mode change 100644 => 100755 js/lib_xmlloader.js mode change 100644 => 100755 ocs/v1.php diff --git a/admin/index.php b/admin/index.php old mode 100644 new mode 100755 diff --git a/admin/index.php~ b/admin/index.php~ old mode 100644 new mode 100755 diff --git a/config/config.php b/config/config.php old mode 100644 new mode 100755 index acb6c3546c..5a27827135 --- a/config/config.php +++ b/config/config.php @@ -1,2 +1,11 @@ - + \ No newline at end of file diff --git a/docs/FAQs b/docs/FAQs old mode 100644 new mode 100755 diff --git a/files/api.php b/files/api.php old mode 100644 new mode 100755 diff --git a/files/get_files.php b/files/get_files.php old mode 100644 new mode 100755 diff --git a/files/index.php b/files/index.php old mode 100644 new mode 100755 diff --git a/files/open_file.php b/files/open_file.php old mode 100644 new mode 100755 diff --git a/files/upload.php b/files/upload.php old mode 100644 new mode 100755 diff --git a/img/arrow_up.png b/img/arrow_up.png old mode 100644 new mode 100755 diff --git a/img/icons/delete.png b/img/icons/delete.png old mode 100644 new mode 100755 diff --git a/img/icons/loading.gif b/img/icons/loading.gif old mode 100644 new mode 100755 diff --git a/img/icons/rename.png b/img/icons/rename.png old mode 100644 new mode 100755 diff --git a/img/owncloud-icon.png b/img/owncloud-icon.png old mode 100644 new mode 100755 diff --git a/inc/HTTP/WebDAV/Server.php b/inc/HTTP/WebDAV/Server.php old mode 100644 new mode 100755 diff --git a/inc/HTTP/WebDAV/Server/Filesystem.php b/inc/HTTP/WebDAV/Server/Filesystem.php old mode 100644 new mode 100755 diff --git a/inc/HTTP/WebDAV/Tools/_parse_lockinfo.php b/inc/HTTP/WebDAV/Tools/_parse_lockinfo.php old mode 100644 new mode 100755 diff --git a/inc/HTTP/WebDAV/Tools/_parse_propfind.php b/inc/HTTP/WebDAV/Tools/_parse_propfind.php old mode 100644 new mode 100755 diff --git a/inc/HTTP/WebDAV/Tools/_parse_proppatch.php b/inc/HTTP/WebDAV/Tools/_parse_proppatch.php old mode 100644 new mode 100755 diff --git a/inc/lib_base.php b/inc/lib_base.php index 851fc254b8..ebc40372e1 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 old mode 100644 new mode 100755 diff --git a/inc/templates/adminform.php b/inc/templates/adminform.php old mode 100644 new mode 100755 diff --git a/js/ajax.js b/js/ajax.js old mode 100644 new mode 100755 diff --git a/js/filebrowser.js b/js/filebrowser.js old mode 100644 new mode 100755 diff --git a/js/lib_ajax.js b/js/lib_ajax.js old mode 100644 new mode 100755 diff --git a/js/lib_api.js b/js/lib_api.js old mode 100644 new mode 100755 diff --git a/js/lib_drag.js b/js/lib_drag.js old mode 100644 new mode 100755 diff --git a/js/lib_files.js b/js/lib_files.js old mode 100644 new mode 100755 diff --git a/js/lib_xmlloader.js b/js/lib_xmlloader.js old mode 100644 new mode 100755 diff --git a/ocs/v1.php b/ocs/v1.php old mode 100644 new mode 100755