From 8c626eec8a384a4bdf47a1b1deae319d18c62e1b Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Tue, 26 Jan 2016 10:59:40 -0500
Subject: [PATCH] Cleanup redundant variables
---
plugins/enigma/lib/enigma_ui.php | 6 +++---
plugins/enigma/lib/enigma_engine.php | 14 ++------------
2 files changed, 5 insertions(+), 15 deletions(-)
diff --git a/plugins/enigma/lib/enigma_engine.php b/plugins/enigma/lib/enigma_engine.php
index 41d31a3..98f932e 100644
--- a/plugins/enigma/lib/enigma_engine.php
+++ b/plugins/enigma/lib/enigma_engine.php
@@ -32,7 +32,6 @@
public $decryptions = array();
public $signatures = array();
- public $signed_parts = array();
public $encrypted_parts = array();
const SIGN_MODE_BODY = 1;
@@ -493,8 +492,7 @@
// Store signature data for display
if (!empty($sig)) {
- $this->signed_parts[$part->mime_id] = $part->mime_id;
- $this->signatures[$part->mime_id] = $sig;
+ $this->signatures[$part->mime_id] = $sig;
}
fclose($fh);
@@ -540,15 +538,7 @@
// Store signature data for display
$this->signatures[$struct->mime_id] = $sig;
-
- // Message can be multipart (assign signature to each subpart)
- if (!empty($msg_part->parts)) {
- foreach ($msg_part->parts as $part)
- $this->signed_parts[$part->mime_id] = $struct->mime_id;
- }
- else {
- $this->signed_parts[$msg_part->mime_id] = $struct->mime_id;
- }
+ $this->signatures[$msg_part->mime_id] = $sig;
}
/**
diff --git a/plugins/enigma/lib/enigma_ui.php b/plugins/enigma/lib/enigma_ui.php
index 372adab..19f1629 100644
--- a/plugins/enigma/lib/enigma_ui.php
+++ b/plugins/enigma/lib/enigma_ui.php
@@ -796,13 +796,13 @@
}
// Signature verification status
- if (($found = $this->find_part_id($part_id, $engine->signed_parts)) !== null
- && ($sig = $engine->signatures[$engine->signed_parts[$found]])
+ if (($found = $this->find_part_id($part_id, $engine->signatures)) !== null
+ && ($sig = $engine->signatures[$found])
) {
$attach_scripts = true;
// show the message only once
- unset($engine->signatures[$engine->signed_parts[$part_id]]);
+ unset($engine->signatures[$found]);
// display status info
$attrib['id'] = 'enigma-message';
--
Gitblit v1.9.1