Merge branch '2013.10' into 2014.11
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 7 Sep 2015 15:48:42 +0000 (17:48 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 7 Sep 2015 15:48:42 +0000 (17:48 +0200)
tine20/Filemanager/js/NodeGridPanel.js
tine20/Tinebase/User.php
tine20/Tinebase/User/Ldap.php

index d1926ad..e4013dc 100644 (file)
@@ -421,6 +421,7 @@ Tine.Filemanager.NodeGridPanel = Ext.extend(Tine.widgets.grid.GridPanel, {
             Ext.MessageBox.show({
                 title: selections[0].data.type == 'folder' ? this.app.i18n._('Folder has been published successfully') : this.app.i18n._('File has been published successfully'), 
                 msg: String.format(this.app.i18n._("Url: {0}") + '<br />' + this.app.i18n._("Valid Until: {1}"), record.get('url'), record.get('expiry_time')), 
+                width:900,
                 buttons: Ext.Msg.OK,
                 icon: Ext.MessageBox.INFO,
                 scope: this
index 770db17..e87e742 100644 (file)
@@ -539,13 +539,15 @@ class Tinebase_User
             $contact = $addressbook->getByUserId($syncedUser->getId());
             $originalContact = clone $contact;
 
+            if (Tinebase_Core::isLogLevel(Zend_Log::TRACE)) Tinebase_Core::getLogger()->trace(__METHOD__ . '::' . __LINE__
+                . ' user: ' .print_r($syncedUser->toArray(), true));
+
             Tinebase_User::getInstance()->updateContactFromSyncBackend($syncedUser, $contact);
             $contact = self::_user2Contact($syncedUser, $contact);
 
             if (Tinebase_Core::isLogLevel(Zend_Log::TRACE)) Tinebase_Core::getLogger()->trace(__METHOD__ . '::' . __LINE__
-                . print_r($syncedUser->toArray(), true)
-                . ' new: ' . print_r($contact->toArray(), true)
-                . ' orig:' . print_r($originalContact->toArray(), true));
+                . ' new contact: ' . print_r($contact->toArray(), true)
+                . ' orig contact:' . print_r($originalContact->toArray(), true));
 
             // TODO allow to diff jpegphoto, too / maybe this should only be done when called via CLI/cronjob
             $diff = $contact->diff($originalContact, array('jpegphoto'));
@@ -569,6 +571,10 @@ class Tinebase_User
         } catch (Addressbook_Exception_NotFound $aenf) {
             self::createContactForSyncedUser($syncedUser);
             $syncedUser = Tinebase_User::getInstance()->updateUserInSqlBackend($syncedUser);
+        } catch (Tinebase_Exception_NotFound $tenf) {
+            if (Tinebase_Core::isLogLevel(Zend_Log::NOTICE)) Tinebase_Core::getLogger()->notice(__METHOD__ . '::' . __LINE__
+                . ' Contact information seems to be missing in sync backend');
+            Tinebase_Exception::log($tenf);
         }
     }
     
index 914ebdf..e1bca98 100644 (file)
@@ -664,6 +664,10 @@ class Tinebase_User_Ldap extends Tinebase_User_Sql implements Tinebase_User_Inte
             $this->_rowNameMapping['accountId'], $userId
         );
 
+        if (Tinebase_Core::isLogLevel(Zend_Log::TRACE))
+            Tinebase_Core::getLogger()->trace(__METHOD__ . '::' . __LINE__
+                . ' fetch meta data - filter: ' . $filter);
+
         $result = $this->_ldap->search(
             $filter,
             $this->_baseDn,