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 | 157 +++++++++++++++++++++++++++++-----------------------
1 files changed, 88 insertions(+), 69 deletions(-)
diff --git a/plugins/database_attachments/database_attachments.php b/plugins/database_attachments/database_attachments.php
index 9a279f5..aacafae 100644
--- a/plugins/database_attachments/database_attachments.php
+++ b/plugins/database_attachments/database_attachments.php
@@ -1,9 +1,10 @@
<?php
+
/**
- * Filesystem Attachments
+ * 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,22 +13,34 @@
* @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.
*/
-require_once('plugins/filesystem_attachments/filesystem_attachments.php');
+
+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';
+
class database_attachments extends filesystem_attachments
{
+ // Cache object
+ protected $cache;
// A prefix for the cache key used in the session and in the key field of the cache table
- private $cache_prefix = "db_attach";
-
- /**
- * Helper method to generate a unique key for the given attachment file
- */
- private function _key($args)
- {
- $uname = $args['path'] ? $args['path'] : $args['name'];
- return $this->cache_prefix . $args['group'] . md5(mktime() . $uname . $_SESSION['user_id']);
- }
+ const PREFIX = "ATTACH";
/**
* Save a newly uploaded attachment
@@ -35,28 +48,22 @@
function upload($args)
{
$args['status'] = false;
- $rcmail = rcmail::get_instance();
- $key = $this->_key($args);
- $data = file_get_contents($args['path']);
+ $cache = $this->get_cache();
+ $key = $this->_key($args);
+ $data = file_get_contents($args['path']);
- if ($data === false)
+ if ($data === false) {
return $args;
+ }
- $data = base64_encode($data);
-
- $status = $rcmail->db->query(
- "INSERT INTO ".get_table_name('cache')."
- (created, user_id, cache_key, data)
- VALUES (".$rcmail->db->now().", ?, ?, ?)",
- $_SESSION['user_id'],
- $key,
- $data);
+ $data = base64_encode($data);
+ $status = $cache->write($key, $data);
if ($status) {
- $args['id'] = $key;
+ $args['id'] = $key;
$args['status'] = true;
- unset($args['path']);
+ $args['path'] = null;
}
return $args;
@@ -68,26 +75,20 @@
function save($args)
{
$args['status'] = false;
- $rcmail = rcmail::get_instance();
- $key = $this->_key($args);
+ $cache = $this->get_cache();
+ $key = $this->_key($args);
if ($args['path']) {
$args['data'] = file_get_contents($args['path']);
- if ($args['data'] === false)
+ if ($args['data'] === false) {
return $args;
+ }
}
- $data = base64_encode($args['data']);
-
- $status = $rcmail->db->query(
- "INSERT INTO ".get_table_name('cache')."
- (created, user_id, cache_key, data)
- VALUES (".$rcmail->db->now().", ?, ?, ?)",
- $_SESSION['user_id'],
- $key,
- $data);
+ $data = base64_encode($args['data']);
+ $status = $cache->write($key, $data);
if ($status) {
$args['id'] = $key;
@@ -103,18 +104,10 @@
*/
function remove($args)
{
- $args['status'] = false;
- $rcmail = rcmail::get_instance();
- $status = $rcmail->db->query(
- "DELETE FROM ".get_table_name('cache')."
- WHERE user_id=?
- AND cache_key=?",
- $_SESSION['user_id'],
- $args['id']);
+ $cache = $this->get_cache();
+ $status = $cache->remove($args['id']);
- if ($status) {
- $args['status'] = true;
- }
+ $args['status'] = true;
return $args;
}
@@ -135,18 +128,11 @@
*/
function get($args)
{
- $rcmail = rcmail::get_instance();
+ $cache = $this->get_cache();
+ $data = $cache->read($args['id']);
- $sql_result = $rcmail->db->query(
- "SELECT cache_id, data
- FROM ".get_table_name('cache')."
- WHERE user_id=?
- AND cache_key=?",
- $_SESSION['user_id'],
- $args['id']);
-
- if ($sql_arr = $rcmail->db->fetch_assoc($sql_result)) {
- $args['data'] = base64_decode($sql_arr['data']);
+ if ($data) {
+ $args['data'] = base64_decode($data);
$args['status'] = true;
}
@@ -158,12 +144,45 @@
*/
function cleanup($args)
{
- $prefix = $this->cache_prefix . $args['group'];
- $rcmail = rcmail::get_instance();
- $rcmail->db->query(
- "DELETE FROM ".get_table_name('cache')."
- WHERE user_id=?
- AND cache_key like '{$prefix}%'",
- $_SESSION['user_id']);
+ // check if cache object exist, it may be empty on session_destroy (#1489726)
+ if ($cache = $this->get_cache()) {
+ $cache->remove($args['group'], true);
+ }
+ }
+
+ /**
+ * Helper method to generate a unique key for the given attachment file
+ */
+ protected function _key($args)
+ {
+ $uname = $args['path'] ?: $args['name'];
+ return $args['group'] . md5(time() . $uname . $_SESSION['user_id']);
+ }
+
+ /**
+ * Initialize and return cache object
+ */
+ protected function get_cache()
+ {
+ if (!$this->cache) {
+ $this->load_config();
+
+ $rcmail = rcube::get_instance();
+ $ttl = 12 * 60 * 60; // default: 12 hours
+ $ttl = $rcmail->config->get('database_attachments_cache_ttl', $ttl);
+ $type = $rcmail->config->get('database_attachments_cache', 'db');
+ $prefix = self::PREFIX;
+
+ // Add session identifier to the prefix to prevent from removing attachments
+ // in other sessions of the same user (#1490542)
+ if ($id = session_id()) {
+ $prefix .= $id;
+ }
+
+ // Init SQL cache (disable cache data serialization)
+ $this->cache = $rcmail->get_cache($prefix, $type, $ttl, false);
+ }
+
+ return $this->cache;
}
}
--
Gitblit v1.9.1