Merge branch '2013.10' into 2014.11
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 19 Aug 2016 07:41:47 +0000 (09:41 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 19 Aug 2016 07:41:47 +0000 (09:41 +0200)
Change-Id: I8b1972e6af0c2b648fdbd89cbe21e77c3c2f5f67

1  2 
tests/tine20/Tinebase/User/LdapTest.php
tine20/Calendar/Frontend/WebDAV/Container.php
tine20/Setup/Frontend/Cli.php
tine20/Setup/Server/Cli.php
tine20/Tinebase/Config.php
tine20/Tinebase/User.php
tine20/Tinebase/User/ActiveDirectory.php
tine20/Tinebase/User/Ldap.php

@@@ -434,10 -313,10 +434,12 @@@ class Setup_Frontend_Cl
          if ($_opts->syncdeletedusers) {
              $options['deleteUsers'] = true;
          }
--
 +        if ($_opts->syncaccountstatus) {
 +            $options['syncAccountStatus'] = true;
 +        }
+         if ($_opts->syncontactphoto) {
+             $options['syncContactPhoto'] = true;
+         }
  
          Tinebase_User::syncUsers($options);
      }
@@@ -48,7 -49,7 +48,8 @@@ class Setup_Server_Cli implements Tineb
                      'dbmailldap'            => 'Only usable with sync_accounts_from_ldap. Fetches dbmail email user data from LDAP.',
                      'onlyusers'             => 'Only usable with sync_accounts_from_ldap. Fetches only users and no groups from LDAP.',
                      'syncdeletedusers'      => 'Only usable with sync_accounts_from_ldap. Removes users from Tine 2.0 DB that no longer exist in LDAP',
 -                    'syncontactphoto'      => 'Only usable with sync_accounts_from_ldap. Always syncs contact photo from ldap',
 +                    'syncaccountstatus'     => 'Only usable with sync_accounts_from_ldap. Synchronizes current account status from LDAP',
++                    'syncontactphoto'       => 'Only usable with sync_accounts_from_ldap. Always syncs contact photo from ldap',
                  'sync_passwords_from_ldap'  => 'Synchronize user passwords from ldap',
                  'egw14import'               => 'Import user and groups from egw14
                           Examples: 
Simple merge
Simple merge
Simple merge