From c90e41b6b74a6072b22e9fe707608aa16b259260 Mon Sep 17 00:00:00 2001
From: Li Chen <mail@chen.li>
Date: Sat, 30 Nov 2013 13:55:42 +0100
Subject: [PATCH] certificate.php: delete useless code and add SALT_ADMIN

---
 onyx/include/admin/certificate.php | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/onyx/include/admin/certificate.php b/onyx/include/admin/certificate.php
index 24a8ddb7..d6b73d4e 100644
--- a/onyx/include/admin/certificate.php
+++ b/onyx/include/admin/certificate.php
@@ -48,14 +48,6 @@ if (!empty($p[2]))
     putenv("OPENSSL_CONF=$misc_dir/openssl.cnf");
     putenv("TOP_DIR=$misc_dir/pki");
     $output = shell_exec("$misc_dir/CA.sh -newca");
-
-    $ca_file = "$misc_dir/pki/cacert.crt";
-    //TODO check permission ?
-    if (file_exists($ca_file))
-    {
-      $data = openssl_x509_parse(file_get_contents("$misc_dir/pki/cacert.crt"));
-      $template->assign("cert", $data);
-    }
   }
 
   elseif ($p[2] == "deleteca")
@@ -66,7 +58,7 @@ if (!empty($p[2]))
 
   if ($p[2] == "deleteca" || $p[2] == "newca")
   {
-    header("Location: /admin/");
+    header("Location: /".SALT_ADMIN."/");
     exit;
   }
 }