From a605b2584df2dd5bc2bd3b9ba73e71d921eb9a13 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Wed, 02 May 2012 16:56:29 -0400
Subject: [PATCH] - Allow to configure the number of values allowed for each LDAP attribute - Support for serialized LDAP address values (usually delimited with a $)
---
program/include/rcube_image.php | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/program/include/rcube_image.php b/program/include/rcube_image.php
index 79dcad6..5ba6357 100644
--- a/program/include/rcube_image.php
+++ b/program/include/rcube_image.php
@@ -73,10 +73,10 @@
*/
public function resize($size, $filename = null)
{
- $result = false;
- $rcmail = rcmail::get_instance();
- $convert = $rcmail->config->get('im_convert_path', false);
- $props = $this->props();
+ $result = false;
+ $rcube = rcube::get_instance();
+ $convert = $rcube->config->get('im_convert_path', false);
+ $props = $this->props();
if (!$filename) {
$filename = $this->image_file;
@@ -98,7 +98,7 @@
$p['-opts'] = array('-resize' => $size.'>');
if (in_array($type, explode(',', $p['types']))) { // Valid type?
- $result = rcmail::exec($convert . ' 2>&1 -flatten -auto-orient -colorspace RGB -quality {quality} {-opts} {in} {type}:{out}', $p) === '';
+ $result = rcube::exec($convert . ' 2>&1 -flatten -auto-orient -colorspace RGB -quality {quality} {-opts} {in} {type}:{out}', $p) === '';
}
if ($result) {
@@ -161,11 +161,11 @@
*/
private function identify()
{
- $rcmail = rcmail::get_instance();
+ $rcube = rcube::get_instance();
- if ($cmd = $rcmail->config->get('im_identify_path')) {
+ if ($cmd = $rcube->config->get('im_identify_path')) {
$args = array('in' => $this->image_file, 'format' => "%m %[fx:w] %[fx:h]");
- $id = rcmail::exec($cmd. ' 2>/dev/null -format {format} {in}', $args);
+ $id = rcube::exec($cmd. ' 2>/dev/null -format {format} {in}', $args);
if ($id) {
return explode(' ', strtolower($id));
--
Gitblit v1.9.1