Merge pull request #5395 from owncloud/more_check_options
add options to disable the check for a working .htaccess file in data
This commit is contained in:
commit
5c5621d84e
|
@ -129,6 +129,12 @@ $CONFIG = array(
|
|||
/* Are we connected to the internet or are we running in a closed network? */
|
||||
"has_internet_connection" => true,
|
||||
|
||||
/* Check if the ownCloud WebDAV server is working correctly. Can be disabled if not needed in special situations*/
|
||||
"check_for_working_webdav" => true,
|
||||
|
||||
/* Check if .htaccess protection of data is working correctly. Can be disabled if not needed in special situations*/
|
||||
"check_for_working_htaccess" => true,
|
||||
|
||||
/* Place to log to, can be owncloud and syslog (owncloud is log menu item in admin menu) */
|
||||
"log_type" => "owncloud",
|
||||
|
||||
|
|
|
@ -754,6 +754,10 @@ class OC_Util {
|
|||
* file in the data directory and trying to access via http
|
||||
*/
|
||||
public static function isHtAccessWorking() {
|
||||
if (!\OC_Config::getValue("check_for_working_htaccess", true)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
// testdata
|
||||
$fileName = '/htaccesstest.txt';
|
||||
$testContent = 'testcontent';
|
||||
|
@ -802,6 +806,9 @@ class OC_Util {
|
|||
if (!function_exists('curl_init')) {
|
||||
return true;
|
||||
}
|
||||
if (!\OC_Config::getValue("check_for_working_webdav", true)) {
|
||||
return true;
|
||||
}
|
||||
$settings = array(
|
||||
'baseUri' => OC_Helper::linkToRemote('webdav'),
|
||||
);
|
||||
|
|
Loading…
Reference in New Issue