Skip to content
Snippets Groups Projects
Commit aacda036 authored by Robin Appelman's avatar Robin Appelman
Browse files

merge

parent fb498b95
No related branches found
No related tags found
No related merge requests found
Showing
with 15 additions and 2 deletions
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
<?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
docs/FAQs 100644 → 100755
File mode changed from 100644 to 100755
files/api.php 100644 → 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
img/arrow_up.png 100644 → 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
......@@ -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'];
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment