Dbmailuser.php Types.php

ralfbecker_sf 2016-04-01 12:46:10 UTC #1

Author: ralfbecker
New Revision: 55597

URL: http://svn.stylite.de/viewvc/egroupware?rev=55597&view=rev
Log:
fix imap server shows smpt types and visa versa, also change case of DBMail

Modified:
trunk/egroupware/api/src/Mail/Imap/Dbmailqmailuser.php
trunk/egroupware/api/src/Mail/Imap/Dbmailuser.php
trunk/egroupware/api/src/Mail/Types.php

Modified: trunk/egroupware/api/src/Mail/Imap/Dbmailqmailuser.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/src/Mail/Imap/Dbmailqmailuser.php?rev=55597&r1=55596&r2=55597&view=diff

— trunk/egroupware/api/src/Mail/Imap/Dbmailqmailuser.php (original)
+++ trunk/egroupware/api/src/Mail/Imap/Dbmailqmailuser.php Fri Apr 1 14:46:10 2016
@@ -27,7 +27,7 @@
/**
* Label shown in EMailAdmin
*/

const DESCRIPTION = ‘dbmail (qmailUser Schema)’;

const DESCRIPTION = ‘DBMail (qmailUser Schema)’;

/**
- Capabilities of this class (pipe-separated): default, sieve, admin, logintypeemail

Modified: trunk/egroupware/api/src/Mail/Imap/Dbmailuser.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/src/Mail/Imap/Dbmailuser.php?rev=55597&r1=55596&r2=55597&view=diff

— trunk/egroupware/api/src/Mail/Imap/Dbmailuser.php (original)
+++ trunk/egroupware/api/src/Mail/Imap/Dbmailuser.php Fri Apr 1 14:46:10 2016
@@ -27,7 +27,7 @@
/**
* Label shown in EMailAdmin
*/

const DESCRIPTION = ‘dbmail (dbmailUser Schema)’;

const DESCRIPTION = ‘DBMail (dbmailUser Schema)’;

/**
- Capabilities of this class (pipe-separated): default, sieve, admin, logintypeemail

Modified: trunk/egroupware/api/src/Mail/Types.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/src/Mail/Types.php?rev=55597&r1=55596&r2=55597&view=diff

— trunk/egroupware/api/src/Mail/Types.php (original)
+++ trunk/egroupware/api/src/Mail/Types.php Fri Apr 1 14:46:10 2016
@@ -25,7 +25,7 @@
*/
static public function getSMTPServerTypes($extended=true)
{

  $retData = self::server_types(true, $extended);

  $retData = self::server_types(false, $extended);
  foreach($GLOBALS['egw']->hooks->process(array(
  	'location' => 'smtp_server_types',
  	'extended' => $extended,

@@ -35,9 +35,10 @@
}

	uksort($retData, function($a, $b) {

  	/* static requires PHP5.6+ */ $prio = array(	// not explicitly mentioned get 0

```
  		__NAMESPACE__.'\\Smtp' => 9,
```
```
  		__NAMESPACE__.'\\Smtp\\Sql' => 8,
```

  	static $prio = array(	// not explicitly mentioned get 0

  		'EGroupware\\Api\\Mail\\Smtp' => 9,

  		'EGroupware\\Api\\Mail\\Smtp\\Sql' => 8,

  		'EGroupware\\Api\\Mail\\Smtp\\Ads' => 7,
  	);
  	return (int)$prio[$b] - (int)$prio[$a];
  });

@@ -54,7 +55,7 @@
*/
static public function getIMAPServerTypes($extended=true)
{

  $retData = self::server_types(false, $extended);

  $retData = self::server_types(true, $extended);
  foreach($GLOBALS['egw']->hooks->process(array(
  	'location' => 'imap_server_types',
  	'extended' => $extended,

@@ -63,11 +64,11 @@
if ($data && $app != ‘emailadmin’) $retData += $data;
}
uksort($retData, function($a, $b) {

  	/* static requires PHP5.6+ */ $prio = array(	// not explicitly mentioned get 0

```
  		__NAMESPACE__.'\\Imap' => 9,
```

  	static $prio = array(	// not explicitly mentioned get 0

  		'EGroupware\\Api\\Mail\\Imap' => 9,
  		'managementserver_imap' => 8,

```
  		__NAMESPACE__.'\\Dovecot' => 7,
```
```
  		__NAMESPACE__.'\\Cyrus' => 6,
```

  		'EGroupware\\Api\\Mail\\Imap\\Dovecot' => 7,

  		'EGroupware\\Api\\Mail\\Imap\\Cyrus' => 6,
  	);
  	return (int)$prio[$b] - (int)$prio[$a];
  });

Transform Data into Opportunity.
Accelerate data analysis in your applications with
Intel Data Analytics Acceleration Library.
Click to learn more.
http://pubads.g.doubleclick.net/gampad/clk?id=278785471&iu=/4140

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