Merge branch '2013.10' into 2014.11
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 8 Jan 2015 13:09:58 +0000 (14:09 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 8 Jan 2015 13:09:58 +0000 (14:09 +0100)
1  2 
tine20/Calendar/css/print.css
tine20/Calendar/js/EventUI.js
tine20/Courses/Controller/Course.php
tine20/Tinebase/Model/FullUser.php
tine20/Tinebase/User/Abstract.php

Simple merge
Simple merge
Simple merge
Simple merge
@@@ -346,15 -346,12 +346,12 @@@ abstract class Tinebase_User_Abstract i
          if (! empty($_account->accountFirstName) && $_schema > 0 && method_exists($this, '_generateUserWithSchema' . $_schema)) {
              $userName = call_user_func_array(array($this, '_generateUserWithSchema' . $_schema), array($_account));
          } else {
 -            $userName = strtolower(substr(replaceSpecialChars($_account->accountLastName), 0, 10));
 +            $userName = strtolower(substr(Tinebase_Helper::replaceSpecialChars($_account->accountLastName), 0, 10));
          }
          
-         if (!empty($_length) && (strlen($userName) > $_length)) {
-             $userName = substr($userName, 0, $_length);
-         }
-         $userName = $this->_addSuffixToNameIfExists('accountLoginName', $userName, $_length);
+         $userName = $this->_addSuffixToNameIfExists('accountLoginName', $userName);
          
-         if (Tinebase_Core::isLogLevel(Zend_Log::DEBUG)) Tinebase_Core::getLogger()->debug(__METHOD__ . '::' . __LINE__ . '  generated username: ' . $userName);
+         if (Tinebase_Core::isLogLevel(Zend_Log::DEBUG)) Tinebase_Core::getLogger()->debug(__METHOD__ . '::' . __LINE__ . '  generated username: ' . $userName . ' with schema: '. $_schema);
          
          return $userName;
      }