From 0344b168276f80189e2254c75a762aff5b517b6b Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sun, 22 May 2016 06:32:57 -0400
Subject: [PATCH] Fix priority icon(s) position
---
plugins/database_attachments/database_attachments.php | 24 +++++++++++++++++++++---
1 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/plugins/database_attachments/database_attachments.php b/plugins/database_attachments/database_attachments.php
index 31747b3..aacafae 100644
--- a/plugins/database_attachments/database_attachments.php
+++ b/plugins/database_attachments/database_attachments.php
@@ -1,9 +1,10 @@
<?php
+
/**
* Database Attachments
*
* This plugin which provides database backed storage for temporary
- * attachment file handling. The primary advantage of this plugin
+ * attachment file handling. The primary advantage of this plugin
* is its compatibility with round-robin dns multi-server roundcube
* installations.
*
@@ -12,7 +13,24 @@
* @author Ziba Scott <ziba@umich.edu>
* @author Aleksander Machniak <alec@alec.pl>
* @version @package_version@
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
+
+if (class_exists('filesystem_attachments', false) && !defined('TESTS_DIR')) {
+ die("Configuration issue. There can be only one enabled plugin for attachments handling");
+}
require_once INSTALL_PATH . 'plugins/filesystem_attachments/filesystem_attachments.php';
@@ -137,8 +155,8 @@
*/
protected function _key($args)
{
- $uname = $args['path'] ? $args['path'] : $args['name'];
- return $args['group'] . md5(mktime() . $uname . $_SESSION['user_id']);
+ $uname = $args['path'] ?: $args['name'];
+ return $args['group'] . md5(time() . $uname . $_SESSION['user_id']);
}
/**
--
Gitblit v1.9.1