R52281 - /branches/14.2/emailadmin/inc/class.emailadmin_imap.inc.php

Old eGW-svn
1

Author: leithoff
New Revision: 52281

URL: http://svn.stylite.de/viewvc/egroupware?rev=52281&view=rev
Log:
handle failed delimiter retrieving, or no delimiter reported by imap. default to slash (/)

Modified:
branches/14.2/emailadmin/inc/class.emailadmin_imap.inc.php

Modified: branches/14.2/emailadmin/inc/class.emailadmin_imap.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/branches/14.2/emailadmin/inc/class.emailadmin_imap.inc.php?rev=52281&r1=52280&r2=52281&view=diff

— branches/14.2/emailadmin/inc/class.emailadmin_imap.inc.php (original)
+++ branches/14.2/emailadmin/inc/class.emailadmin_imap.inc.php Thu Mar 26 12:04:32 2015
@@ -529,7 +529,7 @@
{
$_status[strtoupper($key)]=$v;
}

  •   			$_status['HIERACHY_DELIMITER'] = $_status['delimiter'] = $box['delimiter'];//$this->getDelimiter('user');

  •   			$_status['HIERACHY_DELIMITER'] = $_status['delimiter'] = ($box['delimiter']?$box['delimiter']:$this->getDelimiter('personal'));
  			$_status['ATTRIBUTES'] = $box['attributes'];
  			//error_log(__METHOD__.__LINE__.$k.'->'.array2string($_status));
  			return $_status;

@@ -600,7 +600,7 @@
foreach ((array)$mailboxes as $k =>$box)
{
//error_log(METHOD.LINE.’ Box:’.$k.’->’.array2string($box));

  •   	$ret[$k]=array('MAILBOX'=>$k,'ATTRIBUTES'=>$box['attributes'],'delimiter'=>$box['delimiter'],'SUBSCRIBED'=>true);

  •   	$ret[$k]=array('MAILBOX'=>$k,'ATTRIBUTES'=>$box['attributes'],'delimiter'=>($box['delimiter']?$box['delimiter']:$this->getDelimiter('personal')),'SUBSCRIBED'=>true);
  }
  // for unknown reasons on ALL, UNSUBSCRIBED are not returned
  //always fetch unsubscribed, think about only fetching it when $options['attributes'] is set

@@ -616,7 +616,7 @@
//error_log(METHOD.LINE.’ Box:’.$k.’ already In?’.array_key_exists($k,$boxexists).’->’.array2string($box));
if(!array_key_exists($k,$ret))
{

  •   			$ret[$k]=array('MAILBOX'=>$k,'ATTRIBUTES'=>$box['attributes'],'delimiter'=>$box['delimiter'],'SUBSCRIBED'=>false);

  •   			$ret[$k]=array('MAILBOX'=>$k,'ATTRIBUTES'=>$box['attributes'],'delimiter'=>($box['delimiter']?$box['delimiter']:$this->getDelimiter('personal')),'SUBSCRIBED'=>false);
  		}
  		else
  		{

@@ -689,7 +689,7 @@
}
else
{

  •   		$ret[$k]=array('MAILBOX'=>$k,'ATTRIBUTES'=>$box['attributes'],'delimiter'=>$box['delimiter'],'SUBSCRIBED'=>true);

  •   		$ret[$k]=array('MAILBOX'=>$k,'ATTRIBUTES'=>$box['attributes'],'delimiter'=>($box['delimiter']?$box['delimiter']:$this->getDelimiter('personal')),'SUBSCRIBED'=>true);
  	}
  }
  return $ret;

@@ -946,6 +946,7 @@
static $nameSpace=null;
$foldersNameSpace = array();
$delimiter = $this->getDelimiter();

  •   if (empty($delimiter)) $delimiter='/';
  if (is_null($nameSpace)) $nameSpace = $this->getNameSpaceArray();
  if (is_array($nameSpace)) {
  	foreach($nameSpace as $type => $singleNameSpaceArray)

@@ -1004,7 +1005,7 @@
$namespaces = $this->getNamespaces();
foreach ($namespaces as $nsp)
{

  •   	if ($nsp['type']==$type) return $nsp['delimiter'];

  •   	if ($nsp['type']==$type && $nsp['delimiter']) return $nsp['delimiter'];
  }
  return "/";
    }
    @@ -1122,7 +1123,7 @@
    $username .= ‘@’. $this->domainName;
    }
  •   $mailboxString = $nameSpaces['others'][0]['name'] . $username . (!empty($_folderName) ? $nameSpaces['others'][0]['delimiter'] . $_folderName : '');

  •   $mailboxString = $nameSpaces['others'][0]['name'] . $username . (!empty($_folderName) ? ($nameSpaces['others'][0]['delimiter']?$nameSpaces['others'][0]['delimiter']:'/') . $_folderName : '');

  return $mailboxString;
    }
    @@ -1151,7 +1152,7 @@
    ‘name’ => $data[‘name’],
    ‘prefix’ => $data[‘name’],
    ‘prefix_present’ => !empty($data[‘name’]),
  •   			'delimiter' => $data['delimiter'],

  •   			'delimiter' => ($data['delimiter']?$data['delimiter']:'/'),
  		);
  	}
  }

Dive into the World of Parallel Programming The Go Parallel Website, sponsored
by Intel and developed in partnership with Slashdot Media, is your hub for all
things parallel software development, from weekly thought leadership blogs to
news, videos, case studies, tutorials and more. Take a look and join the
conversation now. http://goparallel.sourceforge.net/

eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs