*/
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;
+use Friendica\Core\Renderer;
use Friendica\Util\Emailer;
/* because the fraking openpgp-php is in composer, require libs in composer
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');
}
$enable = intval(PConfig::get(local_user(), 'securemail', 'enable'));
$publickey = PConfig::get(local_user(), 'securemail', 'pkey');
- $t = get_markup_template('admin.tpl', 'addon/securemail/');
+ $t = Renderer::getMarkupTemplate('admin.tpl', 'addon/securemail/');
- $s .= replace_macros($t, [
+ $s .= Renderer::replaceMacros($t, [
'$title' => L10n::t('"Secure Mail" Settings'),
'$submit' => L10n::t('Save Settings'),
'$test' => L10n::t('Save and send test'), //NOTE: update also in 'post'
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);
* @see App
*/
function securemail_emailer_send_prepare(App &$a, array &$b) {
- if (!x($b, 'uid')) {
+ if (empty($b['uid'])) {
return;
}
$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);