Sql.php

ralfbecker_sf 2016-04-06 08:48:52 UTC #1

Author: ralfbecker
New Revision: 55645

URL: http://svn.stylite.de/viewvc/egroupware?rev=55645&view=rev
Log:
fix mail account dialog for non user-editable accounts was always readonly and SQL error on storing it, caused by moving tables from (no longer existing) emailadmin to api

Modified:
trunk/egroupware/api/src/Mail/Account.php
trunk/egroupware/api/src/Mail/Credentials.php
trunk/egroupware/api/src/Mail/Notifications.php
trunk/egroupware/api/src/Mail/Smtp/Sql.php

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

— trunk/egroupware/api/src/Mail/Account.php (original)
+++ trunk/egroupware/api/src/Mail/Account.php Wed Apr 6 10:48:52 2016
@@ -96,7 +96,10 @@
*/
class Account implements \ArrayAccess
{

const APP = ‘emailadmin’;

/**
- App tables belong to
*/
const APP = ‘api’;
/**
- Table with mail-accounts
  */
  @@ -903,8 +906,8 @@
  }
  
  $access = false;

```
  // emailadmin has all rights
```

  if (isset($GLOBALS['egw_info']['user']['apps']['emailadmin']))

```
  // Admin app has all rights
```

  if (isset($GLOBALS['egw_info']['user']['apps']['admin']))
  {
  	$access = true;
  	$reason = 'user is EMailAdmin';

@@ -1150,7 +1153,7 @@
if (!($data[‘acc_id’] > 0))
{
// set not set values which, are NOT NULL and therefore would give an SQL error

  	$td = self::$db->get_table_definitions('emailadmin', self::TABLE);

  	$td = self::$db->get_table_definitions('api', self::TABLE);
  	foreach($td['fd'] as $col => $def)
  	{
  		if (!isset($data[$col]) && $def['nullable'] === false && !isset($def['default']))

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

— trunk/egroupware/api/src/Mail/Credentials.php (original)
+++ trunk/egroupware/api/src/Mail/Credentials.php Wed Apr 6 10:48:52 2016
@@ -25,8 +25,17 @@
*/
class Credentials
{

const APP = ‘emailadmin’;

/**
- App tables belong to
*/
const APP = ‘api’;
/**
- Name of credentials table
*/
const TABLE = ‘egw_ea_credentials’;
/**
- Join to check account is user-editable
*/
const USER_EDITABLE_JOIN = ‘JOIN egw_ea_accounts ON egw_ea_accounts.acc_id=egw_ea_credentials.acc_id AND acc_user_editable=’;

/**

@@ -378,7 +387,7 @@
$old_mcrypt = null;
foreach(self::$db->select(self::TABLE, self::TABLE.’.*’, array(
‘account_id’ => $data[‘account_id’]

  ),__LINE__, __FILE__, false, '', 'emailadmin', 0, self::USER_EDITABLE_JOIN.self::$db->quote(true, 'bool')) as $row)

  ),__LINE__, __FILE__, false, '', self::APP, 0, self::USER_EDITABLE_JOIN.self::$db->quote(true, 'bool')) as $row)
  {
  	if (!isset($old_mcrypt))
  	{

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

— trunk/egroupware/api/src/Mail/Notifications.php (original)
+++ trunk/egroupware/api/src/Mail/Notifications.php Wed Apr 6 10:48:52 2016
@@ -21,7 +21,13 @@
*/
class Notifications
{

const APP = ‘emailadmin’;

/**
- App tables belong to
*/
const APP = ‘api’;
/**
- Name of credentials table
*/
const TABLE = ‘egw_ea_notifications’;

/**

Modified: trunk/egroupware/api/src/Mail/Smtp/Sql.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/api/src/Mail/Smtp/Sql.php?rev=55645&r1=55644&r2=55645&view=diff

— trunk/egroupware/api/src/Mail/Smtp/Sql.php (original)
+++ trunk/egroupware/api/src/Mail/Smtp/Sql.php Wed Apr 6 10:48:52 2016
@@ -45,7 +45,7 @@
/**
* Name of app our table belongs to
*/

const APP = ‘emailadmin’;

const APP = ‘api’;
/**
- Values for mail_type column

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