Use a variable to handle the misc_dir

This commit is contained in:
Li Chen 2013-11-25 18:24:46 +01:00
parent e137e755c0
commit a9fdcaf9f2
3 changed files with 58 additions and 26 deletions

View file

@ -2,20 +2,31 @@
if(!defined('ONYX')) exit;
if (is_writable(ONYX."../misc/") && !is_dir(ONYX."../misc/pki/"))
mkdir(ONYX."../misc/pki/");
if (isset($VAR['misc_dir']))
$misc_dir = $VAR['misc_dir'];
else
{
erreur("Merci d'ajouter la variable misc_dir dans root.xml");
return "admin/home";
}
$wright = is_writable(ONYX."../misc/pki/");
if (is_writable($misc_dir) && !is_dir("$misc_dir/pki/"))
mkdir("$misc_dir/pki/");
$wright = is_writable("$misc_dir/pki/");
$template->assign("cert_writable", $wright);
//TODO handle the path ?
$ca_file = ONYX . '../misc/pki/cacert.crt';
$ca_file = "$misc_dir/pki/cacert.crt";
//TODO check permission ?
if (file_exists($ca_file))
{
$data = openssl_x509_parse(file_get_contents(ONYX . '../misc/pki/cacert.crt'));
$template->assign("cert", $data);
if (!is_readable($ca_file))
erreur("Impossible de lire le fichier");
else
{
$data = openssl_x509_parse(file_get_contents(ONYX . '../misc/pki/cacert.crt'));
$template->assign("cert", $data);
}
}
return "admin/home";