From cffe97eb6ede164d8169dda4e8922baea3dda0e1 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sun, 13 Sep 2015 08:50:48 -0400
Subject: [PATCH] CS improvements + some doc
---
plugins/enigma/lib/enigma_driver_phpssl.php | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/plugins/enigma/lib/enigma_driver_phpssl.php b/plugins/enigma/lib/enigma_driver_phpssl.php
index a2d73f4..d2e2044 100644
--- a/plugins/enigma/lib/enigma_driver_phpssl.php
+++ b/plugins/enigma/lib/enigma_driver_phpssl.php
@@ -39,15 +39,15 @@
$homedir = $this->rc->config->get('enigma_smime_homedir', INSTALL_PATH . '/plugins/enigma/home');
if (!$homedir)
- return new enigma_error(enigma_error::E_INTERNAL,
+ return new enigma_error(enigma_error::INTERNAL,
"Option 'enigma_smime_homedir' not specified");
// check if homedir exists (create it if not) and is readable
if (!file_exists($homedir))
- return new enigma_error(enigma_error::E_INTERNAL,
+ return new enigma_error(enigma_error::INTERNAL,
"Keys directory doesn't exists: $homedir");
if (!is_writable($homedir))
- return new enigma_error(enigma_error::E_INTERNAL,
+ return new enigma_error(enigma_error::INTERNAL,
"Keys directory isn't writeable: $homedir");
$homedir = $homedir . '/' . $this->user;
@@ -57,10 +57,10 @@
mkdir($homedir, 0700);
if (!file_exists($homedir))
- return new enigma_error(enigma_error::E_INTERNAL,
+ return new enigma_error(enigma_error::INTERNAL,
"Unable to create keys directory: $homedir");
if (!is_writable($homedir))
- return new enigma_error(enigma_error::E_INTERNAL,
+ return new enigma_error(enigma_error::INTERNAL,
"Unable to write to keys directory: $homedir");
$this->homedir = $homedir;
@@ -104,7 +104,7 @@
if ($sig !== true) {
// try without certificate verification
$sig = openssl_pkcs7_verify($msg_file, PKCS7_NOVERIFY, $cert_file);
- $validity = enigma_error::E_UNVERIFIED;
+ $validity = enigma_error::UNVERIFIED;
}
if ($sig === true) {
@@ -112,7 +112,7 @@
}
else {
$errorstr = $this->get_openssl_error();
- $sig = new enigma_error(enigma_error::E_INTERNAL, $errorstr);
+ $sig = new enigma_error(enigma_error::INTERNAL, $errorstr);
}
// remove temp files
@@ -211,7 +211,7 @@
if (empty($cert) || empty($cert['subject'])) {
$errorstr = $this->get_openssl_error();
- return new enigma_error(enigm_error::E_INTERNAL, $errorstr);
+ return new enigma_error(enigma_error::INTERNAL, $errorstr);
}
$data = new enigma_signature();
--
Gitblit v1.9.1