Fix various paths (misc remove related)

This commit is contained in:
nemunaire 2015-01-14 11:10:55 +01:00 committed by Nemunaire
commit 428a1def46
3 changed files with 15 additions and 20 deletions

View file

@ -2,25 +2,20 @@
if(!defined('ONYX')) exit;
if (isset($VAR['misc_dir']))
if (empty($VAR['misc_dir']))
{
$misc_dir = $VAR['misc_dir'];
if (!is_writable("$misc_dir/shared"))
{
erreur("Dossier shared/ non accessible en écriture. (<i>$misc_dir</i>)");
erreur("Please add <var>misc_dir</var> variable into <code>root.xml</code> configuration.");
return "admin/home";
}
}
else
$misc_dir = $VAR['misc_dir'];
if (!is_dir("$misc_dir/shared") || !is_writable("$misc_dir/shared"))
{
erreur("Merci d'ajouter la variable misc_dir dans root.xml");
return "admin/home";
erreur("<code>$misc_dir/shared/</code> directory not writable.");
return "admin/home";
}
if (is_writable($misc_dir) && !is_dir("$misc_dir/pki/"))
mkdir("$misc_dir/pki/");
$template->assign("cert_writable", is_writable("$misc_dir/pki/"));
$template->assign("cert_writable", is_writable("$misc_dir/shared/") && is_writable("$misc_dir/PKI/"));
$ca_file = "$misc_dir/shared/cacert.crt";
if (file_exists($ca_file))