From ed1d212ae2daea5e4bd043417610177093e99f19 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sat, 16 Jan 2016 03:03:51 -0500
Subject: [PATCH] Improved SVG cleanup code
---
program/lib/Roundcube/rcube_result_thread.php | 27 +++------------------------
1 files changed, 3 insertions(+), 24 deletions(-)
diff --git a/program/lib/Roundcube/rcube_result_thread.php b/program/lib/Roundcube/rcube_result_thread.php
index 1687616..5388eb1 100644
--- a/program/lib/Roundcube/rcube_result_thread.php
+++ b/program/lib/Roundcube/rcube_result_thread.php
@@ -1,6 +1,6 @@
<?php
-/*
+/**
+-----------------------------------------------------------------------+
| This file is part of the Roundcube Webmail client |
| Copyright (C) 2005-2011, The Roundcube Dev Team |
@@ -47,7 +47,6 @@
$this->init($data);
}
-
/**
* Initializes object with IMAP command response
*
@@ -83,7 +82,6 @@
$this->raw_data = $this->parse_thread($data);
}
-
/**
* Checks the result from IMAP command
*
@@ -94,7 +92,6 @@
return $this->raw_data === null ? true : false;
}
-
/**
* Checks if the result is empty
*
@@ -104,7 +101,6 @@
{
return empty($this->raw_data) ? true : false;
}
-
/**
* Returns number of elements (threads) in the result
@@ -128,7 +124,6 @@
return $this->meta['count'];
}
-
/**
* Returns number of all messages in the result
@@ -155,7 +150,6 @@
return $this->meta['messages'];
}
-
/**
* Returns maximum message identifier in the result
*
@@ -169,7 +163,6 @@
return $this->meta['max'];
}
-
/**
* Returns minimum message identifier in the result
*
@@ -182,7 +175,6 @@
}
return $this->meta['min'];
}
-
/**
* Slices data set.
@@ -199,7 +191,6 @@
$this->meta['count'] = count($data);
$this->raw_data = implode(self::SEPARATOR_ELEMENT, $data);
}
-
/**
* Filters data set. Removes threads not listed in $roots list.
@@ -240,7 +231,6 @@
$this->raw_data = ltrim($result, self::SEPARATOR_ELEMENT);
}
-
/**
* Reverts order of elements in the result
*/
@@ -269,7 +259,6 @@
$this->raw_data = rtrim($result, self::SEPARATOR_ELEMENT);
}
-
/**
* Check if the given message ID exists in the object
@@ -314,7 +303,6 @@
return false;
}
-
/**
* Return IDs of all messages in the result. Threaded data will be flattened.
*
@@ -333,7 +321,6 @@
return preg_split($regexp, $this->raw_data);
}
-
/**
* Return all messages in the result.
*
@@ -347,7 +334,6 @@
return rcube_imap_generic::compressMessageSet($this->get());
}
-
/**
* Return result element at specified index (all messages, not roots)
@@ -418,17 +404,16 @@
return $data[$index];
}
-
/**
* Returns response parameters e.g. MAILBOX, ORDER
*
- * @param string $param Parameter name
+ * @param string $param Parameter name
*
* @return array|string Response parameters or parameter value
*/
public function get_parameters($param=null)
{
- $params = $this->params;
+ $params = array();
$params['MAILBOX'] = $this->mailbox;
$params['ORDER'] = $this->order;
@@ -438,7 +423,6 @@
return $params;
}
-
/**
* THREAD=REFS sorting implementation (based on provided index)
@@ -509,7 +493,6 @@
$this->raw_data = implode(self::SEPARATOR_ELEMENT, $result);
}
-
/**
* Returns data as tree
*
@@ -534,7 +517,6 @@
return $result;
}
-
/**
* Returns thread depth and children data
*
@@ -551,7 +533,6 @@
return array($depth, $children);
}
-
/**
* Creates 'depth' and 'children' arrays from stored thread 'tree' data.
*/
@@ -566,7 +547,6 @@
}
}
}
-
/**
* Converts part of the raw thread into an array
@@ -589,7 +569,6 @@
return $result;
}
-
/**
* IMAP THREAD response parser
--
Gitblit v1.9.1