From bd0551b22076b82a6d49e9f7a2b2e0c90a1b2326 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Fri, 05 Feb 2016 07:25:27 -0500
Subject: [PATCH] Secure also downloads of addressbook exports, managesieve script exports and Enigma keys exports
---
program/steps/addressbook/search.inc | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/program/steps/addressbook/search.inc b/program/steps/addressbook/search.inc
index d5d5c32..f16abd7 100644
--- a/program/steps/addressbook/search.inc
+++ b/program/steps/addressbook/search.inc
@@ -49,7 +49,7 @@
$OUTPUT->command('insert_saved_search', rcube::Q($name), rcube::Q($result));
}
else
- $OUTPUT->show_message($plugin['message'] ? $plugin['message'] : 'savedsearchcreateerror', 'error');
+ $OUTPUT->show_message($plugin['message'] ?: 'savedsearchcreateerror', 'error');
$OUTPUT->send();
}
@@ -72,7 +72,7 @@
$OUTPUT->set_env('pagecount', 0);
}
else
- $OUTPUT->show_message($plugin['message'] ? $plugin['message'] : 'savedsearchdeleteerror', 'error');
+ $OUTPUT->show_message($plugin['message'] ?: 'savedsearchdeleteerror', 'error');
$OUTPUT->send();
}
@@ -253,7 +253,7 @@
{
global $RCMAIL, $CONTACT_COLTYPES;
- $i_size = !empty($attrib['size']) ? $attrib['size'] : 30;
+ $i_size = $attrib['size'] ?: 30;
$form = array(
'main' => array(
@@ -298,7 +298,7 @@
{
$ftype = $colprop['type'] == 'select' ? 'select' : 'text';
$label = isset($colprop['label']) ? $colprop['label'] : $RCMAIL->gettext($col);
- $category = $colprop['category'] ? $colprop['category'] : 'other';
+ $category = $colprop['category'] ?: 'other';
// load jquery UI datepicker for date fields
if ($colprop['type'] == 'date')
--
Gitblit v1.9.1