Merge branch 'pu/2013.10-userdeactivation'
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 29 Aug 2014 18:47:34 +0000 (20:47 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 29 Aug 2014 18:47:34 +0000 (20:47 +0200)
Conflicts:
tine20/Tinebase/Config.php

Change-Id: Icc3ff03d1c790fe33f57f5ef7b44b4384795b396

1  2 
tine20/Tinebase/Config.php
tine20/Tinebase/Controller.php
tine20/Tinebase/User/Sql.php

@@@ -287,13 -273,13 +287,20 @@@ class Tinebase_Config extends Tinebase_
      const ALARMS_EACH_JOB = 'alarmsEachJob';
      
      /**
+      * ACCOUNT_DEACTIVATION_NOTIFICATION
+      *
+      * @var string
+      */
+     const ACCOUNT_DEACTIVATION_NOTIFICATION = 'accountDeactivationNotification';
+     
+     /**
 +     * roleChangeAllowed
 +     *
 +     * @var string
 +     */
 +    const ROLE_CHANGE_ALLOWED = 'roleChangeAllowed';
 +    
 +    /**
       * (non-PHPdoc)
       * @see tine20/Tinebase/Config/Definition::$_properties
       */
              'setByAdminModule'      => FALSE,
              'setBySetupModule'      => TRUE,
          ),
+         self::ACCOUNT_DEACTIVATION_NOTIFICATION => array(
+             //_('Account deactivation notfication')
+             'label'                 => 'Account deactivation notfication',
+             //_('Send E-Mail to user if the account is deactivated or the user tries to login with deactivated account')
+             'description'           => 'Send E-Mail to User if the account is deactivated or the user tries to login with deactivated account',
+             'type'                  => 'bool',
+             'clientRegistryInclude' => FALSE,
+             'setByAdminModule'      => FALSE,
+             'setBySetupModule'      => TRUE,
+         ),
 +        self::ROLE_CHANGE_ALLOWED => array(
 +                                   //_('Role change allowed')
 +            'label'                 => 'Role change allowed',
 +                                   //_('Allows to configure which user is allowed to switch to another users account')
 +            'description'           => 'Allows to configure which user is allowed to switch to another users account',
 +            'type'                  => 'Tinebase_Config_Struct',
 +            'clientRegistryInclude' => TRUE,
 +            'setByAdminModule'      => FALSE,
 +            'setBySetupModule'      => TRUE,
 +        ),
      );
      
      /**
Simple merge
Simple merge