summaryrefslogtreecommitdiff
path: root/plugins/database_attachments
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/database_attachments')
-rw-r--r--plugins/database_attachments/database_attachments.php126
-rw-r--r--plugins/database_attachments/package.xml6
2 files changed, 70 insertions, 62 deletions
diff --git a/plugins/database_attachments/database_attachments.php b/plugins/database_attachments/database_attachments.php
index 5ec351404..079f4e567 100644
--- a/plugins/database_attachments/database_attachments.php
+++ b/plugins/database_attachments/database_attachments.php
@@ -1,6 +1,6 @@
<?php
/**
- * Database Attachments
+ * Filesystem Attachments
*
* This plugin which provides database backed storage for temporary
* attachment file handling. The primary advantage of this plugin
@@ -13,16 +13,21 @@
* @author Aleksander Machniak <alec@alec.pl>
* @version @package_version@
*/
-
-require_once INSTALL_PATH . 'plugins/filesystem_attachments/filesystem_attachments.php';
-
+require_once('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
- protected $prefix = "db_attach";
+ 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']);
+ }
/**
* Save a newly uploaded attachment
@@ -30,17 +35,23 @@ class database_attachments extends filesystem_attachments
function upload($args)
{
$args['status'] = false;
+ $rcmail = rcmail::get_instance();
+ $key = $this->_key($args);
- $cache = $this->get_cache();
- $key = $this->_key($args);
- $data = file_get_contents($args['path']);
+ $data = file_get_contents($args['path']);
- if ($data === false) {
+ if ($data === false)
return $args;
- }
- $data = base64_encode($data);
- $status = $cache->write($key, $data);
+ $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);
if ($status) {
$args['id'] = $key;
@@ -57,20 +68,26 @@ class database_attachments extends filesystem_attachments
function save($args)
{
$args['status'] = false;
+ $rcmail = rcmail::get_instance();
- $cache = $this->get_cache();
- $key = $this->_key($args);
+ $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 = $cache->write($key, $data);
+ $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);
if ($status) {
$args['id'] = $key;
@@ -86,10 +103,18 @@ class database_attachments extends filesystem_attachments
*/
function remove($args)
{
- $cache = $this->get_cache();
- $status = $cache->remove($args['id']);
+ $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']);
- $args['status'] = true;
+ if ($status) {
+ $args['status'] = true;
+ }
return $args;
}
@@ -110,11 +135,18 @@ class database_attachments extends filesystem_attachments
*/
function get($args)
{
- $cache = $this->get_cache();
- $data = $cache->read($args['id']);
-
- if ($data) {
- $args['data'] = base64_decode($data);
+ $rcmail = rcmail::get_instance();
+
+ $sql_result = $rcmail->db->query(
+ "SELECT 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']);
$args['status'] = true;
}
@@ -126,36 +158,12 @@ class database_attachments extends filesystem_attachments
*/
function cleanup($args)
{
- $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['path'] : $args['name'];
- return $args['group'] . md5(mktime() . $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');
-
- // Init SQL cache (disable cache data serialization)
- $this->cache = $rcmail->get_cache($this->prefix, 'db', $ttl, false);
- }
-
- return $this->cache;
+ $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']);
}
}
diff --git a/plugins/database_attachments/package.xml b/plugins/database_attachments/package.xml
index 44adc219e..40db858a4 100644
--- a/plugins/database_attachments/package.xml
+++ b/plugins/database_attachments/package.xml
@@ -5,7 +5,7 @@
http://pear.php.net/dtd/package-2.0.xsd">
<name>database_attachments</name>
<channel>pear.roundcube.net</channel>
- <summary>Database storage for uploaded attachments</summary>
+ <summary>SQL database storage for uploaded attachments</summary>
<description>
This plugin which provides database backed storage for temporary
attachment file handling. The primary advantage of this plugin
@@ -24,9 +24,9 @@
<email>ziba@umich.edu</email>
<active>yes</active>
</developer>
- <date>2013-06-13</date>
+ <date>2011-11-21</date>
<version>
- <release>1.1</release>
+ <release>1.0</release>
<api>1.0</api>
</version>
<stability>