Merge pull request #790 from MrPetovan/task/6390-move-contact-constants-to-user

[friendica-addons.git/.git] / securemail / securemail.php

diff --git a/securemail/securemail.php b/securemail/securemail.php
index 9025178..a0ec211 100644 (file)
--- a/securemail/securemail.php
+++ b/securemail/securemail.php
@@ -7,8 +7,8 @@
  */
 
 use Friendica\App;
-use Friendica\Core\Addon;
 use Friendica\Core\Config;
+use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
 use Friendica\Core\PConfig;
@@ -28,19 +28,19 @@ require_once 'openpgp_crypt_symmetric.php';
 
 
 function securemail_install() {
-    Addon::registerHook('addon_settings', 'addon/securemail/securemail.php', 'securemail_settings');
-    Addon::registerHook('addon_settings_post', 'addon/securemail/securemail.php', 'securemail_settings_post');
+    Hook::register('addon_settings', 'addon/securemail/securemail.php', 'securemail_settings');
+    Hook::register('addon_settings_post', 'addon/securemail/securemail.php', 'securemail_settings_post');
 
-    Addon::registerHook('emailer_send_prepare', 'addon/securemail/securemail.php', 'securemail_emailer_send_prepare');
+    Hook::register('emailer_send_prepare', 'addon/securemail/securemail.php', 'securemail_emailer_send_prepare');
 
     Logger::log('installed securemail');
 }
 
 function securemail_uninstall() {
-    Addon::unregisterHook('addon_settings', 'addon/securemail/securemail.php', 'securemail_settings');
-    Addon::unregisterHook('addon_settings_post', 'addon/securemail/securemail.php', 'securemail_settings_post');
+    Hook::unregister('addon_settings', 'addon/securemail/securemail.php', 'securemail_settings');
+    Hook::unregister('addon_settings_post', 'addon/securemail/securemail.php', 'securemail_settings_post');
 
-    Addon::unregisterHook('emailer_send_prepare', 'addon/securemail/securemail.php', 'securemail_emailer_send_prepare');
+    Hook::unregister('emailer_send_prepare', 'addon/securemail/securemail.php', 'securemail_emailer_send_prepare');
 
     Logger::log('removed securemail');
 }
@@ -92,7 +92,7 @@ function securemail_settings_post(App &$a, array &$b){
 
     if ($_POST['securemail-submit']) {
         PConfig::set(local_user(), 'securemail', 'pkey', trim($_POST['securemail-pkey']));
-        $enable = ((x($_POST, 'securemail-enable')) ? 1 : 0);
+        $enable = (!empty($_POST['securemail-enable']) ? 1 : 0);
         PConfig::set(local_user(), 'securemail', 'enable', $enable);
         info(L10n::t('Secure Mail Settings saved.') . EOL);
 
@@ -150,7 +150,7 @@ function securemail_settings_post(App &$a, array &$b){
  * @see App
  */
 function securemail_emailer_send_prepare(App &$a, array &$b) {
-    if (!x($b, 'uid')) {
+    if (empty($b['uid'])) {
         return;
     }
 
@@ -164,7 +164,7 @@ function securemail_emailer_send_prepare(App &$a, array &$b) {
     $public_key_ascii = PConfig::get($uid, 'securemail', 'pkey');
 
     preg_match('/-----BEGIN ([A-Za-z ]+)-----/', $public_key_ascii, $matches);
-    $marker = (empty($matches[1])) ? 'MESSAGE' : $matches[1];
+    $marker = empty($matches[1]) ? 'MESSAGE' : $matches[1];
     $public_key = OpenPGP::unarmor($public_key_ascii, $marker);
 
     $key = OpenPGP_Message::parse($public_key);