mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'refactoring' of git://anongit.kde.org/owncloud into refactoring

This commit is contained in:
Jan-Christoph Borchardt 2011-04-17 13:33:38 +02:00
parent 793c507af2 a8f823fc7f
commit 7fbcafdda4
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
files/webdav.php
View File

@ -41,7 +41,6 @@ $passwd=$_SERVER['PHP_AUTH_PW'];
if(OC_USER::login($user,$passwd)){
OC_UTIL::setUpFS();
$server = new HTTP_WebDAV_Server_Filesystem();
$server->db_name = $CONFIG_DBNAME;
$server->ServeRequest($CONFIG_DATADIRECTORY);
}else{

2
lib/HTTP/WebDAV/Server/Filesystem.php
View File

@ -410,7 +410,7 @@
OC_FILESYSTEM::unlink($path);
}
$query = OC_DB::prepare("DELETE FROM *PREFIX*properties WHERE path = ?");
$query->execute(array($options[path]));
$query->execute(array($options['path']));
return "204 No Content";
}

8
templates/installation.php
View File

@ -27,10 +27,12 @@
<p><label class="left">Database</label></p>
<p><input type="radio" name="dbtype" value='sqlite' id="sqlite" checked="checked" /><label for="sqlite">SQLite</label>
<input type="radio" name="dbtype" value='mysql' id="mysql"><label for="mysql">MySQL</label></p>
<?php endif;?>
<?php if($_['hasMySQL']): ?>
<div id="use_mysql">
<p><input type="text" name="dbuser" value="admin / username" /></p>
<p><input type="password" name="dbpass" value="password" /></p>
<p><input type="text" name="dbname" value="database name" /></p>
<p><input type="text" name="dbuser" value="admin / username" /></p>
<p><input type="password" name="dbpass" value="password" /></p>
<p><input type="text" name="dbname" value="database name" /></p>
<?php endif;?>
<?php if($_['hasMySQL'] and !$_['hasSQLite']): ?>
<input type='hidden' name='dbtype' value='mysql'/>