parent
8567a8aaac
commit
83251502e9
3 changed files with 21 additions and 18 deletions
|
@ -31,11 +31,10 @@ if (!isset($_SERVER['DavAdminConfDir'])) {
|
||||||
header('HTTP/1.0 500 Internal Server Error');
|
header('HTTP/1.0 500 Internal Server Error');
|
||||||
header('Status: 500 Internal Server Error');
|
header('Status: 500 Internal Server Error');
|
||||||
header('Content-Type: text/plain;charset=utf8');
|
header('Content-Type: text/plain;charset=utf8');
|
||||||
print("The Server is not configured correctly. " .
|
print(_("The Server is not configured correctly. Please tell your Administrator to set the DavAdminConfDir environment variable."));
|
||||||
"Please tell your Administrator to set the " .
|
|
||||||
"DavAdminConfDir environment variable.");
|
|
||||||
exit();
|
exit();
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Include configuration information. */
|
/** Include configuration information. */
|
||||||
require_once($_SERVER['DavAdminConfDir'] . '/config.inc.php');
|
require_once($_SERVER['DavAdminConfDir'] . '/config.inc.php');
|
||||||
|
|
||||||
|
@ -52,7 +51,7 @@ $smarty->compile_dir = $davconfig['compile_dir'];
|
||||||
/** Handle invalid requests to the application. */
|
/** Handle invalid requests to the application. */
|
||||||
function invalidCall() {
|
function invalidCall() {
|
||||||
header("Content-Type: text/plain; charset=UTF-8");
|
header("Content-Type: text/plain; charset=UTF-8");
|
||||||
print("Ungültiger Aufruf!");
|
print(_("Invalid call!"));
|
||||||
die();
|
die();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -79,39 +78,45 @@ function getFullPath($dirname) {
|
||||||
// check configuration
|
// check configuration
|
||||||
$errmsgs = array();
|
$errmsgs = array();
|
||||||
if (!isset($davconfig['digest.file'])) {
|
if (!isset($davconfig['digest.file'])) {
|
||||||
array_push($errmsgs, 'digest.file is not defined.');
|
array_push($errmsgs,
|
||||||
|
_("digest.file is not defined."));
|
||||||
} elseif (!is_readable($davconfig['digest.file']) ||
|
} elseif (!is_readable($davconfig['digest.file']) ||
|
||||||
!is_writable($davconfig['digest.file'])) {
|
!is_writable($davconfig['digest.file'])) {
|
||||||
array_push($errmsgs,
|
array_push($errmsgs,
|
||||||
'The specified digest file is not readable and writable.');
|
_("The specified digest file is not readable and writable."));
|
||||||
}
|
}
|
||||||
if (!isset($davconfig['group.file'])) {
|
if (!isset($davconfig['group.file'])) {
|
||||||
array_push($errmsgs, 'group.file is not defined.');
|
array_push($errmsgs,
|
||||||
|
_("group.file is not defined."));
|
||||||
} elseif (!is_readable($davconfig['group.file']) ||
|
} elseif (!is_readable($davconfig['group.file']) ||
|
||||||
!is_writable($davconfig['group.file'])) {
|
!is_writable($davconfig['group.file'])) {
|
||||||
array_push($errmsgs,
|
array_push($errmsgs,
|
||||||
'The specified group file is not readable and writable.');
|
_("The specified group file is not readable and writable."));
|
||||||
}
|
}
|
||||||
if (!isset($davconfig['namemap.file'])) {
|
if (!isset($davconfig['namemap.file'])) {
|
||||||
array_push($errmsgs, 'namemap.file is not defined.');
|
array_push($errmsgs,
|
||||||
|
_("namemap.file is not defined."));
|
||||||
} elseif (!is_readable($davconfig['namemap.file']) ||
|
} elseif (!is_readable($davconfig['namemap.file']) ||
|
||||||
!is_writable($davconfig['namemap.file'])) {
|
!is_writable($davconfig['namemap.file'])) {
|
||||||
array_push($errmsgs,
|
array_push($errmsgs,
|
||||||
'The specified name mapping file is not readable and writable.');
|
_("The specified name mapping file is not readable and writable."));
|
||||||
}
|
}
|
||||||
if (!isset($davconfig['dav.dir'])) {
|
if (!isset($davconfig['dav.dir'])) {
|
||||||
array_push($errmsgs, 'dav.dir is not defined.');
|
array_push($errmsgs,
|
||||||
|
_("dav.dir is not defined."));
|
||||||
} elseif (!is_dir($davconfig['dav.dir']) ||
|
} elseif (!is_dir($davconfig['dav.dir']) ||
|
||||||
!is_readable($davconfig['dav.dir']) ||
|
!is_readable($davconfig['dav.dir']) ||
|
||||||
!is_writable($davconfig['dav.dir'])) {
|
!is_writable($davconfig['dav.dir'])) {
|
||||||
array_push($errmsgs,
|
array_push($errmsgs,
|
||||||
'The specified DAV directory is no directory or not accessable.');
|
_("The specified DAV directory is no directory or not accessable."));
|
||||||
}
|
}
|
||||||
if (empty($davconfig['dav.realm'])) {
|
if (empty($davconfig['dav.realm'])) {
|
||||||
array_push($errmsgs, 'dav.realm is not defined.');
|
array_push($errmsgs,
|
||||||
|
_("dav.realm is not defined."));
|
||||||
}
|
}
|
||||||
if (empty($davconfig['dav.uri'])) {
|
if (empty($davconfig['dav.uri'])) {
|
||||||
array_push($errmsgs, 'dav.uri is not defined.');
|
array_push($errmsgs,
|
||||||
|
_("dav.uri is not defined."));
|
||||||
}
|
}
|
||||||
if (!empty($errmsgs)) {
|
if (!empty($errmsgs)) {
|
||||||
errorAsHtml(implode("<br />", $errmsgs));
|
errorAsHtml(implode("<br />", $errmsgs));
|
||||||
|
|
|
@ -111,7 +111,7 @@ function getDirectoryData($dirname) {
|
||||||
$dir['groups'] = getDirGroupsFromHtaccess($dirname);
|
$dir['groups'] = getDirGroupsFromHtaccess($dirname);
|
||||||
list($dir['filecount'], $dir['filesize']) = countFilesRecursive(getFullPath($dirname));
|
list($dir['filecount'], $dir['filesize']) = countFilesRecursive(getFullPath($dirname));
|
||||||
$dir['maydelete'] = ($dir['filecount'] == 0) ? 1 : 0;
|
$dir['maydelete'] = ($dir['filecount'] == 0) ? 1 : 0;
|
||||||
$dir['filesize'] = sprintf("%d kBytes", $dir['filesize'] / 1024);
|
$dir['filesize'] = sprintf(_("%d kBytes"), $dir['filesize'] / 1024);
|
||||||
return $dir;
|
return $dir;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -31,9 +31,7 @@ if (!isset($_SERVER['DavAdminConfDir'])) {
|
||||||
header('HTTP/1.0 500 Internal Server Error');
|
header('HTTP/1.0 500 Internal Server Error');
|
||||||
header('Status: 500 Internal Server Error');
|
header('Status: 500 Internal Server Error');
|
||||||
header('Content-Type: text/plain;charset=utf8');
|
header('Content-Type: text/plain;charset=utf8');
|
||||||
print("The Server is not configured correctly. " .
|
print(_("The Server is not configured correctly. Please tell your Administrator to set the DavAdminConfDir environment variable."));
|
||||||
"Please tell your Administrator to set the " .
|
|
||||||
"DavAdminConfDir environment variable.");
|
|
||||||
exit();
|
exit();
|
||||||
}
|
}
|
||||||
/** Include configuration information. */
|
/** Include configuration information. */
|
||||||
|
|
Loading…
Reference in a new issue