Merge branch 'refactoring' of git://anongit.kde.org/owncloud into refactoring
This commit is contained in:
commit
7fbcafdda4
|
@ -41,7 +41,6 @@ $passwd=$_SERVER['PHP_AUTH_PW'];
|
||||||
if(OC_USER::login($user,$passwd)){
|
if(OC_USER::login($user,$passwd)){
|
||||||
OC_UTIL::setUpFS();
|
OC_UTIL::setUpFS();
|
||||||
$server = new HTTP_WebDAV_Server_Filesystem();
|
$server = new HTTP_WebDAV_Server_Filesystem();
|
||||||
$server->db_name = $CONFIG_DBNAME;
|
|
||||||
$server->ServeRequest($CONFIG_DATADIRECTORY);
|
$server->ServeRequest($CONFIG_DATADIRECTORY);
|
||||||
|
|
||||||
}else{
|
}else{
|
||||||
|
|
|
@ -410,7 +410,7 @@
|
||||||
OC_FILESYSTEM::unlink($path);
|
OC_FILESYSTEM::unlink($path);
|
||||||
}
|
}
|
||||||
$query = OC_DB::prepare("DELETE FROM *PREFIX*properties WHERE 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";
|
return "204 No Content";
|
||||||
}
|
}
|
||||||
|
|
|
@ -27,6 +27,8 @@
|
||||||
<p><label class="left">Database</label></p>
|
<p><label class="left">Database</label></p>
|
||||||
<p><input type="radio" name="dbtype" value='sqlite' id="sqlite" checked="checked" /><label for="sqlite">SQLite</label>
|
<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>
|
<input type="radio" name="dbtype" value='mysql' id="mysql"><label for="mysql">MySQL</label></p>
|
||||||
|
<?php endif;?>
|
||||||
|
<?php if($_['hasMySQL']): ?>
|
||||||
<div id="use_mysql">
|
<div id="use_mysql">
|
||||||
<p><input type="text" name="dbuser" value="admin / username" /></p>
|
<p><input type="text" name="dbuser" value="admin / username" /></p>
|
||||||
<p><input type="password" name="dbpass" value="password" /></p>
|
<p><input type="password" name="dbpass" value="password" /></p>
|
||||||
|
|
Loading…
Reference in New Issue