Index: branches/main/admin/interface/version.php
===================================================================
--- branches/main/admin/interface/version.php	(revision 28)
+++ branches/main/admin/interface/version.php	(revision 29)
@@ -44,7 +44,7 @@
 if (!defined('VERSION_LOADED')) {
     $sInfo = '
         VERSION  = "2.10.1-dev"
-        REVISION = "28"
+        REVISION = "29"
         SP       = ""
     ';
     foreach (parse_ini_string($sInfo) as $item=>$value) {
Index: branches/main/framework/CoreAutoloader.php
===================================================================
--- branches/main/framework/CoreAutoloader.php	(revision 28)
+++ branches/main/framework/CoreAutoloader.php	(revision 29)
@@ -78,6 +78,10 @@
 
     public static function autoLoad($sClassName)
     {
+        $sTmp = \basename($sClassName);
+        if (\strtolower(\substr($sTmp, -5)) == 'trait') {
+            $sClassName = 'bin\traits\\'.$sTmp;
+        }
         $aMatches = \preg_split(
             '=/=',
             \str_replace('\\', '/',$sClassName.'.php'),
@@ -85,7 +89,7 @@
             \PREG_SPLIT_NO_EMPTY
         );
         // insert default NS if no one is given
-        if (\sizeof($aMatches) == 1) { \array_unshift($aMatches, 'framework'); }
+        if (\sizeof($aMatches) == 1) { \array_unshift($aMatches, 'bin'); }
         // extract default filename
         $sClassFileName = \array_pop($aMatches);
         // translate namespaces into the real dir entries
Index: branches/main/framework/traits/Phplib_FtanTrait.php
===================================================================
--- branches/main/framework/traits/Phplib_FtanTrait.php	(nonexistent)
+++ branches/main/framework/traits/Phplib_FtanTrait.php	(revision 29)
@@ -0,0 +1,51 @@
+<?php
+
+/*
+ * Copyright (C) 2017 Manuela v.d.Decken <manuela@isteam.de>
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT OR THIS HEADER
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License 2 for more details.
+ *
+ * You should have received a copy of the GNU General Public License 2
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+/**
+ * Description of Phplib_FtanTrait
+ *
+ * @package      Vendor_Phplib
+ * @copyright    Manuela v.d.Decken <manuela@isteam.de>
+ * @author       Manuela v.d.Decken <manuela@isteam.de>
+ * @license      GNU General Public License 2.0
+ * @version      0.0.1
+ * @revision     $Id$
+ * @since        File available since 11.11.2017
+ * @deprecated   no / since 0000/00/00
+ * @description  xxx
+ */
+//declare(strict_types = 1);
+//declare(encoding = 'UTF-8');
+
+/**
+ * short description of trait
+ */
+trait Phplib_FtanTrait
+{
+    public function set_ftan($aFtan)
+    {
+        $aResult = [
+            'FTAN_NAME'  => $aFtan['name'],
+            'FTAN_VALUE' => $aFtan['value']
+        ];
+        if (isset($aFtan['remain'])) { $aResult['FTAN_REMAIN'] = $aFtan['remain']; }
+        if (isset($aFtan['previous'])) { $aResult['FTAN_PREVIOUS'] = $aFtan['previous']; }
+        $this->set_var($aResult);
+    }
+}

Property changes on: branches/main/framework/traits/Phplib_FtanTrait.php
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Index: branches/main/include/phplib/template.inc
===================================================================
--- branches/main/include/phplib/template.inc	(revision 28)
+++ branches/main/include/phplib/template.inc	(revision 29)
@@ -67,13 +67,9 @@
  * Ticket #812 depricated Fix 2009/11/25
  */
 
-if (is_readable(__DIR__.'/FtanTrait.php') and !trait_exists('\FtanTrait', false)) {
-    include __DIR__.'/FtanTrait.php';
-}
-
 class Template
 {
-    use \FtanTrait;
+    use \Phplib_FtanTrait;
  /**
   * Serialization helper, the name of this class.
   *