R48775 - /trunk/emailadmin/inc/class.emailadmin_imap_dovecot.inc.php

Old eGW-svn
1

Author: ralfbecker
New Revision: 48775

URL: http://svn.stylite.de/viewvc/egroupware?rev=48775&view=rev
Log:
Dovecot specific fix from getUserMailboxString, as we always have to use INBOX not user.

Modified:
trunk/emailadmin/inc/class.emailadmin_imap_dovecot.inc.php

Modified: trunk/emailadmin/inc/class.emailadmin_imap_dovecot.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/emailadmin/inc/class.emailadmin_imap_dovecot.inc.php?rev=48775&r1=48774&r2=48775&view=diff

— trunk/emailadmin/inc/class.emailadmin_imap_dovecot.inc.php (original)
+++ trunk/emailadmin/inc/class.emailadmin_imap_dovecot.inc.php Sun Sep 28 11:09:40 2014
@@ -57,7 +57,7 @@
*
* Prefixes adminUsername with real username (separated by an asterisk)
*

    • @param string $_username=null create an admin connection for given user or $this->acc_imap_username

    • @param string $_username =null create an admin connection for given user or $this->acc_imap_username
      /
      function adminConnection($_username=null)
      {
      @@ -70,6 +70,29 @@
      ’      ’.$this->acc_imap_admin_username;

      parent::adminConnection($_username);

  • }

  • /**

    • Create mailbox string from given mailbox-name and user-name
    • Admin connection in Dovecot is always for a given user, we can simply use INBOX here.
    • @param string $_username
    • @param string $_folderName =’’
    • @return string utf-7 encoded (done in getMailboxName)

  • */

  • function getUserMailboxString($_username, $_folderName=’’)

  • {

  •   unset($_username);	// not used, but required by function signature

  •   $mailboxString = 'INBOX';

  •   if (!empty($_folderName))

  •   {

  •   	$nameSpaces = $this->getNameSpaceArray();

  •   	$mailboxString .= $nameSpaces['others'][0]['delimiter'] . $_folderName;

  •   }

  •   return $mailboxString;

    }

    /**
    @@ -190,10 +213,7 @@
    {
    if (isset($this->username)) $bufferUsername = $this->username;
    if (isset($this->loginName)) $bufferLoginName = $this->loginName;

  •   $this->username = $_username;

  •   $nameSpaces = $this->getNameSpaces();

  •   $mailBoxName = $this->getUserMailboxString($this->username);

  •   $this->loginName = str_replace((is_array($nameSpaces)?$nameSpaces['others'][0]['name']:'user/'),'',$mailBoxName); // we need to strip the namespacepart

  •   $this->username = $this->loginName = $_username;

  // now disconnect to be able to reestablish the connection with the targetUser while we go on
  try

@@ -203,6 +223,7 @@
catch (Exception $e)
{
// error_log(METHOD.LINE." Could not establish admin Connection!".$e->getMessage());

  •   	unset($e);
  	return array();
  }

Meet PCI DSS 3.0 Compliance Requirements with EventLog Analyzer
Achieve PCI DSS 3.0 Compliant Status with Out-of-the-box PCI DSS Reports
Are you Audit-Ready for PCI DSS 3.0 Compliance? Download White paper
Comply to PCI DSS 3.0 Requirement 10 and 11.5 with EventLog Analyzer
http://pubads.g.doubleclick.net/gampad/clk?id=154622311&iu=/4140/ostg.clktrk

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